diff --git a/sources/README b/sources/README index 1611a6d..4254de0 100644 --- a/sources/README +++ b/sources/README @@ -4,7 +4,7 @@ at http://www.dokuwiki.org/ For Installation Instructions see http://www.dokuwiki.org/install -DokuWiki - 2004-2015 (c) Andreas Gohr +DokuWiki - 2004-2016 (c) Andreas Gohr and the DokuWiki Community See COPYING and file headers for license info diff --git a/sources/VERSION b/sources/VERSION index a2857f1..bf1f8c9 100644 --- a/sources/VERSION +++ b/sources/VERSION @@ -1 +1 @@ -2015-08-10a "Detritus" +2016-06-26a "Elenor of Tsort" diff --git a/sources/bin/.htaccess b/sources/bin/.htaccess index 281d5c3..5f279f1 100644 --- a/sources/bin/.htaccess +++ b/sources/bin/.htaccess @@ -1,2 +1,7 @@ -order allow,deny -deny from all + + Require all denied + + + Order allow,deny + Deny from all + diff --git a/sources/bin/dwpage.php b/sources/bin/dwpage.php index d7f6e9b..1c1a1c1 100755 --- a/sources/bin/dwpage.php +++ b/sources/bin/dwpage.php @@ -248,7 +248,7 @@ class PageCLI extends DokuCLI { lock($wiki_id); - if(checklock($wiki_id) != $this->username) { + if(checklock($wiki_id)) { $this->error("Unable to obtain lock for $wiki_id "); var_dump(checklock($wiki_id)); exit(1); diff --git a/sources/conf/.htaccess b/sources/conf/.htaccess index bcc3ea0..b3ffca5 100644 --- a/sources/conf/.htaccess +++ b/sources/conf/.htaccess @@ -1,3 +1,8 @@ ## no access to the conf directory -order allow,deny -deny from all + + Require all denied + + + Order allow,deny + Deny from all + diff --git a/sources/conf/dokuwiki.php b/sources/conf/dokuwiki.php index bdc9739..30ed160 100644 --- a/sources/conf/dokuwiki.php +++ b/sources/conf/dokuwiki.php @@ -65,7 +65,7 @@ $conf['disableactions'] = ''; //comma separated list of actions to di $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP $conf['remote'] = 0; //Enable/disable remote interfaces -$conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated) +$conf['remoteuser'] = '!!not set!!'; //user/groups that have access to remote interface (comma separated) /* Antispam Features */ $conf['usewordblock']= 1; //block spam based on words? 0|1 @@ -149,7 +149,7 @@ $conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz // bz2 generates smaller files, but needs more cpu-power $conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser) $conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 -$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8 +$conf['cssdatauri'] = 512; //Maximum byte size of small images to embed into CSS, won't work on IE<8 $conf['send404'] = 0; //Send a HTTP 404 status for non existing pages? $conf['broken_iua'] = 0; //Platform with broken ignore_user_abort (IIS+CGI) 0|1 $conf['xsendfile'] = 0; //Use X-Sendfile (1 = lighttpd, 2 = standard) diff --git a/sources/conf/interwiki.conf b/sources/conf/interwiki.conf index 4dc3c80..2432f11 100644 --- a/sources/conf/interwiki.conf +++ b/sources/conf/interwiki.conf @@ -26,11 +26,11 @@ wpmeta https://meta.wikipedia.org/wiki/{NAME} doku https://www.dokuwiki.org/ rfc https://tools.ietf.org/html/rfc man http://man.cx/ -amazon https://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ -amazon.de https://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ -amazon.uk https://www.amazon.co.uk/exec/obidos/ASIN/ +amazon https://www.amazon.com/dp/{URL}?tag=splitbrain-20 +amazon.de https://www.amazon.de/dp/{URL}?tag=splitbrain-21 +amazon.uk https://www.amazon.co.uk/dp/{URL} paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= -phpfn https://www.php.net/{NAME} +phpfn https://secure.php.net/{NAME} skype skype:{NAME} google.de https://www.google.de/search?q= go https://www.google.com/search?q={URL}&btnI=lucky diff --git a/sources/conf/license.php b/sources/conf/license.php index 89728ab..30d409e 100644 --- a/sources/conf/license.php +++ b/sources/conf/license.php @@ -14,23 +14,23 @@ $license['publicdomain'] = array( 'url' => 'http://creativecommons.org/licenses/publicdomain/', ); $license['cc-by'] = array( - 'name' => 'CC Attribution 3.0 Unported', - 'url' => 'http://creativecommons.org/licenses/by/3.0/', + 'name' => 'CC Attribution 4.0 International', + 'url' => 'http://creativecommons.org/licenses/by/4.0/', ); $license['cc-by-sa'] = array( - 'name' => 'CC Attribution-Share Alike 3.0 Unported', - 'url' => 'http://creativecommons.org/licenses/by-sa/3.0/', + 'name' => 'CC Attribution-Share Alike 4.0 International', + 'url' => 'http://creativecommons.org/licenses/by-sa/4.0/', ); $license['gnufdl'] = array( 'name' => 'GNU Free Documentation License 1.3', 'url' => 'http://www.gnu.org/licenses/fdl-1.3.html', ); $license['cc-by-nc'] = array( - 'name' => 'CC Attribution-Noncommercial 3.0 Unported', - 'url' => 'http://creativecommons.org/licenses/by-nc/3.0/', + 'name' => 'CC Attribution-Noncommercial 4.0 International', + 'url' => 'http://creativecommons.org/licenses/by-nc/4.0/', ); $license['cc-by-nc-sa'] = array( - 'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported', - 'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/', + 'name' => 'CC Attribution-Noncommercial-Share Alike 4.0 International', + 'url' => 'http://creativecommons.org/licenses/by-nc-sa/4.0/', ); diff --git a/sources/data/.htaccess b/sources/data/.htaccess index 281d5c3..5f279f1 100644 --- a/sources/data/.htaccess +++ b/sources/data/.htaccess @@ -1,2 +1,7 @@ -order allow,deny -deny from all + + Require all denied + + + Order allow,deny + Deny from all + diff --git a/sources/data/deleted.files b/sources/data/deleted.files index 68fad3c..8bb2887 100644 --- a/sources/data/deleted.files +++ b/sources/data/deleted.files @@ -2,6 +2,10 @@ # but were removed later. An up to date DokuWiki should not have any of # the files installed +# removed in 2016-06-26 +inc/cliopts.php +lib/tpl/dokuwiki/css/mixins.less + # removed in 2015-08-10 inc/TarLib.class.php inc/geshi.php @@ -228,19 +232,6 @@ inc/geshi/xpp.php inc/geshi/yaml.php inc/geshi/z80.php inc/geshi/zxbasic.php -inc/lang/ku/admin.txt -inc/lang/ku/denied.txt -inc/lang/ku/editrev.txt -inc/lang/ku/locked.txt -inc/lang/ku/login.txt -inc/lang/ku/mailtext.txt -inc/lang/ku/norev.txt -inc/lang/ku/password.txt -inc/lang/ku/read.txt -inc/lang/ku/register.txt -inc/lang/ku/revisions.txt -inc/lang/ku/showrev.txt -inc/lang/ku/stopwords.txt lib/images/interwiki/coral.gif lib/images/interwiki/dokubug.gif lib/images/interwiki/sb.gif @@ -250,25 +241,6 @@ lib/scripts/tw-sack.js # removed in 2014-05-05 lib/images/fileicons/audio.png -lib/plugins/acl/lang/hi/lang.php -lib/plugins/acl/lang/id-ni/lang.php -lib/plugins/acl/lang/lb/lang.php -lib/plugins/acl/lang/ms/lang.php -lib/plugins/authad/lang/lv/settings.php -lib/plugins/authldap/lang/lv/settings.php -lib/plugins/authmysql/lang/fi/settings.php -lib/plugins/authmysql/lang/lv/settings.php -lib/plugins/authpgsql/lang/fi/settings.php -lib/plugins/authpgsql/lang/it/settings.php -lib/plugins/authpgsql/lang/lv/settings.php -lib/plugins/authpgsql/lang/pl/settings.php -lib/plugins/config/lang/hr/lang.php -lib/plugins/config/lang/id/lang.php -lib/plugins/config/lang/kk/lang.php -lib/plugins/config/lang/lb/lang.php -lib/plugins/config/lang/mk/lang.php -lib/plugins/config/lang/ms/lang.php -lib/plugins/config/lang/vi/lang.php lib/plugins/plugin/admin.php lib/plugins/plugin/classes/ap_delete.class.php lib/plugins/plugin/classes/ap_download.class.php @@ -380,31 +352,6 @@ lib/plugins/plugin/lang/zh/admin_plugin.txt lib/plugins/plugin/lang/zh/lang.php lib/plugins/plugin/plugin.info.txt lib/plugins/plugin/style.css -lib/plugins/popularity/lang/et/lang.php -lib/plugins/popularity/lang/hr/lang.php -lib/plugins/popularity/lang/id/lang.php -lib/plugins/popularity/lang/kk/lang.php -lib/plugins/popularity/lang/lb/lang.php -lib/plugins/popularity/lang/mk/lang.php -lib/plugins/popularity/lang/ms/lang.php -lib/plugins/popularity/lang/vi/lang.php -lib/plugins/revert/lang/af/lang.php -lib/plugins/revert/lang/hi/lang.php -lib/plugins/revert/lang/hr/lang.php -lib/plugins/revert/lang/id-ni/lang.php -lib/plugins/revert/lang/id/lang.php -lib/plugins/revert/lang/kk/lang.php -lib/plugins/revert/lang/lb/lang.php -lib/plugins/revert/lang/lt/lang.php -lib/plugins/revert/lang/mk/lang.php -lib/plugins/revert/lang/ms/lang.php -lib/plugins/revert/lang/vi/lang.php -lib/plugins/usermanager/lang/hi/lang.php -lib/plugins/usermanager/lang/hr/lang.php -lib/plugins/usermanager/lang/id-ni/lang.php -lib/plugins/usermanager/lang/lb/lang.php -lib/plugins/usermanager/lang/ms/lang.php -lib/plugins/usermanager/lang/vi/lang.php # removed in 2013-11-18 lib/images/arrow_down.gif @@ -689,7 +636,6 @@ lib/scripts/domTT.js # removed in 2006-11-06 inc/admin_acl.php -inc/lang/lt/stopwords.txt inc/magpie inc/magpie/rss_cache.inc inc/magpie/rss_fetch.inc diff --git a/sources/data/pages/wiki/syntax.txt b/sources/data/pages/wiki/syntax.txt index bdfda9c..089cf82 100644 --- a/sources/data/pages/wiki/syntax.txt +++ b/sources/data/pages/wiki/syntax.txt @@ -96,9 +96,9 @@ $lang['js']['nosmblinks'] = ''; You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this: - [[http://www.php.net|{{wiki:dokuwiki-128.png}}]] + [[http://php.net|{{wiki:dokuwiki-128.png}}]] -[[http://www.php.net|{{wiki:dokuwiki-128.png}}]] +[[http://php.net|{{wiki:dokuwiki-128.png}}]] Please note: The image formatting is the only formatting syntax accepted in link names. @@ -136,12 +136,12 @@ Resize to given width: {{wiki:dokuwiki-128.png?50}} Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}} -Resized external image: {{http://de3.php.net/images/php.gif?200x50}} +Resized external image: {{http://php.net/images/php.gif?200x50}} Real size: {{wiki:dokuwiki-128.png}} Resize to given width: {{wiki:dokuwiki-128.png?50}} Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}} - Resized external image: {{http://de3.php.net/images/php.gif?200x50}} + Resized external image: {{http://php.net/images/php.gif?200x50}} By using left or right whitespaces you can choose the alignment. diff --git a/sources/doku.php b/sources/doku.php index 77a5f46..390a194 100644 --- a/sources/doku.php +++ b/sources/doku.php @@ -9,7 +9,7 @@ */ // update message version - always use a string to avoid localized floats! -$updateVersion = "47.1"; +$updateVersion = "48.1"; // xdebug_start_profiling(); diff --git a/sources/feed.php b/sources/feed.php index 7ea2e23..7b3b5e9 100644 --- a/sources/feed.php +++ b/sources/feed.php @@ -135,7 +135,7 @@ function rss_parseOptions() { 'content_type' => array('str', 'view', $conf['rss_media']) ) as $name => $val) { - $opt[$name] = $INPUT->$val[0]($val[1], $val[2], true); + $opt[$name] = $INPUT->{$val[0]}($val[1], $val[2], true); } $opt['items'] = max(0, (int) $opt['items']); diff --git a/sources/inc/.htaccess b/sources/inc/.htaccess index 2d9c357..2b34c72 100644 --- a/sources/inc/.htaccess +++ b/sources/inc/.htaccess @@ -1,3 +1,8 @@ ## no access to the inc directory -order allow,deny -deny from all + + Require all denied + + + Order allow,deny + Deny from all + diff --git a/sources/inc/DifferenceEngine.php b/sources/inc/DifferenceEngine.php index 210d1c0..de91a54 100644 --- a/sources/inc/DifferenceEngine.php +++ b/sources/inc/DifferenceEngine.php @@ -1281,5 +1281,241 @@ class InlineDiffFormatter extends DiffFormatter { } } +/** + * A class for computing three way diffs. + * + * @author Geoffrey T. Dairiki + */ +class Diff3 extends Diff { + + /** + * Conflict counter. + * + * @var integer + */ + var $_conflictingBlocks = 0; + + /** + * Computes diff between 3 sequences of strings. + * + * @param array $orig The original lines to use. + * @param array $final1 The first version to compare to. + * @param array $final2 The second version to compare to. + */ + function __construct($orig, $final1, $final2) { + $engine = new _DiffEngine(); + + $this->_edits = $this->_diff3($engine->diff($orig, $final1), + $engine->diff($orig, $final2)); + } + + /** + * Returns the merged lines + * + * @param string $label1 label for first version + * @param string $label2 label for second version + * @param string $label3 separator between versions + * @return array lines of the merged text + */ + function mergedOutput($label1='<<<<<<<',$label2='>>>>>>>',$label3='=======') { + $lines = array(); + foreach ($this->_edits as $edit) { + if ($edit->isConflict()) { + /* FIXME: this should probably be moved somewhere else. */ + $lines = array_merge($lines, + array($label1), + $edit->final1, + array($label3), + $edit->final2, + array($label2)); + $this->_conflictingBlocks++; + } else { + $lines = array_merge($lines, $edit->merged()); + } + } + + return $lines; + } + + /** + * @access private + */ + function _diff3($edits1, $edits2) { + $edits = array(); + $bb = new _Diff3_BlockBuilder(); + + $e1 = current($edits1); + $e2 = current($edits2); + while ($e1 || $e2) { + if ($e1 && $e2 && is_a($e1, '_DiffOp_copy') && is_a($e2, '_DiffOp_copy')) { + /* We have copy blocks from both diffs. This is the (only) + * time we want to emit a diff3 copy block. Flush current + * diff3 diff block, if any. */ + if ($edit = $bb->finish()) { + $edits[] = $edit; + } + + $ncopy = min($e1->norig(), $e2->norig()); + assert($ncopy > 0); + $edits[] = new _Diff3_Op_copy(array_slice($e1->orig, 0, $ncopy)); + + if ($e1->norig() > $ncopy) { + array_splice($e1->orig, 0, $ncopy); + array_splice($e1->closing, 0, $ncopy); + } else { + $e1 = next($edits1); + } + + if ($e2->norig() > $ncopy) { + array_splice($e2->orig, 0, $ncopy); + array_splice($e2->closing, 0, $ncopy); + } else { + $e2 = next($edits2); + } + } else { + if ($e1 && $e2) { + if ($e1->orig && $e2->orig) { + $norig = min($e1->norig(), $e2->norig()); + $orig = array_splice($e1->orig, 0, $norig); + array_splice($e2->orig, 0, $norig); + $bb->input($orig); + } + + if (is_a($e1, '_DiffOp_copy')) { + $bb->out1(array_splice($e1->closing, 0, $norig)); + } + + if (is_a($e2, '_DiffOp_copy')) { + $bb->out2(array_splice($e2->closing, 0, $norig)); + } + } + + if ($e1 && ! $e1->orig) { + $bb->out1($e1->closing); + $e1 = next($edits1); + } + if ($e2 && ! $e2->orig) { + $bb->out2($e2->closing); + $e2 = next($edits2); + } + } + } + + if ($edit = $bb->finish()) { + $edits[] = $edit; + } + + return $edits; + } +} + +/** + * @author Geoffrey T. Dairiki + * + * @access private + */ +class _Diff3_Op { + + function __construct($orig = false, $final1 = false, $final2 = false) { + $this->orig = $orig ? $orig : array(); + $this->final1 = $final1 ? $final1 : array(); + $this->final2 = $final2 ? $final2 : array(); + } + + function merged() { + if (!isset($this->_merged)) { + if ($this->final1 === $this->final2) { + $this->_merged = &$this->final1; + } elseif ($this->final1 === $this->orig) { + $this->_merged = &$this->final2; + } elseif ($this->final2 === $this->orig) { + $this->_merged = &$this->final1; + } else { + $this->_merged = false; + } + } + + return $this->_merged; + } + + function isConflict() { + return $this->merged() === false; + } + +} + +/** + * @author Geoffrey T. Dairiki + * + * @access private + */ +class _Diff3_Op_copy extends _Diff3_Op { + + function __construct($lines = false) { + $this->orig = $lines ? $lines : array(); + $this->final1 = &$this->orig; + $this->final2 = &$this->orig; + } + + function merged() { + return $this->orig; + } + + function isConflict() { + return false; + } +} + +/** + * @author Geoffrey T. Dairiki + * + * @access private + */ +class _Diff3_BlockBuilder { + + function __construct() { + $this->_init(); + } + + function input($lines) { + if ($lines) { + $this->_append($this->orig, $lines); + } + } + + function out1($lines) { + if ($lines) { + $this->_append($this->final1, $lines); + } + } + + function out2($lines) { + if ($lines) { + $this->_append($this->final2, $lines); + } + } + + function isEmpty() { + return !$this->orig && !$this->final1 && !$this->final2; + } + + function finish() { + if ($this->isEmpty()) { + return false; + } else { + $edit = new _Diff3_Op($this->orig, $this->final1, $this->final2); + $this->_init(); + return $edit; + } + } + + function _init() { + $this->orig = $this->final1 = $this->final2 = array(); + } + + function _append(&$array, $lines) { + array_splice($array, sizeof($array), 0, $lines); + } +} //Setup VIM: ex: et ts=4 : diff --git a/sources/inc/Form/CheckableElement.php b/sources/inc/Form/CheckableElement.php index a57bbc1..27d5c2e 100644 --- a/sources/inc/Form/CheckableElement.php +++ b/sources/inc/Form/CheckableElement.php @@ -6,7 +6,7 @@ namespace dokuwiki\Form; * * For Radio- and Checkboxes * - * @package DokuForm + * @package dokuwiki\Form */ class CheckableElement extends InputElement { diff --git a/sources/inc/Form/DropdownElement.php b/sources/inc/Form/DropdownElement.php new file mode 100644 index 0000000..6a2147d --- /dev/null +++ b/sources/inc/Form/DropdownElement.php @@ -0,0 +1,128 @@ +options($options); + } + + /** + * Get or set the options of the Dropdown + * + * Options can be given as associative array (value => label) or as an + * indexd array (label = value) or as an array of arrays. In the latter + * case an element has to look as follows: + * option-value => array ( + * 'label' => option-label, + * 'attrs' => array ( + * attr-key => attr-value, ... + * ) + * ) + * + * @param null|array $options + * @return $this|array + */ + public function options($options = null) { + if($options === null) return $this->options; + if(!is_array($options)) throw new \InvalidArgumentException('Options have to be an array'); + $this->options = array(); + + foreach($options as $key => $val) { + if(is_int($key)) { + $this->options[$val] = array('label' => (string) $val); + } elseif (!is_array($val)) { + $this->options[$key] = array('label' => (string) $val); + } else { + if (!key_exists('label', $val)) throw new \InvalidArgumentException('If option is given as array, it has to have a "label"-key!'); + $this->options[$key] = $val; + } + } + $this->val(''); // set default value (empty or first) + return $this; + } + + /** + * Gets or sets an attribute + * + * When no $value is given, the current content of the attribute is returned. + * An empty string is returned for unset attributes. + * + * When a $value is given, the content is set to that value and the Element + * itself is returned for easy chaining + * + * @param string $name Name of the attribute to access + * @param null|string $value New value to set + * @return string|$this + */ + public function attr($name, $value = null) { + if(strtolower($name) == 'multiple') { + throw new \InvalidArgumentException('Sorry, the dropdown element does not support the "multiple" attribute'); + } + return parent::attr($name, $value); + } + + /** + * Get or set the current value + * + * When setting a value that is not defined in the options, the value is ignored + * and the first option's value is selected instead + * + * @param null|string $value The value to set + * @return $this|string + */ + public function val($value = null) { + if($value === null) return $this->value; + + if(isset($this->options[$value])) { + $this->value = $value; + } else { + // unknown value set, select first option instead + $keys = array_keys($this->options); + $this->value = (string) array_shift($keys); + } + + return $this; + } + + /** + * Create the HTML for the select it self + * + * @return string + */ + protected function mainElementHTML() { + if($this->useInput) $this->prefillInput(); + + $html = ''; + + return $html; + } + +} diff --git a/sources/inc/Form/Element.php b/sources/inc/Form/Element.php index 7938ee0..a357882 100644 --- a/sources/inc/Form/Element.php +++ b/sources/inc/Form/Element.php @@ -69,7 +69,7 @@ abstract class Element { /** * Removes the given attribute if it exists * - * @param $name + * @param string $name * @return $this */ public function rmattr($name) { diff --git a/sources/inc/Form/Form.php b/sources/inc/Form/Form.php index 7eaa530..2d534ae 100644 --- a/sources/inc/Form/Form.php +++ b/sources/inc/Form/Form.php @@ -58,8 +58,8 @@ class Form extends Element { /** * Sets a hidden field * - * @param $name - * @param $value + * @param string $name + * @param string $value * @return $this */ public function setHiddenField($name, $value) { @@ -83,7 +83,7 @@ class Form extends Element { * A position out-of-bounds will return either the * first (underflow) or last (overflow) element. * - * @param $pos + * @param int $pos * @return Element */ public function getElementAt($pos) { @@ -153,7 +153,7 @@ class Form extends Element { * Replaces an existing element with a new one * * @param Element $element the new element - * @param $pos 0-based position of the element to replace + * @param int $pos 0-based position of the element to replace */ public function replaceElement(Element $element, $pos) { if(is_a($element, '\dokuwiki\Form\Form')) throw new \InvalidArgumentException('You can\'t add a form to a form'); @@ -163,7 +163,7 @@ class Form extends Element { /** * Remove an element from the form completely * - * @param $pos 0-based position of the element to remove + * @param int $pos 0-based position of the element to remove */ public function removeElement($pos) { array_splice($this->elements, $pos, 1); @@ -176,8 +176,8 @@ class Form extends Element { /** * Adds a text input field * - * @param $name - * @param $label + * @param string $name + * @param string $label * @param int $pos * @return InputElement */ @@ -188,8 +188,8 @@ class Form extends Element { /** * Adds a password input field * - * @param $name - * @param $label + * @param string $name + * @param string $label * @param int $pos * @return InputElement */ @@ -200,8 +200,8 @@ class Form extends Element { /** * Adds a radio button field * - * @param $name - * @param $label + * @param string $name + * @param string $label * @param int $pos * @return CheckableElement */ @@ -212,8 +212,8 @@ class Form extends Element { /** * Adds a checkbox field * - * @param $name - * @param $label + * @param string $name + * @param string $label * @param int $pos * @return CheckableElement */ @@ -221,11 +221,24 @@ class Form extends Element { return $this->addElement(new CheckableElement('checkbox', $name, $label), $pos); } + /** + * Adds a dropdown field + * + * @param string $name + * @param array $options + * @param string $label + * @param int $pos + * @return DropdownElement + */ + public function addDropdown($name, $options, $label = '', $pos = -1) { + return $this->addElement(new DropdownElement($name, $options, $label), $pos); + } + /** * Adds a textarea field * - * @param $name - * @param $label + * @param string $name + * @param string $label * @param int $pos * @return TextareaElement */ @@ -260,7 +273,7 @@ class Form extends Element { /** * Adds a label referencing another input element, escapes the label for you * - * @param $label + * @param string $label * @param string $for * @param int $pos * @return Element @@ -295,7 +308,7 @@ class Form extends Element { /** * Add fixed HTML to the form * - * @param $html + * @param string $html * @param int $pos * @return HTMLElement */ @@ -306,7 +319,7 @@ class Form extends Element { /** * Add a closed HTML tag to the form * - * @param $tag + * @param string $tag * @param int $pos * @return TagElement */ @@ -319,7 +332,7 @@ class Form extends Element { * * Be sure to close it again! * - * @param $tag + * @param string $tag * @param int $pos * @return TagOpenElement */ @@ -332,7 +345,7 @@ class Form extends Element { * * Be sure it had been opened before * - * @param $tag + * @param string $tag * @param int $pos * @return TagCloseElement */ @@ -343,7 +356,7 @@ class Form extends Element { /** * Open a Fieldset * - * @param $legend + * @param string $legend * @param int $pos * @return FieldsetOpenElement */ @@ -409,17 +422,17 @@ class Form extends Element { public function toHTML() { $this->balanceFieldsets(); - $html = '
attrs()) . '>' . DOKU_LF; + $html = 'attrs()) . '>'; foreach($this->hidden as $name => $value) { - $html .= '' . DOKU_LF; + $html .= ''; } foreach($this->elements as $element) { - $html .= $element->toHTML() . DOKU_LF; + $html .= $element->toHTML(); } - $html .= '
' . DOKU_LF; + $html .= ''; return $html; } diff --git a/sources/inc/Form/InputElement.php b/sources/inc/Form/InputElement.php index 694dd08..0242b61 100644 --- a/sources/inc/Form/InputElement.php +++ b/sources/inc/Form/InputElement.php @@ -128,9 +128,7 @@ class InputElement extends Element { $value = ''; } } - if($value !== '') { - $this->val($value); - } + $this->val($value); } /** diff --git a/sources/inc/Form/TagCloseElement.php b/sources/inc/Form/TagCloseElement.php index dc0264c..b6bf753 100644 --- a/sources/inc/Form/TagCloseElement.php +++ b/sources/inc/Form/TagCloseElement.php @@ -22,7 +22,7 @@ class TagCloseElement extends ValueElement { /** * do not call this * - * @param $class + * @param string $class * @return void * @throws \BadMethodCallException */ @@ -33,35 +33,47 @@ class TagCloseElement extends ValueElement { /** * do not call this * - * @param $id - * @return void + * @param null|string $id + * @return string * @throws \BadMethodCallException */ public function id($id = null) { - throw new \BadMethodCallException('You can\t add ID to closing tag'); + if ($id === null) { + return ''; + } else { + throw new \BadMethodCallException('You can\t add ID to closing tag'); + } } /** * do not call this * - * @param $name - * @param $value - * @return void + * @param string $name + * @param null|string $value + * @return string * @throws \BadMethodCallException */ public function attr($name, $value = null) { - throw new \BadMethodCallException('You can\t add attributes to closing tag'); + if ($value === null) { + return ''; + } else { + throw new \BadMethodCallException('You can\t add attributes to closing tag'); + } } /** * do not call this * - * @param $attributes - * @return void + * @param array|null $attributes + * @return array * @throws \BadMethodCallException */ public function attrs($attributes = null) { - throw new \BadMethodCallException('You can\t add attributes to closing tag'); + if ($attributes === null) { + return array(); + } else { + throw new \BadMethodCallException('You can\t add attributes to closing tag'); + } } /** diff --git a/sources/inc/Form/TextareaElement.php b/sources/inc/Form/TextareaElement.php index 9d461fd..92741ee 100644 --- a/sources/inc/Form/TextareaElement.php +++ b/sources/inc/Form/TextareaElement.php @@ -31,7 +31,7 @@ class TextareaElement extends InputElement { */ public function val($value = null) { if($value !== null) { - $this->text = $value; + $this->text = cleanText($value); return $this; } return $this->text; diff --git a/sources/inc/Form/ValueElement.php b/sources/inc/Form/ValueElement.php index 9dc2fd0..88db167 100644 --- a/sources/inc/Form/ValueElement.php +++ b/sources/inc/Form/ValueElement.php @@ -20,7 +20,7 @@ abstract class ValueElement extends Element { /** * @param string $type - * @param array|string $value + * @param string $value * @param array $attributes */ public function __construct($type, $value, $attributes = array()) { diff --git a/sources/inc/HTTPClient.php b/sources/inc/HTTPClient.php index 092216c..49bb5d1 100644 --- a/sources/inc/HTTPClient.php +++ b/sources/inc/HTTPClient.php @@ -272,13 +272,15 @@ class HTTPClient { $server = $this->proxy_host; $port = $this->proxy_port; if (empty($port)) $port = 8080; + $use_tls = $this->proxy_ssl; }else{ $request_url = $path; if (!isset($port)) $port = ($uri['scheme'] == 'https') ? 443 : 80; + $use_tls = ($uri['scheme'] == 'https'); } // add SSL stream prefix if needed - needs SSL support in PHP - if($port == 443 || $this->proxy_ssl) { + if($use_tls) { if(!in_array('ssl', stream_get_transports())) { $this->status = -200; $this->error = 'This PHP version does not support SSL - cannot connect to server'; @@ -597,13 +599,15 @@ class HTTPClient { // setups with this solution before, but we have no usable test for that and TLS should be the more // common crypto by now if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { - $requesturl = $requestinfo['path']; + $requesturl = $requestinfo['path']. + (!empty($requestinfo['query'])?'?'.$requestinfo['query']:''); return true; } // if the above failed, this will most probably not work either, but we can try if (@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) { - $requesturl = $requestinfo['path']; + $requesturl = $requestinfo['path']. + (!empty($requestinfo['query'])?'?'.$requestinfo['query']:''); return true; } diff --git a/sources/inc/JpegMeta.php b/sources/inc/JpegMeta.php index 1fa4f25..a826c8f 100644 --- a/sources/inc/JpegMeta.php +++ b/sources/inc/JpegMeta.php @@ -1314,8 +1314,8 @@ class JpegMeta { $this->_info['file']['Width'] = $size[0]; $this->_info['file']['Height'] = $size[1]; // set mime types and formats - // http://www.php.net/manual/en/function.getimagesize.php - // http://www.php.net/manual/en/function.image-type-to-mime-type.php + // http://php.net/manual/en/function.getimagesize.php + // http://php.net/manual/en/function.image-type-to-mime-type.php switch ($size[2]){ case 1: $this->_info['file']['Mime'] = 'image/gif'; diff --git a/sources/inc/Mailer.class.php b/sources/inc/Mailer.class.php index 087d82c..9d078d0 100644 --- a/sources/inc/Mailer.class.php +++ b/sources/inc/Mailer.class.php @@ -32,10 +32,12 @@ class Mailer { protected $validator = null; protected $allowhtml = true; + protected $replacements = array('text'=> array(), 'html' => array()); + /** * Constructor * - * Initializes the boundary strings and part counters + * Initializes the boundary strings, part counters and token replacements */ public function __construct() { global $conf; @@ -61,6 +63,8 @@ class Mailer { $this->setHeader('X-Auto-Response-Suppress', 'OOF'); $this->setHeader('List-Id', $conf['title'].' <'.$listid.'>'); $this->setHeader('Date', date('r'), false); + + $this->prepareTokenReplacements(); } /** @@ -174,7 +178,7 @@ class Mailer { * Set the text and HTML body and apply replacements * * This function applies a whole bunch of default replacements in addition - * to the ones specidifed as parameters + * to the ones specified as parameters * * If you pass the HTML part or HTML replacements yourself you have to make * sure you encode all HTML special chars correctly @@ -186,10 +190,6 @@ class Mailer { * @param bool $wrap wrap the HTML in the default header/Footer */ public function setBody($text, $textrep = null, $htmlrep = null, $html = null, $wrap = true) { - global $INFO; - global $conf; - /* @var Input $INPUT */ - global $INPUT; $htmlrep = (array)$htmlrep; $textrep = (array)$textrep; @@ -198,15 +198,20 @@ class Mailer { if(is_null($html)) { $html = $text; $html = hsc($html); - $html = preg_replace('/^-----*$/m', '
', $html); + $html = preg_replace('/^----+$/m', '
', $html); $html = nl2br($html); } if($wrap) { $wrap = rawLocale('mailwrap', 'html'); $html = preg_replace('/\n--
.*$/s', '', $html); //strip signature + $html = str_replace('@EMAILSIGNATURE@', '', $html); //strip @EMAILSIGNATURE@ $html = str_replace('@HTMLBODY@', $html, $wrap); } + if(strpos($text, '@EMAILSIGNATURE@') === false) { + $text .= '@EMAILSIGNATURE@'; + } + // copy over all replacements missing for HTML (autolink URLs) foreach($textrep as $key => $value) { if(isset($htmlrep[$key])) continue; @@ -223,34 +228,9 @@ class Mailer { array($this, 'autoembed_cb'), $html ); - // prepare default replacements - $ip = clientIP(); - $cip = gethostsbyaddrs($ip); - $trep = array( - 'DATE' => dformat(), - 'BROWSER' => $INPUT->server->str('HTTP_USER_AGENT'), - 'IPADDRESS' => $ip, - 'HOSTNAME' => $cip, - 'TITLE' => $conf['title'], - 'DOKUWIKIURL' => DOKU_URL, - 'USER' => $INPUT->server->str('REMOTE_USER'), - 'NAME' => $INFO['userinfo']['name'], - 'MAIL' => $INFO['userinfo']['mail'], - ); - $trep = array_merge($trep, (array)$textrep); - $hrep = array( - 'DATE' => ''.hsc(dformat()).'', - 'BROWSER' => hsc($INPUT->server->str('HTTP_USER_AGENT')), - 'IPADDRESS' => ''.hsc($ip).'', - 'HOSTNAME' => ''.hsc($cip).'', - 'TITLE' => hsc($conf['title']), - 'DOKUWIKIURL' => ''.DOKU_URL.'', - 'USER' => hsc($INPUT->server->str('REMOTE_USER')), - 'NAME' => hsc($INFO['userinfo']['name']), - 'MAIL' => ''. - hsc($INFO['userinfo']['mail']).'', - ); - $hrep = array_merge($hrep, (array)$htmlrep); + // add default token replacements + $trep = array_merge($this->replacements['text'], (array)$textrep); + $hrep = array_merge($this->replacements['html'], (array)$htmlrep); // Apply replacements foreach($trep as $key => $substitution) { @@ -615,6 +595,66 @@ class Mailer { return $headers.MAILHEADER_EOL.$body; } + /** + * Prepare default token replacement strings + * + * Populates the '$replacements' property. + * Should be called by the class constructor + */ + protected function prepareTokenReplacements() { + global $INFO; + global $conf; + /* @var Input $INPUT */ + global $INPUT; + global $lang; + + $ip = clientIP(); + $cip = gethostsbyaddrs($ip); + + $this->replacements['text'] = array( + 'DATE' => dformat(), + 'BROWSER' => $INPUT->server->str('HTTP_USER_AGENT'), + 'IPADDRESS' => $ip, + 'HOSTNAME' => $cip, + 'TITLE' => $conf['title'], + 'DOKUWIKIURL' => DOKU_URL, + 'USER' => $INPUT->server->str('REMOTE_USER'), + 'NAME' => $INFO['userinfo']['name'], + 'MAIL' => $INFO['userinfo']['mail'] + ); + $signature = str_replace('@DOKUWIKIURL@', $this->replacements['text']['DOKUWIKIURL'], $lang['email_signature_text']); + $this->replacements['text']['EMAILSIGNATURE'] = "\n-- \n" . $signature . "\n"; + + $this->replacements['html'] = array( + 'DATE' => '' . hsc(dformat()) . '', + 'BROWSER' => hsc($INPUT->server->str('HTTP_USER_AGENT')), + 'IPADDRESS' => '' . hsc($ip) . '', + 'HOSTNAME' => '' . hsc($cip) . '', + 'TITLE' => hsc($conf['title']), + 'DOKUWIKIURL' => '' . DOKU_URL . '', + 'USER' => hsc($INPUT->server->str('REMOTE_USER')), + 'NAME' => hsc($INFO['userinfo']['name']), + 'MAIL' => '' . + hsc($INFO['userinfo']['mail']) . '' + ); + $signature = $lang['email_signature_text']; + if(!empty($lang['email_signature_html'])) { + $signature = $lang['email_signature_html']; + } + $signature = str_replace( + array( + '@DOKUWIKIURL@', + "\n" + ), + array( + $this->replacements['html']['DOKUWIKIURL'], + '
' + ), + $signature + ); + $this->replacements['html']['EMAILSIGNATURE'] = $signature; + } + /** * Send the mail * diff --git a/sources/inc/PassHash.class.php b/sources/inc/PassHash.class.php index 0701c41..8cb2344 100644 --- a/sources/inc/PassHash.class.php +++ b/sources/inc/PassHash.class.php @@ -42,8 +42,15 @@ class PassHash { $magic = 'P'; } elseif(preg_match('/^\$H\$(.{31})$/', $hash, $m)) { $method = 'pmd5'; - $salt = $m[1]; - $magic = 'H'; + $salt = $m[1]; + $magic = 'H'; + } elseif(preg_match('/^pbkdf2_(\w+?)\$(\d+)\$(.{12})\$/', $hash, $m)) { + $method = 'djangopbkdf2'; + $magic = array( + 'algo' => $m[1], + 'iter' => $m[2], + ); + $salt = $m[3]; } elseif(preg_match('/^sha1\$(.{5})\$/', $hash, $m)) { $method = 'djangosha1'; $salt = $m[1]; @@ -83,7 +90,8 @@ class PassHash { //crypt and compare $call = 'hash_'.$method; - if($this->$call($clear, $salt, $magic) === $hash) { + $newhash = $this->$call($clear, $salt, $magic); + if($newhash === $hash) { return true; } return false; @@ -135,7 +143,7 @@ class PassHash { * * @author Andreas Gohr * @author - * @link http://de.php.net/manual/en/function.crypt.php#73619 + * @link http://php.net/manual/en/function.crypt.php#73619 * * @param string $clear The clear text to hash * @param string $salt The salt to use, null for random @@ -176,7 +184,7 @@ class PassHash { * This is basically the same as smd1 above, but as used by Apache. * * @author - * @link http://de.php.net/manual/en/function.crypt.php#73619 + * @link http://php.net/manual/en/function.crypt.php#73619 * * @param string $clear The clear text to hash * @param string $salt The salt to use, null for random @@ -276,7 +284,7 @@ class PassHash { * * This method was used by old MySQL systems * - * @link http://www.php.net/mysql + * @link http://php.net/mysql * @author * @param string $clear The clear text to hash * @return string Hashed password @@ -435,6 +443,69 @@ class PassHash { return 'md5$'.$salt.'$'.md5($salt.$clear); } + /** + * Password hashing method 'djangopbkdf2' + * + * An algorithm and iteration count should be given in the opts array. + * Defaults to sha256 and 24000 iterations + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param array $opts ('algo' => hash algorithm, 'iter' => iterations) + * @return string Hashed password + * @throws Exception when PHP is missing support for the method/algo + */ + public function hash_djangopbkdf2($clear, $salt=null, $opts=array()) { + $this->init_salt($salt, 12); + if(empty($opts['algo'])) { + $algo = 'sha256'; + } else { + $algo = $opts['algo']; + } + if(empty($opts['iter'])) { + $iter = 24000; + } else { + $iter = (int) $opts['iter']; + } + if(!function_exists('hash_pbkdf2')) { + throw new Exception('This PHP installation has no PBKDF2 support'); + } + if(!in_array($algo, hash_algos())) { + throw new Exception("This PHP installation has no $algo support"); + } + + $hash = base64_encode(hash_pbkdf2($algo, $clear, $salt, $iter, 0, true)); + return "pbkdf2_$algo\$$iter\$$salt\$$hash"; + } + + /** + * Alias for djangopbkdf2 defaulting to sha256 as hash algorithm + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param array $opts ('iter' => iterations) + * @return string Hashed password + * @throws Exception when PHP is missing support for the method/algo + */ + public function hash_djangopbkdf2_sha256($clear, $salt=null, $opts=array()) { + $opts['algo'] = 'sha256'; + return $this->hash_djangopbkdf2($clear, $salt, $opts); + } + + /** + * Alias for djangopbkdf2 defaulting to sha1 as hash algorithm + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param array $opts ('iter' => iterations) + * @return string Hashed password + * @throws Exception when PHP is missing support for the method/algo + */ + public function hash_djangopbkdf2_sha1($clear, $salt=null, $opts=array()) { + $opts['algo'] = 'sha1'; + return $this->hash_djangopbkdf2($clear, $salt, $opts); + } + /** * Passwordhashing method 'bcrypt' * @@ -511,7 +582,7 @@ class PassHash { * * @see hash_hmac() * @author KC Cloyd - * @link http://www.php.net/manual/en/function.hash-hmac.php#93440 + * @link http://php.net/manual/en/function.hash-hmac.php#93440 * * @param string $algo Name of selected hashing algorithm (i.e. "md5", "sha256", "haval160,4", * etc..) See hash_algos() for a list of supported algorithms. diff --git a/sources/inc/RemoteAPICore.php b/sources/inc/RemoteAPICore.php index c0e6869..407e631 100644 --- a/sources/inc/RemoteAPICore.php +++ b/sources/inc/RemoteAPICore.php @@ -3,12 +3,19 @@ /** * Increased whenever the API is changed */ -define('DOKU_API_VERSION', 9); +define('DOKU_API_VERSION', 10); +/** + * Provides the core methods for the remote API. + * The methods are ordered in 'wiki.' and 'dokuwiki.' namespaces + */ class RemoteAPICore { private $api; + /** + * @param RemoteAPI $api + */ public function __construct(RemoteAPI $api) { $this->api = $api; } @@ -18,7 +25,7 @@ class RemoteAPICore { * * @return array */ - function __getRemoteInfo() { + public function __getRemoteInfo() { return array( 'dokuwiki.getVersion' => array( 'args' => array(), @@ -97,7 +104,7 @@ class RemoteAPICore { ), 'wiki.getPageInfo' => array( 'args' => array('string'), 'return' => 'array', - 'doc' => 'Returns a struct with info about the page.', + 'doc' => 'Returns a struct with info about the page, latest version.', 'name' => 'pageInfo' ), 'wiki.getPageInfoVersion' => array( 'args' => array('string', 'int'), @@ -126,9 +133,9 @@ class RemoteAPICore { 'return' => 'array', 'Returns a struct about all recent media changes since given timestamp.' ), 'wiki.aclCheck' => array( - 'args' => array('string'), + 'args' => array('string', 'string', 'array'), 'return' => 'int', - 'doc' => 'Returns the permissions of a given wiki page.' + 'doc' => 'Returns the permissions of a given wiki page. By default, for current user/groups' ), 'wiki.putAttachment' => array( 'args' => array('string', 'file', 'array'), 'return' => 'array', @@ -166,14 +173,14 @@ class RemoteAPICore { /** * @return string */ - function getVersion() { + public function getVersion() { return getVersion(); } /** * @return int unix timestamp */ - function getTime() { + public function getTime() { return time(); } @@ -185,7 +192,7 @@ class RemoteAPICore { * @return string page text. * @throws RemoteAccessDeniedException if no permission for page */ - function rawPage($id,$rev=''){ + public function rawPage($id,$rev=''){ $id = $this->resolvePageId($id); if(auth_quickaclcheck($id) < AUTH_READ){ throw new RemoteAccessDeniedException('You are not allowed to read this file', 111); @@ -208,7 +215,7 @@ class RemoteAPICore { * @throws RemoteAccessDeniedException no permission for media * @throws RemoteException not exist */ - function getAttachment($id){ + public function getAttachment($id){ $id = cleanID($id); if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) { throw new RemoteAccessDeniedException('You are not allowed to read this file', 211); @@ -231,7 +238,7 @@ class RemoteAPICore { * @param string $id page id * @return array */ - function getAttachmentInfo($id){ + public function getAttachmentInfo($id){ $id = cleanID($id); $info = array( 'lastModified' => $this->api->toDate(0), @@ -239,9 +246,18 @@ class RemoteAPICore { ); $file = mediaFN($id); - if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ - $info['lastModified'] = $this->api->toDate(filemtime($file)); - $info['size'] = filesize($file); + if(auth_quickaclcheck(getNS($id) . ':*') >= AUTH_READ) { + if(file_exists($file)) { + $info['lastModified'] = $this->api->toDate(filemtime($file)); + $info['size'] = filesize($file); + } else { + //Is it deleted media with changelog? + $medialog = new MediaChangeLog($id); + $revisions = $medialog->getRevisions(0, 1); + if(!empty($revisions)) { + $info['lastModified'] = $this->api->toDate($revisions[0]); + } + } } return $info; @@ -255,7 +271,7 @@ class RemoteAPICore { * @return null|string html * @throws RemoteAccessDeniedException no access to page */ - function htmlPage($id,$rev=''){ + public function htmlPage($id,$rev=''){ $id = $this->resolvePageId($id); if(auth_quickaclcheck($id) < AUTH_READ){ throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); @@ -268,7 +284,7 @@ class RemoteAPICore { * * @return array */ - function listPages(){ + public function listPages(){ $list = array(); $pages = idx_get_indexer()->getPages(); $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); @@ -298,7 +314,7 @@ class RemoteAPICore { * $opts['hash'] do md5 sum of content? * @return array */ - function readNamespace($ns,$opts){ + public function readNamespace($ns,$opts){ global $conf; if(!is_array($opts)) $opts=array(); @@ -317,7 +333,7 @@ class RemoteAPICore { * @param string $query * @return array */ - function search($query){ + public function search($query){ $regex = array(); $data = ft_pageSearch($query,$regex); $pages = array(); @@ -352,7 +368,7 @@ class RemoteAPICore { * * @return string */ - function getTitle(){ + public function getTitle(){ global $conf; return $conf['title']; } @@ -375,7 +391,7 @@ class RemoteAPICore { * @return array * @throws RemoteAccessDeniedException no access to the media files */ - function listAttachments($ns, $options = array()) { + public function listAttachments($ns, $options = array()) { global $conf; $ns = cleanID($ns); @@ -422,7 +438,7 @@ class RemoteAPICore { * @throws RemoteAccessDeniedException no access for page * @throws RemoteException page not exist */ - function pageInfo($id,$rev=''){ + public function pageInfo($id,$rev=''){ $id = $this->resolvePageId($id); if(auth_quickaclcheck($id) < AUTH_READ){ throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); @@ -458,7 +474,7 @@ class RemoteAPICore { * @throws RemoteAccessDeniedException no write access for page * @throws RemoteException no id, empty new page or locked */ - function putPage($id, $text, $params) { + public function putPage($id, $text, $params) { global $TEXT; global $lang; @@ -519,7 +535,7 @@ class RemoteAPICore { * @param array $params such as summary,minor * @return bool|string */ - function appendPage($id, $text, $params) { + public function appendPage($id, $text, $params) { $currentpage = $this->rawPage($id); if (!is_string($currentpage)) { return $currentpage; @@ -538,7 +554,7 @@ class RemoteAPICore { * @return false|string * @throws RemoteException */ - function putAttachment($id, $file, $params) { + public function putAttachment($id, $file, $params) { $id = cleanID($id); $auth = auth_quickaclcheck(getNS($id).':*'); @@ -572,7 +588,7 @@ class RemoteAPICore { * @throws RemoteAccessDeniedException no permissions * @throws RemoteException file in use or not deleted */ - function deleteAttachment($id){ + public function deleteAttachment($id){ $id = cleanID($id); $auth = auth_quickaclcheck(getNS($id).':*'); $res = media_delete($id, $auth); @@ -588,14 +604,31 @@ class RemoteAPICore { } /** - * Returns the permissions of a given wiki page + * Returns the permissions of a given wiki page for the current user or another user * * @param string $id page id + * @param string|null $user username + * @param array|null $groups array of groups * @return int permission level */ - function aclCheck($id) { + public function aclCheck($id, $user = null, $groups = null) { + /** @var DokuWiki_Auth_Plugin $auth */ + global $auth; + $id = $this->resolvePageId($id); - return auth_quickaclcheck($id); + if($user === null) { + return auth_quickaclcheck($id); + } else { + if($groups === null) { + $userinfo = $auth->getUserData($user); + if($userinfo === false) { + $groups = array(); + } else { + $groups = $userinfo['grps']; + } + } + return auth_aclcheck($id, $user, $groups); + } } /** @@ -607,7 +640,7 @@ class RemoteAPICore { * @return array * @throws RemoteAccessDeniedException no read access for page */ - function listLinks($id) { + public function listLinks($id) { $id = $this->resolvePageId($id); if(auth_quickaclcheck($id) < AUTH_READ){ throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); @@ -618,7 +651,6 @@ class RemoteAPICore { $ins = p_cached_instructions(wikiFN($id)); // instantiate new Renderer - needed for interwiki links - include(DOKU_INC.'inc/parser/xhtml.php'); $Renderer = new Doku_Renderer_xhtml(); $Renderer->interwiki = getInterwiki(); @@ -661,7 +693,7 @@ class RemoteAPICore { * @return array * @throws RemoteException no valid timestamp */ - function getRecentChanges($timestamp) { + public function getRecentChanges($timestamp) { if(strlen($timestamp) != 10) { throw new RemoteException('The provided value is not a valid timestamp', 311); } @@ -699,7 +731,7 @@ class RemoteAPICore { * @return array * @throws RemoteException no valid timestamp */ - function getRecentMediaChanges($timestamp) { + public function getRecentMediaChanges($timestamp) { if(strlen($timestamp) != 10) throw new RemoteException('The provided value is not a valid timestamp', 311); @@ -728,16 +760,18 @@ class RemoteAPICore { /** * Returns a list of available revisions of a given wiki page + * Number of returned pages is set by $conf['recent'] + * However not accessible pages are skipped, so less than $conf['recent'] could be returned * * @author Michael Klier * * @param string $id page id - * @param int $first skip the first n changelog lines + * @param int $first skip the first n changelog lines (0 = from current(if exists), 1 = from 1st old rev, 2 = from 2nd old rev, etc) * @return array * @throws RemoteAccessDeniedException no read access for page * @throws RemoteException empty id */ - function pageVersions($id, $first) { + public function pageVersions($id, $first) { $id = $this->resolvePageId($id); if(auth_quickaclcheck($id) < AUTH_READ) { throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); @@ -750,25 +784,19 @@ class RemoteAPICore { throw new RemoteException('Empty page ID', 131); } + $first = (int) $first; + $first_rev = $first - 1; + $first_rev = $first_rev < 0 ? 0 : $first_rev; $pagelog = new PageChangeLog($id); - $revisions = $pagelog->getRevisions($first, $conf['recent']+1); + $revisions = $pagelog->getRevisions($first_rev, $conf['recent']); - if(count($revisions)==0 && $first!=0) { - $first=0; - $revisions = $pagelog->getRevisions($first, $conf['recent']+1); - } - - if(count($revisions)>0 && $first==0) { + if($first == 0) { array_unshift($revisions, ''); // include current revision if ( count($revisions) > $conf['recent'] ){ array_pop($revisions); // remove extra log entry } } - if(count($revisions) > $conf['recent']) { - array_pop($revisions); // remove extra log entry - } - if(!empty($revisions)) { foreach($revisions as $rev) { $file = wikiFN($id,$rev); @@ -800,7 +828,7 @@ class RemoteAPICore { /** * The version of Wiki RPC API supported */ - function wiki_RPCVersion(){ + public function wiki_RPCVersion(){ return 2; } @@ -817,7 +845,7 @@ class RemoteAPICore { * @param array[] $set list pages with array('lock' => array, 'unlock' => array) * @return array */ - function setLocks($set){ + public function setLocks($set){ $locked = array(); $lockfail = array(); $unlocked = array(); @@ -855,7 +883,7 @@ class RemoteAPICore { * * @return int */ - function getAPIVersion(){ + public function getAPIVersion(){ return DOKU_API_VERSION; } @@ -866,7 +894,7 @@ class RemoteAPICore { * @param string $pass * @return int */ - function login($user,$pass){ + public function login($user,$pass){ global $conf; /** @var DokuWiki_Auth_Plugin $auth */ global $auth; @@ -896,12 +924,12 @@ class RemoteAPICore { * * @return int */ - function logoff(){ + public function logoff(){ global $conf; global $auth; if(!$conf['useacl']) return 0; if(!$auth) return 0; - + auth_logoff(); return 1; diff --git a/sources/inc/actions.php b/sources/inc/actions.php index b0753b2..adba2aa 100644 --- a/sources/inc/actions.php +++ b/sources/inc/actions.php @@ -29,6 +29,8 @@ function act_dispatch(){ // give plugins an opportunity to process the action $evt = new Doku_Event('ACTION_ACT_PREPROCESS',$ACT); + + $headers = array(); if ($evt->advise_before()) { //sanitize $ACT @@ -144,8 +146,10 @@ function act_dispatch(){ $ACT = act_draftdel($ACT); //draft saving on preview - if($ACT == 'preview') + if($ACT == 'preview') { + $headers[] = "X-XSS-Protection: 0"; $ACT = act_draftsave($ACT); + } //edit if(in_array($ACT, array('edit', 'preview', 'recover'))) { @@ -189,7 +193,6 @@ function act_dispatch(){ global $license; //call template FIXME: all needed vars available? - $headers = array(); $headers[] = 'Content-Type: text/html; charset=utf-8'; trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders'); diff --git a/sources/inc/auth.php b/sources/inc/auth.php index e04a6ca..b7bee21 100644 --- a/sources/inc/auth.php +++ b/sources/inc/auth.php @@ -51,11 +51,6 @@ function auth_setup() { if ($conf['authtype'] === $plugin) { $auth = $plugin_controller->load('auth', $plugin); break; - } elseif ('auth' . $conf['authtype'] === $plugin) { - // matches old auth backends (pre-Weatherwax) - $auth = $plugin_controller->load('auth', $plugin); - msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = "auth' . $conf['authtype'] . '"' - . ' in your configuration (see Authentication Backends)',-1,'','',MSG_ADMINS_ONLY); } } @@ -101,10 +96,7 @@ function auth_setup() { $INPUT->set('p', stripctl($INPUT->str('p'))); } - if($INPUT->str('authtok')) { - // when an authentication token is given, trust the session - auth_validateToken($INPUT->str('authtok')); - } elseif(!is_null($auth) && $auth->canDo('external')) { + if(!is_null($auth) && $auth->canDo('external')) { // external trust mechanism in place $auth->trustExternal($INPUT->str('u'), $INPUT->str('p'), $INPUT->bool('r')); } else { @@ -274,52 +266,6 @@ function auth_login($user, $pass, $sticky = false, $silent = false) { return false; } -/** - * Checks if a given authentication token was stored in the session - * - * Will setup authentication data using data from the session if the - * token is correct. Will exit with a 401 Status if not. - * - * @author Andreas Gohr - * - * @param string $token The authentication token - * @return boolean|null true (or will exit on failure) - */ -function auth_validateToken($token) { - if(!$token || $token != $_SESSION[DOKU_COOKIE]['auth']['token']) { - // bad token - http_status(401); - print 'Invalid auth token - maybe the session timed out'; - unset($_SESSION[DOKU_COOKIE]['auth']['token']); // no second chance - exit; - } - // still here? trust the session data - global $USERINFO; - /* @var Input $INPUT */ - global $INPUT; - - $INPUT->server->set('REMOTE_USER',$_SESSION[DOKU_COOKIE]['auth']['user']); - $USERINFO = $_SESSION[DOKU_COOKIE]['auth']['info']; - return true; -} - -/** - * Create an auth token and store it in the session - * - * NOTE: this is completely unrelated to the getSecurityToken() function - * - * @author Andreas Gohr - * - * @return string The auth token - */ -function auth_createToken() { - $token = md5(auth_randombytes(16)); - @session_start(); // reopen the session if needed - $_SESSION[DOKU_COOKIE]['auth']['token'] = $token; - session_write_close(); - return $token; -} - /** * Builds a pseudo UID from browser and IP data * @@ -380,7 +326,7 @@ function auth_cookiesalt($addsession = false, $secure = false) { * * @author Mark Seecof * @author Michael Hamann - * @link http://www.php.net/manual/de/function.mt-rand.php#83655 + * @link http://php.net/manual/de/function.mt-rand.php#83655 * * @param int $length number of bytes to get * @return string binary random strings @@ -752,10 +698,10 @@ function auth_aclcheck_cb($data) { //add ALL group $groups[] = '@ALL'; - + //add User if($user) $groups[] = $user; - + //check exact match first $matches = preg_grep('/^'.preg_quote($id, '/').'[ \t]+([^ \t]+)[ \t]+/', $AUTH_ACL); if(count($matches)) { @@ -1098,12 +1044,19 @@ function updateprofile() { return false; } - // update cookie and session with the changed data if($changes['pass']) { + // update cookie and session with the changed data list( /*user*/, $sticky, /*pass*/) = auth_getCookie(); $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true)); auth_setCookie($INPUT->server->str('REMOTE_USER'), $pass, (bool) $sticky); + } else { + // make sure the session is writable + @session_start(); + // invalidate session cache + $_SESSION[DOKU_COOKIE]['auth']['time'] = 0; + session_write_close(); } + return true; } diff --git a/sources/inc/changelog.php b/sources/inc/changelog.php index f473102..65451b3 100644 --- a/sources/inc/changelog.php +++ b/sources/inc/changelog.php @@ -23,6 +23,7 @@ define('DOKU_CHANGE_TYPE_REVERT', 'R'); * @return array|bool parsed line or false */ function parseChangelogLine($line) { + $line = rtrim($line, "\n"); $tmp = explode("\t", $line); if ($tmp!==false && count($tmp)>1) { $info = array(); @@ -32,9 +33,16 @@ function parseChangelogLine($line) { $info['id'] = $tmp[3]; // page id $info['user'] = $tmp[4]; // user name $info['sum'] = $tmp[5]; // edit summary (or action reason) - $info['extra'] = rtrim($tmp[6], "\n"); // extra data (varies by line type) + $info['extra'] = $tmp[6]; // extra data (varies by line type) + if(isset($tmp[7]) && $tmp[7] !== '') { //last item has line-end|| + $info['sizechange'] = (int) $tmp[7]; + } else { + $info['sizechange'] = null; + } return $info; - } else { return false; } + } else { + return false; + } } /** @@ -48,12 +56,13 @@ function parseChangelogLine($line) { * @param array $flags Additional flags in a key value array. * Available flags: * - ExternalEdit - mark as an external edit. + * @param null|int $sizechange Change of filesize * * @author Andreas Gohr * @author Esther Brunner * @author Ben Coburn */ -function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ +function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null, $sizechange = null){ global $conf, $INFO; /** @var Input $INPUT */ global $INPUT; @@ -71,17 +80,23 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr if(!$date) $date = time(); //use current time if none supplied $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1'; $user = (!$flagExternalEdit)?$INPUT->server->str('REMOTE_USER'):''; + if($sizechange === null) { + $sizechange = ''; + } else { + $sizechange = (int) $sizechange; + } $strip = array("\t", "\n"); $logline = array( - 'date' => $date, - 'ip' => $remote, - 'type' => str_replace($strip, '', $type), - 'id' => $id, - 'user' => $user, - 'sum' => utf8_substr(str_replace($strip, '', $summary),0,255), - 'extra' => str_replace($strip, '', $extra) - ); + 'date' => $date, + 'ip' => $remote, + 'type' => str_replace($strip, '', $type), + 'id' => $id, + 'user' => $user, + 'sum' => utf8_substr(str_replace($strip, '', $summary), 0, 255), + 'extra' => str_replace($strip, '', $extra), + 'sizechange' => $sizechange + ); $wasCreated = ($type===DOKU_CHANGE_TYPE_CREATE); $wasReverted = ($type===DOKU_CHANGE_TYPE_REVERT); @@ -130,8 +145,9 @@ function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extr * @param array $flags Additional flags in a key value array. * Available flags: * - (none, so far) + * @param null|int $sizechange Change of filesize */ -function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ +function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null, $sizechange = null){ global $conf; /** @var Input $INPUT */ global $INPUT; @@ -141,17 +157,23 @@ function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', if(!$date) $date = time(); //use current time if none supplied $remote = clientIP(true); $user = $INPUT->server->str('REMOTE_USER'); + if($sizechange === null) { + $sizechange = ''; + } else { + $sizechange = (int) $sizechange; + } $strip = array("\t", "\n"); $logline = array( - 'date' => $date, - 'ip' => $remote, - 'type' => str_replace($strip, '', $type), - 'id' => $id, - 'user' => $user, - 'sum' => utf8_substr(str_replace($strip, '', $summary),0,255), - 'extra' => str_replace($strip, '', $extra) - ); + 'date' => $date, + 'ip' => $remote, + 'type' => str_replace($strip, '', $type), + 'id' => $id, + 'user' => $user, + 'sum' => utf8_substr(str_replace($strip, '', $summary), 0, 255), + 'extra' => str_replace($strip, '', $extra), + 'sizechange' => $sizechange + ); // add changelog lines $logline = implode("\t", $logline)."\n"; @@ -1035,69 +1057,3 @@ class MediaChangelog extends ChangeLog { return mediaFN($this->id); } } - -/** - * Get the changelog information for a specific page id - * and revision (timestamp). Adjacent changelog lines - * are optimistically parsed and cached to speed up - * consecutive calls to getRevisionInfo. For large - * changelog files, only the chunk containing the - * requested changelog line is read. - * - * @deprecated 2013-11-20 - * - * @author Ben Coburn - * @author Kate Arzamastseva - * - * @param string $id - * @param int $rev - * @param int $chunk_size - * @param bool $media - * @return array|bool - */ -function getRevisionInfo($id, $rev, $chunk_size = 8192, $media = false) { - dbg_deprecated('class PageChangeLog or class MediaChangelog'); - if($media) { - $changelog = new MediaChangeLog($id, $chunk_size); - } else { - $changelog = new PageChangeLog($id, $chunk_size); - } - return $changelog->getRevisionInfo($rev); -} - -/** - * Return a list of page revisions numbers - * Does not guarantee that the revision exists in the attic, - * only that a line with the date exists in the changelog. - * By default the current revision is skipped. - * - * The current revision is automatically skipped when the page exists. - * See $INFO['meta']['last_change'] for the current revision. - * - * For efficiency, the log lines are parsed and cached for later - * calls to getRevisionInfo. Large changelog files are read - * backwards in chunks until the requested number of changelog - * lines are recieved. - * - * @deprecated 2013-11-20 - * - * @author Ben Coburn - * @author Kate Arzamastseva - * - * @param string $id the page of interest - * @param int $first skip the first n changelog lines - * @param int $num number of revisions to return - * @param int $chunk_size - * @param bool $media - * @return array - */ -function getRevisions($id, $first, $num, $chunk_size = 8192, $media = false) { - dbg_deprecated('class PageChangeLog or class MediaChangelog'); - if($media) { - $changelog = new MediaChangeLog($id, $chunk_size); - } else { - $changelog = new PageChangeLog($id, $chunk_size); - } - return $changelog->getRevisions($first, $num); -} - diff --git a/sources/inc/cliopts.php b/sources/inc/cliopts.php deleted file mode 100644 index d7d0611..0000000 --- a/sources/inc/cliopts.php +++ /dev/null @@ -1,512 +0,0 @@ - - * @modified Harry Fuecks hfuecks gmail.com - * @modified Tanguy Ortolo - * @license http://www.opensource.org/licenses/bsd-license.php New BSD License - * @version CVS: $Id$ - * @link http://pear.php.net/package/Console_Getopt - * - */ - -//------------------------------------------------------------------------------ -/** - * Sets up CLI environment based on SAPI and PHP version - * Helps resolve some issues between the CGI and CLI SAPIs - * as well is inconsistencies between PHP 4.3+ and older versions - */ -if (version_compare(phpversion(), '4.3.0', '<') || php_sapi_name() == 'cgi') { - // Handle output buffering - @ob_end_flush(); - ob_implicit_flush(true); - - // PHP ini settings - set_time_limit(0); - ini_set('track_errors', "1"); - ini_set('html_errors', "0"); - ini_set('magic_quotes_runtime', "0"); - - // Define stream constants - define('STDIN', fopen('php://stdin', 'r')); - define('STDOUT', fopen('php://stdout', 'w')); - define('STDERR', fopen('php://stderr', 'w')); - - // Close the streams on script termination - register_shutdown_function( - create_function('', - 'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;') - ); -} - -//------------------------------------------------------------------------------ -/** -* Error codes -*/ -define('DOKU_CLI_OPTS_UNKNOWN_OPT',1); //Unrecognized option -define('DOKU_CLI_OPTS_OPT_ARG_REQUIRED',2); //Option requires argument -define('DOKU_CLI_OPTS_OPT_ARG_DENIED',3); //Option not allowed argument -define('DOKU_CLI_OPTS_OPT_ABIGUOUS',4);//Option abiguous -define('DOKU_CLI_OPTS_ARG_READ',5);//Could not read argv - -//------------------------------------------------------------------------------ -/** - * Command-line options parsing class. - * - * @author Andrei Zmievski - * - * @deprecated 2014-05-16 - */ -class Doku_Cli_Opts { - - /** - * - * @see http://www.sitepoint.com/article/php-command-line-1/3 - * @param string $bin_file executing file name - this MUST be passed the __FILE__ constant - * @param string $short_options short options - * @param array $long_options (optional) long options - * @return Doku_Cli_Opts_Container|Doku_Cli_Opts_Error - */ - function & getOptions($bin_file, $short_options, $long_options = null) { - $args = Doku_Cli_Opts::readPHPArgv(); - - if ( Doku_Cli_Opts::isError($args) ) { - return $args; - } - - // Compatibility between "php extensions.php" and "./extensions.php" - if ( realpath($_SERVER['argv'][0]) == $bin_file ) { - $options = Doku_Cli_Opts::getOpt($args,$short_options,$long_options); - } else { - $options = Doku_Cli_Opts::getOpt2($args,$short_options,$long_options); - } - - if ( Doku_Cli_Opts::isError($options) ) { - return $options; - } - - $container = new Doku_Cli_Opts_Container($options); - return $container; - } - - /** - * Parses the command-line options. - * - * The first parameter to this function should be the list of command-line - * arguments without the leading reference to the running program. - * - * The second parameter is a string of allowed short options. Each of the - * option letters can be followed by a colon ':' to specify that the option - * requires an argument, or a double colon '::' to specify that the option - * takes an optional argument. - * - * The third argument is an optional array of allowed long options. The - * leading '--' should not be included in the option name. Options that - * require an argument should be followed by '=', and options that take an - * option argument should be followed by '=='. - * - * The return value is an array of two elements: the list of parsed - * options and the list of non-option command-line arguments. Each entry in - * the list of parsed options is a pair of elements - the first one - * specifies the option, and the second one specifies the option argument, - * if there was one. - * - * Long and short options can be mixed. - * - * Most of the semantics of this function are based on GNU getopt_long(). - * - * @param array $args an array of command-line arguments - * @param string $short_options specifies the list of allowed short options - * @param array $long_options specifies the list of allowed long options - * - * @return array two-element array containing the list of parsed options and - * the non-option arguments - * @access public - */ - function getopt2($args, $short_options, $long_options = null) { - return Doku_Cli_Opts::doGetopt( - 2, $args, $short_options, $long_options - ); - } - - /** - * This function expects $args to start with the script name (POSIX-style). - * Preserved for backwards compatibility. - * - * @param array $args an array of command-line arguments - * @param string $short_options specifies the list of allowed short options - * @param array $long_options specifies the list of allowed long options - * - * @see getopt2() - * @return array two-element array containing the list of parsed options and - * the non-option arguments - */ - function getopt($args, $short_options, $long_options = null) { - return Doku_Cli_Opts::doGetopt( - 1, $args, $short_options, $long_options - ); - } - - /** - * The actual implementation of the argument parsing code. - * - * @param int $version Version to use - * @param array $args an array of command-line arguments - * @param string $short_options specifies the list of allowed short options - * @param array $long_options specifies the list of allowed long options - * - * @return array - */ - function doGetopt($version, $args, $short_options, $long_options = null) { - - // in case you pass directly readPHPArgv() as the first arg - if (Doku_Cli_Opts::isError($args)) { - return $args; - } - if (empty($args)) { - return array(array(), array()); - } - $opts = array(); - $non_opts = array(); - - settype($args, 'array'); - - if ($long_options && is_array($long_options)) { - sort($long_options); - } - - /* - * Preserve backwards compatibility with callers that relied on - * erroneous POSIX fix. - */ - if ($version < 2) { - if (isset($args[0]{0}) && $args[0]{0} != '-') { - array_shift($args); - } - } - - reset($args); - while (list($i, $arg) = each($args)) { - - /* The special element '--' means explicit end of - options. Treat the rest of the arguments as non-options - and end the loop. */ - if ($arg == '--') { - $non_opts = array_merge($non_opts, array_slice($args, $i + 1)); - break; - } - - if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) { - $non_opts = array_merge($non_opts, array_slice($args, $i)); - break; - } elseif (strlen($arg) > 1 && $arg{1} == '-') { - $error = Doku_Cli_Opts::_parseLongOption(substr($arg, 2), $long_options, $opts, $args); - if (Doku_Cli_Opts::isError($error)) - return $error; - } elseif ($arg == '-') { - // - is stdin - $non_opts = array_merge($non_opts, array_slice($args, $i)); - break; - } else { - $error = Doku_Cli_Opts::_parseShortOption(substr($arg, 1), $short_options, $opts, $args); - if (Doku_Cli_Opts::isError($error)) - return $error; - } - } - - return array($opts, $non_opts); - } - - /** - * Parse short option - * - * @param string $arg Argument - * @param string $short_options Available short options - * @param string[][] &$opts - * @param string[] &$args - * - * @access private - * @return void|Doku_Cli_Opts_Error - */ - function _parseShortOption($arg, $short_options, &$opts, &$args) { - $len = strlen($arg); - for ($i = 0; $i < $len; $i++) { - $opt = $arg{$i}; - $opt_arg = null; - - /* Try to find the short option in the specifier string. */ - if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') - { - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_UNKNOWN_OPT, - "Unrecognized option -- $opt" - ); - } - - if (strlen($spec) > 1 && $spec{1} == ':') { - if (strlen($spec) > 2 && $spec{2} == ':') { - if ($i + 1 < strlen($arg)) { - /* Option takes an optional argument. Use the remainder of - the arg string if there is anything left. */ - $opts[] = array($opt, substr($arg, $i + 1)); - break; - } - } else { - /* Option requires an argument. Use the remainder of the arg - string if there is anything left. */ - if ($i + 1 < strlen($arg)) { - $opts[] = array($opt, substr($arg, $i + 1)); - break; - } else if (list(, $opt_arg) = each($args)) { - /* Else use the next argument. */; - if (Doku_Cli_Opts::_isShortOpt($opt_arg) || Doku_Cli_Opts::_isLongOpt($opt_arg)) - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ARG_REQUIRED, - "option requires an argument --$opt" - ); - } - else - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ARG_REQUIRED, - "Option requires an argument -- $opt" - ); - } - } - - $opts[] = array($opt, $opt_arg); - } - } - - /** - * Checks if an argument is a short option - * - * @param string $arg Argument to check - * - * @access private - * @return bool - */ - function _isShortOpt($arg){ - return strlen($arg) == 2 && $arg[0] == '-' - && preg_match('/[a-zA-Z]/', $arg[1]); - } - - /** - * Checks if an argument is a long option - * - * @param string $arg Argument to check - * - * @access private - * @return bool - */ - function _isLongOpt($arg){ - return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' && - preg_match('/[a-zA-Z]+$/', substr($arg, 2)); - } - - /** - * Parse long option - * - * @param string $arg Argument - * @param string[] $long_options Available long options - * @param string[][] &$opts - * @param string[] &$args - * - * @access private - * @return void|Doku_Cli_Opts_Error - */ - function _parseLongOption($arg, $long_options, &$opts, &$args) { - @list($opt, $opt_arg) = explode('=', $arg, 2); - $opt_len = strlen($opt); - $opt_cnt = count($long_options); - - for ($i = 0; $i < $opt_cnt; $i++) { - $long_opt = $long_options[$i]; - $opt_start = substr($long_opt, 0, $opt_len); - - $long_opt_name = str_replace('=', '', $long_opt); - - /* Option doesn't match. Go on to the next one. */ - if ($opt_start != $opt) - continue; - - $opt_rest = substr($long_opt, $opt_len); - - /* Check that the options uniquely matches one of the allowed - options. */ - if ($i + 1 < count($long_options)) { - $next_option_rest = substr($long_options[$i + 1], $opt_len); - } else { - $next_option_rest = ''; - } - - if ($opt_rest != '' && $opt{0} != '=' && - $i + 1 < $opt_cnt && - $opt == substr($long_options[$i+1], 0, $opt_len) && - $next_option_rest != '' && - $next_option_rest{0} != '=') { - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ABIGUOUS, - "Option --$opt is ambiguous" - ); - } - - if (substr($long_opt, -1) == '=') { - if (substr($long_opt, -2) != '==') { - /* Long option requires an argument. - Take the next argument if one wasn't specified. */; - if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) { - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ARG_REQUIRED, - "Option --$opt requires an argument" - ); - } - - if (Doku_Cli_Opts::_isShortOpt($opt_arg) - || Doku_Cli_Opts::_isLongOpt($opt_arg)) - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ARG_REQUIRED, - "Option --$opt requires an argument" - ); - } - } else if ($opt_arg) { - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_OPT_ARG_DENIED, - "Option --$opt doesn't allow an argument" - ); - } - - $opts[] = array('--' . $opt, $opt_arg); - return; - } - - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_UNKNOWN_OPT, - "Unrecognized option --$opt" - ); - } - - /** - * Safely read the $argv PHP array across different PHP configurations. - * Will take care on register_globals and register_argc_argv ini directives - * - * @access public - * @return array|Doku_Cli_Opts_Error the $argv PHP array or PEAR error if not registered - */ - function readPHPArgv() { - global $argv; - if (!is_array($argv)) { - if (!@is_array($_SERVER['argv'])) { - if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) { - return Doku_Cli_Opts::raiseError( - DOKU_CLI_OPTS_ARG_READ, - "Could not read cmd args (register_argc_argv=Off?)" - ); - } - return $GLOBALS['HTTP_SERVER_VARS']['argv']; - } - return $_SERVER['argv']; - } - return $argv; - } - - /** - * @param $code - * @param $msg - * @return Doku_Cli_Opts_Error - */ - function raiseError($code, $msg) { - return new Doku_Cli_Opts_Error($code, $msg); - } - - /** - * @param $obj - * @return bool - */ - function isError($obj) { - return is_a($obj, 'Doku_Cli_Opts_Error'); - } - -} - -//------------------------------------------------------------------------------ -class Doku_Cli_Opts_Error { - - var $code; - var $msg; - - function __construct($code, $msg) { - $this->code = $code; - $this->msg = $msg; - } - - function getMessage() { - return $this->msg; - } - - function isError() { - return true; - } - -} - -//------------------------------------------------------------------------------ -class Doku_Cli_Opts_Container { - - var $options = array(); - var $args = array(); - - function __construct($options) { - foreach ( $options[0] as $option ) { - if ( false !== ( strpos($option[0], '--') ) ) { - $opt_name = substr($option[0], 2); - } else { - $opt_name = $option[0]; - } - $this->options[$opt_name] = $option[1]; - } - - $this->args = $options[1]; - } - - function has($option) { - return array_key_exists($option, $this->options); - } - - function get($option) { - if ( isset($this->options[$option]) ) { - return ( $this->options[$option] ) ; - } - } - - function arg($index) { - if ( isset($this->args[$index]) ) { - return $this->args[$index]; - } - } - - function numArgs() { - return count($this->args); - } - - function hasArgs() { - return count($this->args) !== 0; - } - - function isError() { - return false; - } - -} diff --git a/sources/inc/common.php b/sources/inc/common.php index e14bd7a..01b4a9c 100644 --- a/sources/inc/common.php +++ b/sources/inc/common.php @@ -30,6 +30,32 @@ function hsc($string) { return htmlspecialchars($string, ENT_QUOTES, 'UTF-8'); } +/** + * Checks if the given input is blank + * + * This is similar to empty() but will return false for "0". + * + * Please note: when you pass uninitialized variables, they will implicitly be created + * with a NULL value without warning. + * + * To avoid this it's recommended to guard the call with isset like this: + * + * (isset($foo) && !blank($foo)) + * (!isset($foo) || blank($foo)) + * + * @param $in + * @param bool $trim Consider a string of whitespace to be blank + * @return bool + */ +function blank(&$in, $trim = false) { + if(is_null($in)) return true; + if(is_array($in)) return empty($in); + if($in === "\0") return true; + if($trim && trim($in) === '') return true; + if(strlen($in) > 0) return false; + return empty($in); +} + /** * print a newline terminated string * @@ -1164,6 +1190,48 @@ function con($pre, $text, $suf, $pretty = false) { return $pre.$text.$suf; } +/** + * Checks if the current page version is newer than the last entry in the page's + * changelog. If so, we assume it has been an external edit and we create an + * attic copy and add a proper changelog line. + * + * This check is only executed when the page is about to be saved again from the + * wiki, triggered in @see saveWikiText() + * + * @param string $id the page ID + */ +function detectExternalEdit($id) { + global $lang; + + $fileLastMod = wikiFN($id); + $lastMod = @filemtime($fileLastMod); // from page + $pagelog = new PageChangeLog($id, 1024); + $lastRev = $pagelog->getRevisions(-1, 1); // from changelog + $lastRev = (int) (empty($lastRev) ? 0 : $lastRev[0]); + + if(!file_exists(wikiFN($id, $lastMod)) && file_exists($fileLastMod) && $lastMod >= $lastRev) { + // add old revision to the attic if missing + saveOldRevision($id); + // add a changelog entry if this edit came from outside dokuwiki + if($lastMod > $lastRev) { + $fileLastRev = wikiFN($id, $lastRev); + $revinfo = $pagelog->getRevisionInfo($lastRev); + if(empty($lastRev) || !file_exists($fileLastRev) || $revinfo['type'] == DOKU_CHANGE_TYPE_DELETE) { + $filesize_old = 0; + } else { + $filesize_old = io_getSizeFile($fileLastRev); + } + $filesize_new = filesize($fileLastMod); + $sizechange = $filesize_new - $filesize_old; + + addLogEntry($lastMod, $id, DOKU_CHANGE_TYPE_EDIT, $lang['external_edit'], '', array('ExternalEdit'=> true), $sizechange); + // remove soon to be stale instructions + $cache = new cache_instructions($id, $fileLastMod); + $cache->removeCache(); + } + } +} + /** * Saves a wikitext by calling io_writeWikiPage. * Also directs changelog and attic updates. @@ -1189,77 +1257,88 @@ function saveWikiText($id, $text, $summary, $minor = false) { /* @var Input $INPUT */ global $INPUT; - // ignore if no changes were made - if($text == rawWiki($id, '')) { - return; - } + // prepare data for event + $svdta = array(); + $svdta['id'] = $id; + $svdta['file'] = wikiFN($id); + $svdta['revertFrom'] = $REV; + $svdta['oldRevision'] = @filemtime($svdta['file']); + $svdta['newRevision'] = 0; + $svdta['newContent'] = $text; + $svdta['oldContent'] = rawWiki($id); + $svdta['summary'] = $summary; + $svdta['contentChanged'] = ($svdta['newContent'] != $svdta['oldContent']); + $svdta['changeInfo'] = ''; + $svdta['changeType'] = DOKU_CHANGE_TYPE_EDIT; + $svdta['sizechange'] = null; - $file = wikiFN($id); - $old = @filemtime($file); // from page - $wasRemoved = (trim($text) == ''); // check for empty or whitespace only - $wasCreated = !file_exists($file); - $wasReverted = ($REV == true); - $pagelog = new PageChangeLog($id, 1024); - $newRev = false; - $oldRev = $pagelog->getRevisions(-1, 1); // from changelog - $oldRev = (int) (empty($oldRev) ? 0 : $oldRev[0]); - if(!file_exists(wikiFN($id, $old)) && file_exists($file) && $old >= $oldRev) { - // add old revision to the attic if missing - saveOldRevision($id); - // add a changelog entry if this edit came from outside dokuwiki - if($old > $oldRev) { - addLogEntry($old, $id, DOKU_CHANGE_TYPE_EDIT, $lang['external_edit'], '', array('ExternalEdit'=> true)); - // remove soon to be stale instructions - $cache = new cache_instructions($id, $file); - $cache->removeCache(); + // select changelog line type + if($REV) { + $svdta['changeType'] = DOKU_CHANGE_TYPE_REVERT; + $svdta['changeInfo'] = $REV; + } else if(!file_exists($svdta['file'])) { + $svdta['changeType'] = DOKU_CHANGE_TYPE_CREATE; + } else if(trim($text) == '') { + // empty or whitespace only content deletes + $svdta['changeType'] = DOKU_CHANGE_TYPE_DELETE; + // autoset summary on deletion + if(blank($svdta['summary'])) { + $svdta['summary'] = $lang['deleted']; } + } else if($minor && $conf['useacl'] && $INPUT->server->str('REMOTE_USER')) { + //minor edits only for logged in users + $svdta['changeType'] = DOKU_CHANGE_TYPE_MINOR_EDIT; } - if($wasRemoved) { + $event = new Doku_Event('COMMON_WIKIPAGE_SAVE', $svdta); + if(!$event->advise_before()) return; + + // if the content has not been changed, no save happens (plugins may override this) + if(!$svdta['contentChanged']) return; + + detectExternalEdit($id); + + if( + $svdta['changeType'] == DOKU_CHANGE_TYPE_CREATE || + ($svdta['changeType'] == DOKU_CHANGE_TYPE_REVERT && !file_exists($svdta['file'])) + ) { + $filesize_old = 0; + } else { + $filesize_old = filesize($svdta['file']); + } + if($svdta['changeType'] == DOKU_CHANGE_TYPE_DELETE) { // Send "update" event with empty data, so plugins can react to page deletion - $data = array(array($file, '', false), getNS($id), noNS($id), false); + $data = array(array($svdta['file'], '', false), getNS($id), noNS($id), false); trigger_event('IO_WIKIPAGE_WRITE', $data); // pre-save deleted revision - @touch($file); + @touch($svdta['file']); clearstatcache(); - $newRev = saveOldRevision($id); + $data['newRevision'] = saveOldRevision($id); // remove empty file - @unlink($file); + @unlink($svdta['file']); + $filesize_new = 0; // don't remove old meta info as it should be saved, plugins can use IO_WIKIPAGE_WRITE for removing their metadata... // purge non-persistant meta data p_purge_metadata($id); - $del = true; - // autoset summary on deletion - if(empty($summary)) $summary = $lang['deleted']; // remove empty namespaces io_sweepNS($id, 'datadir'); io_sweepNS($id, 'mediadir'); } else { // save file (namespace dir is created in io_writeWikiPage) - io_writeWikiPage($file, $text, $id); + io_writeWikiPage($svdta['file'], $text, $id); // pre-save the revision, to keep the attic in sync - $newRev = saveOldRevision($id); - $del = false; + $svdta['newRevision'] = saveOldRevision($id); + $filesize_new = filesize($svdta['file']); } + $svdta['sizechange'] = $filesize_new - $filesize_old; - // select changelog line type - $extra = ''; - $type = DOKU_CHANGE_TYPE_EDIT; - if($wasReverted) { - $type = DOKU_CHANGE_TYPE_REVERT; - $extra = $REV; - } else if($wasCreated) { - $type = DOKU_CHANGE_TYPE_CREATE; - } else if($wasRemoved) { - $type = DOKU_CHANGE_TYPE_DELETE; - } else if($minor && $conf['useacl'] && $INPUT->server->str('REMOTE_USER')) { - $type = DOKU_CHANGE_TYPE_MINOR_EDIT; - } //minor edits only for logged in users + $event->advise_after(); + + addLogEntry($svdta['newRevision'], $svdta['id'], $svdta['changeType'], $svdta['summary'], $svdta['changeInfo'], null, $svdta['sizechange']); - addLogEntry($newRev, $id, $type, $summary, $extra); // send notify mails - notify($id, 'admin', $old, $summary, $minor); - notify($id, 'subscribers', $old, $summary, $minor); + notify($svdta['id'], 'admin', $svdta['oldRevision'], $svdta['summary'], $minor); + notify($svdta['id'], 'subscribers', $svdta['oldRevision'], $svdta['summary'], $minor); // update the purgefile (timestamp of the last time anything within the wiki was changed) io_saveFile($conf['cachedir'].'/purgefile', time()); @@ -1398,7 +1477,7 @@ function filesize_h($size, $dec = 1) { $i++; } - return round($size, $dec).' '.$sizes[$i]; + return round($size, $dec)."\xC2\xA0".$sizes[$i]; //non-breaking space } /** @@ -1462,7 +1541,7 @@ function dformat($dt = null, $format = '') { * Formats a timestamp as ISO 8601 date * * @author - * @link http://www.php.net/manual/en/function.date.php#54072 + * @link http://php.net/manual/en/function.date.php#54072 * * @param int $int_date current date in UNIX timestamp * @return string @@ -1523,7 +1602,7 @@ function unslash($string, $char = "'") { * Convert php.ini shorthands to byte * * @author - * @link http://de3.php.net/manual/en/ini.core.php#79564 + * @link http://php.net/manual/en/ini.core.php#79564 * * @param string $v shorthands * @return int|string @@ -1793,6 +1872,8 @@ function is_mem_available($mem, $bytes = 1048576) { * @param string $url url being directed to */ function send_redirect($url) { + $url = stripctl($url); // defend against HTTP Response Splitting + /* @var Input $INPUT */ global $INPUT; @@ -1860,7 +1941,7 @@ function valid_input_set($param, $valid_values, $array, $exc = '') { */ function get_doku_pref($pref, $default) { $enc_pref = urlencode($pref); - if(strpos($_COOKIE['DOKU_PREFS'], $enc_pref) !== false) { + if(isset($_COOKIE['DOKU_PREFS']) && strpos($_COOKIE['DOKU_PREFS'], $enc_pref) !== false) { $parts = explode('#', $_COOKIE['DOKU_PREFS']); $cnt = count($parts); for($i = 0; $i < $cnt; $i += 2) { diff --git a/sources/inc/config_cascade.php b/sources/inc/config_cascade.php index a6dfadc..2466290 100644 --- a/sources/inc/config_cascade.php +++ b/sources/inc/config_cascade.php @@ -62,6 +62,7 @@ $config_cascade = array_merge( ), 'plainauth.users' => array( 'default' => DOKU_CONF . 'users.auth.php', + 'protected' => '' // not used by default ), 'plugins' => array( 'default' => array(DOKU_CONF . 'plugins.php'), diff --git a/sources/inc/fulltext.php b/sources/inc/fulltext.php index d6cddc5..a727a8b 100644 --- a/sources/inc/fulltext.php +++ b/sources/inc/fulltext.php @@ -701,7 +701,7 @@ function ft_queryParser($Indexer, $query){ if (preg_match($ope_regex, $token)) { // operator $last_ope = end($ope_stack); - while ($ope_precedence[$token] <= $ope_precedence[$last_ope] && $last_ope != '(') { + while ($last_ope !== false && $ope_precedence[$token] <= $ope_precedence[$last_ope] && $last_ope != '(') { $parsed_ary[] = array_pop($ope_stack); $last_ope = end($ope_stack); } diff --git a/sources/inc/html.php b/sources/inc/html.php index 24d108e..443409f 100644 --- a/sources/inc/html.php +++ b/sources/inc/html.php @@ -74,7 +74,7 @@ function html_login(){ function html_denied() { print p_locale_xhtml('denied'); - if(!$_SERVER['REMOTE_USER']){ + if(empty($_SERVER['REMOTE_USER'])){ html_login(); } } @@ -226,8 +226,7 @@ function html_btn($name, $id, $akey, $params, $method='get', $tooltip='', $label $tip .= ' ['.strtoupper($akey).']'; $ret .= 'accesskey="'.$akey.'" '; } - $ret .= 'title="'.$tip.'" '; - $ret .= '/>'; + $ret .= 'title="'.$tip.'">'; $ret .= hsc($label); $ret .= ''; $ret .= ''; @@ -502,28 +501,61 @@ function html_revisions($first=0, $media_id = false){ array_pop($revisions); // remove extra log entry } - if (!$media_id) $date = dformat($INFO['lastmod']); - else $date = dformat(@filemtime(mediaFN($id))); - if (!$media_id) print p_locale_xhtml('revisions'); $params = array('id' => 'page__revisions', 'class' => 'changes'); - if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id), '&'); + if($media_id) { + $params['action'] = media_managerURL(array('image' => $media_id), '&'); + } + + if(!$media_id) { + $exists = $INFO['exists']; + $display_name = useHeading('navigation') ? hsc(p_get_first_heading($id)) : $id; + if(!$display_name) { + $display_name = $id; + } + } else { + $exists = file_exists(mediaFN($id)); + $display_name = $id; + } $form = new Doku_Form($params); $form->addElement(form_makeOpenTag('ul')); - if (!$media_id) $exists = $INFO['exists']; - else $exists = file_exists(mediaFN($id)); + if($exists && $first == 0) { + $minor = false; + if($media_id) { + $date = dformat(@filemtime(mediaFN($id))); + $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'), '&'); - $display_name = (!$media_id && useHeading('navigation')) ? hsc(p_get_first_heading($id)) : $id; - if (!$display_name) $display_name = $id; + $changelog->setChunkSize(1024); + $revinfo = $changelog->getRevisionInfo(@filemtime(fullpath(mediaFN($id)))); - if($exists && $first==0){ - if (!$media_id && isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) - $form->addElement(form_makeOpenTag('li', array('class' => 'minor'))); - else - $form->addElement(form_makeOpenTag('li')); + $summary = $revinfo['sum']; + if($revinfo['user']) { + $editor = $revinfo['user']; + } else { + $editor = $revinfo['ip']; + } + $sizechange = $revinfo['sizechange']; + } else { + $date = dformat($INFO['lastmod']); + if(isset($INFO['meta']) && isset($INFO['meta']['last_change'])) { + if($INFO['meta']['last_change']['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT) { + $minor = true; + } + if(isset($INFO['meta']['last_change']['sizechange'])) { + $sizechange = $INFO['meta']['last_change']['sizechange']; + } else { + $sizechange = null; + } + } + $href = wl($id); + $summary = $INFO['sum']; + $editor = $INFO['editor']; + } + + $form->addElement(form_makeOpenTag('li', array('class' => ($minor ? 'minor' : '')))); $form->addElement(form_makeOpenTag('div', array('class' => 'li'))); $form->addElement(form_makeTag('input', array( 'type' => 'checkbox', @@ -536,8 +568,6 @@ function html_revisions($first=0, $media_id = false){ $form->addElement(''); - if (!$media_id) $href = wl($id); - else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'), '&'); $form->addElement(form_makeOpenTag('a', array( 'class' => 'wikilink1', 'href' => $href))); @@ -546,29 +576,19 @@ function html_revisions($first=0, $media_id = false){ if ($media_id) $form->addElement(form_makeOpenTag('div')); - if (!$media_id) { + if($summary) { $form->addElement(form_makeOpenTag('span', array('class' => 'sum'))); - $form->addElement(' – '); - $form->addElement(htmlspecialchars($INFO['sum'])); + if(!$media_id) $form->addElement(' – '); + $form->addElement('' . htmlspecialchars($summary) . ''); $form->addElement(form_makeCloseTag('span')); } - $changelog->setChunkSize(1024); - $form->addElement(form_makeOpenTag('span', array('class' => 'user'))); - if($media_id) { - $revinfo = $changelog->getRevisionInfo(@filemtime(fullpath(mediaFN($id)))); - if($revinfo['user']) { - $editor = $revinfo['user']; - } else { - $editor = $revinfo['ip']; - } - } else { - $editor = $INFO['editor']; - } - $form->addElement((empty($editor))?('('.$lang['external_edit'].')'):editorinfo($editor)); + $form->addElement((empty($editor))?('('.$lang['external_edit'].')'):''.editorinfo($editor).''); $form->addElement(form_makeCloseTag('span')); + html_sizechange($sizechange, $form); + $form->addElement('('.$lang['current'].')'); if ($media_id) $form->addElement(form_makeCloseTag('div')); @@ -577,7 +597,7 @@ function html_revisions($first=0, $media_id = false){ $form->addElement(form_makeCloseTag('li')); } - foreach($revisions as $rev){ + foreach($revisions as $rev) { $date = dformat($rev); $info = $changelog->getRevisionInfo($rev); if($media_id) { @@ -586,10 +606,11 @@ function html_revisions($first=0, $media_id = false){ $exists = page_exists($id, $rev); } - if ($info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) - $form->addElement(form_makeOpenTag('li', array('class' => 'minor'))); - else - $form->addElement(form_makeOpenTag('li')); + $class = ''; + if($info['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT) { + $class = 'minor'; + } + $form->addElement(form_makeOpenTag('li', array('class' => $class))); $form->addElement(form_makeOpenTag('div', array('class' => 'li'))); if($exists){ $form->addElement(form_makeTag('input', array( @@ -605,9 +626,14 @@ function html_revisions($first=0, $media_id = false){ $form->addElement(form_makeCloseTag('span')); if($exists){ - if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&'); - else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'), '&'); - $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link'))); + if (!$media_id) { + $href = wl($id,"rev=$rev,do=diff", false, '&'); + } else { + $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'), '&'); + } + $form->addElement(form_makeOpenTag('a', array( + 'class' => 'diff_link', + 'href' => $href))); $form->addElement(form_makeTag('img', array( 'src' => DOKU_BASE.'lib/images/diff.png', 'width' => 15, @@ -615,9 +641,15 @@ function html_revisions($first=0, $media_id = false){ 'title' => $lang['diff'], 'alt' => $lang['diff']))); $form->addElement(form_makeCloseTag('a')); - if (!$media_id) $href = wl($id,"rev=$rev",false,'&'); - else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev), '&'); - $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'wikilink1'))); + + if (!$media_id) { + $href = wl($id,"rev=$rev",false,'&'); + } else { + $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev), '&'); + } + $form->addElement(form_makeOpenTag('a', array( + 'class' => 'wikilink1', + 'href' => $href))); $form->addElement($display_name); $form->addElement(form_makeCloseTag('a')); }else{ @@ -629,7 +661,7 @@ function html_revisions($first=0, $media_id = false){ if ($info['sum']) { $form->addElement(form_makeOpenTag('span', array('class' => 'sum'))); - if (!$media_id) $form->addElement(' – '); + if(!$media_id) $form->addElement(' – '); $form->addElement(''.htmlspecialchars($info['sum']).''); $form->addElement(form_makeCloseTag('span')); } @@ -645,6 +677,8 @@ function html_revisions($first=0, $media_id = false){ } $form->addElement(form_makeCloseTag('span')); + html_sizechange($info['sizechange'], $form); + if ($media_id) $form->addElement(form_makeCloseTag('div')); $form->addElement(form_makeCloseTag('div')); @@ -696,7 +730,7 @@ function html_revisions($first=0, $media_id = false){ * @param int $first * @param string $show_changes */ -function html_recent($first=0, $show_changes='both'){ +function html_recent($first = 0, $show_changes = 'both') { global $conf; global $lang; global $ID; @@ -705,48 +739,50 @@ function html_recent($first=0, $show_changes='both'){ * This is the cheapest solution to get this information. */ $flags = 0; - if ($show_changes == 'mediafiles' && $conf['mediarevisions']) { + if($show_changes == 'mediafiles' && $conf['mediarevisions']) { $flags = RECENTS_MEDIA_CHANGES; - } elseif ($show_changes == 'pages') { + } elseif($show_changes == 'pages') { $flags = 0; - } elseif ($conf['mediarevisions']) { + } elseif($conf['mediarevisions']) { $show_changes = 'both'; $flags = RECENTS_MEDIA_PAGES_MIXED; } - $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags); - if(count($recents) == 0 && $first != 0){ - $first=0; - $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags); + $recents = getRecents($first, $conf['recent'] + 1, getNS($ID), $flags); + if(count($recents) == 0 && $first != 0) { + $first = 0; + $recents = getRecents($first, $conf['recent'] + 1, getNS($ID), $flags); } $hasNext = false; - if (count($recents)>$conf['recent']) { + if(count($recents) > $conf['recent']) { $hasNext = true; array_pop($recents); // remove extra log entry } print p_locale_xhtml('recent'); - if (getNS($ID) != '') + if(getNS($ID) != '') { print '

' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '

'; + } $form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET', 'class' => 'changes')); $form->addHidden('sectok', null); $form->addHidden('do', 'recent'); $form->addHidden('id', $ID); - if ($conf['mediarevisions']) { + if($conf['mediarevisions']) { $form->addElement('
'); $form->addElement(form_makeListboxField( 'show_changes', array( 'pages' => $lang['pages_changes'], 'mediafiles' => $lang['media_changes'], - 'both' => $lang['both_changes']), + 'both' => $lang['both_changes'] + ), $show_changes, $lang['changes_type'], - '','', - array('class'=>'quickselect'))); + '', '', + array('class' => 'quickselect'))); $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply'])); $form->addElement('
'); @@ -754,20 +790,21 @@ function html_recent($first=0, $show_changes='both'){ $form->addElement(form_makeOpenTag('ul')); - foreach($recents as $recent){ + foreach($recents as $recent) { $date = dformat($recent['date']); - if ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) - $form->addElement(form_makeOpenTag('li', array('class' => 'minor'))); - else - $form->addElement(form_makeOpenTag('li')); + $class = ''; + if($recent['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT) { + $class = 'minor'; + } + $form->addElement(form_makeOpenTag('li', array('class' => $class))); $form->addElement(form_makeOpenTag('div', array('class' => 'li'))); - if (!empty($recent['media'])) { + if(!empty($recent['media'])) { $form->addElement(media_printicon($recent['id'])); } else { - $icon = DOKU_BASE.'lib/images/fileicons/file.png'; - $form->addElement(''.$recent['id'].''); + $icon = DOKU_BASE . 'lib/images/fileicons/file.png'; + $form->addElement('' . $recent['id'] . ''); } $form->addElement(form_makeOpenTag('span', array('class' => 'date'))); @@ -777,76 +814,81 @@ function html_recent($first=0, $show_changes='both'){ $diff = false; $href = ''; - if (!empty($recent['media'])) { + if(!empty($recent['media'])) { $changelog = new MediaChangeLog($recent['id']); $revs = $changelog->getRevisions(0, 1); $diff = (count($revs) && file_exists(mediaFN($recent['id']))); - if ($diff) { + if($diff) { $href = media_managerURL(array( - 'tab_details' => 'history', - 'mediado' => 'diff', - 'image' => $recent['id'], - 'ns' => getNS($recent['id']) - ), '&'); + 'tab_details' => 'history', + 'mediado' => 'diff', + 'image' => $recent['id'], + 'ns' => getNS($recent['id']) + ), '&'); } } else { - $href = wl($recent['id'],"do=diff", false, '&'); + $href = wl($recent['id'], "do=diff", false, '&'); } - if (!empty($recent['media']) && !$diff) { - $form->addElement(''); + if(!empty($recent['media']) && !$diff) { + $form->addElement(''); } else { $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href))); $form->addElement(form_makeTag('img', array( - 'src' => DOKU_BASE.'lib/images/diff.png', - 'width' => 15, - 'height'=> 11, - 'title' => $lang['diff'], - 'alt' => $lang['diff'] - ))); + 'src' => DOKU_BASE . 'lib/images/diff.png', + 'width' => 15, + 'height' => 11, + 'title' => $lang['diff'], + 'alt' => $lang['diff'] + ))); $form->addElement(form_makeCloseTag('a')); } - if (!empty($recent['media'])) { - $href = media_managerURL(array('tab_details' => 'history', - 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&'); + if(!empty($recent['media'])) { + $href = media_managerURL(array('tab_details' => 'history', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&'); } else { - $href = wl($recent['id'],"do=revisions",false,'&'); + $href = wl($recent['id'], "do=revisions", false, '&'); } - $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => $href))); + $form->addElement(form_makeOpenTag('a', array( + 'class' => 'revisions_link', + 'href' => $href))); $form->addElement(form_makeTag('img', array( - 'src' => DOKU_BASE.'lib/images/history.png', - 'width' => 12, - 'height'=> 14, - 'title' => $lang['btn_revs'], - 'alt' => $lang['btn_revs'] - ))); + 'src' => DOKU_BASE . 'lib/images/history.png', + 'width' => 12, + 'height' => 14, + 'title' => $lang['btn_revs'], + 'alt' => $lang['btn_revs'] + ))); $form->addElement(form_makeCloseTag('a')); - if (!empty($recent['media'])) { + if(!empty($recent['media'])) { $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&'); - $class = (file_exists(mediaFN($recent['id']))) ? 'wikilink1' : $class = 'wikilink2'; - $form->addElement(form_makeOpenTag('a', array('class' => $class, 'href' => $href))); + $class = file_exists(mediaFN($recent['id'])) ? 'wikilink1' : 'wikilink2'; + $form->addElement(form_makeOpenTag('a', array( + 'class' => $class, + 'href' => $href))); $form->addElement($recent['id']); $form->addElement(form_makeCloseTag('a')); } else { - $form->addElement(html_wikilink(':'.$recent['id'],useHeading('navigation')?null:$recent['id'])); + $form->addElement(html_wikilink(':' . $recent['id'], useHeading('navigation') ? null : $recent['id'])); } $form->addElement(form_makeOpenTag('span', array('class' => 'sum'))); - $form->addElement(' – '.htmlspecialchars($recent['sum'])); + $form->addElement(' – ' . htmlspecialchars($recent['sum'])); $form->addElement(form_makeCloseTag('span')); $form->addElement(form_makeOpenTag('span', array('class' => 'user'))); - if($recent['user']){ - $form->addElement(''.editorinfo($recent['user']).''); - if(auth_ismanager()){ - $form->addElement(' ('.$recent['ip'].')'); + if($recent['user']) { + $form->addElement('' . editorinfo($recent['user']) . ''); + if(auth_ismanager()) { + $form->addElement(' (' . $recent['ip'] . ')'); } - }else{ - $form->addElement(''.$recent['ip'].''); + } else { + $form->addElement('' . $recent['ip'] . ''); } $form->addElement(form_makeCloseTag('span')); + html_sizechange($recent['sizechange'], $form); + $form->addElement(form_makeCloseTag('div')); $form->addElement(form_makeCloseTag('li')); } @@ -854,30 +896,30 @@ function html_recent($first=0, $show_changes='both'){ $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav'))); $last = $first + $conf['recent']; - if ($first > 0) { + if($first > 0) { $first -= $conf['recent']; - if ($first < 0) $first = 0; + if($first < 0) $first = 0; $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-prev'))); $form->addElement(form_makeOpenTag('button', array( - 'type' => 'submit', - 'name' => 'first['.$first.']', - 'accesskey' => 'n', - 'title' => $lang['btn_newer'].' [N]', - 'class' => 'button show' + 'type' => 'submit', + 'name' => 'first[' . $first . ']', + 'accesskey' => 'n', + 'title' => $lang['btn_newer'] . ' [N]', + 'class' => 'button show' ))); $form->addElement($lang['btn_newer']); $form->addElement(form_makeCloseTag('button')); $form->addElement(form_makeCloseTag('div')); } - if ($hasNext) { + if($hasNext) { $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-next'))); $form->addElement(form_makeOpenTag('button', array( - 'type' => 'submit', - 'name' => 'first['.$last.']', + 'type' => 'submit', + 'name' => 'first[' . $last . ']', 'accesskey' => 'p', - 'title' => $lang['btn_older'].' [P]', - 'class' => 'button show' - ))); + 'title' => $lang['btn_older'] . ' [P]', + 'class' => 'button show' + ))); $form->addElement($lang['btn_older']); $form->addElement(form_makeCloseTag('button')); $form->addElement(form_makeCloseTag('div')); @@ -897,10 +939,9 @@ function html_index($ns){ global $conf; global $ID; $ns = cleanID($ns); - #fixme use appropriate function if(empty($ns)){ - $ns = dirname(str_replace(':','/',$ID)); - if($ns == '.') $ns =''; + $ns = getNS($ID); + if($ns === false) $ns =''; } $ns = utf8_encodeFN(str_replace(':','/',$ns)); @@ -2116,7 +2157,17 @@ function html_admin(){ // print the rest as sorted list if(count($menu)){ - usort($menu, 'p_sort_modes'); + // sort by name, then sort + usort( + $menu, + function ($a, $b) { + $strcmp = strcasecmp($a['prompt'], $b['prompt']); + if($strcmp != 0) return $strcmp; + if($a['sort'] == $b['sort']) return 0; + return ($a['sort'] < $b['sort']) ? -1 : 1; + } + ); + // output the menu ptln('
'); print p_locale_xhtml('adminplugins'); @@ -2349,6 +2400,7 @@ function html_tabs($tabs, $current_tab = null) { echo ''.NL; } + /** * Prints a single tab * @@ -2373,3 +2425,28 @@ function html_tab($href, $caption, $selected=false) { echo $tab; } +/** + * Display size change + * + * @param int $sizechange - size of change in Bytes + * @param Doku_Form $form - form to add elements to + */ + +function html_sizechange($sizechange, Doku_Form $form) { + if(isset($sizechange)) { + $class = 'sizechange'; + $value = filesize_h(abs($sizechange)); + if($sizechange > 0) { + $class .= ' positive'; + $value = '+' . $value; + } elseif($sizechange < 0) { + $class .= ' negative'; + $value = '-' . $value; + } else { + $value = '±' . $value; + } + $form->addElement(form_makeOpenTag('span', array('class' => $class))); + $form->addElement($value); + $form->addElement(form_makeCloseTag('span')); + } +} diff --git a/sources/inc/httputils.php b/sources/inc/httputils.php index ac79aa1..c365f4f 100644 --- a/sources/inc/httputils.php +++ b/sources/inc/httputils.php @@ -197,6 +197,8 @@ function http_rangeRequest($fh,$size,$mime){ * @return bool */ function http_gzip_valid($uncompressed_file) { + if(!DOKU_HAS_GZIP) return false; + $gzip = $uncompressed_file.'.gz'; if (filemtime($gzip) < filemtime($uncompressed_file)) { // filemtime returns false (0) if file doesn't exist return copy($uncompressed_file, 'compress.zlib://'.$gzip); @@ -252,10 +254,10 @@ function http_cached_finish($file, $content) { // save cache file io_saveFile($file, $content); - if(function_exists('gzopen')) io_saveFile("$file.gz",$content); + if(DOKU_HAS_GZIP) io_saveFile("$file.gz",$content); // finally send output - if ($conf['gzip_output']) { + if ($conf['gzip_output'] && DOKU_HAS_GZIP) { header('Vary: Accept-Encoding'); header('Content-Encoding: gzip'); print gzencode($content,9,FORCE_GZIP); diff --git a/sources/inc/init.php b/sources/inc/init.php index 6d271df..a2646a6 100644 --- a/sources/inc/init.php +++ b/sources/inc/init.php @@ -195,10 +195,12 @@ require_once(DOKU_INC.'vendor/autoload.php'); require_once(DOKU_INC.'inc/load.php'); // disable gzip if not available -if($conf['compression'] == 'bz2' && !function_exists('bzopen')){ +define('DOKU_HAS_BZIP', function_exists('bzopen')); +define('DOKU_HAS_GZIP', function_exists('gzopen')); +if($conf['compression'] == 'bz2' && !DOKU_HAS_BZIP) { $conf['compression'] = 'gz'; } -if($conf['compression'] == 'gz' && !function_exists('gzopen')){ +if($conf['compression'] == 'gz' && !DOKU_HAS_GZIP) { $conf['compression'] = 0; } @@ -547,7 +549,7 @@ EOT; * * @author Andreas Gohr * @author - * @link http://de3.php.net/manual/en/function.realpath.php#75992 + * @link http://php.net/manual/en/function.realpath.php#75992 */ function fullpath($path,$exists=false){ static $run = 0; diff --git a/sources/inc/io.php b/sources/inc/io.php index 704c5b1..4903b17 100644 --- a/sources/inc/io.php +++ b/sources/inc/io.php @@ -107,9 +107,11 @@ function io_readFile($file,$clean=true){ $ret = ''; if(file_exists($file)){ if(substr($file,-3) == '.gz'){ + if(!DOKU_HAS_GZIP) return false; $ret = gzfile($file); if(is_array($ret)) $ret = join('', $ret); }else if(substr($file,-4) == '.bz2'){ + if(!DOKU_HAS_BZIP) return false; $ret = bzfile($file); }else{ $ret = file_get_contents($file); @@ -222,11 +224,13 @@ function _io_saveFile($file, $content, $append) { $fileexists = file_exists($file); if(substr($file,-3) == '.gz'){ + if(!DOKU_HAS_GZIP) return false; $fh = @gzopen($file,$mode.'9'); if(!$fh) return false; gzwrite($fh, $content); gzclose($fh); }else if(substr($file,-4) == '.bz2'){ + if(!DOKU_HAS_BZIP) return false; if($append) { $bzcontent = bzfile($file); if($bzcontent === false) return false; @@ -313,8 +317,10 @@ function io_replaceInFile($file, $oldline, $newline, $regex=false, $maxlines=0) // load into array if(substr($file,-3) == '.gz'){ + if(!DOKU_HAS_GZIP) return false; $lines = gzfile($file); }else if(substr($file,-4) == '.bz2'){ + if(!DOKU_HAS_BZIP) return false; $lines = bzfile($file, true); }else{ $lines = file($file); @@ -483,7 +489,7 @@ function io_makeFileDir($file){ /** * Creates a directory hierachy. * - * @link http://www.php.net/manual/en/function.mkdir.php + * @link http://php.net/manual/en/function.mkdir.php * @author * @author Andreas Gohr * @@ -770,3 +776,46 @@ function io_grep($file,$pattern,$max=0,$backref=false){ return $matches; } + +/** + * Get size of contents of a file, for a compressed file the uncompressed size + * Warning: reading uncompressed size of content of bz-files requires uncompressing + * + * @author Gerrit Uitslag + * + * @param string $file filename path to file + * @return int size of file + */ +function io_getSizeFile($file) { + if (!file_exists($file)) return 0; + + if(substr($file,-3) == '.gz'){ + $fp = @fopen($file, "rb"); + if($fp === false) return 0; + + fseek($fp, -4, SEEK_END); + $buffer = fread($fp, 4); + fclose($fp); + $array = unpack("V", $buffer); + $uncompressedsize = end($array); + }else if(substr($file,-4) == '.bz2'){ + if(!DOKU_HAS_BZIP) return 0; + + $bz = bzopen($file,"r"); + if($bz === false) return 0; + + $uncompressedsize = 0; + while (!feof($bz)) { + //8192 seems to be the maximum buffersize? + $buffer = bzread($bz,8192); + if(($buffer === false) || (bzerrno($bz) !== 0)) { + return 0; + } + $uncompressedsize += strlen($buffer); + } + }else{ + $uncompressedsize = filesize($file); + } + + return $uncompressedsize; + } diff --git a/sources/inc/lang/ar/lang.php b/sources/inc/lang/ar/lang.php index fb89bb0..e25d0ee 100644 --- a/sources/inc/lang/ar/lang.php +++ b/sources/inc/lang/ar/lang.php @@ -345,3 +345,5 @@ $lang['currentns'] = 'مساحة الاسم الحالية'; $lang['searchresult'] = 'نتيجة البحث'; $lang['plainhtml'] = 'نص HTML غير منسق'; $lang['wikimarkup'] = 'علامات الوكي'; +$lang['email_signature_text'] = 'أنشئت هذه الرسالة من دوكو ويكي ÙÙŠ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/ar/mailtext.txt b/sources/inc/lang/ar/mailtext.txt index 21d4165..132e36e 100644 --- a/sources/inc/lang/ar/mailtext.txt +++ b/sources/inc/lang/ar/mailtext.txt @@ -10,8 +10,3 @@ مستخدم : @USER@ @DIFF@ - - --- -تم أرسال هذه الرسالة من دوكو ويكي ÙÙ‰ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ar/mailwrap.html b/sources/inc/lang/ar/mailwrap.html index 554e345..d257190 100644 --- a/sources/inc/lang/ar/mailwrap.html +++ b/sources/inc/lang/ar/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-تم انشاء هذا البريد الالكتروني بواسطة DokuWiki ÙÙŠ @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/ar/password.txt b/sources/inc/lang/ar/password.txt index c8530bb..2489800 100644 --- a/sources/inc/lang/ar/password.txt +++ b/sources/inc/lang/ar/password.txt @@ -4,7 +4,3 @@ أسم المستخدم : @LOGIN@ كلمة السر : @PASSWORD@ - --- -تم أرسال هذه الرسالة من دوكو ويكي -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ar/pwconfirm.txt b/sources/inc/lang/ar/pwconfirm.txt index 401053e..6e971d3 100644 --- a/sources/inc/lang/ar/pwconfirm.txt +++ b/sources/inc/lang/ar/pwconfirm.txt @@ -2,7 +2,5 @@ شخص ما طلب كلمة سر جديدة لـحسابك @TITLE@ ÙÙŠ @DOKUWIKIURL@ إذا لم تكن قد طلبت كلمة سر جديدة رجاء قم بتجاهل هذه الرسالة . -لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط ÙÙŠ الأسÙÙ„ . -@CONFIRM@ - -- -لقد تم عمل هذه الرسالة من قبل DokuWiki .. ÙÙŠ @DOKUWIKIURL@ +لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط ÙÙŠ الأسÙÙ„ . +@CONFIRM@ diff --git a/sources/inc/lang/ar/registermail.txt b/sources/inc/lang/ar/registermail.txt index f04801f..7c1cae0 100644 --- a/sources/inc/lang/ar/registermail.txt +++ b/sources/inc/lang/ar/registermail.txt @@ -8,7 +8,3 @@ المتصÙØ­ : @BROWSER@ عنوان-IP: @IPADDRESS@ اسم المضيÙ: @HOSTNAME@ - --- -ÙˆÙلد هذا البريد من دوكو ويكي ÙÙŠ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ar/subscr_digest.txt b/sources/inc/lang/ar/subscr_digest.txt index 6e8c2fa..58256f5 100644 --- a/sources/inc/lang/ar/subscr_digest.txt +++ b/sources/inc/lang/ar/subscr_digest.txt @@ -14,7 +14,3 @@ @DOKUWIKIURL@ ثم زÙر @SUBSCRIBE@ وألغ اشتراكك من الصÙحات أو النظاقات - --- -أنشئت هذه الرسالة من دوكو ويكي ÙÙŠ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ar/subscr_list.txt b/sources/inc/lang/ar/subscr_list.txt index 22773a8..681fed2 100644 --- a/sources/inc/lang/ar/subscr_list.txt +++ b/sources/inc/lang/ar/subscr_list.txt @@ -11,7 +11,3 @@ @DOKUWIKIURL@ ثم زÙر @SUBSCRIBE@ ثم ألغ اشتراك تغييرات الصÙحة Ùˆ/أو النطاق. - --- -ÙˆÙلد هذا البريد من دوكو ويكي ÙÙŠ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ar/subscr_single.txt b/sources/inc/lang/ar/subscr_single.txt index 6116884..6ac7d21 100644 --- a/sources/inc/lang/ar/subscr_single.txt +++ b/sources/inc/lang/ar/subscr_single.txt @@ -13,11 +13,7 @@ الاصدار القديم: @OLDPAGE@ الاصدار الحديث: @NEWPAGE@ -لإلغاء إشعارات الصÙحة,Ù„Ùج الويكي ÙÙŠ +لإلغاء إشعارات الصÙحة,Ù„Ùج الويكي ÙÙŠ @DOKUWIKIURL@ ثم زÙر @SUBSCRIBE@ وألغ الاشتراك من تغييرات الصÙحة Ùˆ/أو النطاق. - --- -ولد هذا البريد باستخدام دوكو ويكي ÙÙŠ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ar/uploadmail.txt b/sources/inc/lang/ar/uploadmail.txt index e4f16c7..bc61e6e 100644 --- a/sources/inc/lang/ar/uploadmail.txt +++ b/sources/inc/lang/ar/uploadmail.txt @@ -8,7 +8,3 @@ الحجم : @SIZE@ نوع MIME : @MIME@ المستخدم: @USER@ - --- -ولد هذا البريد من دوكو ويكي ÙÙŠ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/az/lang.php b/sources/inc/lang/az/lang.php index 26b177e..b842c79 100644 --- a/sources/inc/lang/az/lang.php +++ b/sources/inc/lang/az/lang.php @@ -213,3 +213,5 @@ $lang['days'] = '%d gün É™vvÉ™l'; $lang['hours'] = '%d saat É™vvÉ™l'; $lang['minutes'] = '%d dÉ™qiqÉ™ É™vvÉ™l'; $lang['seconds'] = '%d saniyÉ™ É™vvÉ™l'; +$lang['email_signature_text'] = 'DokuWiki aÅŸağıdakı adresdÉ™ yerləşir +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/az/mailtext.txt b/sources/inc/lang/az/mailtext.txt index 4394586..97cb68d 100644 --- a/sources/inc/lang/az/mailtext.txt +++ b/sources/inc/lang/az/mailtext.txt @@ -10,9 +10,3 @@ DÉ™yiÅŸiklÉ™rin xülasÉ™si : @SUMMARY@ Ä°stifadəçi : @USER@ @DIFF@ - - --- -Bu mÉ™ktub DokuWiki tÉ™rÉ™findÉ™n yaradıldı. -DokuWiki aÅŸağıdakı adresdÉ™ yerləşir: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/az/password.txt b/sources/inc/lang/az/password.txt index 31bf387..6424161 100644 --- a/sources/inc/lang/az/password.txt +++ b/sources/inc/lang/az/password.txt @@ -4,8 +4,3 @@ Sizin @TITLE@ (@DOKUWIKIURL@) üçün olan mÉ™lumatlarınız Ä°stifadəçi adı : @LOGIN@ ÅžifrÉ™ : @PASSWORD@ - --- -Bu mÉ™ktub DokuWiki tÉ™rÉ™findÉ™n yaradıldı. -DokuWiki aÅŸağıdakı adresdÉ™ yerləşir: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/az/pwconfirm.txt b/sources/inc/lang/az/pwconfirm.txt index 177e5a1..582124a 100644 --- a/sources/inc/lang/az/pwconfirm.txt +++ b/sources/inc/lang/az/pwconfirm.txt @@ -7,8 +7,3 @@ KimsÉ™ @DOKUWIKIURL@ adresindÉ™ yerləşən @TITLE@ adlı wiki-yÉ™ giriÅŸ üçü TÉ™lÉ™bi tÉ™sdiq etmÉ™k üçün, aÅŸağıdakı link-É™ keçin. @CONFIRM@ - --- -Bu mÉ™ktub DokuWiki tÉ™rÉ™findÉ™n yaradıldı. -DokuWiki aÅŸağıdakı adresdÉ™ yerləşir: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/az/registermail.txt b/sources/inc/lang/az/registermail.txt index 5191975..b080e9b 100644 --- a/sources/inc/lang/az/registermail.txt +++ b/sources/inc/lang/az/registermail.txt @@ -8,8 +8,3 @@ Tarix : @DATE@ Brauzer : @BROWSER@ IP adres : @IPADDRESS@ Host : @HOSTNAME@ - --- -Bu mÉ™ktub DokuWiki tÉ™rÉ™findÉ™n yaradıldı. -DokuWiki aÅŸağıdakı adresdÉ™ yerləşir: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/az/uploadmail.txt b/sources/inc/lang/az/uploadmail.txt index d538f82..88103fd 100644 --- a/sources/inc/lang/az/uploadmail.txt +++ b/sources/inc/lang/az/uploadmail.txt @@ -8,8 +8,3 @@ Host : @HOSTNAME@ HÉ™cm : @SIZE@ MIME Növ : @MIME@ Ä°stifadəçi : @USER@ - --- -Bu mÉ™ktub DokuWiki tÉ™rÉ™findÉ™n yaradıldı. -DokuWiki aÅŸağıdakı adresdÉ™ yerləşir: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/bg/lang.php b/sources/inc/lang/bg/lang.php index f12b66a..6296070 100644 --- a/sources/inc/lang/bg/lang.php +++ b/sources/inc/lang/bg/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Nikolay Vladimirov * @author Viktor Usunov * @author Kiril @@ -331,5 +331,8 @@ $lang['media_perm_read'] = 'За Ñъжаление нÑмате доÑÑ‚ $lang['media_perm_upload'] = 'За Ñъжаление нÑмате доÑтатъчно права, за да можете да качите файла.'; $lang['media_update'] = 'Качване на нова верÑиÑ'; $lang['media_restore'] = 'ВъзÑтановÑване на тази верÑиÑ'; +$lang['currentns'] = 'Текущо именно проÑтранÑтво'; $lang['searchresult'] = 'Резултати от Ñ‚ÑŠÑ€Ñенето'; $lang['plainhtml'] = 'Обикновен HTML'; +$lang['email_signature_text'] = 'ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/bg/mailtext.txt b/sources/inc/lang/bg/mailtext.txt index a5f0cbd..60cffed 100644 --- a/sources/inc/lang/bg/mailtext.txt +++ b/sources/inc/lang/bg/mailtext.txt @@ -10,7 +10,3 @@ IP Ð°Ð´Ñ€ÐµÑ : @IPADDRESS@ Потребител : @USER@ @DIFF@ - - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ diff --git a/sources/inc/lang/bg/mailwrap.html b/sources/inc/lang/bg/mailwrap.html index 26b0a1e..7df0cdc 100644 --- a/sources/inc/lang/bg/mailwrap.html +++ b/sources/inc/lang/bg/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@. +@EMAILSIGNATURE@ diff --git a/sources/inc/lang/bg/password.txt b/sources/inc/lang/bg/password.txt index 7a70ef1..77fa48b 100644 --- a/sources/inc/lang/bg/password.txt +++ b/sources/inc/lang/bg/password.txt @@ -4,6 +4,3 @@ Потребител : @LOGIN@ Парола : @PASSWORD@ - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/bg/pwconfirm.txt b/sources/inc/lang/bg/pwconfirm.txt index 802153f..3d0a967 100644 --- a/sources/inc/lang/bg/pwconfirm.txt +++ b/sources/inc/lang/bg/pwconfirm.txt @@ -8,6 +8,3 @@ За да потвърдите, че иÑкането е наиÑтина от ваÑ, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ ÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð»Ð¸Ð½Ðº: @CONFIRM@ - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ diff --git a/sources/inc/lang/bg/registermail.txt b/sources/inc/lang/bg/registermail.txt index 4b0828c..3c555f5 100644 --- a/sources/inc/lang/bg/registermail.txt +++ b/sources/inc/lang/bg/registermail.txt @@ -8,6 +8,3 @@ E. поща : @NEWEMAIL@ Браузър : @BROWSER@ IP Ð°Ð´Ñ€ÐµÑ : @IPADDRESS@ Име на хоÑта : @HOSTNAME@ - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/bg/subscr_digest.txt b/sources/inc/lang/bg/subscr_digest.txt index f0533da..8f8cfea 100644 --- a/sources/inc/lang/bg/subscr_digest.txt +++ b/sources/inc/lang/bg/subscr_digest.txt @@ -13,6 +13,3 @@ Ðко желаете да прекратите уведомÑването за Ñтраницата Ñ‚Ñ€Ñбва да Ñе впишете на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@, да поÑетите @SUBSCRIBE@ и да прекратите абонамента за промени по Ñтраницата или именното проÑтранÑтво. - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/bg/subscr_list.txt b/sources/inc/lang/bg/subscr_list.txt index e9e65bc..1e2b981 100644 --- a/sources/inc/lang/bg/subscr_list.txt +++ b/sources/inc/lang/bg/subscr_list.txt @@ -10,6 +10,3 @@ Ðко желаете да прекратите уведомÑването за Ñтраницата Ñ‚Ñ€Ñбва да Ñе впишете на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@, да поÑетите @SUBSCRIBE@ и да прекратите абонамента за промени по Ñтраницата или именното проÑтранÑтво. - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/bg/subscr_single.txt b/sources/inc/lang/bg/subscr_single.txt index a74a21f..36b2df3 100644 --- a/sources/inc/lang/bg/subscr_single.txt +++ b/sources/inc/lang/bg/subscr_single.txt @@ -16,7 +16,3 @@ Ðко желаете да прекратите уведомÑването за Ñтраницата Ñ‚Ñ€Ñбва да Ñе впишете на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@, да поÑетите @SUBSCRIBE@ и да прекратите абонамента за промени по Ñтраницата или именното проÑтранÑтво. - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/bg/uploadmail.txt b/sources/inc/lang/bg/uploadmail.txt index ebd8d91..0c14437 100644 --- a/sources/inc/lang/bg/uploadmail.txt +++ b/sources/inc/lang/bg/uploadmail.txt @@ -8,6 +8,3 @@ IP Ð°Ð´Ñ€ÐµÑ : @IPADDRESS@ Размер : @SIZE@ MIME тип : @MIME@ Потребител : @USER@ - --- -ПиÑмото е генерирано от DokuWiki на Ð°Ð´Ñ€ÐµÑ @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca-valencia/lang.php b/sources/inc/lang/ca-valencia/lang.php index 862ed28..b899bf3 100644 --- a/sources/inc/lang/ca-valencia/lang.php +++ b/sources/inc/lang/ca-valencia/lang.php @@ -218,3 +218,6 @@ $lang['days'] = 'fa %d dies'; $lang['hours'] = 'fa %d hores'; $lang['minutes'] = 'fa %d minuts'; $lang['seconds'] = 'fa %d segons'; +$lang['email_signature_text'] = 'Este correu ha segut generat per DokuWiki en +@DOKUWIKIURL@'; + diff --git a/sources/inc/lang/ca-valencia/mailtext.txt b/sources/inc/lang/ca-valencia/mailtext.txt index e8da6f8..b9de236 100644 --- a/sources/inc/lang/ca-valencia/mailtext.txt +++ b/sources/inc/lang/ca-valencia/mailtext.txt @@ -10,8 +10,3 @@ Resum: @SUMMARY@ Usuari: @USER@ @DIFF@ - - --- -Este correu l'ha generat DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca-valencia/password.txt b/sources/inc/lang/ca-valencia/password.txt index 73e14e5..d9a781e 100644 --- a/sources/inc/lang/ca-valencia/password.txt +++ b/sources/inc/lang/ca-valencia/password.txt @@ -4,7 +4,3 @@ Estes són les seues senyes d'usuari per a @TITLE@ en @DOKUWIKIURL@ Usuari : @LOGIN@ Contrasenya : @PASSWORD@ - --- -Este correu l'ha generat DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca-valencia/pwconfirm.txt b/sources/inc/lang/ca-valencia/pwconfirm.txt index 919c3d8..a537567 100644 --- a/sources/inc/lang/ca-valencia/pwconfirm.txt +++ b/sources/inc/lang/ca-valencia/pwconfirm.txt @@ -9,7 +9,3 @@ Per a confirmar que la petició ha segut feta realment per vosté utilise el següent víncul. @CONFIRM@ - --- -Este correu l'ha generat DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca-valencia/registermail.txt b/sources/inc/lang/ca-valencia/registermail.txt index 47b9318..02f2c1a 100644 --- a/sources/inc/lang/ca-valencia/registermail.txt +++ b/sources/inc/lang/ca-valencia/registermail.txt @@ -8,7 +8,3 @@ Data : @DATE@ Navegador : @BROWSER@ Direcció IP : @IPADDRESS@ Nom de la màquina : @HOSTNAME@ - --- -Este correu l'ha generat DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca-valencia/uploadmail.txt b/sources/inc/lang/ca-valencia/uploadmail.txt index c5a3302..73837d0 100644 --- a/sources/inc/lang/ca-valencia/uploadmail.txt +++ b/sources/inc/lang/ca-valencia/uploadmail.txt @@ -8,7 +8,3 @@ Nom de la màquina: @HOSTNAME@ Tamany: @SIZE@ Tipo MIME: @MIME@ Usuari: @USER@ - --- -Este correu ha segut generat per DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca/lang.php b/sources/inc/lang/ca/lang.php index d27ce56..9b8f437 100644 --- a/sources/inc/lang/ca/lang.php +++ b/sources/inc/lang/ca/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Carles Bellver * @author Carles Bellver * @author daniel@6temes.cat @@ -331,6 +331,8 @@ $lang['media_perm_read'] = 'No teniu permisos suficients per a llegir arxi $lang['media_perm_upload'] = 'No teniu permisos suficients per a pujar arxius'; $lang['media_update'] = 'Puja la nova versió'; $lang['media_restore'] = 'Restaura aquesta versió'; +$lang['email_signature_text'] = 'Aquest mail ha estat generat per DokuWiki a +@DOKUWIKIURL@'; $lang['currentns'] = 'Espai de noms actual'; $lang['searchresult'] = 'Resultats cerca'; $lang['plainhtml'] = 'HTML pla'; diff --git a/sources/inc/lang/ca/mailtext.txt b/sources/inc/lang/ca/mailtext.txt index eda3309..dd7f0c5 100644 --- a/sources/inc/lang/ca/mailtext.txt +++ b/sources/inc/lang/ca/mailtext.txt @@ -9,8 +9,3 @@ Resum d'edició : @SUMMARY@ Usuari : @USER@ @DIFF@ - - --- -Missatge generat per DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca/mailwrap.html b/sources/inc/lang/ca/mailwrap.html index ed3bb6e..d257190 100644 --- a/sources/inc/lang/ca/mailwrap.html +++ b/sources/inc/lang/ca/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Aquest correu electrònic ha estat generat per DokuWiki a @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/ca/password.txt b/sources/inc/lang/ca/password.txt index 4735fda..d4bd9f9 100644 --- a/sources/inc/lang/ca/password.txt +++ b/sources/inc/lang/ca/password.txt @@ -4,7 +4,3 @@ Aquestes són les teves dades per a entrar en @TITLE@ en l'adreça @DOKUWIKIURL@ Usuari : @LOGIN@ Contrasenya : @PASSWORD@ - --- -Missatge generat per DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ca/pwconfirm.txt b/sources/inc/lang/ca/pwconfirm.txt index 119c429..226e126 100644 --- a/sources/inc/lang/ca/pwconfirm.txt +++ b/sources/inc/lang/ca/pwconfirm.txt @@ -9,7 +9,3 @@ Per confirmar que realment heu sol·licitat una nova contrasenya, utilitzeu l'enllaç següent: @CONFIRM@ - --- -Missatge generat per DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca/registermail.txt b/sources/inc/lang/ca/registermail.txt index 84bf5f1..a15351a 100644 --- a/sources/inc/lang/ca/registermail.txt +++ b/sources/inc/lang/ca/registermail.txt @@ -8,7 +8,3 @@ Data: @DATE@ Navegador: @BROWSER@ Adreça IP: @IPADDRESS@ Ordinador: @HOSTNAME@ - --- -Missatge generat per DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca/subscr_digest.txt b/sources/inc/lang/ca/subscr_digest.txt index 2b95f97..c5666d2 100644 --- a/sources/inc/lang/ca/subscr_digest.txt +++ b/sources/inc/lang/ca/subscr_digest.txt @@ -14,8 +14,3 @@ Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a @DOKUWIKIURL@, visiteu @SUBSCRIBE@ i doneu-vos de baixa dels canvis de la pàgina o de l'espai. - - --- -Aquest mail ha estat generat per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca/subscr_list.txt b/sources/inc/lang/ca/subscr_list.txt index 56bcad5..56b9ee9 100644 --- a/sources/inc/lang/ca/subscr_list.txt +++ b/sources/inc/lang/ca/subscr_list.txt @@ -14,8 +14,3 @@ Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a @DOKUWIKIURL@, visiteu @SUBSCRIBE@ i doneu-vos de baixa dels canvis de la pàgina o de l'espai. - - --- -Aquest mail ha estat generat per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ca/uploadmail.txt b/sources/inc/lang/ca/uploadmail.txt index c282f1f..01b7648 100644 --- a/sources/inc/lang/ca/uploadmail.txt +++ b/sources/inc/lang/ca/uploadmail.txt @@ -8,7 +8,3 @@ Ordinador: @HOSTNAME@ Mida: @SIZE@ Tipus MIME: @MIME@ Usuari: @USER@ - --- -Missatge generat per DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/admin.txt b/sources/inc/lang/cs/admin.txt index ccfbc44..df7c5b6 100644 --- a/sources/inc/lang/cs/admin.txt +++ b/sources/inc/lang/cs/admin.txt @@ -1,3 +1,3 @@ ====== Správa ====== -Níže je možno spravovat vaÅ¡i DokuWiki. +Níže je možno spravovat vaší DokuWiki. diff --git a/sources/inc/lang/cs/lang.php b/sources/inc/lang/cs/lang.php index ffc99ec..3abfdbf 100644 --- a/sources/inc/lang/cs/lang.php +++ b/sources/inc/lang/cs/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Bohumir Zamecnik * @author Tomas Valenta * @author Tomas Valenta @@ -353,3 +353,5 @@ $lang['plainhtml'] = 'ÄŒisté HTML'; $lang['wikimarkup'] = 'Wiki jazyk'; $lang['page_nonexist_rev'] = 'Stránka neexistovala na %s. Byla vytvoÅ™ena dodateÄne na %s.'; $lang['unable_to_parse_date'] = 'Nelze rozebrat parametr "%s".'; +$lang['email_signature_text'] = 'Tento e-mail byl automaticky vygenerován systémem DokuWiki +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/cs/mailtext.txt b/sources/inc/lang/cs/mailtext.txt index 443fc3e..8036ebe 100644 --- a/sources/inc/lang/cs/mailtext.txt +++ b/sources/inc/lang/cs/mailtext.txt @@ -10,8 +10,3 @@ Komentář : @SUMMARY@ Uživatel : @USER@ @DIFF@ - - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/cs/mailwrap.html b/sources/inc/lang/cs/mailwrap.html index dacd38d..f15ec06 100644 --- a/sources/inc/lang/cs/mailwrap.html +++ b/sources/inc/lang/cs/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
- Tento mail byl vygenerován systémem DokuWiki na adrese @DOKUWIKIURL@. + @EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/cs/password.txt b/sources/inc/lang/cs/password.txt index 1b9f777..6b7c682 100644 --- a/sources/inc/lang/cs/password.txt +++ b/sources/inc/lang/cs/password.txt @@ -5,7 +5,3 @@ Zde jsou pÅ™ihlaÅ¡ovací informace pro wiki @TITLE@ (@DOKUWIKIURL@) Jméno : @FULLNAME@ Uživatelské jméno : @LOGIN@ Heslo : @PASSWORD@ - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/cs/pwconfirm.txt b/sources/inc/lang/cs/pwconfirm.txt index 4fcc0ab..2605b48 100644 --- a/sources/inc/lang/cs/pwconfirm.txt +++ b/sources/inc/lang/cs/pwconfirm.txt @@ -7,7 +7,3 @@ Pokud jste o nové heslo nežádali, ignorujte prosím tento e-mail. Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevÅ™ete následující odkaz. @CONFIRM@ - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/registermail.txt b/sources/inc/lang/cs/registermail.txt index f441899..3c449bc 100644 --- a/sources/inc/lang/cs/registermail.txt +++ b/sources/inc/lang/cs/registermail.txt @@ -8,7 +8,3 @@ Datum : @DATE@ ProhlížeÄ : @BROWSER@ IP adresa : @IPADDRESS@ Hostitel : @HOSTNAME@ - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/showrev.txt b/sources/inc/lang/cs/showrev.txt index 48be467..971f836 100644 --- a/sources/inc/lang/cs/showrev.txt +++ b/sources/inc/lang/cs/showrev.txt @@ -1,3 +1,2 @@ **Toto je starší verze dokumentu!** ---- - diff --git a/sources/inc/lang/cs/subscr_digest.txt b/sources/inc/lang/cs/subscr_digest.txt index 128d919..49869b3 100644 --- a/sources/inc/lang/cs/subscr_digest.txt +++ b/sources/inc/lang/cs/subscr_digest.txt @@ -11,12 +11,8 @@ Stará revize: @OLDPAGE@ Nová revize: @NEWPAGE@ Pro odhlášení z odebírání zmÄ›n na této webové stránce -se prosím pÅ™ihlaÅ¡te do wiki na adrese -@DOKUWIKIURL@, pak navÅ¡tivte -@SUBSCRIBE@ -a odhlaste se z odebírání zmÄ›n na stránce Äi +se prosím pÅ™ihlaÅ¡te do wiki na adrese +@DOKUWIKIURL@, pak navÅ¡tivte +@SUBSCRIBE@ +a odhlaste se z odebírání zmÄ›n na stránce Äi ve jmenném prostoru. - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/subscr_list.txt b/sources/inc/lang/cs/subscr_list.txt index 81b344d..d769988 100644 --- a/sources/inc/lang/cs/subscr_list.txt +++ b/sources/inc/lang/cs/subscr_list.txt @@ -8,12 +8,8 @@ Zde jsou: -------------------------------------------------------- Pro odhlášení z odebírání zmÄ›n -se prosím příhlaÅ¡te do wiki na adrese -@DOKUWIKIURL@, pak navÅ¡tivte -@SUBSCRIBE@ -a odhlaste se z odebírání zmÄ›n na stránce Äi +se prosím příhlaÅ¡te do wiki na adrese +@DOKUWIKIURL@, pak navÅ¡tivte +@SUBSCRIBE@ +a odhlaste se z odebírání zmÄ›n na stránce Äi ve jmenném prostoru. - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/subscr_single.txt b/sources/inc/lang/cs/subscr_single.txt index 6f3774c..ea6b4bd 100644 --- a/sources/inc/lang/cs/subscr_single.txt +++ b/sources/inc/lang/cs/subscr_single.txt @@ -14,12 +14,8 @@ Stará revize: @OLDPAGE@ Nová revize: @NEWPAGE@ Pro odhlášení z odebírání zmÄ›n na této webové stránce -se prosím pÅ™ihlaÅ¡te do wiki na adrese -@DOKUWIKIURL@, pak navÅ¡tivte -@SUBSCRIBE@ -a odhlaste se z odebírání zmÄ›n na stránce Äi +se prosím pÅ™ihlaÅ¡te do wiki na adrese +@DOKUWIKIURL@, pak navÅ¡tivte +@SUBSCRIBE@ +a odhlaste se z odebírání zmÄ›n na stránce Äi ve jmenném prostoru. - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cs/uploadmail.txt b/sources/inc/lang/cs/uploadmail.txt index 28f4e28..d66ae26 100644 --- a/sources/inc/lang/cs/uploadmail.txt +++ b/sources/inc/lang/cs/uploadmail.txt @@ -8,7 +8,3 @@ Hostitel : @HOSTNAME@ Velikost : @SIZE@ MIME typ : @MIME@ Uživatel : @USER@ - --- -Tento e-mail byl automaticky vygenerován systémem DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/cy/admin.txt b/sources/inc/lang/cy/admin.txt new file mode 100644 index 0000000..75485fc --- /dev/null +++ b/sources/inc/lang/cy/admin.txt @@ -0,0 +1,4 @@ +====== Gweinyddu ====== + +Gallwch chi ddarganfod rhestr o dasgau gweinyddol ar gael mewn DokuWiki, isod. + diff --git a/sources/inc/lang/cy/adminplugins.txt b/sources/inc/lang/cy/adminplugins.txt new file mode 100644 index 0000000..ff21264 --- /dev/null +++ b/sources/inc/lang/cy/adminplugins.txt @@ -0,0 +1,2 @@ +===== Ategion Ychwanegol ===== + diff --git a/sources/inc/lang/cy/backlinks.txt b/sources/inc/lang/cy/backlinks.txt new file mode 100644 index 0000000..2180e55 --- /dev/null +++ b/sources/inc/lang/cy/backlinks.txt @@ -0,0 +1,4 @@ +====== Olgysylltiadau ====== + +Dyma restr o dudalennau sy'n ymddangos eu bod nhw'n cysylltu'n ôl i'r dudalen gyfredol. + diff --git a/sources/inc/lang/cy/conflict.txt b/sources/inc/lang/cy/conflict.txt new file mode 100644 index 0000000..133e863 --- /dev/null +++ b/sources/inc/lang/cy/conflict.txt @@ -0,0 +1,6 @@ +====== Mae fersiwn mwy diweddar yn bodoli ====== + +Mae fersiwn mwy diweddar o'r ddogfen a wnaethoch chi olygu yn bodoli. Bydd hwn yn digwydd pan fydd defnyddiwr arall yn newid y ddogfen wrth i chi'n ei golygu hi. + +Archwiliwch y gwahaniaethau isod yn drylwyr, yna penderfynnwch pa fersiwn i'w gadw. Os ydych chi'n dewis ''cadw'', caiff eich fersiwn chi ei gadw. Pwyswch ''canslo'' i gadw'r fersiwn cyfredol. + diff --git a/sources/inc/lang/cy/denied.txt b/sources/inc/lang/cy/denied.txt new file mode 100644 index 0000000..2c0eb00 --- /dev/null +++ b/sources/inc/lang/cy/denied.txt @@ -0,0 +1,4 @@ +====== Gwrthodwyd Hawl ====== + +Sori, 'sdim hawliau digonol 'da chi i barhau. + diff --git a/sources/inc/lang/cy/diff.txt b/sources/inc/lang/cy/diff.txt new file mode 100644 index 0000000..69a9ff6 --- /dev/null +++ b/sources/inc/lang/cy/diff.txt @@ -0,0 +1,4 @@ +====== Gwahaniaethau ====== + +Mae hwn yn dangos y gwahaniaethau rhwng dau fersiwn y dudalen. + diff --git a/sources/inc/lang/cy/draft.txt b/sources/inc/lang/cy/draft.txt new file mode 100644 index 0000000..3b10c51 --- /dev/null +++ b/sources/inc/lang/cy/draft.txt @@ -0,0 +1,8 @@ +====== Ffeil ddrafft wedi'i darganfod ====== + +Doedd eich sesiwn golygu ddiwethaf heb gwblhau'n gywir. Gwnaeth DokuWiki gadw copi ddrafft yn awtomatig wrth i chi weithio, sydd nawr ar gael i chi er mwyn parhau gyda'ch golygu. Gallwch chi weld y data a gafodd ei gadw o'ch sesiwn diwethaf isod. + +Penderfynwch os ydych chi am //adennill// eich sesiwn golygu goll, //dileu//'r drafft awtogadw neu //canslo//'r broses olygu. + + + diff --git a/sources/inc/lang/cy/edit.txt b/sources/inc/lang/cy/edit.txt new file mode 100644 index 0000000..7e2d899 --- /dev/null +++ b/sources/inc/lang/cy/edit.txt @@ -0,0 +1,2 @@ +Golygwch y dudalen a phwyso ''Cadw''. Gweler [[wiki:syntax]] ar gyfer cystrawen Wici. Golygwch y dudalen hon dim ond os ydych chi'n gallu ei **gwella** hi. Os ydych chi am brofi pethau, cymerwch eich camau cyntaf ar y [[playground:playground|maes chwarae]]. + diff --git a/sources/inc/lang/cy/editrev.txt b/sources/inc/lang/cy/editrev.txt new file mode 100644 index 0000000..5d32e9a --- /dev/null +++ b/sources/inc/lang/cy/editrev.txt @@ -0,0 +1,2 @@ +**Rydych chi wedi llwytho hen adolygiad y ddogfen!** Os ydych chi'n ei chadw hi, byddwch chi'n creu fersiwn newydd gyda'r data hwn. +---- diff --git a/sources/inc/lang/cy/index.txt b/sources/inc/lang/cy/index.txt new file mode 100644 index 0000000..607a2f6 --- /dev/null +++ b/sources/inc/lang/cy/index.txt @@ -0,0 +1,4 @@ +====== Map safle ====== + +Dyma fap safle o bob tudalen sydd ar gael, wedi'u trefnu gan [[doku>namespaces|namespaces]]. + diff --git a/sources/inc/lang/cy/install.html b/sources/inc/lang/cy/install.html new file mode 100644 index 0000000..406c7b4 --- /dev/null +++ b/sources/inc/lang/cy/install.html @@ -0,0 +1,24 @@ +

Mae'r dudalen hon yn eich helpu chi i arsefydlu am y tro cyntaf a gyda ffurfweddu +Dokuwiki. Mae mwy o wybodaeth ar yr arsefydlwr hwn +ar dudalen ddogfennaeth ei hun.

+ +

Mae DokuWiki yn defnyddio ffeiliau arferol ar gyfer storio tudalennau wici a +gwybodaeth gysylltiol gyda'r tudalennau hynny (e.e. delweddau, indecsau chwilio, +hen adolygiadau, ac ati). Er mwyn gweithredu'n llwyddiannus mae'n +rhaid i DokuWiki gael yr hawl i ysgrifennu i'r ffolderi sydd yn +dal y ffeiliau hynny. 'Dyw'r arsefydlwr hwn ddim yn gallu gosod hawliau ffolderi. +Bydd hwn, fel rheol, yn gorfod cael ei wneud yn uniongyrchol gydag anogwr gorchymyn, +neu os ydych chi'n defnyddio gwesteiwr, drwy FTP neu eich panel gwesteio (e.e. +cPanel).

+ +

Bydd yr arsefydlwr hwn yn gosod eich ffurfwedd DokuWiki ar gyfer +ACL, sydd yn ei dro yn caniatáu +mewngofnodi gweinyddwr a mynediad i ddewislen gweinyddu DokuWiki ar gyfer arsefydlu +ategion, rheoli defnyddwyr, rheoli mynediad i dudalennau wici a newid gosodiadau +ffurfwedd. 'Sdim angen hwn ar DokuWiki er mwyn gweithio, ond bydd yn gwneud +Dokuwiki yn haws i'w weinyddu.

+ +

Dylai defnyddwyr profiadol neu'r rheiny gydag anghenion gosodiad rrbennig special +ddefnyddio'r dolenni hyn am wybodaeth parthed +canllawiau arsefydlu +and gosodiadau ffurfwedd.

diff --git a/sources/inc/lang/cy/jquery.ui.datepicker.js b/sources/inc/lang/cy/jquery.ui.datepicker.js new file mode 100644 index 0000000..f56cbef --- /dev/null +++ b/sources/inc/lang/cy/jquery.ui.datepicker.js @@ -0,0 +1,37 @@ +/* Welsh/UK initialisation for the jQuery UI date picker plugin. */ +/* Written by William Griffiths. */ +(function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define([ "../datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}(function( datepicker ) { + +datepicker.regional['cy-GB'] = { + closeText: 'Done', + prevText: 'Prev', + nextText: 'Next', + currentText: 'Today', + monthNames: ['Ionawr','Chwefror','Mawrth','Ebrill','Mai','Mehefin', + 'Gorffennaf','Awst','Medi','Hydref','Tachwedd','Rhagfyr'], + monthNamesShort: ['Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh', + 'Gor', 'Aws', 'Med', 'Hyd', 'Tac', 'Rha'], + dayNames: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'], + dayNamesShort: ['Sul', 'Llu', 'Maw', 'Mer', 'Iau', 'Gwe', 'Sad'], + dayNamesMin: ['Su','Ll','Ma','Me','Ia','Gw','Sa'], + weekHeader: 'Wy', + dateFormat: 'dd/mm/yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; +datepicker.setDefaults(datepicker.regional['cy-GB']); + +return datepicker.regional['cy-GB']; + +})); diff --git a/sources/inc/lang/cy/lang.php b/sources/inc/lang/cy/lang.php new file mode 100644 index 0000000..7018e00 --- /dev/null +++ b/sources/inc/lang/cy/lang.php @@ -0,0 +1,373 @@ + + * @author Anika Henke + * @author Matthias Grimm + * @author Matthias Schulte + * @author Alan Davies + */ +$lang['encoding'] = 'utf-8'; +$lang['direction'] = 'ltr'; +$lang['doublequoteopening'] = '“'; //“ +$lang['doublequoteclosing'] = 'â€'; //” +$lang['singlequoteopening'] = '‘'; //‘ +$lang['singlequoteclosing'] = '’'; //’ +$lang['apostrophe'] = '’'; //’ + +$lang['btn_edit'] = 'Golygu\'r dudaen hon'; +$lang['btn_source'] = 'Dangos y ffynhonnell'; +$lang['btn_show'] = 'Dangos y dudalen'; +$lang['btn_create'] = 'Creu\'r dudalen'; +$lang['btn_search'] = 'Chwilio'; +$lang['btn_save'] = 'Cadw'; +$lang['btn_preview'] = 'Rhagolwg'; +$lang['btn_top'] = 'Nôl i\'r brig'; +$lang['btn_newer'] = '<< mwy diweddar'; +$lang['btn_older'] = 'llai diweddar >>'; +$lang['btn_revs'] = 'Hen adolygiadau'; +$lang['btn_recent'] = 'Newidiadau Diweddar'; +$lang['btn_upload'] = 'Lanlwytho'; +$lang['btn_cancel'] = 'Canslo'; +$lang['btn_index'] = 'Safle map'; +$lang['btn_secedit'] = 'Golygu'; +$lang['btn_login'] = 'Mewngofnodi'; +$lang['btn_logout'] = 'Allgofnodi'; +$lang['btn_admin'] = 'Gweinyddu'; +$lang['btn_update'] = 'Diweddaru'; +$lang['btn_delete'] = 'Dileu'; +$lang['btn_back'] = 'Nôl'; +$lang['btn_backlink'] = 'Olgysylltiadau'; +$lang['btn_subscribe'] = 'Rheoli Tanysgrifiadau'; +$lang['btn_profile'] = 'Diweddaru Proffil'; +$lang['btn_reset'] = 'Ailosod'; +$lang['btn_resendpwd'] = 'Gosod cyfrinair newydd'; +$lang['btn_draft'] = 'Golygu drafft'; +$lang['btn_recover'] = 'Adennill drafft'; +$lang['btn_draftdel'] = 'Dileu drafft'; +$lang['btn_revert'] = 'Adfer'; +$lang['btn_register'] = 'Cofrestru'; +$lang['btn_apply'] = 'Gosod'; +$lang['btn_media'] = 'Rheolwr Cyfrwng'; +$lang['btn_deleteuser'] = 'Tynnu Fy Nghyfrif'; +$lang['btn_img_backto'] = 'Nôl i %s'; +$lang['btn_mediaManager'] = 'Dangos mewn rheolwr cyfrwng'; + +$lang['loggedinas'] = 'Mewngofnodwyd fel:'; +$lang['user'] = 'Defnyddair'; +$lang['pass'] = 'Cyfrinair'; +$lang['newpass'] = 'Cyfrinair newydd'; +$lang['oldpass'] = 'Cadarnhau cyfrinair cyfredol'; +$lang['passchk'] = 'unwaith eto'; +$lang['remember'] = 'Cofio fi'; +$lang['fullname'] = 'Enw go iawn'; +$lang['email'] = 'E-Bost'; +$lang['profile'] = 'Proffil Defnyddiwr'; +$lang['badlogin'] = 'Sori, roedd y defnyddair neu\'r gyfriair yn anghywir.'; +$lang['badpassconfirm'] = 'Sori, roedd y cyfrinair yn anghywir'; +$lang['minoredit'] = 'Newidiadau Bach'; +$lang['draftdate'] = 'Awtogadwyd drafft ar'; // full dformat date will be added +$lang['nosecedit'] = 'Newidiwyd y dudaen yn y cyfamser, roedd gwybodaeth yr adran wedi dyddio, felly llwythwyd y dudalen gyfan.'; +$lang['searchcreatepage'] = 'Os na wnaethoch chi ddod o hyd i\'r hyn roeddech chi am ddarganfod, gallwch chi greu neu golygu\'r dudalen wedi\'i henwi ar ôl eich ymholiad gyda\'r teclyn priodol.'; + +$lang['regmissing'] = 'Sori, llenwch bob maes.'; +$lang['reguexists'] = 'Sori, mae defnyddiwr â\'r enw hwn yn bodoli eisoes.'; +$lang['regsuccess'] = 'Cafodd y defnyddiwr ei greu a chafodd y cyfrinair ei anfon gan ebost.'; +$lang['regsuccess2'] = 'Cafodd y defnyddiwr ei greu.'; +$lang['regfail'] = 'Doedd dim modd creu\'r defnyddiwr.'; +$lang['regmailfail'] = 'Mae\'n debyg roedd gwall wrth anfon y post cyfrinair. Cysylltwch â\'r gweinyddwr!'; +$lang['regbadmail'] = 'Mae\'r cyfeiriad ebost a gyflwynoch chi\'n edrych yn annilys - os ydych chi\'n credu ei fod yn gywir, cysylltwch â\'r gweinyddwr'; +$lang['regbadpass'] = '\'Dyw\'r ddau gyfrinair ddim yn unfath, ceisiwch eto.'; +$lang['regpwmail'] = 'Eich cyfrinair DokuWiki'; +$lang['reghere'] = '\'Sdim cyfrif \'da chi eto? Cewch afael yn un nawr'; + +$lang['profna'] = '\'Dyw\'r wici hwn ddim yn caniatáu newid eich proffil'; +$lang['profnochange'] = 'Dim newidiadau, dim i\'w wneud.'; +$lang['profnoempty'] = '\'Sdim modd gadael eich enw neu\'ch cyfeiriad ebost chi\'n wag.'; +$lang['profchanged'] = 'Diweddarwyd eich proffil defnyddiwr yn llwyddiannus.'; +$lang['profnodelete'] = '\'Dyw\'r wici hwn ddim yn caniatáu dileu defnyddwyr'; +$lang['profdeleteuser'] = 'Dileu Cyfrif'; +$lang['profdeleted'] = 'Cafodd eich cyfrif defnyddiwr chi ei ddileu o\'r wiki hwn'; +$lang['profconfdelete'] = '\'Dwi eisiau tynnu fy nghyfrif oddi ar y wici hwn.
\'Sdim modd dadwneud hyn.'; +$lang['profconfdeletemissing'] = 'Blwch gwirio heb ei dicio'; +$lang['proffail'] = 'Proffil defnyddiwr heb ei ddiweddaru.'; + +$lang['pwdforget'] = 'Anghofio\'ch cyfrinair? Cael gafael ar un newydd'; +$lang['resendna'] = '\'Dyw\'r wici hwn ddim yn caniatáu ailanfon cyfrineiriau.'; +$lang['resendpwd'] = 'Gosod cyfrinair newydd ar gyfer'; +$lang['resendpwdmissing'] = 'Sori, mae\'n rhaid llenwi pob maes.'; +$lang['resendpwdnouser'] = 'Sori, \'dyn ni ddim yn gallu darganfod y defnyddiwr hwn yn ein databas ni.'; +$lang['resendpwdbadauth'] = 'Sori, \'dyw\'r cod dilysu hwn ddim yn ddilys. Sicrhewch eich bod chi wedi defnyddio\'r ddolen gadarnhau gyfan.'; +$lang['resendpwdconfirm'] = 'Cafodd ddolen gadarnhau ei hanfon gan ebost.'; +$lang['resendpwdsuccess'] = 'Cafodd eich cyfrinair newydd chi ei anfon gan ebost.'; + +$lang['license'] = 'Heb law bod datganiad i\'r gwrthwyneb, mae cynnwys y wici hwn o dan y drwydded ganlynol:'; +$lang['licenseok'] = 'Sylwir: Gan olygu\'r dudalen hon rydych chi\'n cytuno i drwyddedu\'ch cynnwys chi o dan y drwydded ganlynol:'; + +$lang['searchmedia'] = 'Chwilio enw ffeil:'; +$lang['searchmedia_in'] = 'Chwilio mewn %s'; +$lang['txt_upload'] = 'Dewis ffeil i\'w lanlwytho:'; +$lang['txt_filename'] = 'Upload as (optional):'; +$lang['txt_overwrt'] = 'Trosysgrifo ffeil sy\'n bodoli'; +$lang['maxuploadsize'] = 'Lanlwytho uchanfswm %s y ffeil.'; +$lang['lockedby'] = 'Clowyd yn bresennol gan:'; +$lang['lockexpire'] = 'Clo\'n dod i ben ar:'; + +$lang['js']['willexpire'] = 'Mae\'ch clo ar gyfer golygu\'r dudalen hon yn mynd i ddod i ben mewn munud.\nEr mwyn osgoi gwrthdrawiadau defnyddiwch y botwm rhagolwg i ailosod amserydd y clo.'; +$lang['js']['notsavedyet'] = 'Caiff newidiadau heb gadw eu colli.'; +$lang['js']['searchmedia'] = 'Chwilio am ffeiliau'; +$lang['js']['keepopen'] = 'Cadw ffesnestr y dewisiad ar agor'; +$lang['js']['hidedetails'] = 'Cuddio Manylion'; +$lang['js']['mediatitle'] = 'Gosodiadau dolenni'; +$lang['js']['mediadisplay'] = 'Math y ddolen'; +$lang['js']['mediaalign'] = 'Aliniad'; +$lang['js']['mediasize'] = 'Maint y ddelwedd'; +$lang['js']['mediatarget'] = 'Targed y ddolen'; +$lang['js']['mediaclose'] = 'Cau'; +$lang['js']['mediainsert'] = 'Mewnosod'; +$lang['js']['mediadisplayimg'] = 'Dangos y ddelwedd.'; +$lang['js']['mediadisplaylnk'] = 'Dangos y ddolen yn unig.'; +$lang['js']['mediasmall'] = 'Fersiwn bach'; +$lang['js']['mediamedium'] = 'Fersiwn canolig'; +$lang['js']['medialarge'] = 'Fersiwn mawr'; +$lang['js']['mediaoriginal'] = 'Fersiwn gwreiddiol'; +$lang['js']['medialnk'] = 'Cysylltu i dudalen fanylion'; +$lang['js']['mediadirect'] = 'Cysylltiad uniongyrchol i\'r gwreiddiol'; +$lang['js']['medianolnk'] = 'Dim dolen'; +$lang['js']['medianolink'] = 'Peidio cysylltu i\'r dudalen'; +$lang['js']['medialeft'] = 'Alinio\'r ddelwedd i\'r chwith.'; +$lang['js']['mediaright'] = 'Alinio\'r ddelwedd i\'r dde.'; +$lang['js']['mediacenter'] = 'Alinio\'r ddelwedd i\'r canol.'; +$lang['js']['medianoalign'] = 'Peidio alinio.'; +$lang['js']['nosmblinks'] = 'Mae cysylltu gyda Windows shares dim ond yn gweithio gyda Microsoft Internet Explorer.\nGallwch chi gopïo a gludo\'r ddolen hefyd.'; +$lang['js']['linkwiz'] = 'Dewin Dolenni'; +$lang['js']['linkto'] = 'Cysylltu i:'; +$lang['js']['del_confirm'] = 'Gwir ddileu\'r eitem(au) a ddewiswyd?'; +$lang['js']['restore_confirm'] = 'Gwir adfer y fersiwn hwn?'; +$lang['js']['media_diff'] = 'Gweld gwahaniaethau:'; +$lang['js']['media_diff_both'] = 'Ochr wrth Ochr'; +$lang['js']['media_diff_opacity'] = 'Tywynnu-drwodd'; +$lang['js']['media_diff_portions'] = 'Taro'; //Swipe - rhaid bod gwell ateb i hwn +$lang['js']['media_select'] = 'Dewis ffeiliau…'; +$lang['js']['media_upload_btn'] = 'Lanlwytho'; +$lang['js']['media_done_btn'] = 'Gorffen'; +$lang['js']['media_drop'] = 'Gollwng ffeiliau yma i\'w lanlwytho'; +$lang['js']['media_cancel'] = 'tynnu'; +$lang['js']['media_overwrt'] = 'Trosysgrifo ffeiliau sy\'n bodoli'; + +$lang['rssfailed'] = 'Roedd gwall wrth hôl y ffrwd hwn: '; +$lang['nothingfound'] = 'Dim wedi\'i ddarganfod.'; + +$lang['mediaselect'] = 'Ffeiliau Cyfrwng'; +$lang['uploadsucc'] = 'Lanlwythiad llwyddiannus'; +$lang['uploadfail'] = 'Methodd y lanlwythiad. Hawliau anghywir efallai?'; +$lang['uploadwrong'] = 'Gwrthodwyd y lanlwythiad. Gwaherddir yr estyniad ffeil hwn!'; +$lang['uploadexist'] = 'Mae\'r ffeil eisoes yn bodoli. Dim wedi\'i wneud.'; +$lang['uploadbadcontent'] = 'Doedd y cynnwys a lanlwythwyd ddim yn cydweddu ag estyniad ffeil %s.'; +$lang['uploadspam'] = 'Cafodd y lanlwythiad ei flocio gan rhestr wahardd sbam.'; +$lang['uploadxss'] = 'Cafodd y lanlwythiad ei flocio efallai oherwydd cynnwys maleisus.'; +$lang['uploadsize'] = 'Roedd y ffeil a lanlwythwyd yn rhy fawr. (uchaf. %s)'; +$lang['deletesucc'] = 'Cafodd ffeil "%s" ei dileu.'; +$lang['deletefail'] = 'Doedd dim modd dileu "%s" - gwiriwch hawliau.'; +$lang['mediainuse'] = 'Doedd "%s" heb ei dileu - mae\'n cael ei defnyddio ar hyn o bryd.'; +$lang['namespaces'] = 'Namespaces'; //namespace +$lang['mediafiles'] = 'Ffeiliau ar gael mewn'; +$lang['accessdenied'] = '\'Sdim hawl \'da chi weld y dudalen hon.'; +$lang['mediausage'] = 'Defnyddiwch y gystrawen ganlynol i gyfeirio at y ffeil hon:'; +$lang['mediaview'] = 'Dangos y ffeil wreiddiol'; +$lang['mediaroot'] = 'gwraidd'; +$lang['mediaupload'] = 'lanlwythwch ffeil i\'r namespace cyfredol yma. Er mwy creu is-namespace, ychwanegwch nhw o flaen enw\'r ffeil gan eu gwahanu nhw gyda cholonau, ar ôl i chi ddewis y ffeiliau. Gall ffeiliau hefyd eu dewis gan lusgo a gollwng.'; //namespace +$lang['mediaextchange'] = 'Newidiwyd yr estyniad o .%s i .%s!'; +$lang['reference'] = 'Cyfeirnodau ar gyfer'; +$lang['ref_inuse'] = '\'Sdim modd dileu\'r ffeil hon, oherwydd ei bod hi\'n dal yn cael ei defnyddio gan y tudalennau canlynol:'; +$lang['ref_hidden'] = 'Mae rhai cyfeirnodau ar dudalennau \'sdim hawl \'da chi weld'; + +$lang['hits'] = 'Trawiadau'; +$lang['quickhits'] = 'Enw tudalennau\'n cydweddu'; +$lang['toc'] = 'Tabl Cynnwys'; +$lang['current'] = 'cyfredol'; +$lang['yours'] = 'Eich Fersiwn'; +$lang['diff'] = 'Dangos gwahaniaethau i\'r adolygiadau cyfredol'; +$lang['diff2'] = 'Dangos gwahaniaethau rhwng adolygiadau a ddewiswyd'; +$lang['difflink'] = 'Cysylltu i\'r olwg gymharu hon'; +$lang['diff_type'] = 'Dangos gwahaniaethau:'; +$lang['diff_inline'] = 'Mewnlin'; +$lang['diff_side'] = 'Ochr wrth Ochr'; +$lang['diffprevrev'] = 'Adolygiad blaenorol'; +$lang['diffnextrev'] = 'Adolygiad nesaf'; +$lang['difflastrev'] = 'Adolygiad diwethaf'; +$lang['diffbothprevrev'] = 'Dwy ochr yr adolygiad blaenorol'; +$lang['diffbothnextrev'] = 'Dwy ochr yr adolygiad nesaf'; +$lang['line'] = 'Llinell'; +$lang['breadcrumb'] = 'Olrhain:'; +$lang['youarehere'] = 'Rydych chi yma:'; +$lang['lastmod'] = 'Newidiwyd ddiwethaf:'; +$lang['by'] = 'gan'; +$lang['deleted'] = 'tynnwyd'; +$lang['created'] = 'crewyd'; +$lang['restored'] = 'adferwyd hen adolygiad (%s)'; +$lang['external_edit'] = 'golygiad allanol'; +$lang['summary'] = 'Crynodeb golygiad'; +$lang['noflash'] = 'Mae angen Ategyn Adobe Flash i ddangos y cynnwys hwn.'; +$lang['download'] = 'Lawrlwytho Darn'; +$lang['tools'] = 'Teclynnau'; +$lang['user_tools'] = 'Teclynnau Defnyddiwr'; +$lang['site_tools'] = 'Teclynnau Safle'; +$lang['page_tools'] = 'Teclynnau Tudalennau'; +$lang['skip_to_content'] = 'nedio i\'r cynnwys'; +$lang['sidebar'] = 'Bar ochr'; + +$lang['mail_newpage'] = 'ychwanegwyd tudalen:'; +$lang['mail_changed'] = 'newidiwyd tudalen:'; +$lang['mail_subscribe_list'] = 'newidiwyd tudalennau mewn namespace:'; //namespace +$lang['mail_new_user'] = 'defnyddiwr newydd:'; +$lang['mail_upload'] = 'lanlwythwyd ffeil:'; + +$lang['changes_type'] = 'Dangos newidiadau mewn'; +$lang['pages_changes'] = 'Tudalennau'; +$lang['media_changes'] = 'Ffeiliau cyfrwng'; +$lang['both_changes'] = 'Tudalennau a ffeiliau cyfrwng'; + +$lang['qb_bold'] = 'Testun Bras'; +$lang['qb_italic'] = 'Testun Italig'; +$lang['qb_underl'] = 'Testun wedi\'i Danlinellu'; +$lang['qb_code'] = 'Testun Unbylchog'; +$lang['qb_strike'] = 'Testun Llinell Drwodd'; +$lang['qb_h1'] = 'Pennawd Lefel 1'; +$lang['qb_h2'] = 'Pennawd Lefel 2'; +$lang['qb_h3'] = 'Pennawd Lefel 3'; +$lang['qb_h4'] = 'Pennawd Lefel 4'; +$lang['qb_h5'] = 'Pennawd Lefel 5'; +$lang['qb_h'] = 'Pennawd'; +$lang['qb_hs'] = 'Dewis Pennawd'; +$lang['qb_hplus'] = 'Pennawd Uwch'; +$lang['qb_hminus'] = 'Pennawd Is'; +$lang['qb_hequal'] = 'Pennawd yr un Lefel'; +$lang['qb_link'] = 'Dolen fewnol'; +$lang['qb_extlink'] = 'Dolen allanol'; +$lang['qb_hr'] = 'Llinell Lorweddol'; +$lang['qb_ol'] = 'Eitem Rhestr Drefnedig'; +$lang['qb_ul'] = 'Eitem Rhestr Rifol'; +$lang['qb_media'] = 'Ychwanegu Delweddau a ffeiliau eraill (agor mewn ffenestr newydd)'; +$lang['qb_sig'] = 'Mewnosod Llofnod'; +$lang['qb_smileys'] = 'Gwenogluniau'; +$lang['qb_chars'] = 'Nodau Arbennig'; + +$lang['upperns'] = 'neidio i namespace uwch'; //namespace + +$lang['metaedit'] = 'Golygu Metadata'; +$lang['metasaveerr'] = 'Methwyd ysgrifennu metadata'; +$lang['metasaveok'] = 'Cadwyd y metadata'; +$lang['img_title'] = 'Teitl:'; +$lang['img_caption'] = 'Egluryn:'; +$lang['img_date'] = 'Dyddiad:'; +$lang['img_fname'] = 'Enw ffeil:'; +$lang['img_fsize'] = 'Maint:'; +$lang['img_artist'] = 'Ffotograffydd:'; +$lang['img_copyr'] = 'Hawlfraint:'; +$lang['img_format'] = 'Fformat:'; +$lang['img_camera'] = 'Camera:'; +$lang['img_keywords'] = 'Allweddeiriau:'; +$lang['img_width'] = 'Lled:'; +$lang['img_height'] = 'Uchder:'; + +$lang['subscr_subscribe_success'] = 'Ychwanegwyd %s i\'r rhestr danysgrifio ar gyfer %s'; +$lang['subscr_subscribe_error'] = 'Gwall wrth ychwanegu %s i\'r rhestr danysgrifio ar gyfer %s'; +$lang['subscr_subscribe_noaddress'] = '\'Sdim cyfeiriad wedi\'i gysylltu gyda\'ch defnyddair, felly \'sdim modd eich ychwanegu chi i\'r rhestr danysgrifio'; +$lang['subscr_unsubscribe_success'] = 'Tynnwyd %s o\'r rhestr danysgrifio ar gyfer %s'; +$lang['subscr_unsubscribe_error'] = 'Roedd gwall wrth dynnu %s o\'r rhestr danysgrfio ar gyfer %s'; +$lang['subscr_already_subscribed'] = 'Mae %s eisoes wedi tanysgrifio i %s'; +$lang['subscr_not_subscribed'] = '\'Dyw %s heb danysgrifio i %s'; +// Manage page for subscriptions +$lang['subscr_m_not_subscribed'] = '\'Dych chi heb danysgrifio i\'r dudalen gyfredol neu\'r namespace, yn bresennol.'; //namespace +$lang['subscr_m_new_header'] = 'Ychwanegu tanysgrifiad'; +$lang['subscr_m_current_header'] = 'Tanysgrifiadau cyfredol'; +$lang['subscr_m_unsubscribe'] = 'Tynnu tanysgrifiad'; +$lang['subscr_m_subscribe'] = 'Tanysgrifio'; +$lang['subscr_m_receive'] = 'Derbyn'; +$lang['subscr_style_every'] = 'ebost ar bob newid'; +$lang['subscr_style_digest'] = 'ebost cryno o\'r newidiadau ar bob tudalen (pob %.2f diwrnod)'; +$lang['subscr_style_list'] = 'rhestr o dudalennau a newidiwyd ers yr ebost diwethaf (pob %.2f diwrnod)'; + +/* auth.class language support */ +$lang['authtempfail'] = '\'Dyw dilysiad defnyddiwr ddim ar gael yn bresennol (dros dro). Os ydy\'r sefyllfa\'n parhau, cysylltwch â gweinyddwr y wici.'; + +/* installer strings */ +$lang['i_chooselang'] = 'Dewiswch eich iaith'; +$lang['i_installer'] = 'Arsefydlwr DokuWiki'; +$lang['i_wikiname'] = 'Enw Wici'; +$lang['i_enableacl'] = 'Galluogi ACL (awgrymwyd)'; +$lang['i_superuser'] = 'Uwchddefnyddiwr'; +$lang['i_problems'] = 'Gwnaeth yr arsefydlwr ddod o hyd i broblemau, isod. \'Sdim modd parhau nes i chi eu datrys nhw.'; +$lang['i_modified'] = 'Oherwydd rhesymau diogelwch, bydd y sgript hwn dim ond yn gweithio gydag arsefydliad DokuWiki newydd sydd heb ei newid. + Dylech chi naill ai ail-echdynnu\'r ffeiliau o\'r pecyn a lawrlwythwyd neu porwch dros y + canllawiau arsefydylu Dokuwiki cyfan'; +$lang['i_funcna'] = 'Swyddogaeth PHP %s ddim ar gael. Posib bod eich gwesteiwr wedi\'i hanalluogi am ryw reswm?'; +$lang['i_phpver'] = 'Mae\'ch fersiwn PHP %s yn is na\'r hyn sydd ei angen %s. Mae angen i chi ddiweddaru eich arsefydliad PHP.'; +$lang['i_mbfuncoverload'] = 'Mae\'n rhaid analluogi mbstring.func_overload mewn php.ini er mwyn rhedeg DokuWiki.'; +$lang['i_permfail'] = '\'Dyw DokuWiki ddim yn gallu ysgrifennu i %s. Mae angen newid gosodiadau hawliau ar gyfer y ffolder hwn!'; +$lang['i_confexists'] = 'Mae %s eisoes yn bodoli'; +$lang['i_writeerr'] = 'Methu creu %s. Bydd angen i chi wirio hawliau ffolder/ffeil a chreu\'r ffeil gan law.'; +$lang['i_badhash'] = 'dokuwiki.php heb ei adnabod neu wedi\'i newid (hash=%s)'; +$lang['i_badval'] = '%s - gwerth anghyfreithlon neu wag'; +$lang['i_success'] = 'Gorffennodd y ffurfwedd yn llwyddiannus. Gallwch chi ddileu\'r ffeil install.php nawr. Ewch + i\'ch DokuWiki newydd.'; +$lang['i_failure'] = 'Ymddangosodd gwallau wrth ysgrifennu\'r ffeiliau ffurfwedd. Bydd angen i chi eu cywiro + nhw gan law cyn gallwch chi ddefnyddio\'ch DokuWiki newydd.'; +$lang['i_policy'] = 'Polisi ACL cychwynnol'; +$lang['i_pol0'] = 'Wici Agored (darllen, ysgrifennu, lanlwytho i bawb)'; +$lang['i_pol1'] = 'Wici Cyhoeddus (darllen i bawb, ysgrifennu a lanlwytho i ddefnyddwyr cofrestredig)'; +$lang['i_pol2'] = 'Wici Caeedig (darllen, ysgrifennu, lanlwytho i ddefnyddwyr cofrestredig yn unig)'; +$lang['i_allowreg'] = 'Caniatáu defnyddwyr i gofrestru eu hunain'; +$lang['i_retry'] = 'Ailgeisio'; +$lang['i_license'] = 'Dewiswch y drwydded rydych chi am osod ar eich cynnwys:'; +$lang['i_license_none'] = 'Peidio â dangos unrhyw wybodaeth drwyddedu'; +$lang['i_pop_field'] = 'Plis, helpwch ni i wella\'r profiad o ddefnyddio DokuWiki:'; +$lang['i_pop_label'] = 'Anfon data defnydd anhysbys i ddatblygwyr DokuWiki unwaith y mis'; + +$lang['recent_global'] = 'Yn bresennol, rydych chi\'n gwylio newidiadau tu fewn namespace %s. Gallwch chi hefyd weld y newidiadau diweddar ar gyfer y wici cyfan.'; //namespace + +$lang['years'] = '%d blynedd yn ôl'; +$lang['months'] = '%d mis yn ôl'; +$lang['weeks'] = '%d wythnos yn ôl'; +$lang['days'] = '%d diwrnod yn ôl'; +$lang['hours'] = '%d awr yn ôl'; +$lang['minutes'] = '%d munud yn ôl'; +$lang['seconds'] = '%d eiliad yn ôl'; + +$lang['wordblock'] = 'Doedd eich newid heb gadw gan ei fod yn cynnwys testun wedi\'i flocio (sbam).'; + +$lang['media_uploadtab'] = 'Lanlwytho'; +$lang['media_searchtab'] = 'Chwilio'; +$lang['media_file'] = 'Ffeil'; +$lang['media_viewtab'] = 'Golwg'; +$lang['media_edittab'] = 'Golygu'; +$lang['media_historytab'] = 'Hanes'; +$lang['media_list_thumbs'] = 'Bawdlun'; +$lang['media_list_rows'] = 'Rhesi'; +$lang['media_sort_name'] = 'Enw'; +$lang['media_sort_date'] = 'Dyddiad'; +$lang['media_namespaces'] = 'Dewis namespace'; //namespace +$lang['media_files'] = 'Ffeiliau mewn %s'; +$lang['media_upload'] = 'Lanlwytho i %s'; +$lang['media_search'] = 'Chwilio mewn %s'; +$lang['media_view'] = '%s'; +$lang['media_viewold'] = '%s ar %s'; +$lang['media_edit'] = 'Golygu %s'; +$lang['media_history'] = 'Hanes %s'; +$lang['media_meta_edited'] = 'golygwyd metadata'; +$lang['media_perm_read'] = 'Sori, ond \'sdim digon o hawliau \'da chi i ddarllen ffeiliau.'; +$lang['media_perm_upload'] = 'Sori, ond \'sdim digon o hawliau \'da chi i lanlwytho ffeiliau.'; +$lang['media_update'] = 'Lanlwytho fersiwn newydd'; +$lang['media_restore'] = 'Adfer y fersiwn hwn'; +$lang['media_acl_warning'] = 'Gall y rhestr hon fod yn anghyflawn oherwydd cyfyngiadau ACL a thudalennau coll.'; + +$lang['currentns'] = 'Namespace cyfredol'; //namespace +$lang['searchresult'] = 'Canlyniad Chwilio'; +$lang['plainhtml'] = 'HTML Plaen'; +$lang['wikimarkup'] = 'Iaith Wici'; +$lang['page_nonexist_rev'] = 'Doedd y dudalen ddim yn bodoli ar %s. Cafodd ei chreu wedyn ar %s.'; +$lang['unable_to_parse_date'] = 'Methu dosbarthu ar baramedr "%s".'; +//Setup VIM: ex: et ts=2 : diff --git a/sources/inc/lang/cy/locked.txt b/sources/inc/lang/cy/locked.txt new file mode 100644 index 0000000..4c7865d --- /dev/null +++ b/sources/inc/lang/cy/locked.txt @@ -0,0 +1,3 @@ +====== Tudalen ar glo ====== + +Mae'r dudalen hon wedi'i chloi ar gyfer golygu gan ddefnyddiwr arall. Bydd yn rhaid i chi aros tan i'r defnyddiwr orffen golygu neu tan fod y cyfnod cloi yn dod i ben. diff --git a/sources/inc/lang/cy/login.txt b/sources/inc/lang/cy/login.txt new file mode 100644 index 0000000..dbdde0e --- /dev/null +++ b/sources/inc/lang/cy/login.txt @@ -0,0 +1,4 @@ +====== Mewngofnodi ====== + +'Dych chi heb fewngofnodi! Rhowch eich manylion mewngofnodi isod. Mae angen galluogi cwcis er mwyn mewngofnodi. + diff --git a/sources/inc/lang/cy/mailtext.txt b/sources/inc/lang/cy/mailtext.txt new file mode 100644 index 0000000..2746233 --- /dev/null +++ b/sources/inc/lang/cy/mailtext.txt @@ -0,0 +1,17 @@ +Cafodd tudalen yn eich DokuWiki ei hychwanegu neu newid. Dyma'r manylion: + +Dyddiad : @DATE@ +Porwr : @BROWSER@ +Cyfeiriad-IP : @IPADDRESS@ +Gwesteiwr : @HOSTNAME@ +Hen Adolygiad : @OLDPAGE@ +Adolygiad Newydd: @NEWPAGE@ +Crynodeb Golygu : @SUMMARY@ +Defnyddiwr : @USER@ + +@DIFF@ + + +-- +Cafodd y neges hon ei generadyu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/mailwrap.html b/sources/inc/lang/cy/mailwrap.html new file mode 100644 index 0000000..254fcca --- /dev/null +++ b/sources/inc/lang/cy/mailwrap.html @@ -0,0 +1,13 @@ + + + @TITLE@ + + + + +@HTMLBODY@ + +
+Cafodd y neges hon ei generadu gan DokuWiki ar @DOKUWIKIURL@. + + diff --git a/sources/inc/lang/cy/newpage.txt b/sources/inc/lang/cy/newpage.txt new file mode 100644 index 0000000..dfe8a79 --- /dev/null +++ b/sources/inc/lang/cy/newpage.txt @@ -0,0 +1,4 @@ +====== 'Dyw'r testun hwn ddim yn bodoli eto ====== + +Rydych chi wedi dilyn dolen i destun sy ddim yn bodoli eto. Os oes hawliau 'da chi, gallwch chi ei greu gan bwyso ar "Creu y dudalen hon". + diff --git a/sources/inc/lang/cy/norev.txt b/sources/inc/lang/cy/norev.txt new file mode 100644 index 0000000..7d978c5 --- /dev/null +++ b/sources/inc/lang/cy/norev.txt @@ -0,0 +1,4 @@ +====== Adolygiad ddim y bodoli ====== + +'Dyw'r adolygiad hwn ddim yn bodoli. Pwyswch ar "Hen adolygiadau" am restr o hen adolygiadau'r ddogfen hon. + diff --git a/sources/inc/lang/cy/password.txt b/sources/inc/lang/cy/password.txt new file mode 100644 index 0000000..da0678e --- /dev/null +++ b/sources/inc/lang/cy/password.txt @@ -0,0 +1,10 @@ +Shw mae @FULLNAME@! + +Dyma'ch manylion ar gyfer @TITLE@ ar @DOKUWIKIURL@ + +Defnyddair : @LOGIN@ +Cyfrinair : @PASSWORD@ + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/preview.txt b/sources/inc/lang/cy/preview.txt new file mode 100644 index 0000000..477879d --- /dev/null +++ b/sources/inc/lang/cy/preview.txt @@ -0,0 +1,4 @@ +====== Rhagolwg ====== + +Dyma ragolwg o sut fydd eich testun yn edrych. Cofiwch: 'Dyw e **heb ei gadw** 'to! + diff --git a/sources/inc/lang/cy/pwconfirm.txt b/sources/inc/lang/cy/pwconfirm.txt new file mode 100644 index 0000000..529571e --- /dev/null +++ b/sources/inc/lang/cy/pwconfirm.txt @@ -0,0 +1,15 @@ +Shw mae @FULLNAME@! + +Mae rhywun wedi gofyn am gyfrinair newydd ar gyfer eich manylion +@TITLE@ ar @DOKUWIKIURL@ + +Os na wnaethoch chi ofyn am gyfrinair newydd, anwybyddwch yr e-bost hwn. + +I gadarnhau daeth y cais oddi wrthoch chi, pwyswch y ddolen isod. + +@CONFIRM@ + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ + diff --git a/sources/inc/lang/cy/read.txt b/sources/inc/lang/cy/read.txt new file mode 100644 index 0000000..8703ef9 --- /dev/null +++ b/sources/inc/lang/cy/read.txt @@ -0,0 +1,2 @@ +Mae'r dudalen hon i'w darllen yn unig. Gallwch chi edrych ar y ffynhonnell, ond nid ei newid hi. Cysylltwch â'ch gweinyddwr chi os ydych chi'n meddwl bod hwn yn anghywir. + diff --git a/sources/inc/lang/cy/recent.txt b/sources/inc/lang/cy/recent.txt new file mode 100644 index 0000000..2affbf9 --- /dev/null +++ b/sources/inc/lang/cy/recent.txt @@ -0,0 +1,5 @@ +====== Newidiadau Diweddar ====== + +Cafodd y tudalennau canlynol eu newid yn ddiweddar. + + diff --git a/sources/inc/lang/cy/register.txt b/sources/inc/lang/cy/register.txt new file mode 100644 index 0000000..6fbc850 --- /dev/null +++ b/sources/inc/lang/cy/register.txt @@ -0,0 +1,4 @@ +====== Cofrestru fel defnyddiwr newydd ====== + +Llenwch yr holl wybodaeth isod i greu cyfrif newydd ar y wici hwn. Sicrhewch eich bod chi'n cynnwys **cyfeiriad e-bost dilys** - os na chewch chi'ch annog am gyfrinair, caiff un ei anfon i'ch cyfeiriad. Dylai'r enw mewngofnodi fod yn [[doku>pagename|enw tudalen]] dilys. + diff --git a/sources/inc/lang/cy/registermail.txt b/sources/inc/lang/cy/registermail.txt new file mode 100644 index 0000000..0cb2b4f --- /dev/null +++ b/sources/inc/lang/cy/registermail.txt @@ -0,0 +1,14 @@ +Cofrestrodd defnyddiwr newydd. Dyma'r manylion: + +Defnyddair : @NEWUSER@ +Enw llawn : @NEWNAME@ +E-bost : @NEWEMAIL@ + +Dyddiad : @DATE@ +Porwr : @BROWSER@ +Cyfeiriad-IP : @IPADDRESS@ +Gwesteiwr : @HOSTNAME@ + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/resendpwd.txt b/sources/inc/lang/cy/resendpwd.txt new file mode 100644 index 0000000..ddad8a9 --- /dev/null +++ b/sources/inc/lang/cy/resendpwd.txt @@ -0,0 +1,4 @@ +====== Anfon cyfrinair newydd ====== + +Ailgyflwynwch eich defnyddair yn y ffurflen isod i wneud cais am gyfrinair newydd i'ch cyfrif ar y wici hwn. Caiff ddolen gadarnhau ei hanfon i chi drwy eich e-bost cofrestredig. + diff --git a/sources/inc/lang/cy/resetpwd.txt b/sources/inc/lang/cy/resetpwd.txt new file mode 100644 index 0000000..57f1992 --- /dev/null +++ b/sources/inc/lang/cy/resetpwd.txt @@ -0,0 +1,4 @@ +====== Gosod cyfrinair newydd ====== + +Rhowch gyfrinair newydd i'ch cyfrif ar y wici hwn. + diff --git a/sources/inc/lang/cy/revisions.txt b/sources/inc/lang/cy/revisions.txt new file mode 100644 index 0000000..afbc9fe --- /dev/null +++ b/sources/inc/lang/cy/revisions.txt @@ -0,0 +1,4 @@ +====== Hen Adolygiadau ====== + +Dyma adolygiadau hŷn y ddogfen gyfredol. I droi'n ôl i hen adolygiad, dewiswch e isod a phwyso ''Golygu'r dudalen hon'' a'i gadw. + diff --git a/sources/inc/lang/cy/searchpage.txt b/sources/inc/lang/cy/searchpage.txt new file mode 100644 index 0000000..fd554e1 --- /dev/null +++ b/sources/inc/lang/cy/searchpage.txt @@ -0,0 +1,5 @@ +====== Chwilio ====== + +Gallwch chi ddarganfod canlyniadau eich chwiliad isod. @CREATEPAGEINFO@ + +===== Canlyniadau ===== diff --git a/sources/inc/lang/cy/showrev.txt b/sources/inc/lang/cy/showrev.txt new file mode 100644 index 0000000..6cc9d6c --- /dev/null +++ b/sources/inc/lang/cy/showrev.txt @@ -0,0 +1,2 @@ +**Dyma hen adolygiad y ddogfen!** +---- diff --git a/sources/inc/lang/cy/stopwords.txt b/sources/inc/lang/cy/stopwords.txt new file mode 100644 index 0000000..2ac4c31 --- /dev/null +++ b/sources/inc/lang/cy/stopwords.txt @@ -0,0 +1,31 @@ +# 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/ +allan +beth +ble +bydd +chi +dyma +dyna +eich +gyda +hefyd +hon +honna +hwn +hwnnw +hwy +hyn +hynny +mewn +nhw +oddi +oedd +pan +pwy +roedd +sut +wrth +www \ No newline at end of file diff --git a/sources/inc/lang/cy/subscr_digest.txt b/sources/inc/lang/cy/subscr_digest.txt new file mode 100644 index 0000000..611e057 --- /dev/null +++ b/sources/inc/lang/cy/subscr_digest.txt @@ -0,0 +1,20 @@ +Shw mae! + +Gwnaeth y dudalen @PAGE@ mewn wici @TITLE@ newid. +Dyma'r newidiadau: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Hen Adolygiad: @OLDPAGE@ +Adolygiad Newydd: @NEWPAGE@ + +I ganslo hysbysiadau tudalen, mewngofnodwch i'r wici ar +@DOKUWIKIURL@ ac yna ewch i +@SUBSCRIBE@ +a thanysgrifio o newidiadau tudalen a/neu namespace. + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/subscr_form.txt b/sources/inc/lang/cy/subscr_form.txt new file mode 100644 index 0000000..47d1a17 --- /dev/null +++ b/sources/inc/lang/cy/subscr_form.txt @@ -0,0 +1,3 @@ +====== Rheoli Tanysgrifiad ====== + +Mae'r dudalen hon yn eich galluogi i reoli'ch tanysgrifiadau ar gyfer y dudalen gyfredol a'r namespace. diff --git a/sources/inc/lang/cy/subscr_list.txt b/sources/inc/lang/cy/subscr_list.txt new file mode 100644 index 0000000..592f290 --- /dev/null +++ b/sources/inc/lang/cy/subscr_list.txt @@ -0,0 +1,17 @@ +Shw mae! + +Gwnaeth tudalennau yn y namespace @PAGE@ o'r wici @TITLE@ newid. +Dyma'r tudaalennau sydd wedi newid: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +I ganslo hysbysiadau'r dudalen, mewngofnodwch i'r wici ar +@DOKUWIKIURL@ yna ewch i +@SUBSCRIBE@ +a thanysgrifio o newidiadau tudalen a/neu namespace. + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/subscr_single.txt b/sources/inc/lang/cy/subscr_single.txt new file mode 100644 index 0000000..2a774eb --- /dev/null +++ b/sources/inc/lang/cy/subscr_single.txt @@ -0,0 +1,23 @@ +Shw mae! + +Gwnaeth y dudalen @PAGE@ yn y wici @TITLE@ newid. +Dyma'r newidiadau: + +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- + +Dyddiad : @DATE@ +Defnyddiwr : @USER@ +Crynodeb Golygu : @SUMMARY@ +Hen Adolygiad : @OLDPAGE@ +Adolygiad Newwydd: @NEWPAGE@ + +I ganslo hysbysiadau'r dudalen, mewngofnodwch i'r wici ar +@DOKUWIKIURL@ yna ewch i +@SUBSCRIBE@ +a thanysgrifio o newidiadau tudalen a namespace. + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/cy/updateprofile.txt b/sources/inc/lang/cy/updateprofile.txt new file mode 100644 index 0000000..ce9ca50 --- /dev/null +++ b/sources/inc/lang/cy/updateprofile.txt @@ -0,0 +1,5 @@ +====== Diweddaru proffil eich cyfrif ====== + +Newidiwch y meysydd rydych chi amm newid yn unig. 'Sdim modd i chi newid eich defnyddair. + + diff --git a/sources/inc/lang/cy/uploadmail.txt b/sources/inc/lang/cy/uploadmail.txt new file mode 100644 index 0000000..8102232 --- /dev/null +++ b/sources/inc/lang/cy/uploadmail.txt @@ -0,0 +1,15 @@ +Cafodd ffeil ei lanlwytho i'ch DokuWiki. Dyma'r manylion: + +Ffeil : @MEDIA@ +Hen adolygiad : @OLD@ +Dyddiad : @DATE@ +Porwr : @BROWSER@ +Cyfeiriad-IP : @IPADDRESS@ +Gwesteiwr : @HOSTNAME@ +Maint : @SIZE@ +Teip MIME : @MIME@ +Defnyddiwr : @USER@ + +-- +Cafodd y neges hon ei generadu gan DokuWiki ar +@DOKUWIKIURL@ diff --git a/sources/inc/lang/da/lang.php b/sources/inc/lang/da/lang.php index ee8a92c..00f0270 100644 --- a/sources/inc/lang/da/lang.php +++ b/sources/inc/lang/da/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author koeppe * @author Jon Bendtsen * @author Lars Næsbye Christensen @@ -85,6 +85,7 @@ $lang['regmissing'] = 'Du skal udfylde alle felter.'; $lang['reguexists'] = 'Dette brugernavn er allerede i brug.'; $lang['regsuccess'] = 'Du er nu oprettet som bruger. Dit adgangskode bliver sendt til dig i en e-mail.'; $lang['regsuccess2'] = 'Du er nu oprettet som bruger.'; +$lang['regfail'] = 'Brugeren kunne ikke oprettes.'; $lang['regmailfail'] = 'Dit adgangskode blev ikke sendt. Kontakt venligst administratoren.'; $lang['regbadmail'] = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.'; $lang['regbadpass'] = 'De to adgangskoder er ikke ens, vær venlig at prøve igen.'; @@ -98,6 +99,7 @@ $lang['profnodelete'] = 'Denne wiki understøtter ikke sletning af brug $lang['profdeleteuser'] = 'Slet konto'; $lang['profdeleted'] = 'Din brugerkonto er blevet slettet fra denne wiki'; $lang['profconfdelete'] = 'Jeg ønsker at slette min konto fra denne wiki.
Denne handling kan ikke fortrydes.'; +$lang['proffail'] = 'Brugerprofilen blev ikke opdateret.'; $lang['pwdforget'] = 'Har du glemt dit adgangskode? Få en ny'; $lang['resendna'] = 'Denne wiki understøtter ikke udsendelse af ny adgangskode.'; $lang['resendpwd'] = 'Vælg en ny adgangskode for'; @@ -345,8 +347,11 @@ $lang['media_perm_read'] = 'Du har ikke nok rettigheder til at læse filer $lang['media_perm_upload'] = 'Du har ikke nok rettigheder til at uploade filer.'; $lang['media_update'] = 'Upload ny version'; $lang['media_restore'] = 'Genskab denne version'; +$lang['media_acl_warning'] = 'Listen er måske ikke komplet pga. ACL restriktioner og skjulte sider.'; $lang['currentns'] = 'Nuværende navnerum'; $lang['searchresult'] = 'Søgsresultat'; $lang['plainhtml'] = 'Ren HTML'; $lang['wikimarkup'] = 'Wiki Opmærkning'; $lang['page_nonexist_rev'] = 'Siden blev ikke fundet ved %s. Den blev efterfølgende oprettet ved %s.'; +$lang['email_signature_text'] = 'Denne e-mail blev genereret af DokuWiki på +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/da/mailtext.txt b/sources/inc/lang/da/mailtext.txt index 948a265..bea9cd3 100644 --- a/sources/inc/lang/da/mailtext.txt +++ b/sources/inc/lang/da/mailtext.txt @@ -10,8 +10,3 @@ Redigerings resumé : @SUMMARY@ Bruger : @USER@ @DIFF@ - - --- -Denne e-mail blev genereret af DokuWiki på: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/da/mailwrap.html b/sources/inc/lang/da/mailwrap.html index 0eb2e0b..d257190 100644 --- a/sources/inc/lang/da/mailwrap.html +++ b/sources/inc/lang/da/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Denne mail blev sendt af DokuWiki på @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/da/password.txt b/sources/inc/lang/da/password.txt index 051564c..b129bb9 100644 --- a/sources/inc/lang/da/password.txt +++ b/sources/inc/lang/da/password.txt @@ -4,8 +4,3 @@ Her er dine brugeroplysninger @TITLE@ at @DOKUWIKIURL@ Brugernavn : @LOGIN@ Adgangskode : @PASSWORD@ - --- -Denne e-mail blev genereret af DokuWiki på -@DOKUWIKIURL@ - \ No newline at end of file diff --git a/sources/inc/lang/da/pwconfirm.txt b/sources/inc/lang/da/pwconfirm.txt index 3df556e..25c20a4 100644 --- a/sources/inc/lang/da/pwconfirm.txt +++ b/sources/inc/lang/da/pwconfirm.txt @@ -8,7 +8,3 @@ Hvis du ikke bad om dette, så ignorer venligst denne email. For at bekræfte at det var dig der bad om dette, benyt venligst det følgende henvisning. @CONFIRM@ - --- -Denne e-mail blev genereret af DokuWiki på -@DOKUWIKIURL@ diff --git a/sources/inc/lang/da/registermail.txt b/sources/inc/lang/da/registermail.txt index d431f75..8ce3b54 100644 --- a/sources/inc/lang/da/registermail.txt +++ b/sources/inc/lang/da/registermail.txt @@ -8,7 +8,3 @@ Dato : @DATE@ Browser : @BROWSER@ IP-adresse : @IPADDRESS@ Værtsnavn : @HOSTNAME@ - --- -Denne mail blev genereret af DokuWiki på -@DOKUWIKIURL@ diff --git a/sources/inc/lang/da/subscr_digest.txt b/sources/inc/lang/da/subscr_digest.txt index 0aa19ac..06a28d6 100644 --- a/sources/inc/lang/da/subscr_digest.txt +++ b/sources/inc/lang/da/subscr_digest.txt @@ -14,7 +14,3 @@ For at stoppe notifikationer om sideændringer, login på wikien på @DOKUWIKIURL@ og besøg så @SUBSCRIBE@ for at afmelde side og/eller navneområde ændringer. - --- -Denne mail blev sendt af DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/da/subscr_list.txt b/sources/inc/lang/da/subscr_list.txt index 02a34d2..62f8f66 100644 --- a/sources/inc/lang/da/subscr_list.txt +++ b/sources/inc/lang/da/subscr_list.txt @@ -11,7 +11,3 @@ For at stoppe notifikationer om sideændringer, login på wikien på @DOKUWIKIURL@ og besøg så @SUBSCRIBE@ for at afmelde side og/eller navneområde ændringer. - --- -Denne mail blev sendt af DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/da/subscr_single.txt b/sources/inc/lang/da/subscr_single.txt index cdc5545..fb50523 100644 --- a/sources/inc/lang/da/subscr_single.txt +++ b/sources/inc/lang/da/subscr_single.txt @@ -13,11 +13,7 @@ Summering: @SUMMARY@ Gammel Revision: @OLDPAGE@ Ny Revision: @NEWPAGE@ -For at slå side notifikationer fra, skal du logge ind på +For at slå side notifikationer fra, skal du logge ind på @DOKUWIKIURL@ og besøge @SUBSCRIBE@ og slå abonnoment for side / navnerum ændringer fra. - --- -Denne email blev generet af DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/da/uploadmail.txt b/sources/inc/lang/da/uploadmail.txt index 316463f..87a0875 100644 --- a/sources/inc/lang/da/uploadmail.txt +++ b/sources/inc/lang/da/uploadmail.txt @@ -8,7 +8,3 @@ Værtsnavn : @HOSTNAME@ Størrelse : @SIZE@ MIME Type : @MIME@ Bruger : @USER@ - --- -Denne e-mail blev genereret af DokuWiki på -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de-informal/lang.php b/sources/inc/lang/de-informal/lang.php index 42fb9a2..be10843 100644 --- a/sources/inc/lang/de-informal/lang.php +++ b/sources/inc/lang/de-informal/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Andreas Gohr * @author Christof * @author Anika Henke @@ -350,6 +350,8 @@ $lang['media_restore'] = 'Diese Version wiederherstellen'; $lang['media_acl_warning'] = 'Diese Liste ist möglicherweise nicht vollständig. Versteckte und durch ACL gesperrte Seiten werden nicht angezeigt.'; $lang['currentns'] = 'Aktueller Namensraum'; $lang['searchresult'] = 'Suchergebnis'; +$lang['email_signature_text'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter +@DOKUWIKIURL@'; $lang['plainhtml'] = 'Reines HTML'; $lang['wikimarkup'] = 'Wiki Markup'; $lang['page_nonexist_rev'] = 'Seite existierte nicht an der Stelle %s. Sie wurde an folgende Stelle erstellt: %s.'; diff --git a/sources/inc/lang/de-informal/mailtext.txt b/sources/inc/lang/de-informal/mailtext.txt index 508c080..127b481 100644 --- a/sources/inc/lang/de-informal/mailtext.txt +++ b/sources/inc/lang/de-informal/mailtext.txt @@ -10,9 +10,3 @@ Zusammenfassung: @SUMMARY@ Benutzer : @USER@ @DIFF@ - - --- -Diese Mail wurde vom DokuWiki auf -@DOKUWIKIURL@ -erzeugt. diff --git a/sources/inc/lang/de-informal/mailwrap.html b/sources/inc/lang/de-informal/mailwrap.html index 420fdf8..7df0cdc 100644 --- a/sources/inc/lang/de-informal/mailwrap.html +++ b/sources/inc/lang/de-informal/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Diese Mail kommt vom DokuWiki auf @DOKUWIKIURL@. +@EMAILSIGNATURE@ diff --git a/sources/inc/lang/de-informal/password.txt b/sources/inc/lang/de-informal/password.txt index e17dba4..e99fc53 100644 --- a/sources/inc/lang/de-informal/password.txt +++ b/sources/inc/lang/de-informal/password.txt @@ -4,8 +4,3 @@ Hier sind deine Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@ Benutzername: @LOGIN@ Passwort : @PASSWORD@ - --- -Diese Mail wurde vom DokuWiki auf -@DOKUWIKIURL@ -erzeugt. \ No newline at end of file diff --git a/sources/inc/lang/de-informal/pwconfirm.txt b/sources/inc/lang/de-informal/pwconfirm.txt index 9029bf1..a3b95d8 100644 --- a/sources/inc/lang/de-informal/pwconfirm.txt +++ b/sources/inc/lang/de-informal/pwconfirm.txt @@ -10,8 +10,3 @@ Um die Anforderung zu bestätigen, folge bitte dem unten angegebenen Bestätigungslink. @CONFIRM@ - --- -Diese Mail wurde vom DokuWiki auf -@DOKUWIKIURL@ -erzeugt. diff --git a/sources/inc/lang/de-informal/registermail.txt b/sources/inc/lang/de-informal/registermail.txt index ed37a95..e19fb8f 100644 --- a/sources/inc/lang/de-informal/registermail.txt +++ b/sources/inc/lang/de-informal/registermail.txt @@ -8,7 +8,3 @@ Date : @DATE@ Browser : @BROWSER@ IP-Address : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de-informal/subscr_digest.txt b/sources/inc/lang/de-informal/subscr_digest.txt index f8cab21..1e29137 100644 --- a/sources/inc/lang/de-informal/subscr_digest.txt +++ b/sources/inc/lang/de-informal/subscr_digest.txt @@ -14,8 +14,3 @@ Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an @DOKUWIKIURL@, besuchen dann @SUBSCRIBE@ und klicke auf den Link 'Aboverwaltung'. - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/de-informal/subscr_list.txt b/sources/inc/lang/de-informal/subscr_list.txt index 5f99cf9..0bc7a6a 100644 --- a/sources/inc/lang/de-informal/subscr_list.txt +++ b/sources/inc/lang/de-informal/subscr_list.txt @@ -7,11 +7,7 @@ Nachfolgenden findest du die geänderten Seiten: @DIFF@ -------------------------------------------------------- -Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter -@DOKUWIKIURL@ an, gehe zur Seite +Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter +@DOKUWIKIURL@ an, gehe zur Seite @SUBSCRIBE@ und deaktiviere das Abonnement für die Seite und/oder den Namensraum. - --- -Diese E-Mail wurde erzeugt vom DokuWiki unter -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/de-informal/subscr_single.txt b/sources/inc/lang/de-informal/subscr_single.txt index 6e3f58b..7ab02cc 100644 --- a/sources/inc/lang/de-informal/subscr_single.txt +++ b/sources/inc/lang/de-informal/subscr_single.txt @@ -17,8 +17,3 @@ Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an @DOKUWIKIURL@, besuche dann @SUBSCRIBE@ und klicke auf den Link 'Aboverwaltung'. - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/de-informal/uploadmail.txt b/sources/inc/lang/de-informal/uploadmail.txt index 69f1140..d608cd5 100644 --- a/sources/inc/lang/de-informal/uploadmail.txt +++ b/sources/inc/lang/de-informal/uploadmail.txt @@ -9,8 +9,3 @@ Hostname : @HOSTNAME@ Größe : @SIZE@ MIME-Typ : @MIME@ Benutzer : @USER@ - --- -Diese Mail wurde vom DokuWiki auf -@DOKUWIKIURL@ -erzeugt. diff --git a/sources/inc/lang/de/lang.php b/sources/inc/lang/de/lang.php index c452042..0e04de1 100644 --- a/sources/inc/lang/de/lang.php +++ b/sources/inc/lang/de/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Andreas Gohr * @author Christof * @author Anika Henke @@ -360,3 +360,5 @@ $lang['plainhtml'] = 'HTML Klartext'; $lang['wikimarkup'] = 'Wiki Markup'; $lang['page_nonexist_rev'] = 'Die Seite exitiert nicht unter %s. Sie wurde aber unter %s'; $lang['unable_to_parse_date'] = 'Parameter "%s" kann nicht geparsed werden.'; +$lang['email_signature_text'] = 'Diese E-Mail wurde erzeugt vom DokuWiki unter +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/de/mailtext.txt b/sources/inc/lang/de/mailtext.txt index fee88d4..5968a70 100644 --- a/sources/inc/lang/de/mailtext.txt +++ b/sources/inc/lang/de/mailtext.txt @@ -10,8 +10,3 @@ Zusammenfassung: @SUMMARY@ Benutzer : @USER@ @DIFF@ - - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de/mailwrap.html b/sources/inc/lang/de/mailwrap.html index 420fdf8..7df0cdc 100644 --- a/sources/inc/lang/de/mailwrap.html +++ b/sources/inc/lang/de/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Diese Mail kommt vom DokuWiki auf @DOKUWIKIURL@. +@EMAILSIGNATURE@ diff --git a/sources/inc/lang/de/password.txt b/sources/inc/lang/de/password.txt index cce3b8e..e6ab83c 100644 --- a/sources/inc/lang/de/password.txt +++ b/sources/inc/lang/de/password.txt @@ -4,7 +4,3 @@ Hier sind Ihre Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@ Benutzername: @LOGIN@ Passwort : @PASSWORD@ - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de/pwconfirm.txt b/sources/inc/lang/de/pwconfirm.txt index 3aa81bf..b571163 100644 --- a/sources/inc/lang/de/pwconfirm.txt +++ b/sources/inc/lang/de/pwconfirm.txt @@ -10,7 +10,3 @@ Um die Anforderung zu bestätigen, folgen Sie bitte dem unten angegebenen Bestätigungslink. @CONFIRM@ - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de/registermail.txt b/sources/inc/lang/de/registermail.txt index ed37a95..e19fb8f 100644 --- a/sources/inc/lang/de/registermail.txt +++ b/sources/inc/lang/de/registermail.txt @@ -8,7 +8,3 @@ Date : @DATE@ Browser : @BROWSER@ IP-Address : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/de/subscr_digest.txt b/sources/inc/lang/de/subscr_digest.txt index 7cc79bb..75d9236 100644 --- a/sources/inc/lang/de/subscr_digest.txt +++ b/sources/inc/lang/de/subscr_digest.txt @@ -14,8 +14,3 @@ Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an @DOKUWIKIURL@, besuchen dann @SUBSCRIBE@ und klicken auf den Link 'Aboverwaltung'. - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/de/subscr_list.txt b/sources/inc/lang/de/subscr_list.txt index 98ec4c2..1b2331a 100644 --- a/sources/inc/lang/de/subscr_list.txt +++ b/sources/inc/lang/de/subscr_list.txt @@ -7,12 +7,7 @@ Das sind die geänderten Seiten: @DIFF@ -------------------------------------------------------- -Um das Abonnement für diese Seite aufzulösen, melde Sie sich im Wiki an +Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an @DOKUWIKIURL@, besuchen dann @SUBSCRIBE@ und klicken auf die Taste 'Änderungen abbestellen'. - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/de/subscr_single.txt b/sources/inc/lang/de/subscr_single.txt index da9914e..087ad5a 100644 --- a/sources/inc/lang/de/subscr_single.txt +++ b/sources/inc/lang/de/subscr_single.txt @@ -17,8 +17,3 @@ Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an @DOKUWIKIURL@, besuchen dann @SUBSCRIBE@ und klicken auf die Taste 'Aboverwaltung'. - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/de/uploadmail.txt b/sources/inc/lang/de/uploadmail.txt index 977e756..3646bcc 100644 --- a/sources/inc/lang/de/uploadmail.txt +++ b/sources/inc/lang/de/uploadmail.txt @@ -9,7 +9,3 @@ Hostname : @HOSTNAME@ Größe : @SIZE@ MIME-Typ : @MIME@ Benutzer : @USER@ - --- -Diese Mail kommt vom DokuWiki auf -@DOKUWIKIURL@ diff --git a/sources/inc/lang/el/lang.php b/sources/inc/lang/el/lang.php index 0e62dd3..c32a0b0 100644 --- a/sources/inc/lang/el/lang.php +++ b/sources/inc/lang/el/lang.php @@ -326,3 +326,5 @@ $lang['media_perm_upload'] = 'Συγνώμη, δεν έχετε επαÏκή $lang['media_update'] = 'ΦόÏτωση νέας έκδοσης'; $lang['media_restore'] = 'ΕπαναφοÏά αυτή της έκδοσης'; $lang['searchresult'] = 'Αποτέλεσμα έÏευνας'; +$lang['email_signature_text'] = 'Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/el/mailtext.txt b/sources/inc/lang/el/mailtext.txt index a5059ca..cc2a22f 100644 --- a/sources/inc/lang/el/mailtext.txt +++ b/sources/inc/lang/el/mailtext.txt @@ -11,7 +11,3 @@ IP-ΔιεÏθυνση : @IPADDRESS@ ΧÏήστης : @USER@ @DIFF@ - --- -Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση -@DOKUWIKIURL@ diff --git a/sources/inc/lang/el/mailwrap.html b/sources/inc/lang/el/mailwrap.html index b2e6557..d257190 100644 --- a/sources/inc/lang/el/mailwrap.html +++ b/sources/inc/lang/el/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Το email έχει δημιουÏγηθεί από το DokuWiki στις @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/el/password.txt b/sources/inc/lang/el/password.txt index d27fbb3..c664cb0 100644 --- a/sources/inc/lang/el/password.txt +++ b/sources/inc/lang/el/password.txt @@ -4,7 +4,3 @@ Όνομα : @LOGIN@ Συνθηματικό : @PASSWORD@ - --- -Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση -@DOKUWIKIURL@ diff --git a/sources/inc/lang/el/pwconfirm.txt b/sources/inc/lang/el/pwconfirm.txt index a9e58be..4c1559c 100644 --- a/sources/inc/lang/el/pwconfirm.txt +++ b/sources/inc/lang/el/pwconfirm.txt @@ -8,7 +8,3 @@ Αν όντως εσείς ζητήσατε την δημιουÏγία νέου συνθηματικοÏ, ακολουθήστε τον παÏακάτω σÏνδεσμο για να το επιβεβαιώσετε. @CONFIRM@ - --- -Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση -@DOKUWIKIURL@ diff --git a/sources/inc/lang/el/registermail.txt b/sources/inc/lang/el/registermail.txt index 0b3e0b7..5266fc1 100644 --- a/sources/inc/lang/el/registermail.txt +++ b/sources/inc/lang/el/registermail.txt @@ -8,7 +8,3 @@ e-mail : @NEWEMAIL@ ΦυλλομετÏητής : @BROWSER@ IP-ΔιεÏθυνση : @IPADDRESS@ Όνομα υπολογιστή: @HOSTNAME@ - --- -Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση -@DOKUWIKIURL@ diff --git a/sources/inc/lang/el/subscr_digest.txt b/sources/inc/lang/el/subscr_digest.txt index 7dd0345..5ee54d3 100644 --- a/sources/inc/lang/el/subscr_digest.txt +++ b/sources/inc/lang/el/subscr_digest.txt @@ -10,11 +10,7 @@ Παλιά έκδοση: @OLDPAGE@ Îέα έκδοση: @NEWPAGE@ -Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε -στο wiki στην διεÏθυνση @DOKUWIKIURL@ -και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ +Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε +στο wiki στην διεÏθυνση @DOKUWIKIURL@ +και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ και διαγÏαφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου. - --- -Αυτό το μήνυμα παÏάχθηκε απο το DokuWiki στην -διεÏθυνση @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/el/subscr_list.txt b/sources/inc/lang/el/subscr_list.txt index 97b8dc4..11ebf15 100644 --- a/sources/inc/lang/el/subscr_list.txt +++ b/sources/inc/lang/el/subscr_list.txt @@ -2,7 +2,7 @@ Η σελίδα @PAGE@ στο @TITLE@ άλλαξε. -Κάποιες σελίδες στον φάκελο @PAGE@ του wiki +Κάποιες σελίδες στον φάκελο @PAGE@ του wiki @TITLE@ έχουν αλλάξει. ΟÏίστε οι αλλαγμένες σελίδες: @@ -10,11 +10,7 @@ @DIFF@ -------------------------------------------------------- -Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki -στην διεÏθυνση @DOKUWIKIURL@ -και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ +Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki +στην διεÏθυνση @DOKUWIKIURL@ +και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ και διαγÏαφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου. - --- -Αυτό το μήνυμα παÏάχθηκε απο το DokuWiki στην -διεÏθυνση @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/el/subscr_single.txt b/sources/inc/lang/el/subscr_single.txt index 610af49..b67631c 100644 --- a/sources/inc/lang/el/subscr_single.txt +++ b/sources/inc/lang/el/subscr_single.txt @@ -12,11 +12,7 @@ Παλιά έκδοση: @OLDPAGE@ Îέα έκδοση: @NEWPAGE@ -Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki -στην διεÏθυνση @DOKUWIKIURL@ -και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ +Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki +στην διεÏθυνση @DOKUWIKIURL@ +και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ και διαγÏαφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου. - --- -Αυτό το μήνυμα παÏάχθηκε απο το DokuWiki στην -διεÏθυνση @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/el/uploadmail.txt b/sources/inc/lang/el/uploadmail.txt index 52d2f1f..c9cfca9 100644 --- a/sources/inc/lang/el/uploadmail.txt +++ b/sources/inc/lang/el/uploadmail.txt @@ -9,7 +9,3 @@ IP-ΔιεÏθυνση : @IPADDRESS@ Μέγεθος : @SIZE@ MIME Type : @MIME@ ΧÏήστης : @USER@ - --- -Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/lang.php b/sources/inc/lang/en/lang.php index 9812ab6..2e7d368 100644 --- a/sources/inc/lang/en/lang.php +++ b/sources/inc/lang/en/lang.php @@ -368,4 +368,7 @@ $lang['plainhtml'] = 'Plain HTML'; $lang['wikimarkup'] = 'Wiki Markup'; $lang['page_nonexist_rev'] = 'Page did not exist at %s. It was subsequently created at %s.'; $lang['unable_to_parse_date'] = 'Unable to parse at parameter "%s".'; +$lang['email_signature_text'] = 'This mail was generated by DokuWiki at +@DOKUWIKIURL@'; +$lang['email_signature_html'] = ''; //Setup VIM: ex: et ts=2 : diff --git a/sources/inc/lang/en/mailtext.txt b/sources/inc/lang/en/mailtext.txt index 44a3f65..aea14d4 100644 --- a/sources/inc/lang/en/mailtext.txt +++ b/sources/inc/lang/en/mailtext.txt @@ -10,8 +10,3 @@ Edit Summary: @SUMMARY@ User : @USER@ @DIFF@ - - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/mailwrap.html b/sources/inc/lang/en/mailwrap.html index f9f80fd..7df0cdc 100644 --- a/sources/inc/lang/en/mailwrap.html +++ b/sources/inc/lang/en/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-This mail was generated by DokuWiki at @DOKUWIKIURL@. +@EMAILSIGNATURE@ diff --git a/sources/inc/lang/en/password.txt b/sources/inc/lang/en/password.txt index 6d5cbe6..0a0dfb5 100644 --- a/sources/inc/lang/en/password.txt +++ b/sources/inc/lang/en/password.txt @@ -4,7 +4,3 @@ Here is your userdata for @TITLE@ at @DOKUWIKIURL@ Login : @LOGIN@ Password : @PASSWORD@ - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/pwconfirm.txt b/sources/inc/lang/en/pwconfirm.txt index a342ff9..3732d8a 100644 --- a/sources/inc/lang/en/pwconfirm.txt +++ b/sources/inc/lang/en/pwconfirm.txt @@ -9,7 +9,3 @@ To confirm that the request was really sent by you please use the following link. @CONFIRM@ - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/registermail.txt b/sources/inc/lang/en/registermail.txt index f020157..5517ca1 100644 --- a/sources/inc/lang/en/registermail.txt +++ b/sources/inc/lang/en/registermail.txt @@ -8,7 +8,3 @@ Date : @DATE@ Browser : @BROWSER@ IP-Address : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/subscr_digest.txt b/sources/inc/lang/en/subscr_digest.txt index 35011b6..cc42e08 100644 --- a/sources/inc/lang/en/subscr_digest.txt +++ b/sources/inc/lang/en/subscr_digest.txt @@ -14,7 +14,3 @@ To cancel the page notifications, log into the wiki at @DOKUWIKIURL@ then visit @SUBSCRIBE@ and unsubscribe page and/or namespace changes. - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/subscr_list.txt b/sources/inc/lang/en/subscr_list.txt index 4c38b93..dcf8000 100644 --- a/sources/inc/lang/en/subscr_list.txt +++ b/sources/inc/lang/en/subscr_list.txt @@ -11,7 +11,3 @@ To cancel the page notifications, log into the wiki at @DOKUWIKIURL@ then visit @SUBSCRIBE@ and unsubscribe page and/or namespace changes. - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/subscr_single.txt b/sources/inc/lang/en/subscr_single.txt index 0bc310e..8f097dc 100644 --- a/sources/inc/lang/en/subscr_single.txt +++ b/sources/inc/lang/en/subscr_single.txt @@ -17,7 +17,3 @@ To cancel the page notifications, log into the wiki at @DOKUWIKIURL@ then visit @SUBSCRIBE@ and unsubscribe page and/or namespace changes. - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/en/uploadmail.txt b/sources/inc/lang/en/uploadmail.txt index 16bb698..dca8e33 100644 --- a/sources/inc/lang/en/uploadmail.txt +++ b/sources/inc/lang/en/uploadmail.txt @@ -9,7 +9,3 @@ Hostname : @HOSTNAME@ Size : @SIZE@ MIME Type : @MIME@ User : @USER@ - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/lang.php b/sources/inc/lang/eo/lang.php index 3e0b910..fdccb89 100644 --- a/sources/inc/lang/eo/lang.php +++ b/sources/inc/lang/eo/lang.php @@ -337,3 +337,5 @@ $lang['currentns'] = 'Aktuala nomspaco'; $lang['searchresult'] = 'Serĉrezulto'; $lang['plainhtml'] = 'Plena HTML'; $lang['wikimarkup'] = 'Vikiteksto'; +$lang['email_signature_text'] = 'Tiu ĉi mesaÄo kreiÄis de DokuWiki ĉe +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/eo/mailtext.txt b/sources/inc/lang/eo/mailtext.txt index 2765301..6c5b80c 100644 --- a/sources/inc/lang/eo/mailtext.txt +++ b/sources/inc/lang/eo/mailtext.txt @@ -10,6 +10,3 @@ Bulteno de ÅanÄoj: @SUMMARY@ Uzanto: @USER@ @DIFF@ - --- -Tiu ĉi mesaÄo kreiÄis de DokuWiki, kiu lokiÄas ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/mailwrap.html b/sources/inc/lang/eo/mailwrap.html index 9e92a00..d257190 100644 --- a/sources/inc/lang/eo/mailwrap.html +++ b/sources/inc/lang/eo/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Tiu retpoÅtaĵo venas de DokuWiki ĉe @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/eo/password.txt b/sources/inc/lang/eo/password.txt index 6dc42a9..6995ec5 100644 --- a/sources/inc/lang/eo/password.txt +++ b/sources/inc/lang/eo/password.txt @@ -4,6 +4,3 @@ Jen viaj uzantodatumoj por @TITLE@ ĉe @DOKUWIKIURL@ Ensalutnomo: @LOGIN@ Pasvorto: @PASSWORD@ - --- -Tiu ĉi mesaÄo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/pwconfirm.txt b/sources/inc/lang/eo/pwconfirm.txt index 5abc3d1..d6cde8d 100644 --- a/sources/inc/lang/eo/pwconfirm.txt +++ b/sources/inc/lang/eo/pwconfirm.txt @@ -8,6 +8,3 @@ Se ne vi petis tion, ignoru tiun ĉi mesaÄon. Por konfirmi, ke la peto estis vere via, bonvolu musklaki jenan ligilon: @CONFIRM@ - --- -Tiu ĉi mesaÄo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/registermail.txt b/sources/inc/lang/eo/registermail.txt index 9ef6013..b9c3870 100644 --- a/sources/inc/lang/eo/registermail.txt +++ b/sources/inc/lang/eo/registermail.txt @@ -8,6 +8,3 @@ Dato: @DATE@ Foliumilo: @BROWSER@ IP-Adreso: @IPADDRESS@ Provizanto: @HOSTNAME@ - --- -Tiu ĉi mesaÄo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/subscr_digest.txt b/sources/inc/lang/eo/subscr_digest.txt index 42fc79a..7e5310a 100644 --- a/sources/inc/lang/eo/subscr_digest.txt +++ b/sources/inc/lang/eo/subscr_digest.txt @@ -14,6 +14,3 @@ Por nuligi la paÄinformojn, ensalutu la vikion ĉe @DOKUWIKIURL@, poste iru al @SUBSCRIBE@ kaj malabonu la paÄajn kaj/aÅ­ nomspacajn ÅanÄojn. - --- -Tiu retpoÅtaĵo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/subscr_list.txt b/sources/inc/lang/eo/subscr_list.txt index 1957e85..ed0c809 100644 --- a/sources/inc/lang/eo/subscr_list.txt +++ b/sources/inc/lang/eo/subscr_list.txt @@ -11,6 +11,3 @@ Por nuligi la paÄinformojn, ensalutu la vikion ĉe @DOKUWIKIURL@, poste iru al @SUBSCRIBE@ kaj malabonu la paÄajn kaj/aÅ­ nomspacajn ÅanÄojn. - --- -Tiu retpoÅtaĵo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/subscr_single.txt b/sources/inc/lang/eo/subscr_single.txt index e4847e8..56d489c 100644 --- a/sources/inc/lang/eo/subscr_single.txt +++ b/sources/inc/lang/eo/subscr_single.txt @@ -17,6 +17,3 @@ Por nuligi la paÄinformojn, ensalutu la vikion ĉe @DOKUWIKIURL@, poste iru al @SUBSCRIBE@ kaj malabonu la paÄajn kaj/aÅ­ nomspacajn ÅanÄojn. - --- -Tiu retpoÅtaĵo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/eo/uploadmail.txt b/sources/inc/lang/eo/uploadmail.txt index 1cb48ad..6268824 100644 --- a/sources/inc/lang/eo/uploadmail.txt +++ b/sources/inc/lang/eo/uploadmail.txt @@ -8,6 +8,3 @@ Ret-nodo: @HOSTNAME@ Grandeco: @SIZE@ Dosier-tipo: @MIME@ Uzanto: @USER@ - --- -Tiu ĉi mesaÄo kreiÄis de DokuWiki ĉe @DOKUWIKIURL@ diff --git a/sources/inc/lang/es/lang.php b/sources/inc/lang/es/lang.php index 2630490..cc2fbb1 100644 --- a/sources/inc/lang/es/lang.php +++ b/sources/inc/lang/es/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Zigor Astarbe * @author Adrián Ariza * @author Gabiel Molina @@ -41,6 +41,9 @@ * @author Alejandro Nunez * @author Mauricio Segura * @author Domingo Redal + * @author solohazlo + * @author Romano + * @author David Roy */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -374,3 +377,5 @@ $lang['plainhtml'] = 'HTML sencillo'; $lang['wikimarkup'] = 'Etiquetado Wiki'; $lang['page_nonexist_rev'] = 'La página no existía en %s. Por tanto fue creada en %s.'; $lang['unable_to_parse_date'] = 'Incapaz de evaluar el parámetro "%s".'; +$lang['email_signature_text'] = 'Este mail ha sido generado por DokuWiki en +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/es/mailtext.txt b/sources/inc/lang/es/mailtext.txt index 893ec1c..e74d3eb 100644 --- a/sources/inc/lang/es/mailtext.txt +++ b/sources/inc/lang/es/mailtext.txt @@ -10,8 +10,3 @@ Resumen de la edición: @SUMMARY@ Usuario : @USER@ @DIFF@ - - --- -Este correo ha sido generado por DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/es/mailwrap.html b/sources/inc/lang/es/mailwrap.html index 3cf255f..d257190 100644 --- a/sources/inc/lang/es/mailwrap.html +++ b/sources/inc/lang/es/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Este correo ha sido generado por DokuWiki desde @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/es/password.txt b/sources/inc/lang/es/password.txt index 1312ed0..64bded4 100644 --- a/sources/inc/lang/es/password.txt +++ b/sources/inc/lang/es/password.txt @@ -4,6 +4,3 @@ Estos son los datos de usuario para @TITLE@ en @DOKUWIKIURL@ Usuario : @LOGIN@ Contraseña : @PASSWORD@ - --- -Este correo ha sido generado por DokuWiki en @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/es/pwconfirm.txt b/sources/inc/lang/es/pwconfirm.txt index c3dad11..b03d309 100644 --- a/sources/inc/lang/es/pwconfirm.txt +++ b/sources/inc/lang/es/pwconfirm.txt @@ -9,8 +9,3 @@ Para confirmar que la solicitud fue realizada realmente por usted, por favor use el siguiente enlace. @CONFIRM@ - - --- -Este mail ha sido generado por DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/es/registermail.txt b/sources/inc/lang/es/registermail.txt index e773e32..b9208a1 100644 --- a/sources/inc/lang/es/registermail.txt +++ b/sources/inc/lang/es/registermail.txt @@ -8,7 +8,3 @@ Fecha : @DATE@ Navegador : @BROWSER@ Dirección-IP : @IPADDRESS@ Nombre del host : @HOSTNAME@ - --- -Este mail ha sido generado por DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/es/subscr_digest.txt b/sources/inc/lang/es/subscr_digest.txt index df03fca..5bb5012 100644 --- a/sources/inc/lang/es/subscr_digest.txt +++ b/sources/inc/lang/es/subscr_digest.txt @@ -14,7 +14,3 @@ Para cancelar la página de notificaciones, entra a la wiki en @DOKUWIKIURL@ luego visita @SUBSCRIBE@ y date de baja en la página y/o cambios en el espacio de nombre. - --- -Este correo ha sido generado por DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/es/subscr_list.txt b/sources/inc/lang/es/subscr_list.txt index 80e8dc8..4c58a2d 100644 --- a/sources/inc/lang/es/subscr_list.txt +++ b/sources/inc/lang/es/subscr_list.txt @@ -11,7 +11,3 @@ Para cancelar la página de notificaciones, entra a la wiki en @DOKUWIKIURL@ luego visita @SUBSCRIBE@ y date de baja en la página y/o cambios en el espacio de nombre. - --- -Este correo ha sido generado por DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/es/subscr_single.txt b/sources/inc/lang/es/subscr_single.txt index abddeeb..a974cc9 100644 --- a/sources/inc/lang/es/subscr_single.txt +++ b/sources/inc/lang/es/subscr_single.txt @@ -17,7 +17,3 @@ Para cancelar la página de notificaciones, entra a la wiki en @DOKUWIKIURL@ luego visita @SUBSCRIBE@ y date de baja en la página y/o cambios en el espacio de nombre. - --- -Este correo ha sido generado por DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/es/uploadmail.txt b/sources/inc/lang/es/uploadmail.txt index cf70d00..eb1c5df 100644 --- a/sources/inc/lang/es/uploadmail.txt +++ b/sources/inc/lang/es/uploadmail.txt @@ -9,7 +9,3 @@ Hostname : @HOSTNAME@ Tamaño : @SIZE@ MIME Type : @MIME@ Usuario : @USER@ - --- -Este correo fue generado por DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/et/lang.php b/sources/inc/lang/et/lang.php index dbff49d..f8051d0 100644 --- a/sources/inc/lang/et/lang.php +++ b/sources/inc/lang/et/lang.php @@ -333,3 +333,5 @@ $lang['currentns'] = 'Hetke nimeruum'; $lang['searchresult'] = 'Otsingu tulemus'; $lang['plainhtml'] = 'Liht-HTML'; $lang['wikimarkup'] = 'Wiki märgistus'; +$lang['email_signature_text'] = 'See meil on saadetud DokuWiki poolt +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/et/mailtext.txt b/sources/inc/lang/et/mailtext.txt index 3214584..f1a6202 100644 --- a/sources/inc/lang/et/mailtext.txt +++ b/sources/inc/lang/et/mailtext.txt @@ -10,7 +10,3 @@ Toimeta kokkuvõtet: @SUMMARY@ Kasutaja : @USER@ @DIFF@ - - --- -Selle e-posti tekitas Sulle DokuWiki @DOKUWIKIURL@ diff --git a/sources/inc/lang/et/password.txt b/sources/inc/lang/et/password.txt index 19db86d..9d75bb8 100644 --- a/sources/inc/lang/et/password.txt +++ b/sources/inc/lang/et/password.txt @@ -4,6 +4,3 @@ Siin on sinu kasutajaandmed @TITLE@ks @DOKUWIKIURL@s Sisse logimisnimi : @LOGIN@ Parool : @PASSWORD@ - --- -Selle kirja saatis DokuWiki @DOKUWIKIURL@st diff --git a/sources/inc/lang/et/pwconfirm.txt b/sources/inc/lang/et/pwconfirm.txt index 4f17140..ee3b313 100644 --- a/sources/inc/lang/et/pwconfirm.txt +++ b/sources/inc/lang/et/pwconfirm.txt @@ -6,7 +6,3 @@ Kui see ei olnud Sina, siis võid seda meili lihtsalt ignoreerida. Kinnitamaks uue parooli saamise soovi mine aadressile: @CONFIRM@ - --- -See meil on saadetud DokuWiki poolt -@DOKUWIKIURL@ diff --git a/sources/inc/lang/et/registermail.txt b/sources/inc/lang/et/registermail.txt index 47d2ef1..3b78963 100644 --- a/sources/inc/lang/et/registermail.txt +++ b/sources/inc/lang/et/registermail.txt @@ -8,7 +8,3 @@ Kuupäev : @DATE@ Lehitseja : @BROWSER@ IP-Aaddress : @IPADDRESS@ Hosti nimi : @HOSTNAME@ - --- -See meil on saadetud DokuWiki poolt -@DOKUWIKIURL@ diff --git a/sources/inc/lang/et/subscr_digest.txt b/sources/inc/lang/et/subscr_digest.txt index 7446fd9..d382912 100644 --- a/sources/inc/lang/et/subscr_digest.txt +++ b/sources/inc/lang/et/subscr_digest.txt @@ -12,10 +12,6 @@ Endine: @OLDPAGE@ Uus: @NEWPAGE@ Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ -ja mine: +ja mine: @SUBSCRIBE@ ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. - --- -Selle e-kirja lõi DokuWiki aadressilt -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/et/subscr_list.txt b/sources/inc/lang/et/subscr_list.txt index 0629651..ec32a6b 100644 --- a/sources/inc/lang/et/subscr_list.txt +++ b/sources/inc/lang/et/subscr_list.txt @@ -10,10 +10,6 @@ Endine: @OLDPAGE@ Uus: @NEWPAGE@ Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ -ja mine: +ja mine: @SUBSCRIBE@ ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. - --- -Selle e-kirja lõi DokuWiki aadressilt -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/et/subscr_single.txt b/sources/inc/lang/et/subscr_single.txt index fff069f..02069a6 100644 --- a/sources/inc/lang/et/subscr_single.txt +++ b/sources/inc/lang/et/subscr_single.txt @@ -1,23 +1,19 @@ -Tere! +Tere! -Wiki-s @TITLE@ toimetati lehekülge @PAGE@. -Muudatustest lähemalt: - --------------------------------------------------------- -@DIFF@ --------------------------------------------------------- +Wiki-s @TITLE@ toimetati lehekülge @PAGE@. +Muudatustest lähemalt: -Kuupäev : @DATE@ -Kasutaja : @USER@ -Kokkuvõte: @SUMMARY@ -Endine: @OLDPAGE@ -Uus: @NEWPAGE@ +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- -Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ -ja mine: -@SUBSCRIBE@ +Kuupäev : @DATE@ +Kasutaja : @USER@ +Kokkuvõte: @SUMMARY@ +Endine: @OLDPAGE@ +Uus: @NEWPAGE@ + +Lehekülje teavituste katkestamiseks, sisene wiki-sse aadressil @DOKUWIKIURL@ +ja mine: +@SUBSCRIBE@ ning loobu lehekülje ja/või nimeruumi muudatuste teavitustest. - --- -Selle e-kirja lõi DokuWiki aadressilt -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/et/uploadmail.txt b/sources/inc/lang/et/uploadmail.txt index 2d3a6aa..2c21926 100644 --- a/sources/inc/lang/et/uploadmail.txt +++ b/sources/inc/lang/et/uploadmail.txt @@ -10,7 +10,3 @@ Lähemalt: Suurus : @SIZE@ MIME liik : @MIME@ Kasutaja : @ USER@ - --- -Selle e-kirja lõi DokuWiki aadressilt -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/eu/lang.php b/sources/inc/lang/eu/lang.php index f66cda0..fc33830 100644 --- a/sources/inc/lang/eu/lang.php +++ b/sources/inc/lang/eu/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Xabi Ezpeleta * @author Inko Illarramendi * @author Zigor Astarbe @@ -306,3 +306,5 @@ $lang['media_viewold'] = '%s -n %s'; $lang['media_edit'] = '%s editatu'; $lang['media_update'] = 'Bertsio berria igo'; $lang['media_restore'] = 'Bertsio hau berrezarri'; +$lang['email_signature_text'] = 'Email hau DokuWiki erabiliz sortu da +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/eu/mailtext.txt b/sources/inc/lang/eu/mailtext.txt index 86ab1a3..ad0ff2f 100644 --- a/sources/inc/lang/eu/mailtext.txt +++ b/sources/inc/lang/eu/mailtext.txt @@ -10,8 +10,3 @@ Aldatu laburpena : @SUMMARY@ Erabiltzailea : @USER@ @DIFF@ - - --- -Email hau DokuWiki erabiliz sortu da; -@DOKUWIKIURL@ diff --git a/sources/inc/lang/eu/mailwrap.html b/sources/inc/lang/eu/mailwrap.html index 0cf92c2..d257190 100644 --- a/sources/inc/lang/eu/mailwrap.html +++ b/sources/inc/lang/eu/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Mezu elektroniko hau DokuWiki-k sortua da @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/eu/password.txt b/sources/inc/lang/eu/password.txt index cf2a017..a9c079f 100644 --- a/sources/inc/lang/eu/password.txt +++ b/sources/inc/lang/eu/password.txt @@ -4,7 +4,3 @@ Hau da zure erabiltzailea @TITLE@ -rentzako @DOKUWIKIURL@ Erabiltzailea : @LOGIN@ Pasahitza : @PASSWORD@ - --- -eMail hau DokuWikiren bitartez sortu da; -@DOKUWIKIURL@ diff --git a/sources/inc/lang/eu/pwconfirm.txt b/sources/inc/lang/eu/pwconfirm.txt index 0f0fd5e..ee4e4f8 100644 --- a/sources/inc/lang/eu/pwconfirm.txt +++ b/sources/inc/lang/eu/pwconfirm.txt @@ -7,6 +7,3 @@ Ez baduzu zuk eskatu pasahitz berria, ez kasurik egin posta honi. Eskakizuna zuk bidalia dela egiaztatzeko, mesedez, ondorengo esteka erabili. @CONFIRM@ - --- -Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da. \ No newline at end of file diff --git a/sources/inc/lang/eu/registermail.txt b/sources/inc/lang/eu/registermail.txt index a015444..a2897e6 100644 --- a/sources/inc/lang/eu/registermail.txt +++ b/sources/inc/lang/eu/registermail.txt @@ -8,6 +8,3 @@ Data : @DATE@ Nabigatzailea : @BROWSER@ IP-Helbidea : @IPADDRESS@ Hostalari izena : @HOSTNAME@ - --- -Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da. \ No newline at end of file diff --git a/sources/inc/lang/eu/subscr_digest.txt b/sources/inc/lang/eu/subscr_digest.txt index e7962ca..d4c32d7 100644 --- a/sources/inc/lang/eu/subscr_digest.txt +++ b/sources/inc/lang/eu/subscr_digest.txt @@ -10,11 +10,7 @@ Hemen aldaketak: Berrikuste zaharra: @OLDPAGE@ Berrikuste berria: @NEWPAGE@ -Orri jakinarazpenak ezeztatzeko, sartu wikian +Orri jakinarazpenak ezeztatzeko, sartu wikian @DOKUWIKIURL@ helbidean, bisitatu @SUBSCRIBE@ eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza. - --- -E-posta hau DokuWiki-k sortua izan da helbide honetan: -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/eu/subscr_list.txt b/sources/inc/lang/eu/subscr_list.txt index 950cd35..10037c3 100644 --- a/sources/inc/lang/eu/subscr_list.txt +++ b/sources/inc/lang/eu/subscr_list.txt @@ -7,11 +7,7 @@ Hemen aldatutako orriak: @DIFF@ -------------------------------------------------------- -Orri jakinarazpenak ezeztatzeko, sartu wikian +Orri jakinarazpenak ezeztatzeko, sartu wikian @DOKUWIKIURL@ helbidean, bisitatu @SUBSCRIBE@ eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza. - --- -E-posta hau DokuWiki-k sortua izan da helbide honetan: -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/eu/subscr_single.txt b/sources/inc/lang/eu/subscr_single.txt index 4902117..13b1787 100644 --- a/sources/inc/lang/eu/subscr_single.txt +++ b/sources/inc/lang/eu/subscr_single.txt @@ -13,11 +13,7 @@ Aldaketaren Laburpena: @SUMMARY@ Berrikuste Zaharra: @OLDPAGE@ Berrikuste Berria: @NEWPAGE@ -Orri jakinarazpenak ezeztatzeko, sartu wikian +Orri jakinarazpenak ezeztatzeko, sartu wikian @DOKUWIKIURL@ helbidean, bisitatu @SUBSCRIBE@ eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza. - --- -E-posta hau DokuWiki-k sortua izan da helbide honetan: -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/eu/uploadmail.txt b/sources/inc/lang/eu/uploadmail.txt index 639f3d9..7b685e0 100644 --- a/sources/inc/lang/eu/uploadmail.txt +++ b/sources/inc/lang/eu/uploadmail.txt @@ -8,6 +8,3 @@ Hostalari izena : @HOSTNAME@ Tamaina : @SIZE@ MIME Mota : @MIME@ Erabiltzailea : @USER@ - --- -Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da. \ No newline at end of file diff --git a/sources/inc/lang/fa/admin.txt b/sources/inc/lang/fa/admin.txt index ce75509..f8e36ba 100644 --- a/sources/inc/lang/fa/admin.txt +++ b/sources/inc/lang/fa/admin.txt @@ -1,3 +1,3 @@ ====== مدیریت ====== -در اینجا لیستی از وظیÙه‌های مدیریتی را مشاهده می‌کنید. \ No newline at end of file +در اینجا Ùهرستی از وظیÙه‌های مدیریتی را مشاهده می‌کنید. \ No newline at end of file diff --git a/sources/inc/lang/fa/adminplugins.txt b/sources/inc/lang/fa/adminplugins.txt index 3d2bb4a..dab0251 100644 --- a/sources/inc/lang/fa/adminplugins.txt +++ b/sources/inc/lang/fa/adminplugins.txt @@ -1 +1 @@ -===== برنامه های جانبی دیگر ===== \ No newline at end of file +===== برنامه‌های جانبی دیگر ===== \ No newline at end of file diff --git a/sources/inc/lang/fa/backlinks.txt b/sources/inc/lang/fa/backlinks.txt index 6864e22..774d3d6 100644 --- a/sources/inc/lang/fa/backlinks.txt +++ b/sources/inc/lang/fa/backlinks.txt @@ -1,3 +1,3 @@ ====== پیوندهای بازگشتی ====== -در این‌جا لیستی از صÙحاتی Ú©Ù‡ به این صÙحه پیوند داده‌اند را مشاهده می‌کنید. \ No newline at end of file +در این‌جا Ùهرستی از صÙحاتی Ú©Ù‡ به این صÙحه پیوند داده‌اند را مشاهده می‌کنید. \ No newline at end of file diff --git a/sources/inc/lang/fa/denied.txt b/sources/inc/lang/fa/denied.txt index 4bffa0f..190b710 100644 --- a/sources/inc/lang/fa/denied.txt +++ b/sources/inc/lang/fa/denied.txt @@ -1,4 +1,4 @@ ====== دسترسی ممکن نیست ====== -شرمنده، شما اجازه‌ی دسترسی ب این صÙحه را ندارید. +شرمنده، شما اجازهٔ دسترسی به این صÙحه را ندارید. diff --git a/sources/inc/lang/fa/diff.txt b/sources/inc/lang/fa/diff.txt index d5354f7..80e1ce7 100644 --- a/sources/inc/lang/fa/diff.txt +++ b/sources/inc/lang/fa/diff.txt @@ -1,3 +1,3 @@ ====== تÙاوت‌ها ====== -تÙاوت دو نسخه‌ی متÙاوت از صÙحه را مشاهده می‌کنید. \ No newline at end of file +تÙاوت دو نسخهٔ متÙاوت از صÙحه را مشاهده می‌کنید. \ No newline at end of file diff --git a/sources/inc/lang/fa/editrev.txt b/sources/inc/lang/fa/editrev.txt index ca896fe..eae5394 100644 --- a/sources/inc/lang/fa/editrev.txt +++ b/sources/inc/lang/fa/editrev.txt @@ -1 +1,2 @@ -**شما یک نگارش قدیمی را مشاهده می‌کنید!** اگر این نگارش را ذخیره کنید، شما یک نگارش جدید ایجاد کرده‌اید! \ No newline at end of file +**شما یک نگارش قدیمی را مشاهده می‌کنید!** اگر این نگارش را ذخیره کنید، شما یک نگارش جدید ایجاد کرده‌اید! +---- \ No newline at end of file diff --git a/sources/inc/lang/fa/lang.php b/sources/inc/lang/fa/lang.php index 7b45b31..c8c36d2 100644 --- a/sources/inc/lang/fa/lang.php +++ b/sources/inc/lang/fa/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author behrad eslamifar * @author Omid Mottaghi @@ -15,6 +15,8 @@ * @author Mohamad Mehdi Habibi * @author Mohammad Sadegh * @author Omid Hezaveh + * @author Mohmmad Razavi + * @author Masoud Sadrnezhaad */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'rtl'; @@ -24,9 +26,9 @@ $lang['singlequoteopening'] = '‘'; $lang['singlequoteclosing'] = '’'; $lang['apostrophe'] = '’'; $lang['btn_edit'] = 'ویرایش این صÙحه'; -$lang['btn_source'] = 'نمایش مبدا'; +$lang['btn_source'] = 'نمایش متن صÙحه'; $lang['btn_show'] = 'نمایش صÙحه'; -$lang['btn_create'] = 'ساخت این صÙحه'; +$lang['btn_create'] = 'ایجاد این صÙحه'; $lang['btn_search'] = 'جستجو'; $lang['btn_save'] = 'ذخیره'; $lang['btn_preview'] = 'پیش‌نمایش'; @@ -63,23 +65,24 @@ $lang['btn_mediaManager'] = 'مشاهده در مدیریت رسانه‌ه $lang['loggedinas'] = 'به این عنوان وارد شده‌اید:'; $lang['user'] = 'نام کاربری'; $lang['pass'] = 'گذرواژه‌'; -$lang['newpass'] = 'گذروازه‌ی جدید'; +$lang['newpass'] = 'گذرواژه‌ی جدید'; $lang['oldpass'] = 'گذرواژه‌ی Ùعلی را تایید کنید'; $lang['passchk'] = 'یک بار دیگر'; $lang['remember'] = 'مرا به خاطر بسپار.'; -$lang['fullname'] = '*نام واقعی شما'; -$lang['email'] = 'ایمیل شما*'; +$lang['fullname'] = 'نام واقعی شما'; +$lang['email'] = 'ایمیل شما'; $lang['profile'] = 'پروÙایل کاربر'; -$lang['badlogin'] = 'خطا در ورود به سیستم'; -$lang['badpassconfirm'] = 'متاسÙÙ… ØŒ رمز عبور اشتباه است'; +$lang['badlogin'] = 'متاسÙÙ…ØŒ نام کاربری یا رمز عبور اشتباه است.'; +$lang['badpassconfirm'] = 'متاسÙÙ…ØŒ رمز عبور اشتباه است'; $lang['minoredit'] = 'این ویرایش Ø®Ùرد است'; -$lang['draftdate'] = 'ذخیره خودکار پیش‌نویس'; +$lang['draftdate'] = 'ذخیره خودکار پیش‌نویس در'; $lang['nosecedit'] = 'این صÙحه در این میان تغییر کرده است، اطلاعات بخش قدیمی شده است، در عوض محتوای Ú©Ù„ نمایش داده می‌شود.'; $lang['searchcreatepage'] = 'اگر به نتیجه‌ی مطلوبی نرسیده‌اید، می‌توانید صÙحه‌ی مورد نظر را ایجاد کنید.'; $lang['regmissing'] = 'متاسÙÙ…ØŒ شما باید همه قسمت‌ها را پر کنید.'; $lang['reguexists'] = 'نام کاربری‌ای Ú©Ù‡ وارد کردید قبلن استÙاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.'; $lang['regsuccess'] = 'کاربر ساخته شد Ùˆ گذرواژه به صورت ایمیل ارسال گردید.'; $lang['regsuccess2'] = 'حساب ایجاد شد.'; +$lang['regfail'] = 'ایجاد کاربر ممکن نیست.'; $lang['regmailfail'] = 'مشکلی در ارسال ایمیل پیش آمده است، با مدیر تماس بگیرید!'; $lang['regbadmail'] = 'نشانی واردشده‌ی ایمیل قابل‌قبول نیست، چرا Ú©Ù‡ دارای ساختار نامعتبری است. خواهشمندیم نشانی‌ای با ساختار صحیح وارد کنید Ùˆ یا بخش مربوط را خالی بگذارید.'; $lang['regbadpass'] = 'گذرواژه‌هایی Ú©Ù‡ وارد کردید یکسان نیستند.'; @@ -94,30 +97,30 @@ $lang['profdeleteuser'] = 'حذ٠حساب کاربری'; $lang['profdeleted'] = 'حساب کاربری شما حذ٠گردیده است.'; $lang['profconfdelete'] = 'می‌خواهم حساب کاربری من از این ویکی حذ٠شود.
این عمل قابل برگشت نیست.'; $lang['profconfdeletemissing'] = 'جعبه‌ی تأیید تیک نخورده است'; -$lang['pwdforget'] = 'گذرواژه‌ی خود را Ùراموش کرده‌اید؟ جدید دریاÙت کنید'; +$lang['proffail'] = 'بروزرسانی پروÙایل کاربری انجام نشد.'; +$lang['pwdforget'] = 'گذرواژه‌ی خود را Ùراموش کرده‌اید؟ گذرواژه‌ی جدید دریاÙت کنید'; $lang['resendna'] = 'این ویکی ارسال مجدد گذرواژه را پشتیبانی نمی‌کند'; $lang['resendpwd'] = 'تعیین کلمه عبور جدید برای '; -$lang['resendpwdmissing'] = 'متاسÙÙ…ØŒ شما باید تمام قسمت‌ها را پر کنید'; -$lang['resendpwdnouser'] = 'متاسÙÙ…ØŒ ما نتوانستیم این نام کاربری را در بانک خود پیدا کنیم'; +$lang['resendpwdmissing'] = 'متاسÙÙ…ØŒ شما باید تمام قسمت‌ها را پر کنید.'; +$lang['resendpwdnouser'] = 'متاسÙÙ…ØŒ ما نتوانستیم این نام کاربری را در پایگاه دادهٔ خود پیدا کنیم.'; $lang['resendpwdbadauth'] = 'متاسÙÙ…ØŒ کد شناسایی معتبر نیست. از صحت لینک تاییدیه اطمینان حاصل کنید.'; -$lang['resendpwdconfirm'] = 'یک ایمیل تاییدیه‌ی آدرس به آدرس مورنظر ارسال شد. قبل از اینکه نامه‌ی دیگری قابل ارسال به این آدرس باشد، باید دستوراتی Ú©Ù‡ در آن نامه آمده است را جهت تایید این مساله Ú©Ù‡ این آدرس متعلق به شماست، اجرا کنید.'; -$lang['resendpwdsuccess'] = 'گذرواژه‌ی جدید شما توسط ایمیل ارسال شد'; +$lang['resendpwdconfirm'] = 'یک لینک تاییدیه آدرس از طریق ایمیل ارسال شد.'; +$lang['resendpwdsuccess'] = 'گذرواژه‌ی جدید شما توسط ایمیل ارسال شد.'; $lang['license'] = 'به جز مواردی Ú©Ù‡ ذکر می‌شود، مابقی محتویات ویکی تحت مجوز زیر می‌باشند:'; $lang['licenseok'] = 'توجه: با ویرایش این صÙحه، شما مجوز زیر را تایید می‌کنید:'; $lang['searchmedia'] = 'نام Ùایل برای جستجو:'; $lang['searchmedia_in'] = 'جستجو در %s'; -$lang['txt_upload'] = 'Ùایل را برای ارسال انتخاب کنید:'; +$lang['txt_upload'] = 'Ùایل را برای آپلود انتخاب کنید:'; $lang['txt_filename'] = 'ارسال به صورت (اختیاری):'; $lang['txt_overwrt'] = 'بر روی Ùایل موجود بنویس'; $lang['maxuploadsize'] = 'حداکثر %s برای هر Ùایل مجاز است.'; $lang['lockedby'] = 'در حال حاضر Ù‚ÙÙ„ شده است:'; -$lang['lockexpire'] = 'Ù‚ÙÙ„ منقضی شده است:'; +$lang['lockexpire'] = 'Ù‚ÙÙ„ منقضی می‌شود در:'; $lang['js']['willexpire'] = 'حالت Ù‚ÙÙ„ شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صÙر شدن ساعت Ù‚ÙÙ„ بزنید.'; -$lang['js']['notsavedyet'] = 'تغییرات ذخیره شده از بین خواهد رÙت. - می‌خواهید ادامه دهید؟'; -$lang['js']['searchmedia'] = 'جستجو برای Ùایل'; -$lang['js']['keepopen'] = 'پنجره را ر زمان انتخاب باز نگه‌دار'; -$lang['js']['hidedetails'] = 'پتهان کردن جزییات'; +$lang['js']['notsavedyet'] = 'تغییرات ذخیره نشده از بین خواهد رÙت.'; +$lang['js']['searchmedia'] = 'جستجو برای Ùایل‌ها'; +$lang['js']['keepopen'] = 'پنجره را در زمان انتخاب باز نگه‌دار'; +$lang['js']['hidedetails'] = 'پنهان کردن جزئیات'; $lang['js']['mediatitle'] = 'تنظیمات پیوند'; $lang['js']['mediadisplay'] = 'نوع پیوند'; $lang['js']['mediaalign'] = 'هم‌ترازی'; @@ -125,13 +128,13 @@ $lang['js']['mediasize'] = 'اندازه تصویر'; $lang['js']['mediatarget'] = 'هد٠پیوند'; $lang['js']['mediaclose'] = 'بستن'; $lang['js']['mediainsert'] = 'درج کردن'; -$lang['js']['mediadisplayimg'] = 'نمایش تصویر'; +$lang['js']['mediadisplayimg'] = 'نمایش تصویر.'; $lang['js']['mediadisplaylnk'] = 'Ùقط پیوند را نمایش بده.'; $lang['js']['mediasmall'] = 'نگارش Ú©ÙˆÚ†Ú©'; $lang['js']['mediamedium'] = 'نگارش متوسط'; $lang['js']['medialarge'] = 'نگارش بزرگ'; $lang['js']['mediaoriginal'] = 'نگارش اصلی'; -$lang['js']['medialnk'] = 'پیوند به صÙحه‌ی جزییات'; +$lang['js']['medialnk'] = 'پیوند به صÙحه‌ی جزئیات'; $lang['js']['mediadirect'] = 'پیوند مستقیم به اصلی'; $lang['js']['medianolnk'] = 'بدون پیوند'; $lang['js']['medianolink'] = 'تصویر را پیوند Ù†Ú©Ù†'; @@ -149,38 +152,38 @@ $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_select'] = 'انتخاب Ùایل‌ها...'; $lang['js']['media_upload_btn'] = 'آپلود'; $lang['js']['media_done_btn'] = 'انجام شد'; -$lang['js']['media_drop'] = 'Ùایل ها را در اینجا قرار دهید تا آپلود شود'; +$lang['js']['media_drop'] = 'Ùایل‌ها را در اینجا قرار دهید تا آپلود شود'; $lang['js']['media_cancel'] = 'حذÙ'; -$lang['js']['media_overwrt'] = 'جاینوشت Ùایل های موجود'; -$lang['rssfailed'] = 'بروز خطا در هنگام واکشی'; -$lang['nothingfound'] = 'چیزی پیدا نشد'; +$lang['js']['media_overwrt'] = 'جاینوشت Ùایل‌های موجود'; +$lang['rssfailed'] = 'بروز خطا در هنگام واکشی این Ùید:'; +$lang['nothingfound'] = 'چیزی پیدا نشد.'; $lang['mediaselect'] = 'Ùایل‌ها'; $lang['uploadsucc'] = 'ارسال با موÙقیت انجام شد'; -$lang['uploadfail'] = 'خطا در ارسال'; -$lang['uploadwrong'] = 'ارسال متوق٠شد. این توسعه‌ی Ùایل ممنوع می‌باشد.'; -$lang['uploadexist'] = 'این Ùابل وجود دارد. عملی انجام نشد.'; -$lang['uploadbadcontent'] = 'محتوای Ùایل ارسال شده با توسعه‌ی %s متناقض است.'; +$lang['uploadfail'] = 'خطا در ارسال. شاید دسترسی‌ها نادرست است؟'; +$lang['uploadwrong'] = 'ارسال متوق٠شد. این Ùرمت Ùایل ممنوع می‌باشد.'; +$lang['uploadexist'] = 'این Ùایل وجود دارد. عملی انجام نشد.'; +$lang['uploadbadcontent'] = 'محتوای Ùایل آپلود شده با Ùرمت %s یکسان نیست.'; $lang['uploadspam'] = 'Ùایل ارسال شده توسط لیست سیاه اسپم‌ها مسدود شده است.'; $lang['uploadxss'] = 'این صÙحه حاوی اسکریپت یا کد اچ‌تی‌ام‌ال است Ú©Ù‡ ممکن است به نادرست توسط مرورگر وب تÙسیر شود.'; $lang['uploadsize'] = 'Ùایل ارسال شده سنگین است. (بیشینه، %s)'; $lang['deletesucc'] = 'Ùایل «%s» حذ٠شد.'; $lang['deletefail'] = '«%s» حذ٠نمی‌شود، دسترسی‌ها را بررسی کنید.'; $lang['mediainuse'] = 'Ùایل «%s» حذ٠نمی‌شود، چون هنوز در حال استÙاده است.'; -$lang['namespaces'] = 'Ùضای‌نام'; +$lang['namespaces'] = 'Ùضای‌نام‌ها'; $lang['mediafiles'] = 'Ùایل‌های موجود در'; $lang['accessdenied'] = 'شما اجازه‌ی مشاهده‌ی این صÙحه را ندارید.'; $lang['mediausage'] = 'برای ارجاع دادن به Ùایل از نگارش زیر استÙاده کنید.'; $lang['mediaview'] = 'مشاهده‌ی Ùایل اصلی'; $lang['mediaroot'] = 'ریشه'; -$lang['mediaupload'] = 'ارسال Ùایل به Ùضای‌نام کنونی. برای ایجاد زیرÙضای‌نام‌ها، نام‌های آن‌ها را به عنوان پیشوندهایی Ú©Ù‡ با دونقطه «:» جدا شده‌اند به نام Ùایل، در قسمت «ارسال به صورت» اضاÙÙ‡ کنید.'; -$lang['mediaextchange'] = 'توسعه‌ی Ùایل از %s به %s تغییر داده شد.'; +$lang['mediaupload'] = 'ارسال Ùایل به Ùضای‌نام کنونی. برای ایجاد زیرÙضای‌نام‌ها، پس از انتخاب Ùایل‌ها در قسمت «ارسال به صورت» به نام Ùایل نام‌های Ùضای‌نام‌ها را به عنوان پیشوندهایی Ú©Ù‡ با دونقطه «:» جدا شده‌اند، اضاÙÙ‡ کنید. همچنین Ùایل‌ها می‌توانند با کشیدن Ùˆ ول کردن انتخاب شوند.'; +$lang['mediaextchange'] = 'Ùرمت Ùایل از %s به %s تغییر داده شد.'; $lang['reference'] = 'ارجاع‌های'; $lang['ref_inuse'] = 'این Ùایل نمی‌تواند حذ٠شود، زیرا هم‌چنان در این صÙحه استÙاده شده است:'; $lang['ref_hidden'] = 'تعدادی مرجع در صÙحاتی Ú©Ù‡ شما دسترسی خواندن ندارید وجود دارد.'; -$lang['hits'] = 'بازدید'; +$lang['hits'] = 'بازدیدها'; $lang['quickhits'] = 'جور کردن نام صÙحات'; $lang['toc'] = 'Ùهرست مندرجات'; $lang['current'] = 'Ùعلی'; @@ -339,7 +342,12 @@ $lang['media_perm_read'] = 'متاسÙانه شما حق خواندن ای $lang['media_perm_upload'] = 'متاسÙانه شما حق آپلود این Ùایل‌ها را ندارید.'; $lang['media_update'] = 'آپلود نسخه‌ی جدید'; $lang['media_restore'] = 'بازیابی این نسخه'; +$lang['media_acl_warning'] = 'این لیست ممکن است به خاطر محدودیتهای دسترسیهای ACL Ùˆ صÙحات پنهان کامل نباشد.'; $lang['currentns'] = 'Ùضای نام جاری'; $lang['searchresult'] = 'نتیجه‌ی جستجو'; $lang['plainhtml'] = 'HTML ساده'; $lang['wikimarkup'] = 'نشانه‌گذاری ویکی'; +$lang['email_signature_text'] = 'این ایمیل توسط DokuWiki تولید شده است +@DOKUWIKIURL@'; +$lang['page_nonexist_rev'] = 'صÙحه %s وجود نداشت. این صÙحه معاقباً در%s ایجاد شد.'; +$lang['unable_to_parse_date'] = 'امکان تجزیه Ùˆ تحلیل پارامتر «%s» وجود ندارد.'; diff --git a/sources/inc/lang/fa/mailtext.txt b/sources/inc/lang/fa/mailtext.txt index 44e98db..b51be6b 100644 --- a/sources/inc/lang/fa/mailtext.txt +++ b/sources/inc/lang/fa/mailtext.txt @@ -10,8 +10,3 @@ کاربر: @USER@ @DIFF@ - - --- -این ایمیل توسط DokuWiki تولید شده است -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fa/mailwrap.html b/sources/inc/lang/fa/mailwrap.html index c313c0b..d257190 100644 --- a/sources/inc/lang/fa/mailwrap.html +++ b/sources/inc/lang/fa/mailwrap.html @@ -1,4 +1,4 @@ - + @TITLE@ @@ -8,7 +8,6 @@ @HTMLBODY@
-This mail was generated by DokuWiki at @DOKUWIKIURL@. - این ایمیل توسط DokuWiki at @DOKUWIKIURL@ تولید شده است. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/fa/password.txt b/sources/inc/lang/fa/password.txt index 3f552c5..5b40412 100644 --- a/sources/inc/lang/fa/password.txt +++ b/sources/inc/lang/fa/password.txt @@ -4,7 +4,3 @@ نام کاربری: @LOGIN@ گذرواژه: @PASSWORD@ - --- -این ایمیل توسط DokuWiki تولید شده است -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fa/pwconfirm.txt b/sources/inc/lang/fa/pwconfirm.txt index fd76b7d..ddde4e7 100644 --- a/sources/inc/lang/fa/pwconfirm.txt +++ b/sources/inc/lang/fa/pwconfirm.txt @@ -7,7 +7,3 @@ اگر این درخواست توسط شما داده شده است، باید آن را تایید کنید، پس روی پیوند زیر کلیک کنید. @CONFIRM@ - --- -این ایمیل توسط DokuWiki تولید شده است -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fa/registermail.txt b/sources/inc/lang/fa/registermail.txt index e22c2d0..f69460f 100644 --- a/sources/inc/lang/fa/registermail.txt +++ b/sources/inc/lang/fa/registermail.txt @@ -8,7 +8,3 @@ مرورگر: @BROWSER@ آدرس IP: @IPADDRESS@ نام هوست: @HOSTNAME@ - --- -این ایمیل توسط DokuWiki تولید شده است -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fa/subscr_digest.txt b/sources/inc/lang/fa/subscr_digest.txt index 0ba4c89..c5ac515 100644 --- a/sources/inc/lang/fa/subscr_digest.txt +++ b/sources/inc/lang/fa/subscr_digest.txt @@ -11,6 +11,3 @@ نگارش نو: @NEWPAGE@ برای از بین بردن آگاهی‌های این صÙحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده Ùˆ صÙحه‌ی @SUBSCRIBE@ را مرور کنید Ùˆ عضویت خود را از صÙحه یا Ùضای‌نام پاک کنید. - --- -این رای‌نامه با نرم‌اÙزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است. \ No newline at end of file diff --git a/sources/inc/lang/fa/subscr_list.txt b/sources/inc/lang/fa/subscr_list.txt index 92ac92b..6970997 100644 --- a/sources/inc/lang/fa/subscr_list.txt +++ b/sources/inc/lang/fa/subscr_list.txt @@ -11,6 +11,3 @@ نگارش نو: @NEWPAGE@ برای از بین بردن آگاهی‌های این صÙحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده Ùˆ صÙحه‌ی @SUBSCRIBE@ را مرور کنید Ùˆ عضویت خود را از صÙحه یا Ùضای‌نام پاک کنید. - --- -این رای‌نامه با نرم‌اÙزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است. \ No newline at end of file diff --git a/sources/inc/lang/fa/subscr_single.txt b/sources/inc/lang/fa/subscr_single.txt index a0d2a5d..75ffb24 100644 --- a/sources/inc/lang/fa/subscr_single.txt +++ b/sources/inc/lang/fa/subscr_single.txt @@ -14,6 +14,3 @@ نگارش نو: @NEWPAGE@ برای از بین بردن آگاهی‌های این صÙحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده Ùˆ صÙحه‌ی @NEWPAGE@ را مرور کنید Ùˆ عضویت خود را از صÙحه یا Ùضای‌نام پاک کنید. - --- -این رای‌نامه با نرم‌اÙزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است. \ No newline at end of file diff --git a/sources/inc/lang/fa/uploadmail.txt b/sources/inc/lang/fa/uploadmail.txt index 625df73..e9218b6 100644 --- a/sources/inc/lang/fa/uploadmail.txt +++ b/sources/inc/lang/fa/uploadmail.txt @@ -8,7 +8,3 @@ اندازه: @SIZE@ MIME: @MIME@ کاربر: @USER@ - --- -این ایمیل توسط DokuWiki تولید شده است -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fi/lang.php b/sources/inc/lang/fi/lang.php index de2ca13..d16c856 100644 --- a/sources/inc/lang/fi/lang.php +++ b/sources/inc/lang/fi/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Petteri * @author Matti Pöllä * @author Otto Vainio @@ -10,6 +10,7 @@ * @author Sami Olmari * @author Rami Lehti * @author Jussi Takala + * @author Wiki Doku */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -75,6 +76,7 @@ $lang['regmissing'] = 'Kaikki kentät tulee täyttää.'; $lang['reguexists'] = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.'; $lang['regsuccess'] = 'Käyttäjä luotiin ja salasana lähetettiin sähköpostilla.'; $lang['regsuccess2'] = 'Käyttäjänimi on luotu.'; +$lang['regfail'] = 'Valitsemaasi käyttäjää ei voitu luoda.'; $lang['regmailfail'] = 'Näyttää siltä, että salasanan lähettämisessä tapahtui virhe. Ota yhteys ylläpitäjään!'; $lang['regbadmail'] = 'Antamasi sähköpostiosoite näyttää epäkelvolta. Jos pidät tätä virheenä ota yhteys ylläpitäjään.'; $lang['regbadpass'] = 'Annetut kaksi salasanaa eivät täsmää. Yritä uudelleen.'; @@ -337,3 +339,5 @@ $lang['searchresult'] = 'Haun tulokset'; $lang['plainhtml'] = 'pelkkä HTML'; $lang['wikimarkup'] = 'Wiki markup'; $lang['unable_to_parse_date'] = 'Parametrin "%s" jäsennys ei onnistu.'; +$lang['email_signature_text'] = 'Tämän postin loi DokuWiki osoitteessa +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/fi/mailtext.txt b/sources/inc/lang/fi/mailtext.txt index 1808ebc..015b3c3 100644 --- a/sources/inc/lang/fi/mailtext.txt +++ b/sources/inc/lang/fi/mailtext.txt @@ -10,8 +10,3 @@ Yhteenveto: @SUMMARY@ Käyttäjä : @USER@ @DIFF@ - - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fi/mailwrap.html b/sources/inc/lang/fi/mailwrap.html index 6ff63c0..d257190 100644 --- a/sources/inc/lang/fi/mailwrap.html +++ b/sources/inc/lang/fi/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Tämä viesti on tehty DokuWiki:ssä @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/fi/password.txt b/sources/inc/lang/fi/password.txt index 51e1604..e088166 100644 --- a/sources/inc/lang/fi/password.txt +++ b/sources/inc/lang/fi/password.txt @@ -4,7 +4,3 @@ Tässä käyttäjätietosi sivulla @TITLE@ osoitteessa @DOKUWIKIURL@ Käyttäjätunnus : @LOGIN@ Salasana : @PASSWORD@ - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fi/pwconfirm.txt b/sources/inc/lang/fi/pwconfirm.txt index e552f5c..de6780c 100644 --- a/sources/inc/lang/fi/pwconfirm.txt +++ b/sources/inc/lang/fi/pwconfirm.txt @@ -7,7 +7,3 @@ Jos sinä ei pyytänyt uutta salasanaa, niin voit unohtaa tämän postin. Käytä alla olevaa linkkiä vahvistaaksesi, että pyynnön lähettäjä todella olet sinä. @CONFIRM@ - --- -Tämän postin loi DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fi/registermail.txt b/sources/inc/lang/fi/registermail.txt index c276873..07c35be 100644 --- a/sources/inc/lang/fi/registermail.txt +++ b/sources/inc/lang/fi/registermail.txt @@ -8,7 +8,3 @@ Päivämäärä : @DATE@ Selain : @BROWSER@ IP-osoite : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fi/subscr_digest.txt b/sources/inc/lang/fi/subscr_digest.txt index 4664844..e395e07 100644 --- a/sources/inc/lang/fi/subscr_digest.txt +++ b/sources/inc/lang/fi/subscr_digest.txt @@ -14,7 +14,3 @@ Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa @DOKUWIKIURL@ , jonka jälkeen katso @SUBSCRIBE@ ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista. - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fi/subscr_list.txt b/sources/inc/lang/fi/subscr_list.txt index cd39014..255f123 100644 --- a/sources/inc/lang/fi/subscr_list.txt +++ b/sources/inc/lang/fi/subscr_list.txt @@ -11,8 +11,3 @@ Peruuttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa @DOKUWIKIURL@ , jonka jälkeen katso @SUBSCRIBE@ ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista. - - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fi/subscr_single.txt b/sources/inc/lang/fi/subscr_single.txt index 0fd83e2..f373ff3 100644 --- a/sources/inc/lang/fi/subscr_single.txt +++ b/sources/inc/lang/fi/subscr_single.txt @@ -17,7 +17,3 @@ Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa @DOKUWIKIURL@ , jonka jälkeen katso @SUBSCRIBE@ ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista. - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fi/uploadmail.txt b/sources/inc/lang/fi/uploadmail.txt index 0c116a7..e7b9abf 100644 --- a/sources/inc/lang/fi/uploadmail.txt +++ b/sources/inc/lang/fi/uploadmail.txt @@ -8,7 +8,3 @@ Hostname : @HOSTNAME@ Koko : @SIZE@ MIME Type : @MIME@ Käyttäjä : @USER@ - --- -Tämän postin loi DokuWiki osoitteessa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fo/lang.php b/sources/inc/lang/fo/lang.php index d1d7096..50f2fac 100644 --- a/sources/inc/lang/fo/lang.php +++ b/sources/inc/lang/fo/lang.php @@ -167,3 +167,5 @@ $lang['img_format'] = 'Snið:'; $lang['img_camera'] = 'Fototól:'; $lang['img_keywords'] = 'Evnisorð:'; $lang['authtempfail'] = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.'; +$lang['email_signature_text'] = 'Hesin t-postur var skaptur av DokuWiki á +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/fo/mailtext.txt b/sources/inc/lang/fo/mailtext.txt index 358a23b..331edfe 100644 --- a/sources/inc/lang/fo/mailtext.txt +++ b/sources/inc/lang/fo/mailtext.txt @@ -10,8 +10,3 @@ Rætti samandráttur : @SUMMARY@ Brúkari : @USER@ @DIFF@ - - --- -Hesin t-postur var skaptur av DokuWiki á: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fo/password.txt b/sources/inc/lang/fo/password.txt index 1e4797b..df8b6e7 100644 --- a/sources/inc/lang/fo/password.txt +++ b/sources/inc/lang/fo/password.txt @@ -4,7 +4,3 @@ Her eru tínar brúkaraupplýsingar @TITLE@ at @DOKUWIKIURL@ Brúkaranavn : @LOGIN@ Loyniorð : @PASSWORD@ - --- -Hesin t-postur var skaptur av DokuWiki á: -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fo/subscr_digest.txt b/sources/inc/lang/fo/subscr_digest.txt index 3d9f097..ff76e53 100644 --- a/sources/inc/lang/fo/subscr_digest.txt +++ b/sources/inc/lang/fo/subscr_digest.txt @@ -14,7 +14,3 @@ Fyri at avmelda síðu kunngerðir, logga inn í wikiina á @DOKUWIKIURL@ vitja so @SUBSCRIBE@ og avmelda hald á síðu og/ella navnaøkis broytingar. - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fr/lang.php b/sources/inc/lang/fr/lang.php index c737862..4d4f254 100644 --- a/sources/inc/lang/fr/lang.php +++ b/sources/inc/lang/fr/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Sébastien Bauer * @author Antoine Fixary * @author cumulus @@ -369,3 +369,5 @@ $lang['plainhtml'] = 'HTML brut'; $lang['wikimarkup'] = 'Wiki balise'; $lang['page_nonexist_rev'] = 'La page n\'existait pas le %s. Elle a été créée le %s.'; $lang['unable_to_parse_date'] = 'Ne peut analyser le paramètre date "%s".'; +$lang['email_signature_text'] = 'Ce courriel a été généré par DokuWiki depuis +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/fr/mailtext.txt b/sources/inc/lang/fr/mailtext.txt index 3f19175..d93eb1e 100644 --- a/sources/inc/lang/fr/mailtext.txt +++ b/sources/inc/lang/fr/mailtext.txt @@ -11,8 +11,3 @@ Résumé : @SUMMARY@ Utilisateur : @USER@ @DIFF@ - - --- -Ce courriel a été généré par DokuWiki depuis -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fr/mailwrap.html b/sources/inc/lang/fr/mailwrap.html index aa50110..d257190 100644 --- a/sources/inc/lang/fr/mailwrap.html +++ b/sources/inc/lang/fr/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Ce courriel a été automatiquement généré par DokuWiki depuis @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/fr/password.txt b/sources/inc/lang/fr/password.txt index 47cb391..2ffe715 100644 --- a/sources/inc/lang/fr/password.txt +++ b/sources/inc/lang/fr/password.txt @@ -4,7 +4,3 @@ Voici vos identifiants pour @TITLE@ sur @DOKUWIKIURL@ Utilisateur : @LOGIN@ Mot de passe : @PASSWORD@ - --- -Ce courriel a été envoyé par DokuWiki depuis -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fr/pwconfirm.txt b/sources/inc/lang/fr/pwconfirm.txt index 5cbfb22..187ec0b 100644 --- a/sources/inc/lang/fr/pwconfirm.txt +++ b/sources/inc/lang/fr/pwconfirm.txt @@ -9,7 +9,3 @@ passe, ignorez simplement ce message. Pour confirmer que cette requête émane bien de vous, merci de cliquer sur le lien ci-dessous. @CONFIRM@ - --- -Ce courriel a été généré par DokuWiki depuis -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fr/registermail.txt b/sources/inc/lang/fr/registermail.txt index 43d72db..fe39c2d 100644 --- a/sources/inc/lang/fr/registermail.txt +++ b/sources/inc/lang/fr/registermail.txt @@ -8,7 +8,3 @@ Date : @DATE@ Navigateur internet : @BROWSER@ Adresse IP : @IPADDRESS@ Nom d'hôte : @HOSTNAME@ - --- -Ce courriel a été généré par DokuWiki depuis -@DOKUWIKIURL@ diff --git a/sources/inc/lang/fr/subscr_digest.txt b/sources/inc/lang/fr/subscr_digest.txt index 8c21e57..c1fa463 100644 --- a/sources/inc/lang/fr/subscr_digest.txt +++ b/sources/inc/lang/fr/subscr_digest.txt @@ -13,7 +13,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse @DOKUWIKIURL@ puis visitez @SUBSCRIBE@ et désabonnez-vous de la page ou de la catégorie. - --- -Ce courriel a été généré par DokuWiki depuis -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fr/subscr_list.txt b/sources/inc/lang/fr/subscr_list.txt index 38d76d8..4c5c55d 100644 --- a/sources/inc/lang/fr/subscr_list.txt +++ b/sources/inc/lang/fr/subscr_list.txt @@ -10,7 +10,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse @DOKUWIKIURL@ puis visitez @SUBSCRIBE@ et désabonnez-vous de la page ou de la catégorie. - --- -Ce courriel a été généré par Dokuwiki : -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fr/subscr_single.txt b/sources/inc/lang/fr/subscr_single.txt index 13f2998..a13bd00 100644 --- a/sources/inc/lang/fr/subscr_single.txt +++ b/sources/inc/lang/fr/subscr_single.txt @@ -16,7 +16,3 @@ Pour annuler les notifications de page, connectez-vous au wiki à l'adresse @DOKUWIKIURL@ puis visitez @SUBSCRIBE@ et désabonnez-vous de la page ou de la catégorie. - --- -Ce courriel a été généré par Dokuwiki depuis -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/fr/uploadmail.txt b/sources/inc/lang/fr/uploadmail.txt index 80be0de..37273d9 100644 --- a/sources/inc/lang/fr/uploadmail.txt +++ b/sources/inc/lang/fr/uploadmail.txt @@ -8,7 +8,3 @@ Nom d'hôte : @HOSTNAME@ Taille : @SIZE@ Type MIME : @MIME@ Utilisateur : @USER@ - --- -Ce message a été généré par DokuWiki depuis -@DOKUWIKIURL@ diff --git a/sources/inc/lang/gl/lang.php b/sources/inc/lang/gl/lang.php index 9e3d4f2..941989a 100644 --- a/sources/inc/lang/gl/lang.php +++ b/sources/inc/lang/gl/lang.php @@ -315,3 +315,5 @@ $lang['media_perm_read'] = 'Sentímolo, non tes permisos suficientes para $lang['media_perm_upload'] = 'Sentímolo, non tes permisos suficientes para subir arquivos.'; $lang['media_update'] = 'Subir nova versión'; $lang['media_restore'] = 'Restaurar esta versión'; +$lang['email_signature_text'] = 'Este correo foi xerado polo DokuWiki en +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/gl/mailtext.txt b/sources/inc/lang/gl/mailtext.txt index a6799d6..bf102e1 100644 --- a/sources/inc/lang/gl/mailtext.txt +++ b/sources/inc/lang/gl/mailtext.txt @@ -10,8 +10,3 @@ Resumo da Edición : @SUMMARY@ Usuario : @USER@ @DIFF@ - - --- -Este correo foi xerado polo DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/gl/mailwrap.html b/sources/inc/lang/gl/mailwrap.html index 19927c1..d257190 100644 --- a/sources/inc/lang/gl/mailwrap.html +++ b/sources/inc/lang/gl/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Este correo era xerado por DokuWiki en @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/gl/password.txt b/sources/inc/lang/gl/password.txt index 652a558..36f8562 100644 --- a/sources/inc/lang/gl/password.txt +++ b/sources/inc/lang/gl/password.txt @@ -4,7 +4,3 @@ Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@ Usuario : @LOGIN@ Contrasinal : @PASSWORD@ - --- -Este correo foi xerado polo DokuWiki en -@DOKUWIKIURL@ diff --git a/sources/inc/lang/gl/pwconfirm.txt b/sources/inc/lang/gl/pwconfirm.txt index ef20212..8185560 100644 --- a/sources/inc/lang/gl/pwconfirm.txt +++ b/sources/inc/lang/gl/pwconfirm.txt @@ -9,7 +9,3 @@ Para confirmares que esta solicitude foi realmente enviada por ti, por favor, visita a seguinte ligazón. @CONFIRM@ - --- -Este correo-e foi xerado polo DokuWiki de -@DOKUWIKIURL@ diff --git a/sources/inc/lang/gl/registermail.txt b/sources/inc/lang/gl/registermail.txt index 7d40174..aad8481 100644 --- a/sources/inc/lang/gl/registermail.txt +++ b/sources/inc/lang/gl/registermail.txt @@ -8,7 +8,3 @@ Data : @DATE@ Navegador : @BROWSER@ Enderezo IP : @IPADDRESS@ Nome do Host : @HOSTNAME@ - --- -Este correo-e foi xerado polo DokuWiki de -@DOKUWIKIURL@ diff --git a/sources/inc/lang/gl/subscr_digest.txt b/sources/inc/lang/gl/subscr_digest.txt index 4ebd14d..275a7d5 100644 --- a/sources/inc/lang/gl/subscr_digest.txt +++ b/sources/inc/lang/gl/subscr_digest.txt @@ -14,7 +14,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en @DOKUWIKIURL@ e logo visita @SUBSCRIBE@ e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo. - --- -Este correo-e foi xerado polo DokuWiki de -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/gl/subscr_list.txt b/sources/inc/lang/gl/subscr_list.txt index b62aae3..8ee1a7a 100644 --- a/sources/inc/lang/gl/subscr_list.txt +++ b/sources/inc/lang/gl/subscr_list.txt @@ -11,7 +11,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en @DOKUWIKIURL@ e logo visita @SUBSCRIBE@ e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo. - --- -Este correo-e foi xerado polo DokuWiki de -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/gl/subscr_single.txt b/sources/inc/lang/gl/subscr_single.txt index 77102d4..b30c817 100644 --- a/sources/inc/lang/gl/subscr_single.txt +++ b/sources/inc/lang/gl/subscr_single.txt @@ -17,7 +17,3 @@ Para cancelares as notificacións da páxina inicia sesión no wiki en @DOKUWIKIURL@ e logo visita @SUBSCRIBE@ e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo. - --- -Este correo-e foi xerado polo DokuWiki de -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/gl/uploadmail.txt b/sources/inc/lang/gl/uploadmail.txt index 2a7c247..c01bc7d 100644 --- a/sources/inc/lang/gl/uploadmail.txt +++ b/sources/inc/lang/gl/uploadmail.txt @@ -8,7 +8,3 @@ Nome do Host : @HOSTNAME@ Tamaño : @SIZE@ Tipo MIME : @MIME@ Usuario : @USER@ - --- -Este correo foi xerado polo DokuWiki en -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/he/lang.php b/sources/inc/lang/he/lang.php index a24ccac..49f17c3 100644 --- a/sources/inc/lang/he/lang.php +++ b/sources/inc/lang/he/lang.php @@ -15,6 +15,7 @@ * @author tomer * @author itsho * @author Menashe Tomer + * @author sagi */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'rtl'; @@ -95,6 +96,7 @@ $lang['profdeleteuser'] = 'הסר חשבון'; $lang['profdeleted'] = 'חשבון המשתמש שלך נמחק מויקי ×–×”'; $lang['profconfdelete'] = 'ברצוני להסיר ×ת החשבון שלי מוויקי ×–×”.
×œ× × ×™×ª×Ÿ לבטל פעולה זו.'; $lang['profconfdeletemissing'] = 'תיבת ×ישור ×ינו מסומן'; +$lang['proffail'] = 'פרופיל המשתמש ×œ× ×¢×•×“×›×Ÿ'; $lang['pwdforget'] = 'שכחת ×ת הססמה שלך? ניתן לקבל חדשה'; $lang['resendna'] = 'הוויקי ×”×–×” ×ינו תומך בחידוש ססמה'; $lang['resendpwd'] = 'הגדר ×¡×™×¡×ž× ×—×“×©×” בעבור'; @@ -341,8 +343,11 @@ $lang['media_perm_read'] = 'מצטערי×, ×ין לך הרש×ות לק $lang['media_perm_upload'] = 'מצטערי×, ×ין לך הרש×ות להעלות קבצי×.'; $lang['media_update'] = 'העלה גירסה חדשה'; $lang['media_restore'] = 'שחזר גירסה זו'; +$lang['media_acl_warning'] = 'רשימה זו עלולה להיות חסרה עכב חוסר בהרש×ות ×ו ×“×¤×™× ×ž×•×¡×ª×¨×™×'; $lang['currentns'] = '×©× ×ž×¨×—×‘ נוכחי'; $lang['searchresult'] = 'תוצ×ות חיפוש'; $lang['plainhtml'] = 'HTML פשוט'; $lang['page_nonexist_rev'] = 'העמוד ×œ× ×§×™×™× ×‘%s. העמוד נוצר ×‘×ž×§×•× ×–×ת ב%s.'; $lang['unable_to_parse_date'] = '×œ× × ×™×ª×Ÿ לפענח פרמטר "%s".'; +$lang['email_signature_text'] = 'הודעת דו×״ל זו נוצרה על ידי ×”Ö¾DokuWiki הזמין בכתובת +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/he/mailtext.txt b/sources/inc/lang/he/mailtext.txt index 5ef4ec7..f33760e 100644 --- a/sources/inc/lang/he/mailtext.txt +++ b/sources/inc/lang/he/mailtext.txt @@ -10,8 +10,3 @@ משתמש : @USER@ @DIFF@ - --- - -דף ×–×” נוצר ×¢×´×™ ×”Ö¾DokuWiki הזמין בכתובת -@DOKUWIKIURL@ diff --git a/sources/inc/lang/he/password.txt b/sources/inc/lang/he/password.txt index 745c5cb..bfa29b6 100644 --- a/sources/inc/lang/he/password.txt +++ b/sources/inc/lang/he/password.txt @@ -4,7 +4,3 @@ ×©× ×›× ×™×¡×” : @LOGIN@ ססמה : @PASSWORD@ - --- -מכתב ×–×” נוצר על ידי ×”Ö¾DokuWiki הזמין בכתובת -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/he/pwconfirm.txt b/sources/inc/lang/he/pwconfirm.txt index 7dc46c3..3fa786c 100644 --- a/sources/inc/lang/he/pwconfirm.txt +++ b/sources/inc/lang/he/pwconfirm.txt @@ -7,7 +7,3 @@ כדי ל×שר שהבקשה ב×מת נשלחה על ידך עליך השתמש בקישור הב×. @CONFIRM@ - --- -הודעת דו×״ל זו נוצרה על ידי ×”Ö¾DokuWiki הזמין בכתובת -@DOKUWIKIURL@ diff --git a/sources/inc/lang/he/registermail.txt b/sources/inc/lang/he/registermail.txt index d478d1c..2216cb3 100644 --- a/sources/inc/lang/he/registermail.txt +++ b/sources/inc/lang/he/registermail.txt @@ -8,7 +8,3 @@ דפדפן : @BROWSER@ כתובת IP‏ : @IPADDRESS@ ×©× ×”×ž×רח : @HOSTNAME@ - --- -הודעת דו×״ל זו נוצרה על ידי ×”Ö¾DokuWiki הזמין בכתובת -@DOKUWIKIURL@ diff --git a/sources/inc/lang/he/subscr_digest.txt b/sources/inc/lang/he/subscr_digest.txt index af52202..5548a70 100644 --- a/sources/inc/lang/he/subscr_digest.txt +++ b/sources/inc/lang/he/subscr_digest.txt @@ -14,7 +14,3 @@ @DOKUWIKIURL@ ו××– לבקר ב××’×£ @SUBSCRIBE@ ולבטל ×ת המינוי ×œ×©×™× ×•×™×™× ×‘×“×£ ו/×ו במרחב הש×. - --- -הודעת דו×״ל זו נוצרה על ידי ×”Ö¾DokuWiki שבכתובת -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/he/subscr_single.txt b/sources/inc/lang/he/subscr_single.txt index 78b551e..c2ddb72 100644 --- a/sources/inc/lang/he/subscr_single.txt +++ b/sources/inc/lang/he/subscr_single.txt @@ -16,7 +16,3 @@ @DOKUWIKIURL@ ו××– לבקר בדף @SUBSCRIBE@ ולבטל ×ת המינוי לקבלת ×©×™× ×•×™×™× ×‘×“×£ ו/×ו במרחב הש×. - --- -הודעת דו×״ל זו נוצרה על ידי ×”Ö¾DokuWiki הזמין בכתובת -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/he/uploadmail.txt b/sources/inc/lang/he/uploadmail.txt index fd67079..9c06f13 100644 --- a/sources/inc/lang/he/uploadmail.txt +++ b/sources/inc/lang/he/uploadmail.txt @@ -8,7 +8,3 @@ גודל : @SIZE@ סיווג : @MIME@ משתמש : @USER@ - --- -דו×ר ×–×” נוצר על ידי דוקוויקי בתובת -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/lang.php b/sources/inc/lang/hr/lang.php index 40e0c59..1023a0e 100644 --- a/sources/inc/lang/hr/lang.php +++ b/sources/inc/lang/hr/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Tomo Krajina * @author Branko Rihtman * @author Dražen OdobaÅ¡ić @@ -341,3 +341,5 @@ $lang['plainhtml'] = 'ÄŒisti HTML'; $lang['wikimarkup'] = 'Wiki kod'; $lang['page_nonexist_rev'] = 'Stranica ne postoji na %s. Ona je naknadno napravljena na %s.'; $lang['unable_to_parse_date'] = 'Ne mogu analizirati parametar "%s".'; +$lang['email_signature_text'] = 'Ovaj email je poslan na +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/hr/mailtext.txt b/sources/inc/lang/hr/mailtext.txt index 911f8ea..9988efc 100644 --- a/sources/inc/lang/hr/mailtext.txt +++ b/sources/inc/lang/hr/mailtext.txt @@ -10,7 +10,3 @@ Opis izmjene : @SUMMARY@ Korisnik : @USER@ @DIFF@ - - --- -Ovaj email je poslan na: @DOKUWIKIURL@ diff --git a/sources/inc/lang/hr/password.txt b/sources/inc/lang/hr/password.txt index bb156c2..76cccbd 100644 --- a/sources/inc/lang/hr/password.txt +++ b/sources/inc/lang/hr/password.txt @@ -4,6 +4,3 @@ Slijede podaci za @TITLE@ sa @DOKUWIKIURL@ KorisniÄko ime : @LOGIN@ Lozinka : @PASSWORD@ - --- -@DOKUWIKIURL@ diff --git a/sources/inc/lang/hr/pwconfirm.txt b/sources/inc/lang/hr/pwconfirm.txt index b2d9fa3..506e98e 100644 --- a/sources/inc/lang/hr/pwconfirm.txt +++ b/sources/inc/lang/hr/pwconfirm.txt @@ -7,7 +7,3 @@ Ako to niste bili Vi, molimo da samo ignorirate ovu poruku. Da bi ste potvrdili da ste to ipak bili Vi, molimo slijedite link u nastavku: @CONFIRM@ - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/registermail.txt b/sources/inc/lang/hr/registermail.txt index ceaf3fb..9c556d9 100644 --- a/sources/inc/lang/hr/registermail.txt +++ b/sources/inc/lang/hr/registermail.txt @@ -2,13 +2,9 @@ Novi korisnik je registriran. Ovdje su detalji: KorisniÄko ime : @NEWUSER@ Puno ime : @NEWNAME@ -e-poÅ¡ta : @NEWEMAIL@ +e-poÅ¡ta : @NEWEMAIL@ -Datum : @DATE@ +Datum : @DATE@ Preglednik : @BROWSER@ -IP-Adresa : @IPADDRESS@ +IP-Adresa : @IPADDRESS@ RaÄunalo : @HOSTNAME@ - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/subscr_digest.txt b/sources/inc/lang/hr/subscr_digest.txt index fad158d..8a13c01 100644 --- a/sources/inc/lang/hr/subscr_digest.txt +++ b/sources/inc/lang/hr/subscr_digest.txt @@ -13,7 +13,3 @@ Nova verzija: @NEWPAGE@ Da poniÅ¡tite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite @SUBSCRIBE@ i odjavite se s promjena na stranici i/ili imeniÄkom prostoru. - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/subscr_list.txt b/sources/inc/lang/hr/subscr_list.txt index 611c769..75a4340 100644 --- a/sources/inc/lang/hr/subscr_list.txt +++ b/sources/inc/lang/hr/subscr_list.txt @@ -9,7 +9,3 @@ Stranice u imeniÄkom prostoru @PAGE@ na @TITLE@ wiki-u su izmijenjene. Ovo su i Da poniÅ¡tite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite @SUBSCRIBE@ i odjavite se s promjena na stranici i/ili imeniÄkom prostoru. - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/subscr_single.txt b/sources/inc/lang/hr/subscr_single.txt index 18f6690..31d492f 100644 --- a/sources/inc/lang/hr/subscr_single.txt +++ b/sources/inc/lang/hr/subscr_single.txt @@ -16,7 +16,3 @@ Nova verzija : @NEWPAGE@ Da poniÅ¡tite obavijesti o izmjenama prijavite se na wiki @DOKUWIKIURL@ i zatim posjetite @SUBSCRIBE@ i odjavite se s promjena na stranici i/ili imeniÄkom prostoru. - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hr/uploadmail.txt b/sources/inc/lang/hr/uploadmail.txt index 5b18b2b..51fe803 100644 --- a/sources/inc/lang/hr/uploadmail.txt +++ b/sources/inc/lang/hr/uploadmail.txt @@ -9,7 +9,3 @@ RaÄunalo : @HOSTNAME@ VeliÄina : @SIZE@ MIME Tip : @MIME@ Korisnik : @USER@ - --- -Ova poruka je generirana od strane DokuWiki dostupnog na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hu-formal/lang.php b/sources/inc/lang/hu-formal/lang.php index a98bdc0..66ff893 100644 --- a/sources/inc/lang/hu-formal/lang.php +++ b/sources/inc/lang/hu-formal/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Marina Vladi */ $lang['encoding'] = 'utf-8'; @@ -25,3 +25,5 @@ $lang['btn_older'] = 'régebbi >>'; $lang['btn_revs'] = 'Korábbi változatok'; $lang['btn_recent'] = 'Legújabb változások'; $lang['btn_upload'] = 'Feltöltés'; +$lang['email_signature_text'] = 'Ezt a levelet a DokuWiki generálta +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/hu/lang.php b/sources/inc/lang/hu/lang.php index 83b45b6..cbb3374 100644 --- a/sources/inc/lang/hu/lang.php +++ b/sources/inc/lang/hu/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Ziegler Gábor * @author Sandor TIHANYI * @author Siaynoq Mage @@ -345,5 +345,7 @@ $lang['currentns'] = 'Aktuális névtér'; $lang['searchresult'] = 'Keresés eredménye'; $lang['plainhtml'] = 'Sima HTML'; $lang['wikimarkup'] = 'Wiki-jelölÅ‘nyelv'; +$lang['email_signature_text'] = 'Ezt a levelet a DokuWiki generálta +@DOKUWIKIURL@'; $lang['page_nonexist_rev'] = 'A(z) %s oldal nem létezik. KésÅ‘bb lett létrehozva a(z) %s helyen.'; $lang['unable_to_parse_date'] = 'A "%s" paraméter feldolgozása sikertelen.'; diff --git a/sources/inc/lang/hu/mailtext.txt b/sources/inc/lang/hu/mailtext.txt index 9b0c292..d8d0336 100644 --- a/sources/inc/lang/hu/mailtext.txt +++ b/sources/inc/lang/hu/mailtext.txt @@ -10,7 +10,3 @@ ElÅ‘zÅ‘ változat: @OLDPAGE@ Felhasználó: @USER@ @DIFF@ - - --- -Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta. diff --git a/sources/inc/lang/hu/mailwrap.html b/sources/inc/lang/hu/mailwrap.html index 50fc497..d257190 100644 --- a/sources/inc/lang/hu/mailwrap.html +++ b/sources/inc/lang/hu/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/hu/password.txt b/sources/inc/lang/hu/password.txt index db24b90..49cf69f 100644 --- a/sources/inc/lang/hu/password.txt +++ b/sources/inc/lang/hu/password.txt @@ -4,7 +4,3 @@ A felhasználói adataid a @TITLE@ wikihez, a következő helyen: @DOKUWIKIURL@ Azonosító: @LOGIN@ Jelszó: @PASSWORD@ - --- -Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta. - diff --git a/sources/inc/lang/hu/pwconfirm.txt b/sources/inc/lang/hu/pwconfirm.txt index da677d1..203dc39 100644 --- a/sources/inc/lang/hu/pwconfirm.txt +++ b/sources/inc/lang/hu/pwconfirm.txt @@ -9,6 +9,3 @@ Ha Te voltál, az új jelszó kérelmed megerősítéséhez kattints a következő linkre vagy másold a böngésződbe: @CONFIRM@ - --- -Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki generálta. diff --git a/sources/inc/lang/hu/registermail.txt b/sources/inc/lang/hu/registermail.txt index d45ef0d..d37d59b 100644 --- a/sources/inc/lang/hu/registermail.txt +++ b/sources/inc/lang/hu/registermail.txt @@ -8,6 +8,3 @@ Dátum: @DATE@ Böngésző: @BROWSER@ IP-cím : @IPADDRESS@ Gép neve: @HOSTNAME@ - --- -Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta. \ No newline at end of file diff --git a/sources/inc/lang/hu/subscr_digest.txt b/sources/inc/lang/hu/subscr_digest.txt index b00e0bb..874c934 100644 --- a/sources/inc/lang/hu/subscr_digest.txt +++ b/sources/inc/lang/hu/subscr_digest.txt @@ -11,6 +11,3 @@ Régi verzió: @OLDPAGE@ Új verzió: @NEWPAGE@ Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@. - --- -Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta. \ No newline at end of file diff --git a/sources/inc/lang/hu/subscr_list.txt b/sources/inc/lang/hu/subscr_list.txt index 13295ff..c87d6dc 100644 --- a/sources/inc/lang/hu/subscr_list.txt +++ b/sources/inc/lang/hu/subscr_list.txt @@ -8,6 +8,3 @@ A módosított oldalak a következők: -------------------------------------------------------- Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@. - --- -Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta. \ No newline at end of file diff --git a/sources/inc/lang/hu/subscr_single.txt b/sources/inc/lang/hu/subscr_single.txt index e28226d..8d36def 100644 --- a/sources/inc/lang/hu/subscr_single.txt +++ b/sources/inc/lang/hu/subscr_single.txt @@ -14,7 +14,3 @@ Régi verzió: @OLDPAGE@ Új verzió: @NEWPAGE@ Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @NEWPAGE@. - --- -Ezt a levelet a DokuWiki generálta -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/hu/uploadmail.txt b/sources/inc/lang/hu/uploadmail.txt index c772ab2..62e0c2e 100644 --- a/sources/inc/lang/hu/uploadmail.txt +++ b/sources/inc/lang/hu/uploadmail.txt @@ -8,6 +8,3 @@ Gépnév: @HOSTNAME@ Méret: @SIZE@ MIME-típus: @MIME@ Felhasználó: @USER@ - --- -Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta. \ No newline at end of file diff --git a/sources/inc/lang/ia/lang.php b/sources/inc/lang/ia/lang.php index 3585d71..b40d99c 100644 --- a/sources/inc/lang/ia/lang.php +++ b/sources/inc/lang/ia/lang.php @@ -258,3 +258,5 @@ $lang['days'] = '%d dies retro'; $lang['hours'] = '%d horas retro'; $lang['minutes'] = '%d minutas retro'; $lang['seconds'] = '%d secundas retro'; +$lang['email_signature_text'] = 'Iste message ha essite generate per DokuWiki a +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/ia/mailtext.txt b/sources/inc/lang/ia/mailtext.txt index 14c1a3a..ed3eb25 100644 --- a/sources/inc/lang/ia/mailtext.txt +++ b/sources/inc/lang/ia/mailtext.txt @@ -10,8 +10,3 @@ Summario: @SUMMARY@ Usator : @USER@ @DIFF@ - - --- -Iste e-mail ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/password.txt b/sources/inc/lang/ia/password.txt index 9ad93d6..bf0e400 100644 --- a/sources/inc/lang/ia/password.txt +++ b/sources/inc/lang/ia/password.txt @@ -4,7 +4,3 @@ Ecce tu datos de usator pro @TITLE@ a @DOKUWIKIURL@ Nomine de usator : @LOGIN@ Contrasigno : @PASSWORD@ - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/pwconfirm.txt b/sources/inc/lang/ia/pwconfirm.txt index a490f79..c8e3d00 100644 --- a/sources/inc/lang/ia/pwconfirm.txt +++ b/sources/inc/lang/ia/pwconfirm.txt @@ -8,7 +8,3 @@ Si tu non ha requestate un nove contrasigno, alora simplemente ignora iste messa Pro confirmar que le requesta realmente ha essite inviate per te, per favor usa le ligamine sequente. @CONFIRM@ - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/registermail.txt b/sources/inc/lang/ia/registermail.txt index c4e9d56..b6fa332 100644 --- a/sources/inc/lang/ia/registermail.txt +++ b/sources/inc/lang/ia/registermail.txt @@ -8,7 +8,3 @@ Data : @DATE@ Navigator : @BROWSER@ Adresse IP : @IPADDRESS@ Nomine host : @HOSTNAME@ - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/subscr_digest.txt b/sources/inc/lang/ia/subscr_digest.txt index ba7b92d..b2cac2c 100644 --- a/sources/inc/lang/ia/subscr_digest.txt +++ b/sources/inc/lang/ia/subscr_digest.txt @@ -14,7 +14,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a @DOKUWIKIURL@ postea visita @SUBSCRIBE@ e cancella tu subscription al modificationes in paginas e/o spatios de nomines. - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/subscr_list.txt b/sources/inc/lang/ia/subscr_list.txt index 9f93db2..01ff350 100644 --- a/sources/inc/lang/ia/subscr_list.txt +++ b/sources/inc/lang/ia/subscr_list.txt @@ -11,7 +11,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a @DOKUWIKIURL@ postea visita @SUBSCRIBE@ e cancella tu subscription al modificationes in paginas e/o spatios de nomines. - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/subscr_single.txt b/sources/inc/lang/ia/subscr_single.txt index 445df19..da670ca 100644 --- a/sources/inc/lang/ia/subscr_single.txt +++ b/sources/inc/lang/ia/subscr_single.txt @@ -17,10 +17,3 @@ Pro cancellar le notificationes de paginas, aperi un session al wiki a @DOKUWIKIURL@ postea visita @SUBSCRIBE@ e cancella tu subscription al modificationes in paginas e/o spatios de nomines. - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ia/uploadmail.txt b/sources/inc/lang/ia/uploadmail.txt index 8f120f2..c406d4b 100644 --- a/sources/inc/lang/ia/uploadmail.txt +++ b/sources/inc/lang/ia/uploadmail.txt @@ -8,7 +8,3 @@ Nomine host: @HOSTNAME@ Dimension : @SIZE@ Typo MIME : @MIME@ Usator : @USER@ - --- -Iste message ha essite generate per DokuWiki a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/id/lang.php b/sources/inc/lang/id/lang.php index 4321e2c..fad9929 100644 --- a/sources/inc/lang/id/lang.php +++ b/sources/inc/lang/id/lang.php @@ -309,3 +309,5 @@ $lang['media_restore'] = 'Kembalikan versi ini'; $lang['currentns'] = 'Namespace saat ini'; $lang['searchresult'] = 'Hasil Pencarian'; $lang['wikimarkup'] = 'Markah Wiki'; +$lang['email_signature_text'] = 'Email ini dibuat otomatis oleh DokuWiki +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/id/mailtext.txt b/sources/inc/lang/id/mailtext.txt index 7eede9b..df9699e 100644 --- a/sources/inc/lang/id/mailtext.txt +++ b/sources/inc/lang/id/mailtext.txt @@ -10,8 +10,3 @@ Edit Summary: @SUMMARY@ User : @USER@ @DIFF@ - - --- -Email ini digenerate oleh DokuWiki di -@DOKUWIKIURL@ diff --git a/sources/inc/lang/id/password.txt b/sources/inc/lang/id/password.txt index 2e64b8d..285915c 100644 --- a/sources/inc/lang/id/password.txt +++ b/sources/inc/lang/id/password.txt @@ -4,7 +4,3 @@ Berikut data Anda untuk @TITLE@ di @DOKUWIKIURL@ Login : @LOGIN@ Password : @PASSWORD@ - --- -Email ini dibuat otomatis oleh DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/id/pwconfirm.txt b/sources/inc/lang/id/pwconfirm.txt index 19131ee..a787792 100644 --- a/sources/inc/lang/id/pwconfirm.txt +++ b/sources/inc/lang/id/pwconfirm.txt @@ -7,7 +7,3 @@ Jika Anda tidak meminta password baru, mohon mengacuhkan email ini. Untuk mengkonfirmasi bahwa permintaan tersebut adalah benar dari Anda, silahkan gunakan link dibawah. @CONFIRM@ - --- -Email ini dibuat otomatis oleh DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/id/registermail.txt b/sources/inc/lang/id/registermail.txt index ed8c97c..5943e35 100644 --- a/sources/inc/lang/id/registermail.txt +++ b/sources/inc/lang/id/registermail.txt @@ -8,7 +8,3 @@ Date : @DATE@ Browser : @BROWSER@ IP-Address : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Email ini dibuat otomatis oleh DokuWIki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/id/subscr_digest.txt b/sources/inc/lang/id/subscr_digest.txt index 5e1041c..2a5176b 100644 --- a/sources/inc/lang/id/subscr_digest.txt +++ b/sources/inc/lang/id/subscr_digest.txt @@ -1,17 +1,14 @@ -Hei! +Hei! -Halaman @PAGE@ di wiki @TITLE@ telah disunting. +Halaman @PAGE@ di wiki @TITLE@ telah disunting. Berikut perubahannya: --------------------------------------------------------- -@DIFF@ --------------------------------------------------------- +-------------------------------------------------------- +@DIFF@ +-------------------------------------------------------- -Revisi lama: @OLDPAGE@ +Revisi lama: @OLDPAGE@ -Revisi baru: @NEWPAGE@ +Revisi baru: @NEWPAGE@ Untuk menonaktifkan pemberitahuan ini, masuk ke wiki di @DOKUWIKIURL@ kemudian kunjungi @SUBSCRIBE@ dan halaman batal berlangganan dan/atau namespace yang diubah. - --- -Email ini dibuat oleh DokuWiki di @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/id/uploadmail.txt b/sources/inc/lang/id/uploadmail.txt index dc628fc..bb5f5e8 100644 --- a/sources/inc/lang/id/uploadmail.txt +++ b/sources/inc/lang/id/uploadmail.txt @@ -8,7 +8,3 @@ Hostname : @HOSTNAME@ Size : @SIZE@ MIME Type : @MIME@ User : @USER@ - --- -Email ini dibuat otomatis oleh DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/it/lang.php b/sources/inc/lang/it/lang.php index a94bf82..24e670c 100644 --- a/sources/inc/lang/it/lang.php +++ b/sources/inc/lang/it/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Giorgio Vecchiocattivi * @author Roberto Bolli [http://www.rbnet.it/] * @author Silvia Sargentoni @@ -355,3 +355,6 @@ $lang['searchresult'] = 'Risultati della ricerca'; $lang['plainhtml'] = 'HTML'; $lang['wikimarkup'] = 'Marcatura wiki'; $lang['page_nonexist_rev'] = 'Pagina non esistente a %s. E\' stata creata successivamente a %s.'; +$lang['email_signature_text'] = 'Questa email è stata generata dal DokuWiki all\'indirizzo +@DOKUWIKIURL@'; +$lang['unable_to_parse_date'] = 'Impossibile eseguire l\'analisi al parametro "%s".'; diff --git a/sources/inc/lang/it/mailtext.txt b/sources/inc/lang/it/mailtext.txt index 3a32696..3374d37 100644 --- a/sources/inc/lang/it/mailtext.txt +++ b/sources/inc/lang/it/mailtext.txt @@ -10,8 +10,3 @@ Oggetto della modifica : @SUMMARY@ Utente : @USER@ @DIFF@ - - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ diff --git a/sources/inc/lang/it/mailwrap.html b/sources/inc/lang/it/mailwrap.html index 24a2bc8..d257190 100644 --- a/sources/inc/lang/it/mailwrap.html +++ b/sources/inc/lang/it/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Questa email è stata generata da DokuWiki presso @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/it/password.txt b/sources/inc/lang/it/password.txt index 670d5ae..f7ca9e9 100644 --- a/sources/inc/lang/it/password.txt +++ b/sources/inc/lang/it/password.txt @@ -4,7 +4,3 @@ Questi sono i tuoi dati di accesso per @TITLE@ su @DOKUWIKIURL@ Nome utente : @LOGIN@ Password : @PASSWORD@ - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ diff --git a/sources/inc/lang/it/pwconfirm.txt b/sources/inc/lang/it/pwconfirm.txt index 8a594de..3eb36fb 100644 --- a/sources/inc/lang/it/pwconfirm.txt +++ b/sources/inc/lang/it/pwconfirm.txt @@ -9,7 +9,3 @@ Per confermare che la richiesta è stata realmente inviata da te usa il seguente collegamento. @CONFIRM@ - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ diff --git a/sources/inc/lang/it/registermail.txt b/sources/inc/lang/it/registermail.txt index 30a6fed..77454cd 100644 --- a/sources/inc/lang/it/registermail.txt +++ b/sources/inc/lang/it/registermail.txt @@ -8,7 +8,3 @@ Data : @DATE@ Browser : @BROWSER@ Indirizzo IP : @IPADDRESS@ Nome host : @HOSTNAME@ - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ diff --git a/sources/inc/lang/it/subscr_digest.txt b/sources/inc/lang/it/subscr_digest.txt index a191287..29fd4bc 100644 --- a/sources/inc/lang/it/subscr_digest.txt +++ b/sources/inc/lang/it/subscr_digest.txt @@ -10,11 +10,7 @@ Queste sono le modifiche: Vecchia revisione: @OLDPAGE@ Nuova revisione: @NEWPAGE@ -Per non ricevere più queste notifiche collegati al +Per non ricevere più queste notifiche collegati al wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@ -e rimuovi la sottoscrizione alle modifiche delle +e rimuovi la sottoscrizione alle modifiche delle pagine e/o categorie. - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/it/subscr_list.txt b/sources/inc/lang/it/subscr_list.txt index 8eb7acd..f870388 100644 --- a/sources/inc/lang/it/subscr_list.txt +++ b/sources/inc/lang/it/subscr_list.txt @@ -8,11 +8,7 @@ Queste sono le pagine modificate: @DIFF@ -------------------------------------------------------- -Per non ricevere più queste notifiche collegati al +Per non ricevere più queste notifiche collegati al wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@ -e rimuovi la sottoscrizione alle modifiche delle +e rimuovi la sottoscrizione alle modifiche delle pagine e/o categorie. - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/it/subscr_single.txt b/sources/inc/lang/it/subscr_single.txt index a8649a4..421a156 100644 --- a/sources/inc/lang/it/subscr_single.txt +++ b/sources/inc/lang/it/subscr_single.txt @@ -13,12 +13,8 @@ Sommario modifica: @SUMMARY@ Vecchia revisione: @OLDPAGE@ Nuova revisione: @NEWPAGE@ -Per non ricevere più queste notifiche, collegati al +Per non ricevere più queste notifiche, collegati al wiki all'indirizzo @DOKUWIKIURL@ e poi visita @SUBSCRIBE@ -e rimuovi la sottoscrizione alle modifiche della +e rimuovi la sottoscrizione alle modifiche della pagina o categoria. - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/it/uploadmail.txt b/sources/inc/lang/it/uploadmail.txt index da3dacd..4dd7cd4 100644 --- a/sources/inc/lang/it/uploadmail.txt +++ b/sources/inc/lang/it/uploadmail.txt @@ -8,7 +8,3 @@ Hostname : @HOSTNAME@ Dimensione : @SIZE@ Tipo MIME : @MIME@ Utente : @USER@ - --- -Questa email è stata generata dal DokuWiki all'indirizzo -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ja/lang.php b/sources/inc/lang/ja/lang.php index 38df66d..3f2101d 100644 --- a/sources/inc/lang/ja/lang.php +++ b/sources/inc/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuji Takenaka * @author Ikuo Obataya * @author Daniel Dupriest @@ -345,3 +345,5 @@ $lang['plainhtml'] = 'プレーンHTML'; $lang['wikimarkup'] = 'Wikiマークアップ'; $lang['page_nonexist_rev'] = '指定ページ %s ã¯ã‚ã‚Šã¾ã›ã‚“。ã“ã®ãƒªãƒ³ã‚¯ %s ã‹ã‚‰ä½œæˆã§ãã¾ã™ã€‚'; $lang['unable_to_parse_date'] = 'パラメータ "%s" を処ç†ã§ãã¾ã›ã‚“。'; +$lang['email_signature_text'] = 'ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/ja/mailtext.txt b/sources/inc/lang/ja/mailtext.txt index 09688cb..4bad3d9 100644 --- a/sources/inc/lang/ja/mailtext.txt +++ b/sources/inc/lang/ja/mailtext.txt @@ -10,8 +10,3 @@ IPアドレス : @IPADDRESS@ ユーザーå : @USER@ @DIFF@ - - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ja/mailwrap.html b/sources/inc/lang/ja/mailwrap.html index a9dd414..d257190 100644 --- a/sources/inc/lang/ja/mailwrap.html +++ b/sources/inc/lang/ja/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã® DokuWiki ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚Œã¾ã—ãŸï¼š
@DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/ja/password.txt b/sources/inc/lang/ja/password.txt index c00fe0b..fa11b10 100644 --- a/sources/inc/lang/ja/password.txt +++ b/sources/inc/lang/ja/password.txt @@ -4,7 +4,3 @@ ユーザーå : @LOGIN@ パスワード : @PASSWORD@ - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ja/pwconfirm.txt b/sources/inc/lang/ja/pwconfirm.txt index 98ccfcd..c53b784 100644 --- a/sources/inc/lang/ja/pwconfirm.txt +++ b/sources/inc/lang/ja/pwconfirm.txt @@ -7,7 +7,3 @@ ã“ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’è¡Œã£ãŸæœ¬äººã§ã‚ã‚Œã°ã€ä»¥ä¸‹ã®ãƒªãƒ³ã‚¯ã‹ã‚‰ä½œæ¥­ã‚’完了ã•ã›ã¦ãã ã•ã„。 @CONFIRM@ - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ja/registermail.txt b/sources/inc/lang/ja/registermail.txt index 2b272de..ad5241a 100644 --- a/sources/inc/lang/ja/registermail.txt +++ b/sources/inc/lang/ja/registermail.txt @@ -8,7 +8,3 @@ ブラウザ : @BROWSER@ IPアドレス : @IPADDRESS@ ホストå : @HOSTNAME@ - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ja/subscr_digest.txt b/sources/inc/lang/ja/subscr_digest.txt index b6c91a3..026a2fe 100644 --- a/sources/inc/lang/ja/subscr_digest.txt +++ b/sources/inc/lang/ja/subscr_digest.txt @@ -15,7 +15,3 @@ ãã®å¾Œã€ @SUBSCRIBE@ ページã¨åå‰ç©ºé–“ã®å¤‰æ›´ã«å¯¾ã™ã‚‹è³¼èª­ã‚’解除ã—ã¦ãã ã•ã„。 - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã® DokuWiki ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚Œã¾ã—ãŸï¼š -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ja/subscr_list.txt b/sources/inc/lang/ja/subscr_list.txt index 9869fb8..dbe37c7 100644 --- a/sources/inc/lang/ja/subscr_list.txt +++ b/sources/inc/lang/ja/subscr_list.txt @@ -13,7 +13,3 @@ ãã®å¾Œã€ @SUBSCRIBE@ ページã¨åå‰ç©ºé–“ã®å¤‰æ›´ã«å¯¾ã™ã‚‹è³¼èª­ã‚’解除ã—ã¦ãã ã•ã„。 - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã® DokuWiki ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚Œã¾ã—ãŸï¼š -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ja/subscr_single.txt b/sources/inc/lang/ja/subscr_single.txt index 4620f73..4dac31e 100644 --- a/sources/inc/lang/ja/subscr_single.txt +++ b/sources/inc/lang/ja/subscr_single.txt @@ -18,7 +18,3 @@ ãã®å¾Œã€ @SUBSCRIBE@ ページã¨åå‰ç©ºé–“ã®å¤‰æ›´ã«å¯¾ã™ã‚‹è³¼èª­ã‚’解除ã—ã¦ãã ã•ã„。 - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã® DokuWiki ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚Œã¾ã—ãŸï¼š -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ja/uploadmail.txt b/sources/inc/lang/ja/uploadmail.txt index 53f30db..8734c91 100644 --- a/sources/inc/lang/ja/uploadmail.txt +++ b/sources/inc/lang/ja/uploadmail.txt @@ -8,7 +8,3 @@ IPアドレス : @IPADDRESS@ サイズ : @SIZE@ MIMEタイプ : @MIME@ ユーザーå : @USER@ - --- -ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/km/lang.php b/sources/inc/lang/km/lang.php index 52e0e6a..2dbc0d3 100644 --- a/sources/inc/lang/km/lang.php +++ b/sources/inc/lang/km/lang.php @@ -198,3 +198,5 @@ $lang['i_pol2'] = 'វីគីបិទជិáž'; $lang['i_retry'] = 'ម្ážáž„ទៀáž'; //Setup VIM: ex: et ts=2 : +$lang['email_signature_text'] = 'អ៊ីមáŸáž›áž“áŸáŸ‡áž”ន្ចáŸáž¢áž–ីឌោគូវីគីនៅ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/km/password.txt b/sources/inc/lang/km/password.txt index a3495e7..8cdfcd8 100644 --- a/sources/inc/lang/km/password.txt +++ b/sources/inc/lang/km/password.txt @@ -4,7 +4,3 @@ នាមបង្រើ៖ @LOGIN@ ពាក្សសម្ងាážáŸ– @PASSWORD@ - --- -អ៊ីមáŸáž›áž“áŸáŸ‡áž”ន្ចáŸáž¢áž–ីឌោគូវីគីនៅ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/km/pwconfirm.txt b/sources/inc/lang/km/pwconfirm.txt index 7c6a3ac..34051aa 100644 --- a/sources/inc/lang/km/pwconfirm.txt +++ b/sources/inc/lang/km/pwconfirm.txt @@ -7,7 +7,3 @@ សុំអះអាងដែលសំណើនáŸáŸ‡ážŠáŸ„យទៅážáž¶áž˜ážáŸ’សែ @CONFIRM@ - --- -អ៊ីមáŸáž›áž“áŸáŸ‡áž”ង្កើážáž–ីឌក្គូវីគីនៅ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ko/lang.php b/sources/inc/lang/ko/lang.php index 5ee0df8..73b14e3 100644 --- a/sources/inc/lang/ko/lang.php +++ b/sources/inc/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hyun Kim * @author jk Lee * @author dongnak@gmail.com @@ -14,6 +14,7 @@ * @author Garam * @author Young gon Cha * @author hyeonsoft + * @author Erial */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -82,7 +83,7 @@ $lang['regsuccess2'] = 'ì‚¬ìš©ìž ê³„ì •ì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤.'; $lang['regfail'] = 'ì‚¬ìš©ìž ê³„ì •ì„ ë§Œë“¤ 수 없었습니다.'; $lang['regmailfail'] = '비밀번호를 ì´ë©”ì¼ë¡œ 보내는 ë™ì•ˆ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 관리ìžì—게 문ì˜í•´ì£¼ì„¸ìš”!'; $lang['regbadmail'] = '주어진 ì´ë©”ì¼ ì£¼ì†Œê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤ - 오류ë¼ê³  ìƒê°í•˜ë©´ 관리ìžì—게 문ì˜í•´ì£¼ì„¸ìš”'; -$lang['regbadpass'] = 'ë‘ ì£¼ì–´ì§„ 비밀번호가 같지 않습니다. 다시 입력하세요.'; +$lang['regbadpass'] = 'ë‘ ì£¼ì–´ì§„ 비밀번호가 ì¼ì¹˜í•˜ì§€ 않습니다, 다시 입력하세요.'; $lang['regpwmail'] = 'ë„쿠위키 비밀번호'; $lang['reghere'] = 'ê³„ì •ì´ ì—†ë‚˜ìš”? ê³„ì •ì„ ë“±ë¡í•˜ì„¸ìš”'; $lang['profna'] = 'ì´ ìœ„í‚¤ëŠ” 프로필 ìˆ˜ì •ì„ í•  수 없습니다'; @@ -111,7 +112,7 @@ $lang['txt_upload'] = '올릴 íŒŒì¼ ì„ íƒ:'; $lang['txt_filename'] = '올릴 íŒŒì¼ ì´ë¦„ (ì„ íƒ ì‚¬í•­):'; $lang['txt_overwrt'] = '기존 파ì¼ì— ë®ì–´ì“°ê¸°'; $lang['maxuploadsize'] = '최대 올리기 용량. 파ì¼ë‹¹ %s.'; -$lang['lockedby'] = '현재 잠겨진 사용ìž:'; +$lang['lockedby'] = '현재 ìž ê·¼ 사용ìž:'; $lang['lockexpire'] = '잠금 í•´ì œ 시간:'; $lang['js']['willexpire'] = 'ìž ì‹œ 후 편집 ìž ê¸ˆì´ í•´ì œë©ë‹ˆë‹¤.\n편집 충ëŒì„ 피하려면 미리 보기를 눌러 잠금 ì‹œê°„ì„ ë‹¤ì‹œ 설정하세요.'; $lang['js']['notsavedyet'] = '저장하지 ì•Šì€ ë°”ë€œì´ ì‚¬ë¼ì§‘니다.'; @@ -122,7 +123,7 @@ $lang['js']['mediatitle'] = 'ë§í¬ 설정'; $lang['js']['mediadisplay'] = 'ë§í¬ 유형'; $lang['js']['mediaalign'] = '배치'; $lang['js']['mediasize'] = '그림 í¬ê¸°'; -$lang['js']['mediatarget'] = 'ë§í¬ 목표'; +$lang['js']['mediatarget'] = 'ë§í¬ 타겟'; $lang['js']['mediaclose'] = '닫기'; $lang['js']['mediainsert'] = '넣기'; $lang['js']['mediadisplayimg'] = 'ê·¸ë¦¼ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.'; @@ -303,7 +304,7 @@ $lang['i_policy'] = '초기 ACL ì •ì±…'; $lang['i_pol0'] = '열린 위키 (누구나 ì½ê¸°, 쓰기, 올리기가 가능합니다)'; $lang['i_pol1'] = '공개 위키 (누구나 ì½ì„ 수 있지만, 등ë¡ëœ 사용ìžë§Œ 쓰기와 올리기가 가능합니다)'; $lang['i_pol2'] = '닫힌 위키 (등ë¡ëœ 사용ìžë§Œ ì½ê¸°, 쓰기, 올리기가 가능합니다)'; -$lang['i_allowreg'] = 'ì‚¬ìš©ìž ìžì‹ ì´ 등ë¡í•  수 있ìŒ'; +$lang['i_allowreg'] = 'ì‚¬ìš©ìž ìžì‹ ì´ 등ë¡í•  수 있ë„ë¡ í•˜ê¸°'; $lang['i_retry'] = '다시 ì‹œë„'; $lang['i_license'] = 'ë‚´ìš©ì„ ë°°í¬í•˜ê¸° 위한 ë¼ì´ì„ ìŠ¤ë¥¼ ì„ íƒí•˜ì„¸ìš”:'; $lang['i_license_none'] = 'ë¼ì´ì„ ìŠ¤ 정보를 보여주지 않습니다'; @@ -348,3 +349,4 @@ $lang['plainhtml'] = 'ì¼ë°˜ HTML'; $lang['wikimarkup'] = '위키 문법'; $lang['page_nonexist_rev'] = '문서가 %sì— ì¡´ìž¬í•˜ì§€ 않았습니다. ê·¸ 뒤로 %sì— ë§Œë“¤ì–´ì¡ŒìŠµë‹ˆë‹¤.'; $lang['unable_to_parse_date'] = '"%s" 변수ì—ì„œ 구문 분ì„í•  수 없습니다.'; +$lang['email_signature_text'] = 'ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤'; diff --git a/sources/inc/lang/ko/mailtext.txt b/sources/inc/lang/ko/mailtext.txt index c97f446..2b22258 100644 --- a/sources/inc/lang/ko/mailtext.txt +++ b/sources/inc/lang/ko/mailtext.txt @@ -10,7 +10,3 @@ IP 주소: @IPADDRESS@ 사용ìž: @USER@ @DIFF@ - - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/mailwrap.html b/sources/inc/lang/ko/mailwrap.html index ef061f1..7df0cdc 100644 --- a/sources/inc/lang/ko/mailwrap.html +++ b/sources/inc/lang/ko/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤. +@EMAILSIGNATURE@ diff --git a/sources/inc/lang/ko/password.txt b/sources/inc/lang/ko/password.txt index a60801a..1bd9246 100644 --- a/sources/inc/lang/ko/password.txt +++ b/sources/inc/lang/ko/password.txt @@ -4,6 +4,3 @@ 로그ì¸: @LOGIN@ 비밀번호: @PASSWORD@ - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/pwconfirm.txt b/sources/inc/lang/ko/pwconfirm.txt index d820664..dfe32a0 100644 --- a/sources/inc/lang/ko/pwconfirm.txt +++ b/sources/inc/lang/ko/pwconfirm.txt @@ -8,6 +8,3 @@ ì •ë§ë¡œ ë‹¹ì‹ ì´ ìš”ì²­ì„ í•´ì„œ 보내졌는지 확ì¸í•˜ë ¤ë©´ ë‹¤ìŒ ë§í¬ë¥¼ 사용하세요. @CONFIRM@ - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/registermail.txt b/sources/inc/lang/ko/registermail.txt index afa6668..adc5a08 100644 --- a/sources/inc/lang/ko/registermail.txt +++ b/sources/inc/lang/ko/registermail.txt @@ -8,6 +8,3 @@ 브ë¼ìš°ì €: @BROWSER@ IP 주소: @IPADDRESS@ 호스트 ì´ë¦„: @HOSTNAME@ - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/subscr_digest.txt b/sources/inc/lang/ko/subscr_digest.txt index d1f2d4b..bdb46ad 100644 --- a/sources/inc/lang/ko/subscr_digest.txt +++ b/sources/inc/lang/ko/subscr_digest.txt @@ -13,6 +13,3 @@ 문서 ì•Œë¦¼ì„ ì·¨ì†Œí•˜ë ¤ë©´, @DOKUWIKIURL@ì— ë¡œê·¸ì¸í•œ ë’¤ @SUBSCRIBE@ 문서를 방문해 문서나 ì´ë¦„ê³µê°„ì˜ êµ¬ë…ì„ ì·¨ì†Œí•˜ì„¸ìš”. - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/subscr_list.txt b/sources/inc/lang/ko/subscr_list.txt index 95133bb..69a2d53 100644 --- a/sources/inc/lang/ko/subscr_list.txt +++ b/sources/inc/lang/ko/subscr_list.txt @@ -9,6 +9,3 @@ ë¬¸ì„œì˜ ì•Œë¦¼ì„ ì·¨ì†Œí•˜ë ¤ë©´, @DOKUWIKIURL@ì— ë¡œê·¸ì¸í•œ ë’¤ @SUBSCRIBE@ 문서를 방문해 문서나 ì´ë¦„ê³µê°„ì˜ êµ¬ë…ì„ ì·¨ì†Œí•˜ì„¸ìš”. - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/subscr_single.txt b/sources/inc/lang/ko/subscr_single.txt index 1c7e551..425d0d9 100644 --- a/sources/inc/lang/ko/subscr_single.txt +++ b/sources/inc/lang/ko/subscr_single.txt @@ -15,6 +15,3 @@ ë¬¸ì„œì˜ ì•Œë¦¼ì„ ì·¨ì†Œí•˜ë ¤ë©´, @DOKUWIKIURL@ì— ë¡œê·¸ì¸í•œ ë’¤ @SUBSCRIBE@ 문서를 방문해 문서나 ì´ë¦„ê³µê°„ì˜ êµ¬ë…ì„ ì·¨ì†Œí•˜ì„¸ìš”. - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/ko/uploadmail.txt b/sources/inc/lang/ko/uploadmail.txt index 430a843..1b6e55c 100644 --- a/sources/inc/lang/ko/uploadmail.txt +++ b/sources/inc/lang/ko/uploadmail.txt @@ -9,6 +9,3 @@ IP 주소: @IPADDRESS@ í¬ê¸°: @SIZE@ MIME 유형: @MIME@ 사용ìž: @USER@ - --- -ì´ ë©”ì¼ì€ @DOKUWIKIURL@ì—ì„œ ë„쿠위키가 ìƒì„±í–ˆìŠµë‹ˆë‹¤ \ No newline at end of file diff --git a/sources/inc/lang/la/lang.php b/sources/inc/lang/la/lang.php index d6b8285..5f5f59e 100644 --- a/sources/inc/lang/la/lang.php +++ b/sources/inc/lang/la/lang.php @@ -257,3 +257,5 @@ $lang['hours'] = 'a horis %d'; $lang['minutes'] = 'a minutis %d'; $lang['seconds'] = 'a secundis %d'; $lang['wordblock'] = 'Mutationes non seruantur, eo quod mala uerba contenit'; +$lang['email_signature_text'] = 'Hic cursus generatus a +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/la/mailtext.txt b/sources/inc/lang/la/mailtext.txt index 2d2504c..8348378 100644 --- a/sources/inc/lang/la/mailtext.txt +++ b/sources/inc/lang/la/mailtext.txt @@ -9,8 +9,3 @@ Summa recensere: @SUMMARY@ Sodalis : @USER@ @DIFF@ - - --- -Hic cursus generatus a(b) -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/password.txt b/sources/inc/lang/la/password.txt index f49f4b8..0557357 100644 --- a/sources/inc/lang/la/password.txt +++ b/sources/inc/lang/la/password.txt @@ -4,7 +4,3 @@ Hae res @TITLE@, i ad paginam: @DOKUWIKIURL@ Sodalis nomen : @LOGIN@ Tessera : @PASSWORD@ - --- -Hic cursus generatus a(b) -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/pwconfirm.txt b/sources/inc/lang/la/pwconfirm.txt index 32e351a..ade0a1c 100644 --- a/sources/inc/lang/la/pwconfirm.txt +++ b/sources/inc/lang/la/pwconfirm.txt @@ -8,7 +8,3 @@ Si nouam tesseram non petiuisti, hoc nuntium ignorat. Ut hoc nuntium petiuisti, premendo hunc nexum confirmas. @CONFIRM@ - --- -Hic cursus generatus a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/registermail.txt b/sources/inc/lang/la/registermail.txt index 7390195..1f28659 100644 --- a/sources/inc/lang/la/registermail.txt +++ b/sources/inc/lang/la/registermail.txt @@ -8,7 +8,3 @@ Dies : @DATE@ Machina interretis : @BROWSER@ IP-numerus : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Hic cursus generatus a -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/subscr_digest.txt b/sources/inc/lang/la/subscr_digest.txt index 32d378a..d4ca79a 100644 --- a/sources/inc/lang/la/subscr_digest.txt +++ b/sources/inc/lang/la/subscr_digest.txt @@ -14,7 +14,3 @@ Ut paginae adnotationes deleas, in uicem ineas in @DOKUWIKIURL@, deinde uideas @SUBSCRIBE@ et paginarum generum optiones mutes. - --- -Hic cursus a uicis generatus -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/subscr_list.txt b/sources/inc/lang/la/subscr_list.txt index e6ff8d8..3921ff6 100644 --- a/sources/inc/lang/la/subscr_list.txt +++ b/sources/inc/lang/la/subscr_list.txt @@ -11,7 +11,3 @@ Ut adnotationes deleas, preme hic @DOKUWIKIURL@ then visit @SUBSCRIBE@ et paginarum et\aut generum mutationes tollis. - --- -Hic cursus generatus a(b) -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/subscr_single.txt b/sources/inc/lang/la/subscr_single.txt index 1428501..4bfd7ef 100644 --- a/sources/inc/lang/la/subscr_single.txt +++ b/sources/inc/lang/la/subscr_single.txt @@ -17,7 +17,3 @@ Ut paginae adnotationes deleas, in uicem ineas in @DOKUWIKIURL@, deinde uideas @SUBSCRIBE@ et paginarum et\aut generum optiones mutasa. - --- -Hic cursus a uicis generatus -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/la/uploadmail.txt b/sources/inc/lang/la/uploadmail.txt index 0442979..329bf31 100644 --- a/sources/inc/lang/la/uploadmail.txt +++ b/sources/inc/lang/la/uploadmail.txt @@ -8,7 +8,3 @@ Hospes situs : @HOSTNAME@ Pondus : @SIZE@ MIME Genus : @MIME@ Sodalis : @USER@ - --- -Hic cursu generatus a(b) -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lb/lang.php b/sources/inc/lang/lb/lang.php index a48ab4e..f15e878 100644 --- a/sources/inc/lang/lb/lang.php +++ b/sources/inc/lang/lb/lang.php @@ -192,3 +192,5 @@ $lang['days'] = 'virun %d Deeg'; $lang['hours'] = 'virun %d Stonnen'; $lang['minutes'] = 'virun %d Minutten'; $lang['seconds'] = 'virun %d Sekonnen'; +$lang['email_signature_text'] = 'Dës Mail gouf generéiert vun DokuWiki op +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/lb/mailtext.txt b/sources/inc/lang/lb/mailtext.txt index 520cd84..59c46e0 100644 --- a/sources/inc/lang/lb/mailtext.txt +++ b/sources/inc/lang/lb/mailtext.txt @@ -10,8 +10,3 @@ Zesummefaassung: @SUMMARY@ Benotzer : @USER@ @DIFF@ - - --- -Dës Mail gouf generéiert vum DokuWiki op -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lb/password.txt b/sources/inc/lang/lb/password.txt index bd8062e..1d05832 100644 --- a/sources/inc/lang/lb/password.txt +++ b/sources/inc/lang/lb/password.txt @@ -4,7 +4,3 @@ Hei sinn deng Benotzerdaten fir @TITLE@ op @DOKUWIKIURL@ Benotzernumm : @LOGIN@ Passwuert : @PASSWORD@ - --- -Dës Mail gouf generéiert vun DokuWiki op -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lb/pwconfirm.txt b/sources/inc/lang/lb/pwconfirm.txt index 1124657..efb0406 100644 --- a/sources/inc/lang/lb/pwconfirm.txt +++ b/sources/inc/lang/lb/pwconfirm.txt @@ -1,6 +1,6 @@ Moien @FULLNAME@! -Iergendeen huet e neit Passwuert fir däin @TITLE@ +Iergendeen huet e neit Passwuert fir däin @TITLE@ login op @DOKUWIKIURL@ gefrot Wanns de kee nei Passwuert gefrot hues, dann ignoréier dës Mail. @@ -9,7 +9,3 @@ Fir ze konfirméieren dass du wierklech en neit Passwuert gefrot hues, klick op folgende Link. @CONFIRM@ - --- -Des Mail gouf generéiert vun DokuWiki op -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lb/registermail.txt b/sources/inc/lang/lb/registermail.txt index 0f4fee8..5240dee 100644 --- a/sources/inc/lang/lb/registermail.txt +++ b/sources/inc/lang/lb/registermail.txt @@ -8,7 +8,3 @@ Datum : @DATE@ Browser : @BROWSER@ IP-Adress : @IPADDRESS@ Hostnumm : @HOSTNAME@ - --- -Des Mail gouf generéiert vun DokuWiki op -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lb/uploadmail.txt b/sources/inc/lang/lb/uploadmail.txt index 3c2587c..c4b9e8d 100644 --- a/sources/inc/lang/lb/uploadmail.txt +++ b/sources/inc/lang/lb/uploadmail.txt @@ -8,7 +8,3 @@ Hostnumm : @HOSTNAME@ Gréisst : @SIZE@ MIME Typ : @MIME@ Benotzer : @USER@ - --- -Dës Mail gouf generéiert vun DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/lt/lang.php b/sources/inc/lang/lt/lang.php index a9eb052..dcf0985 100644 --- a/sources/inc/lang/lt/lang.php +++ b/sources/inc/lang/lt/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Linas Valiukas * @author Edmondas Girkantas * @author ArÅ«nas VaitekÅ«nas @@ -180,3 +180,5 @@ $lang['i_wikiname'] = 'Wiki vardas'; $lang['i_enableacl'] = 'Ä®jungti ACL (rekomenduojama)'; $lang['i_superuser'] = 'Supervartotojas'; $lang['i_problems'] = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. TÄ™sti negalima, kol nebus paÅ¡alintos priežastys.'; +$lang['email_signature_text'] = 'Å is laiÅ¡kas buvo sugeneruotas DokuWiki +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/lt/mailtext.txt b/sources/inc/lang/lt/mailtext.txt index 63b2f59..2abd3ab 100644 --- a/sources/inc/lang/lt/mailtext.txt +++ b/sources/inc/lang/lt/mailtext.txt @@ -12,7 +12,3 @@ Vartotojas : @USER@ Pakeitimo diff'as: @DIFF@ - - --- -Å is laiÅ¡kas buvo sugeneruotas DokuWiki (@DOKUWIKIURL@). diff --git a/sources/inc/lang/lt/password.txt b/sources/inc/lang/lt/password.txt index 8c65cf8..0bcc8e7 100644 --- a/sources/inc/lang/lt/password.txt +++ b/sources/inc/lang/lt/password.txt @@ -4,6 +4,3 @@ Labas, @FULLNAME@! Prisijungimo vardas: @LOGIN@ Slaptažodis: @PASSWORD@ - --- -Å is laiÅ¡kas sugeneruotas DokuWiki sistemos (@DOKUWIKIURL@). diff --git a/sources/inc/lang/lv/lang.php b/sources/inc/lang/lv/lang.php index cb7091e..88f8e5f 100644 --- a/sources/inc/lang/lv/lang.php +++ b/sources/inc/lang/lv/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Aivars MiÅ¡ka */ $lang['encoding'] = 'utf-8'; @@ -333,3 +333,5 @@ $lang['currentns'] = 'PaÅ¡reizÄ“jÄ sadaļa'; $lang['searchresult'] = 'MeklÄ“Å¡anas rezultÄti'; $lang['plainhtml'] = 'TÄ«rs HTML'; $lang['wikimarkup'] = 'Viki iezÄ«mÄ“Å¡ana valoda'; +$lang['email_signature_text'] = 'VÄ“stuli nosÅ«tÄ«jusi DokuWiki programma no +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/lv/mailtext.txt b/sources/inc/lang/lv/mailtext.txt index cd4a5d6..8316003 100644 --- a/sources/inc/lang/lv/mailtext.txt +++ b/sources/inc/lang/lv/mailtext.txt @@ -10,9 +10,3 @@ AnotÄcija : @SUMMARY@ LietotÄjs : @USER@ @DIFF@ - - --- -VÄ“stuli nosÅ«tÄ«jusi DokuWiki programma no -@DOKUWIKIURL@ datora - diff --git a/sources/inc/lang/lv/mailwrap.html b/sources/inc/lang/lv/mailwrap.html index 34b7239..d257190 100644 --- a/sources/inc/lang/lv/mailwrap.html +++ b/sources/inc/lang/lv/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Å o vÄ“stuli nosÅ«tÄ«jusi programma DokuWiki no vietnes @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/lv/password.txt b/sources/inc/lang/lv/password.txt index be5e7e2..7cd7d8b 100644 --- a/sources/inc/lang/lv/password.txt +++ b/sources/inc/lang/lv/password.txt @@ -4,6 +4,3 @@ Tavi dati @TITLE@ lapÄm uz servera @DOKUWIKIURL@ ir LietotÄjvÄrds: @LOGIN@ Parole: @PASSWORD@ - --- -Å o dokumentu izveidojusi DokuWiki programma uz servera @DOKUWIKIURL@ diff --git a/sources/inc/lang/lv/pwconfirm.txt b/sources/inc/lang/lv/pwconfirm.txt index 308ca29..62c8bed 100644 --- a/sources/inc/lang/lv/pwconfirm.txt +++ b/sources/inc/lang/lv/pwconfirm.txt @@ -8,7 +8,3 @@ Ja paroli neesi prasÄ«jis, ignorÄ“ Å¡o vÄ“stuli. Lai apstiprinÄtu, ka esi paroli pieprasÄ«jis lieto norÄdÄ«to saiti. @CONFIRM@ - --- -Å o vÄ“stuli Ä£enerÄ“jusi DokuWiki no -@DOKUWIKIURL \ No newline at end of file diff --git a/sources/inc/lang/lv/registermail.txt b/sources/inc/lang/lv/registermail.txt index 50fd8a9..2a2084c 100644 --- a/sources/inc/lang/lv/registermail.txt +++ b/sources/inc/lang/lv/registermail.txt @@ -8,7 +8,3 @@ Datums : @DATE@ PÄrlÅ«ks : @BROWSER@ IP aderese : @IPADDRESS@ Datora vÄrds: @HOSTNAME@ - --- -Å o vÄ“stuli Ä£enerÄ“jis DokuWiki no -@DOKUWIKIURL \ No newline at end of file diff --git a/sources/inc/lang/lv/subscr_digest.txt b/sources/inc/lang/lv/subscr_digest.txt index 9878405..fb24a31 100644 --- a/sources/inc/lang/lv/subscr_digest.txt +++ b/sources/inc/lang/lv/subscr_digest.txt @@ -9,11 +9,7 @@ Labdien! VecÄ versija: @OLDPAGE@ JaunÄ versija: @NEWPAGE@ -Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties -@DOKUWIKIURL@, apmeklÄ“jiet +Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties +@DOKUWIKIURL@, apmeklÄ“jiet @SUBSCRIBE@ un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem . - --- -Å o vÄ“stuli izveidoja DokuWiki no -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lv/subscr_list.txt b/sources/inc/lang/lv/subscr_list.txt index 986b378..9c0ecf8 100644 --- a/sources/inc/lang/lv/subscr_list.txt +++ b/sources/inc/lang/lv/subscr_list.txt @@ -6,11 +6,7 @@ Labdien! @DIFF@ -------------------------------------------------------- -Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties -@DOKUWIKIURL@, apmeklÄ“jiet +Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties +@DOKUWIKIURL@, apmeklÄ“jiet @SUBSCRIBE@ un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem . - --- -Å o vÄ“stuli izveidoja DokuWiki no -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lv/subscr_single.txt b/sources/inc/lang/lv/subscr_single.txt index ca61778..b5b05d3 100644 --- a/sources/inc/lang/lv/subscr_single.txt +++ b/sources/inc/lang/lv/subscr_single.txt @@ -13,11 +13,7 @@ VecÄ versija: @OLDPAGE@ JaunÄ versija: @NEWPAGE@ -Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties -@DOKUWIKIURL@, apmeklÄ“jiet +Lai atceltu izmaiņu paziņoÅ¡anu, ielogojieties +@DOKUWIKIURL@, apmeklÄ“jiet @SUBSCRIBE@ un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem . - --- -Å o vÄ“stuli izveidoja DokuWiki no -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/lv/uploadmail.txt b/sources/inc/lang/lv/uploadmail.txt index 5975d5b..8d664d6 100644 --- a/sources/inc/lang/lv/uploadmail.txt +++ b/sources/inc/lang/lv/uploadmail.txt @@ -8,7 +8,3 @@ Datora vÄrds : @HOSTNAME@ IzmÄ“rs : @SIZE@ MIME tips : @MIME@ LietotÄjs : @USER@ - --- -VÄ“stuli nosÅ«tÄ«jusi DokuWiki programma no -@DOKUWIKIURL@ datora. \ No newline at end of file diff --git a/sources/inc/lang/mg/lang.php b/sources/inc/lang/mg/lang.php index 5b406ed..240133f 100644 --- a/sources/inc/lang/mg/lang.php +++ b/sources/inc/lang/mg/lang.php @@ -116,3 +116,5 @@ $lang['js']['del_confirm']= 'Hofafana ilay andalana?'; $lang['searchcreatepage'] = "Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''."; //Setup VIM: ex: et ts=2 : +$lang['email_signature_text'] = 'Ity imailaka ity dia navoakan\'ny wiki tao amin\'ny +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/mg/mailtext.txt b/sources/inc/lang/mg/mailtext.txt index ca91934..c772686 100644 --- a/sources/inc/lang/mg/mailtext.txt +++ b/sources/inc/lang/mg/mailtext.txt @@ -10,8 +10,3 @@ Fiovana : @SUMMARY@ Novain'i : @USER@ @DIFF@ - - --- -Ity imailaka ity dia navoakan'ny wiki tao amin'ny -@DOKUWIKIURL@ diff --git a/sources/inc/lang/mg/password.txt b/sources/inc/lang/mg/password.txt index 000bd91..4ed2858 100644 --- a/sources/inc/lang/mg/password.txt +++ b/sources/inc/lang/mg/password.txt @@ -4,8 +4,3 @@ Ireto ny momba anao ho an'ny @TITLE@ ao amin'ny @DOKUWIKIURL@ Anarana : @LOGIN@ Alahidy : @PASSWORD@ - --- -Ity imailaka ity dia navoakan'ny wiki tao amin'ny -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/ml/jquery.ui.datepicker.js b/sources/inc/lang/ml/jquery.ui.datepicker.js new file mode 100644 index 0000000..ffcc15f --- /dev/null +++ b/sources/inc/lang/ml/jquery.ui.datepicker.js @@ -0,0 +1,37 @@ +/* Malayalam (UTF-8) initialisation for the jQuery UI date picker plugin. */ +/* Written by Saji Nediyanchath (saji89@gmail.com). */ +(function( factory ) { + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define([ "../datepicker" ], factory ); + } else { + + // Browser globals + factory( jQuery.datepicker ); + } +}(function( datepicker ) { + +datepicker.regional['ml'] = { + closeText: 'ശരി', + prevText: 'à´®àµà´¨àµà´¨à´¤àµà´¤àµ†', + nextText: 'à´…à´Ÿàµà´¤àµà´¤à´¤àµ ', + currentText: 'ഇനàµà´¨àµ', + monthNames: ['ജനàµà´µà´°à´¿','ഫെബàµà´°àµà´µà´°à´¿','മാരàµâ€à´šàµà´šàµ','à´à´ªàµà´°à´¿à´²àµâ€','മേയàµ','ജൂണàµâ€', + 'ജൂലൈ','ആഗസàµà´±àµà´±àµ','സെപàµà´±àµà´±à´‚ബരàµâ€','à´’à´•àµà´Ÿàµ‹à´¬à´°àµâ€','നവംബരàµâ€','ഡിസംബരàµâ€'], + monthNamesShort: ['ജനàµ', 'ഫെബàµ', 'മാരàµâ€', 'à´à´ªàµà´°à´¿', 'മേയàµ', 'ജൂണàµâ€', + 'ജൂലാ', 'ആഗ', 'സെപàµ', 'à´’à´•àµà´Ÿàµ‹', 'നവം', 'à´¡à´¿à´¸'], + dayNames: ['ഞായരàµâ€', 'തിങàµà´•à´³àµâ€', 'ചൊവàµà´µ', 'à´¬àµà´§à´¨àµâ€', 'à´µàµà´¯à´¾à´´à´‚', 'വെളàµà´³à´¿', 'ശനി'], + dayNamesShort: ['ഞായ', 'തിങàµà´•', 'ചൊവàµà´µ', 'à´¬àµà´§', 'à´µàµà´¯à´¾à´´à´‚', 'വെളàµà´³à´¿', 'ശനി'], + dayNamesMin: ['à´žà´¾','തി','ചൊ','à´¬àµ','à´µàµà´¯à´¾','വെ','à´¶'], + weekHeader: 'à´†', + dateFormat: 'dd/mm/yy', + firstDay: 1, + isRTL: false, + showMonthAfterYear: false, + yearSuffix: ''}; +datepicker.setDefaults(datepicker.regional['ml']); + +return datepicker.regional['ml']; + +})); diff --git a/sources/inc/lang/mr/lang.php b/sources/inc/lang/mr/lang.php index 62274e1..4b6d1bd 100644 --- a/sources/inc/lang/mr/lang.php +++ b/sources/inc/lang/mr/lang.php @@ -262,3 +262,5 @@ $lang['i_pol1'] = 'सारà¥à¤µà¤œà¤¨à¤¿à¤• विकी ( स $lang['i_pol2'] = 'बंदिसà¥à¤¤ विकी ( वाचन , लेखन व अपलोडची परवानगी फकà¥à¤¤ नोंदणीकृत सदसà¥à¤¯à¤¾à¤‚ना ) '; $lang['i_retry'] = 'पà¥à¤¨à¥à¤¹à¤¾ पà¥à¤°à¤¯à¤¤à¥à¤¨'; $lang['recent_global'] = 'तà¥à¤®à¥à¤¹à¥€ सधà¥à¤¯à¤¾ %s या नेमसà¥à¤ªà¥‡à¤¸ मधील बदल पाहात आहात.तà¥à¤®à¥à¤¹à¥€ पूरà¥à¤£ विकी मधले बदल सà¥à¤¦à¥à¤§à¤¾ पाहू शकता.'; +$lang['email_signature_text'] = 'हा ईमेल, येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/mr/mailtext.txt b/sources/inc/lang/mr/mailtext.txt index 18fa238..826ab0c 100644 --- a/sources/inc/lang/mr/mailtext.txt +++ b/sources/inc/lang/mr/mailtext.txt @@ -10,6 +10,3 @@ IP-पतà¥à¤¤à¤¾ : @IPADDRESS@ सदसà¥à¤¯ : @USER@ @DIFF@ - --- -हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे. \ No newline at end of file diff --git a/sources/inc/lang/mr/password.txt b/sources/inc/lang/mr/password.txt index 090c01d..a83f97e 100644 --- a/sources/inc/lang/mr/password.txt +++ b/sources/inc/lang/mr/password.txt @@ -4,6 +4,3 @@ लॉगिन : @LOGIN@ पासवरà¥à¤¡ : @PASSWORD@ - --- -हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे. \ No newline at end of file diff --git a/sources/inc/lang/mr/pwconfirm.txt b/sources/inc/lang/mr/pwconfirm.txt index ec0b707..8c03f17 100644 --- a/sources/inc/lang/mr/pwconfirm.txt +++ b/sources/inc/lang/mr/pwconfirm.txt @@ -6,6 +6,3 @@ जर नकà¥à¤•à¥€ तà¥à¤®à¥à¤¹à¥€à¤š हा पासवरà¥à¤¡ मागवला असेल तर खालील लिंकवर कà¥à¤²à¤¿à¤• करून ते नकà¥à¤•à¥€ करा. @CONFIRM@ - --- -हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे. \ No newline at end of file diff --git a/sources/inc/lang/mr/registermail.txt b/sources/inc/lang/mr/registermail.txt index a6fea4d..ed3b92b 100644 --- a/sources/inc/lang/mr/registermail.txt +++ b/sources/inc/lang/mr/registermail.txt @@ -8,6 +8,3 @@ बà¥à¤°à¤¾à¤‰à¤œà¤° : @BROWSER@ IP-पतà¥à¤¤à¤¾ : @IPADDRESS@ होसà¥à¤Ÿ नाम : @HOSTNAME@ - --- -हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे. \ No newline at end of file diff --git a/sources/inc/lang/mr/showrev.txt b/sources/inc/lang/mr/showrev.txt index aeaeee5..dc05830 100644 --- a/sources/inc/lang/mr/showrev.txt +++ b/sources/inc/lang/mr/showrev.txt @@ -1,2 +1,2 @@ ** ही हà¥à¤¯à¤¾ दसà¥à¤¤à¤¾à¤µà¥‡à¤œà¤šà¥€ जà¥à¤¨à¥€ आवृतà¥à¤¤à¥€ आहे. ** --- \ No newline at end of file +---- \ No newline at end of file diff --git a/sources/inc/lang/mr/uploadmail.txt b/sources/inc/lang/mr/uploadmail.txt index 66e7365..1aea97c 100644 --- a/sources/inc/lang/mr/uploadmail.txt +++ b/sources/inc/lang/mr/uploadmail.txt @@ -8,6 +8,3 @@ IP-पतà¥à¤¤à¤¾ : @IPADDRESS@ साइज़ : @SIZE@ MIME टाइप : @MIME@ सदसà¥à¤¯ : @USER@ - --- -हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे. \ No newline at end of file diff --git a/sources/inc/lang/ne/lang.php b/sources/inc/lang/ne/lang.php index 46074d0..fae403f 100644 --- a/sources/inc/lang/ne/lang.php +++ b/sources/inc/lang/ne/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Saroj Kumar Dhakal * @author Saroj Kumar Dhakal * @author सरोज ढकाल @@ -201,3 +201,5 @@ $lang['i_pol1'] = 'Public विकि (पठन सवैका $lang['i_pol2'] = 'बनà¥à¤¦ विकि (पठन , लेखन, अपलोड ) दरà¥à¤¤à¤¾ भà¤à¤•à¤¾ पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾à¤•à¤¾ लागि मातà¥à¤° ।'; $lang['i_retry'] = 'पà¥à¤¨: पà¥à¤°à¤¯à¤¾à¤¸ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ '; $lang['recent_global'] = 'तपाई अहिले %s नेमसà¥à¤ªà¥‡à¤¸ भितà¥à¤° भà¤à¤•à¤¾ परिवरà¥à¤¤à¤¨ हेरà¥à¤¦à¥ˆà¤¹à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›à¥¤ तपाई पà¥à¤°à¥ˆ विकिमा भà¤à¤•à¥‹ परिवरà¥à¤¤à¤¨ हेरà¥à¤¨ सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›.'; +$lang['email_signature_text'] = 'यो पतà¥à¤° DokuWiki ले, मा तयार पारेको हो । +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/ne/pwconfirm.txt b/sources/inc/lang/ne/pwconfirm.txt index 1d8cd9f..0552cc5 100644 --- a/sources/inc/lang/ne/pwconfirm.txt +++ b/sources/inc/lang/ne/pwconfirm.txt @@ -7,6 +7,3 @@ कृपया तपाईको माग साचà¥à¤šà¥ˆ पठाइà¤à¤•à¥‹ थियो भनà¥à¤¨à¥‡ यकिन गराउनाको लागि तलाको लिङà¥à¤•à¤®à¤¾ पà¥à¤°à¤¯à¥‹à¤— गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ । @CONFIRM@ - --- -यो पतà¥à¤° DokuWiki ले @DOKUWIKIURL@ मा तयार पारेको हो । diff --git a/sources/inc/lang/ne/uploadmail.txt b/sources/inc/lang/ne/uploadmail.txt index 74ea464..a023797 100644 --- a/sources/inc/lang/ne/uploadmail.txt +++ b/sources/inc/lang/ne/uploadmail.txt @@ -7,7 +7,3 @@ आकार : @SIZE@ MIME पà¥à¤°à¤•à¤¾à¤° : @MIME@ पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ : @USER@ - --- -यो पतà¥à¤° DokuWiki ले -@DOKUWIKIURL@मा सà¥à¤µà¤¤: तयार पारेको हो। \ No newline at end of file diff --git a/sources/inc/lang/nl/lang.php b/sources/inc/lang/nl/lang.php index a2f2a64..eb7ef09 100644 --- a/sources/inc/lang/nl/lang.php +++ b/sources/inc/lang/nl/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author François Kooman * @author Jack van Klaren * @author Riny Heijdendael @@ -29,6 +29,7 @@ * @author Hugo Smet * @author Mark C. Prins * @author hugo smet + * @author Wesley de Weerd */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -360,5 +361,7 @@ $lang['currentns'] = 'Huidige namespace'; $lang['searchresult'] = 'Zoekresultaat'; $lang['plainhtml'] = 'Alleen HTML'; $lang['wikimarkup'] = 'Wiki Opmaak'; +$lang['email_signature_text'] = 'Deze mail werd gegenereerd door DokuWiki op +@DOKUWIKIURL@'; $lang['page_nonexist_rev'] = 'Pagina bestaat niet bij %s. Het is vervolgens aangemaakt bij %s.'; $lang['unable_to_parse_date'] = 'Begrijp het niet bij parameter "%s".'; diff --git a/sources/inc/lang/nl/mailtext.txt b/sources/inc/lang/nl/mailtext.txt index d12093a..32f6f63 100644 --- a/sources/inc/lang/nl/mailtext.txt +++ b/sources/inc/lang/nl/mailtext.txt @@ -10,8 +10,3 @@ Samenvatting : @SUMMARY@ User : @USER@ @DIFF@ - - --- -Deze mail werd gegenereerd door DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/nl/mailwrap.html b/sources/inc/lang/nl/mailwrap.html index 2ffe19a..f15ec06 100644 --- a/sources/inc/lang/nl/mailwrap.html +++ b/sources/inc/lang/nl/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
- Deze mail is gegenereerd door DokuWiki op @DOKUWIKIURL@. + @EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/nl/password.txt b/sources/inc/lang/nl/password.txt index 5041322..94a180a 100644 --- a/sources/inc/lang/nl/password.txt +++ b/sources/inc/lang/nl/password.txt @@ -4,7 +4,3 @@ Hier is je gebruikersinformatie voor @TITLE@ op @DOKUWIKIURL@ Gebruikersnaam: @LOGIN@ Wachtwoord : @PASSWORD@ - --- -Deze mail werd gegenereerd door DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/nl/pwconfirm.txt b/sources/inc/lang/nl/pwconfirm.txt index ab72ae7..8b900b1 100644 --- a/sources/inc/lang/nl/pwconfirm.txt +++ b/sources/inc/lang/nl/pwconfirm.txt @@ -7,7 +7,3 @@ Als je geen nieuw wachtwoord hebt aangevraagd kun je deze e-mail negeren. Volg de volgende link om te bevestigen dat je inderdaad een nieuw wachtwoord wilt: @CONFIRM@ - --- -Deze mail werd gegenereerd door DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/nl/registermail.txt b/sources/inc/lang/nl/registermail.txt index 5efb251..8d23efd 100644 --- a/sources/inc/lang/nl/registermail.txt +++ b/sources/inc/lang/nl/registermail.txt @@ -8,7 +8,3 @@ Datum : @DATE@ Browser : @BROWSER@ IP-adres : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Dit bericht is gegenereerd door DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/nl/subscr_digest.txt b/sources/inc/lang/nl/subscr_digest.txt index 9f0fe87..6a904a7 100644 --- a/sources/inc/lang/nl/subscr_digest.txt +++ b/sources/inc/lang/nl/subscr_digest.txt @@ -10,6 +10,3 @@ Vorige revisie: @OLDPAGE@ Nieuwe revisie: @NEWPAGE@ Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op de wiki op @DOKUWIKIURL@ en bezoekt u @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven. - --- -Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/nl/subscr_list.txt b/sources/inc/lang/nl/subscr_list.txt index 7cde712..b77b075 100644 --- a/sources/inc/lang/nl/subscr_list.txt +++ b/sources/inc/lang/nl/subscr_list.txt @@ -7,6 +7,3 @@ Pagina's in de namespace @PAGE@ van de @TITLE@ wiki zijn veranderd. Hier zijn de -------------------------------------------------------- Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven. - --- -Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/nl/subscr_single.txt b/sources/inc/lang/nl/subscr_single.txt index 1cd0c85..fe761f0 100644 --- a/sources/inc/lang/nl/subscr_single.txt +++ b/sources/inc/lang/nl/subscr_single.txt @@ -1,6 +1,6 @@ Halllo! -De pagina @PAGE@ in de @TITLE@ wiki is veranderd. +De pagina @PAGE@ in de @TITLE@ wiki is veranderd. Hier zijn de wijzigingen: -------------------------------------------------------- @@ -14,6 +14,3 @@ Vorige revisie: @OLDPAGE@ Nieuwe revisie: @NEWPAGE@ Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @NEWPAGE@. Vervolgens kunt u "Inschrijvingen wijzigen" gebruiken om inschrijvingen te stoppen. - --- -Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/nl/uploadmail.txt b/sources/inc/lang/nl/uploadmail.txt index 59920ae..85a4b95 100644 --- a/sources/inc/lang/nl/uploadmail.txt +++ b/sources/inc/lang/nl/uploadmail.txt @@ -9,7 +9,3 @@ Hostname : @HOSTNAME@ Grootte : @SIZE@ MIME type: @MIME@ Gebruiker: @USER@ - --- -Dit bericht is gegenereerd door DokuWiki op -@DOKUWIKIURL@ diff --git a/sources/inc/lang/no/lang.php b/sources/inc/lang/no/lang.php index 9388a0a..8379923 100644 --- a/sources/inc/lang/no/lang.php +++ b/sources/inc/lang/no/lang.php @@ -358,4 +358,6 @@ $lang['searchresult'] = 'Søk i resultat'; $lang['plainhtml'] = 'Enkel HTML'; $lang['wikimarkup'] = 'wiki-format'; $lang['page_nonexist_rev'] = 'Finnes ingen side på %s. Den er derfor laget på %s'; +$lang['email_signature_text'] = 'Denne meldingen ble laget av DokuWiki +@DOKUWIKIURL@'; $lang['unable_to_parse_date'] = 'Ikke mulig å tolke "%s".'; diff --git a/sources/inc/lang/no/mailtext.txt b/sources/inc/lang/no/mailtext.txt index 9c0714c..7260733 100644 --- a/sources/inc/lang/no/mailtext.txt +++ b/sources/inc/lang/no/mailtext.txt @@ -10,8 +10,3 @@ Redigeringskommentar : @SUMMARY@ Bruker : @USER@ @DIFF@ - - --- -Denne meldingen ble laget av DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/no/password.txt b/sources/inc/lang/no/password.txt index bc4e89f..46023e3 100644 --- a/sources/inc/lang/no/password.txt +++ b/sources/inc/lang/no/password.txt @@ -4,7 +4,3 @@ Her er dine brukeropplysninger for @TITLE@ på @DOKUWIKIURL@ Brukernavn : @LOGIN@ Passord : @PASSWORD@ - --- -Denne meldingen ble laget av DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/no/pwconfirm.txt b/sources/inc/lang/no/pwconfirm.txt index 36163c6..29ff6f2 100644 --- a/sources/inc/lang/no/pwconfirm.txt +++ b/sources/inc/lang/no/pwconfirm.txt @@ -9,7 +9,3 @@ For å bekrefte at forespørselen virkelig kom fra deg kan du bruke følgende lenke: @CONFIRM@ - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ diff --git a/sources/inc/lang/no/registermail.txt b/sources/inc/lang/no/registermail.txt index 35ed253..8902273 100644 --- a/sources/inc/lang/no/registermail.txt +++ b/sources/inc/lang/no/registermail.txt @@ -8,7 +8,3 @@ Dato : @DATE@ Nettleser : @BROWSER@ IP-adresse : @IPADDRESS@ Tjener : @HOSTNAME@ - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ diff --git a/sources/inc/lang/no/subscr_digest.txt b/sources/inc/lang/no/subscr_digest.txt index 670d39d..90da8e6 100644 --- a/sources/inc/lang/no/subscr_digest.txt +++ b/sources/inc/lang/no/subscr_digest.txt @@ -11,10 +11,6 @@ Gammel versjon : @OLDPAGE@ Ny versjon: @NEWPAGE@ For å avslutte varslingen, logg inn på -@DOKUWIKIURL@ og gå til +@DOKUWIKIURL@ og gå til @SUBSCRIBE@ og avslutt abonnementet på endringer av siden eller i navnerommet. - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/no/subscr_list.txt b/sources/inc/lang/no/subscr_list.txt index 860d88d..d06bc23 100644 --- a/sources/inc/lang/no/subscr_list.txt +++ b/sources/inc/lang/no/subscr_list.txt @@ -8,10 +8,6 @@ Her er endringene: -------------------------------------------------------- For å avslutte varslinga, logg inn på -@DOKUWIKIURL@ og gå til +@DOKUWIKIURL@ og gå til @SUBSCRIBE@ og avslutt abonnementet på endringer av sida eller i navnerommet. - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/no/subscr_single.txt b/sources/inc/lang/no/subscr_single.txt index b26b3a8..5fb7716 100644 --- a/sources/inc/lang/no/subscr_single.txt +++ b/sources/inc/lang/no/subscr_single.txt @@ -14,10 +14,6 @@ Gammel versjon : @OLDPAGE@ Ny versjon: @NEWPAGE@ For å avslutte varslingen, logg inn på -@DOKUWIKIURL@, gå til +@DOKUWIKIURL@, gå til @SUBSCRIBE@ og avslutt abonnementet på endringer av siden eller i navnerommet. - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/no/uploadmail.txt b/sources/inc/lang/no/uploadmail.txt index 2890d96..237ec65 100644 --- a/sources/inc/lang/no/uploadmail.txt +++ b/sources/inc/lang/no/uploadmail.txt @@ -9,7 +9,3 @@ Vertnavn : @HOSTNAME@ Størrelse : @SIZE@ MIME-type : @MIME@ Bruker : @USER@ - --- -Denne e-posten ble generert av DokuWiki på -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pl/lang.php b/sources/inc/lang/pl/lang.php index ae307b4..d9c90cd 100644 --- a/sources/inc/lang/pl/lang.php +++ b/sources/inc/lang/pl/lang.php @@ -345,3 +345,5 @@ $lang['currentns'] = 'Obecny katalog'; $lang['searchresult'] = 'Wyniki wyszukiwania'; $lang['plainhtml'] = 'Czysty HTML'; $lang['wikimarkup'] = 'Znaczniki'; +$lang['email_signature_text'] = 'List został wygenerowany przez DokuWiki pod adresem +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/pl/mailtext.txt b/sources/inc/lang/pl/mailtext.txt index 1180966..cae98db 100644 --- a/sources/inc/lang/pl/mailtext.txt +++ b/sources/inc/lang/pl/mailtext.txt @@ -11,8 +11,3 @@ Opis zmian : @SUMMARY@ Użytkownik : @USER@ @DIFF@ - - --- -List został wygenerowany przez DokuWiki pod adresem -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pl/mailwrap.html b/sources/inc/lang/pl/mailwrap.html index 6177286..d257190 100644 --- a/sources/inc/lang/pl/mailwrap.html +++ b/sources/inc/lang/pl/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Ta wiadomość została wygenerowana przez DokuWiki na @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/pl/password.txt b/sources/inc/lang/pl/password.txt index 948472f..745556f 100644 --- a/sources/inc/lang/pl/password.txt +++ b/sources/inc/lang/pl/password.txt @@ -4,7 +4,3 @@ Dane użytkownika @TITLE@ pod adresem @DOKUWIKIURL@ Użytkownik : @LOGIN@ Hasło : @PASSWORD@ - --- -List został wygenerowany przez DokuWiki pod adresem -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pl/pwconfirm.txt b/sources/inc/lang/pl/pwconfirm.txt index f6ccca4..989de79 100644 --- a/sources/inc/lang/pl/pwconfirm.txt +++ b/sources/inc/lang/pl/pwconfirm.txt @@ -7,7 +7,3 @@ Jeśli to nie Ty prosiłeś(aś) o nowe hasło, zignoruj ten list. Aby potwierdzić prośbę o hasło, przejdź na następującą stronę. @CONFIRM@ - --- -List został wygenerowany przez DokuWiki pod adresem -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pl/registermail.txt b/sources/inc/lang/pl/registermail.txt index 18437fa..0022967 100644 --- a/sources/inc/lang/pl/registermail.txt +++ b/sources/inc/lang/pl/registermail.txt @@ -9,7 +9,3 @@ Data : @DATE@ Przeglądarka : @BROWSER@ Adres IP : @IPADDRESS@ Nazwa DNS : @HOSTNAME@ - --- -List został wygenerowany przez DokuWiki pod adresem -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pl/subscr_digest.txt b/sources/inc/lang/pl/subscr_digest.txt index 2b1f63c..7abbb35 100644 --- a/sources/inc/lang/pl/subscr_digest.txt +++ b/sources/inc/lang/pl/subscr_digest.txt @@ -15,7 +15,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na @SUBSCRIBE@ i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub katalogach. - --- -Ta wiadomość została wygenerowana przez DokuWiki na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pl/subscr_list.txt b/sources/inc/lang/pl/subscr_list.txt index 9a74d75..633225f 100644 --- a/sources/inc/lang/pl/subscr_list.txt +++ b/sources/inc/lang/pl/subscr_list.txt @@ -12,7 +12,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na @SUBSCRIBE@ i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub katalogach. - --- -Ta wiadomość została wygenerowana przez DokuWiki na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pl/subscr_single.txt b/sources/inc/lang/pl/subscr_single.txt index 3f4bc73..0c8c3ea 100644 --- a/sources/inc/lang/pl/subscr_single.txt +++ b/sources/inc/lang/pl/subscr_single.txt @@ -18,7 +18,3 @@ Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na @SUBSCRIBE@ i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub katalogach. - --- -Ta wiadomość została wygenerowana przez DokuWiki na -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pl/uploadmail.txt b/sources/inc/lang/pl/uploadmail.txt index e76ec80..a8daa05 100644 --- a/sources/inc/lang/pl/uploadmail.txt +++ b/sources/inc/lang/pl/uploadmail.txt @@ -10,7 +10,3 @@ Nazwa DNS : @HOSTNAME@ Rozmiar : @SIZE@ Typ MIME : @MIME@ Użytkownik : @USER@ - --- -List został wygenerowany przez DokuWiki pod adresem -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pt-br/lang.php b/sources/inc/lang/pt-br/lang.php index 67b4651..1074914 100644 --- a/sources/inc/lang/pt-br/lang.php +++ b/sources/inc/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Luis Fernando Enciso * @author Alauton/Loug * @author Frederico Gonçalves Guimarães @@ -25,6 +25,8 @@ * @author Juliano Marconi Lanigra * @author Ednei * @author Hudson FAS + * @author Guilherme Cardoso + * @author Viliam Dias */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -359,3 +361,5 @@ $lang['plainhtml'] = 'HTML simples'; $lang['wikimarkup'] = 'Marcação wiki'; $lang['page_nonexist_rev'] = 'Página não encontrada em %s. Foi criada posteriormente em %s.'; $lang['unable_to_parse_date'] = 'Impossível analisar em "%s".'; +$lang['email_signature_text'] = 'Essa mensagem foi gerada pelo DokuWiki em +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/pt-br/mailtext.txt b/sources/inc/lang/pt-br/mailtext.txt index e52535b..5bdbfdd 100644 --- a/sources/inc/lang/pt-br/mailtext.txt +++ b/sources/inc/lang/pt-br/mailtext.txt @@ -10,8 +10,3 @@ Resumo da edição: @SUMMARY@ Usuário: @USER@ @DIFF@ - - --- -Essa mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt-br/mailwrap.html b/sources/inc/lang/pt-br/mailwrap.html index 80bea7a..d257190 100644 --- a/sources/inc/lang/pt-br/mailwrap.html +++ b/sources/inc/lang/pt-br/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/pt-br/password.txt b/sources/inc/lang/pt-br/password.txt index 199d6e1..0a7587a 100644 --- a/sources/inc/lang/pt-br/password.txt +++ b/sources/inc/lang/pt-br/password.txt @@ -4,7 +4,3 @@ Aqui estão os seus dados de usuário para @TITLE@ em @DOKUWIKIURL@ Usuário : @LOGIN@ Senha : @PASSWORD@ - --- -Essa mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pt-br/pwconfirm.txt b/sources/inc/lang/pt-br/pwconfirm.txt index 2a7c885..324f9df 100644 --- a/sources/inc/lang/pt-br/pwconfirm.txt +++ b/sources/inc/lang/pt-br/pwconfirm.txt @@ -7,7 +7,3 @@ Se não foi você quem fez essa requisição, simplesmente ignore essa mensagem. Se você realmente deseja receber uma nova senha, por favor, utilize o link abaixo, para confirmar sua requisição. @CONFIRM@ - --- -Essa mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt-br/registermail.txt b/sources/inc/lang/pt-br/registermail.txt index 9bb6a00..bbf2547 100644 --- a/sources/inc/lang/pt-br/registermail.txt +++ b/sources/inc/lang/pt-br/registermail.txt @@ -8,7 +8,3 @@ Data: @DATE@ Navegador: @BROWSER@ Endereço IP: @IPADDRESS@ Nome do host: @HOSTNAME@ - --- -Essa mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt-br/subscr_digest.txt b/sources/inc/lang/pt-br/subscr_digest.txt index 77f76e1..8251651 100644 --- a/sources/inc/lang/pt-br/subscr_digest.txt +++ b/sources/inc/lang/pt-br/subscr_digest.txt @@ -14,7 +14,3 @@ Para cancelar as notificações de mudanças, entre em @DOKUWIKIURL@, vá até @SUBSCRIBE@ e cancele o monitoramento da página e/ou do espaço de nomes. - --- -Este e-mail foi gerado pelo DokuWiki em -@DOKUWIKIURL@ diff --git a/sources/inc/lang/pt-br/subscr_list.txt b/sources/inc/lang/pt-br/subscr_list.txt index c6011d0..fb46777 100644 --- a/sources/inc/lang/pt-br/subscr_list.txt +++ b/sources/inc/lang/pt-br/subscr_list.txt @@ -20,9 +20,7 @@ e então visite @SUBSCRIBE@ e cancele a inscrição de edição da página ou na Para cancelar a página de notificações, entre na wiki @DOKUWIKIURL@, visite a página de @SUBSCRIBE@ e cancele a inscrição de edição da página ou namespace. --- -Este e-mail foi gerado pelo DokuWiki em -@DOKUWIKIURL@ - -preview.txt ====== Preview ====== + + +preview.txt ====== Preview ====== diff --git a/sources/inc/lang/pt-br/subscr_single.txt b/sources/inc/lang/pt-br/subscr_single.txt index b1c052e..e59a1e1 100644 --- a/sources/inc/lang/pt-br/subscr_single.txt +++ b/sources/inc/lang/pt-br/subscr_single.txt @@ -17,6 +17,3 @@ Para cancelar as notificações de mudanças, entre em @DOKUWIKIURL@, vá até @NEWPAGE@ e cancele o monitoramento da página e/ou do espaço de nomes. --- -Este e-mail foi gerado pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt-br/uploadmail.txt b/sources/inc/lang/pt-br/uploadmail.txt index a3ac9ba..8527f8e 100644 --- a/sources/inc/lang/pt-br/uploadmail.txt +++ b/sources/inc/lang/pt-br/uploadmail.txt @@ -8,7 +8,3 @@ Nome do host: @HOSTNAME@ Tamanho: @SIZE@ Tipo MIME: @MIME@ Usuário: @USER@ - --- -Essa mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/admin.txt b/sources/inc/lang/pt/admin.txt index 366792a..5b103b3 100644 --- a/sources/inc/lang/pt/admin.txt +++ b/sources/inc/lang/pt/admin.txt @@ -1,3 +1,3 @@ ====== Administração ====== -Abaixo pode encontrar uma lista de tarefas de administrativas permitidas pelo DokuWiki. \ No newline at end of file +Abaixo pode encontrar uma lista de tarefas de administrativas disponíveis na DokuWiki. \ No newline at end of file diff --git a/sources/inc/lang/pt/adminplugins.txt b/sources/inc/lang/pt/adminplugins.txt index 3eac7af..259f5ce 100644 --- a/sources/inc/lang/pt/adminplugins.txt +++ b/sources/inc/lang/pt/adminplugins.txt @@ -1 +1 @@ -===== Plugins Adicionais ===== \ No newline at end of file +===== Extras Adicionais ===== \ No newline at end of file diff --git a/sources/inc/lang/pt/backlinks.txt b/sources/inc/lang/pt/backlinks.txt index e78ddf8..4eb82cb 100644 --- a/sources/inc/lang/pt/backlinks.txt +++ b/sources/inc/lang/pt/backlinks.txt @@ -1,4 +1,4 @@ ====== Backlinks ====== -Esta é uma lista de todos os documentos que apresentam ligações ao documento corrente. +Esta é uma lista de páginas que parece que interliga para a página atual. diff --git a/sources/inc/lang/pt/conflict.txt b/sources/inc/lang/pt/conflict.txt index b6d7319..49575fd 100644 --- a/sources/inc/lang/pt/conflict.txt +++ b/sources/inc/lang/pt/conflict.txt @@ -1,5 +1,5 @@ -====== Uma versão mais recente existe ====== +====== Existe uma versão mais recente ====== -Existe uma versão mais recente do documento editado. Isso acontece quando um outro usuário alterou o documento enquanto você estava editando. +Existe uma versão mais recente do documento editado. Isto acontece quando um outro utilizador alterou o documento enquanto o estava a editar. -Examine cuidadosamente as diferenças mostradas abaixo, em seguida, decida qual versão manter. Se você escolher ''salvar '', sua versão será salva. Clique ''cancelar '' para manter a versão atual. +Analise cuidadosamente as diferenças mostradas abaixo, depois decida qual a versão a manter. Se escolher 'guardar'', a sua versão será guardada. Clique em ''cancelar '' para manter a versão atual. diff --git a/sources/inc/lang/pt/denied.txt b/sources/inc/lang/pt/denied.txt index 84c3a94..f4e8e01 100644 --- a/sources/inc/lang/pt/denied.txt +++ b/sources/inc/lang/pt/denied.txt @@ -1,4 +1,4 @@ ====== Permissão Negada ====== -Desculpe, você não possui direitos e permissões suficientes para continuar. +Desculpe, não tem direitos suficientes para continuar. diff --git a/sources/inc/lang/pt/diff.txt b/sources/inc/lang/pt/diff.txt index e27640a..b733262 100644 --- a/sources/inc/lang/pt/diff.txt +++ b/sources/inc/lang/pt/diff.txt @@ -1,5 +1,3 @@ ====== Diferenças ====== -Esta página mostra as diferenças entre a revisão do documento que escolheu e a versão actual. - ----- +Esta página mostra as diferenças entre as duas revisões da página. \ No newline at end of file diff --git a/sources/inc/lang/pt/lang.php b/sources/inc/lang/pt/lang.php index c45d522..890a6fd 100644 --- a/sources/inc/lang/pt/lang.php +++ b/sources/inc/lang/pt/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author José Carlos Monteiro * @author José Monteiro * @author Enrico Nicoletto @@ -14,6 +14,7 @@ * @author Guido Salatino * @author Romulo Pereira * @author Paulo Carmino + * @author Alfredo Silva */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -22,24 +23,24 @@ $lang['doublequoteclosing'] = 'â€'; $lang['singlequoteopening'] = '‘'; $lang['singlequoteclosing'] = '’'; $lang['apostrophe'] = '’'; -$lang['btn_edit'] = 'Editar página'; -$lang['btn_source'] = 'Ver fonte'; -$lang['btn_show'] = 'Ver página'; -$lang['btn_create'] = 'Criar página'; +$lang['btn_edit'] = 'Editar esta página'; +$lang['btn_source'] = 'Mostrar página fonte '; +$lang['btn_show'] = 'Mostrar página'; +$lang['btn_create'] = 'Criar esta página'; $lang['btn_search'] = 'Pesquisar'; -$lang['btn_save'] = 'Salvar'; -$lang['btn_preview'] = 'Prever'; +$lang['btn_save'] = 'Guardar'; +$lang['btn_preview'] = 'Pré-visualizar'; $lang['btn_top'] = 'Voltar ao topo'; $lang['btn_newer'] = '<< mais recente'; $lang['btn_older'] = 'menos recente >>'; $lang['btn_revs'] = 'Revisões antigas'; -$lang['btn_recent'] = 'Alt. Recentes'; -$lang['btn_upload'] = 'Carregar'; +$lang['btn_recent'] = 'Alterações Recentes'; +$lang['btn_upload'] = 'Enviar'; $lang['btn_cancel'] = 'Cancelar'; $lang['btn_index'] = 'Ãndice'; $lang['btn_secedit'] = 'Editar'; -$lang['btn_login'] = 'Entrar'; -$lang['btn_logout'] = 'Sair'; +$lang['btn_login'] = 'Iniciar sessão'; +$lang['btn_logout'] = 'Terminar sessão'; $lang['btn_admin'] = 'Administrar'; $lang['btn_update'] = 'Actualizar'; $lang['btn_delete'] = 'Apagar'; @@ -345,3 +346,5 @@ $lang['plainhtml'] = 'HTML simples'; $lang['wikimarkup'] = 'Markup de Wiki'; $lang['page_nonexist_rev'] = 'Página não existia no %s. Posteriormente, foi criado em %s.'; $lang['unable_to_parse_date'] = 'Não é possível analisar o parâmetro "%s".'; +$lang['email_signature_text'] = 'Este email foi gerado por DokuWiki em +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/pt/mailtext.txt b/sources/inc/lang/pt/mailtext.txt index 915a147..844f246 100644 --- a/sources/inc/lang/pt/mailtext.txt +++ b/sources/inc/lang/pt/mailtext.txt @@ -12,9 +12,3 @@ Edit Summary : @SUMMARY@ User : @USER@ @DIFF@ - - - ----- - -Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@ diff --git a/sources/inc/lang/pt/password.txt b/sources/inc/lang/pt/password.txt index 70ecf91..cfd81f3 100644 --- a/sources/inc/lang/pt/password.txt +++ b/sources/inc/lang/pt/password.txt @@ -4,7 +4,3 @@ Aqui estão as suas credenciais de autenticação para @TITLE@, em @DOKUWIKIURL@ Utilizador : @LOGIN@ Senha : @PASSWORD@ - ----- -Esta mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/pwconfirm.txt b/sources/inc/lang/pt/pwconfirm.txt index 2848a11..00fee3e 100644 --- a/sources/inc/lang/pt/pwconfirm.txt +++ b/sources/inc/lang/pt/pwconfirm.txt @@ -7,7 +7,3 @@ Se não foi você que efectuou o pedido então por favor ignore esta mensagem. Senão, para confirmar o pedido, por favor siga este link: @CONFIRM@ - --- - -Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/registermail.txt b/sources/inc/lang/pt/registermail.txt index b9c1f16..7f5333d 100644 --- a/sources/inc/lang/pt/registermail.txt +++ b/sources/inc/lang/pt/registermail.txt @@ -8,7 +8,3 @@ Data : @DATE@ Browser : @BROWSER@ Endereço IP : @IPADDRESS@ Hostname : @HOSTNAME@ - ----- - -Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/subscr_digest.txt b/sources/inc/lang/pt/subscr_digest.txt index 3f8a814..943bba8 100644 --- a/sources/inc/lang/pt/subscr_digest.txt +++ b/sources/inc/lang/pt/subscr_digest.txt @@ -14,7 +14,3 @@ Para cancelar as notificações de página, inicie sessão na wiki em @DOKUWIKIURL@, visite @SUBSCRIBE@ e des-subscreva as alterações à página e/ou nome espaço de nome. - --- -Este email foi gerado por DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/subscr_list.txt b/sources/inc/lang/pt/subscr_list.txt index 65325b9..fdaef5e 100644 --- a/sources/inc/lang/pt/subscr_list.txt +++ b/sources/inc/lang/pt/subscr_list.txt @@ -7,11 +7,7 @@ Eis as páginas alteradas: @DIFF@ -------------------------------------------------------- -Para cancelar as notificações de páginas, inicie sessão na wiki em +Para cancelar as notificações de páginas, inicie sessão na wiki em @DOKUWIKIURL@, visite @SUBSCRIBE@ e des-subscreva às alterações da página e/ou espaço de nome. - --- -Este email foi gerado por DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/subscr_single.txt b/sources/inc/lang/pt/subscr_single.txt index 469c6bf..10674f7 100644 --- a/sources/inc/lang/pt/subscr_single.txt +++ b/sources/inc/lang/pt/subscr_single.txt @@ -17,7 +17,3 @@ Para cancelar as notificações de página, inicie sessão no wiki em @DOKUWIKIURL@, visite @SUBSCRIBE@ e des-subscreva às alterações de página e/ou espaço de nome. - --- -Este email foi gerado automaticamente por DokuWiki em -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/pt/uploadmail.txt b/sources/inc/lang/pt/uploadmail.txt index bb571ff..09787e1 100644 --- a/sources/inc/lang/pt/uploadmail.txt +++ b/sources/inc/lang/pt/uploadmail.txt @@ -9,7 +9,3 @@ Hostname : @HOSTNAME@ Tamanho : @SIZE@ MIME Type : @MIME@ Utilizador : @USER@ - --- -Esta mensagem foi gerada pelo DokuWiki em -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/lang.php b/sources/inc/lang/ro/lang.php index 5dab68c..1eb9955 100644 --- a/sources/inc/lang/ro/lang.php +++ b/sources/inc/lang/ro/lang.php @@ -10,6 +10,7 @@ * @author Marius OLAR * @author Marius Olar * @author Marian Banica + * @author Adrian Vesa */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -75,6 +76,7 @@ $lang['regmissing'] = 'Ne pare rău, trebuie să completezi toate cî $lang['reguexists'] = 'Ne pare rău, un utilizator cu acest nume este deja autentificat.'; $lang['regsuccess'] = 'Utilizatorul a fost creat. Parola a fost trimisă prin e-mail.'; $lang['regsuccess2'] = 'Utilizatorul a fost creat.'; +$lang['regfail'] = 'Utilizatorul nu a putu fi creat.'; $lang['regmailfail'] = 'Se pare că a fost o eroare la trimiterea parolei prin e-mail. Contactează administratorul!'; $lang['regbadmail'] = 'Adresa de e-mail este nevalidă - dacă eÈ™ti de părere că este o eroare contactează administratorul.'; $lang['regbadpass'] = 'Cele două parole furnizate nu sunt identice; încearcă din nou.'; @@ -87,6 +89,8 @@ $lang['profchanged'] = 'Profilul de utilizator a fost actualizat cu su $lang['profnodelete'] = 'Acest wiki nu accepta stergerea conturilor utilizatorilor'; $lang['profdeleteuser'] = 'Sterge cont'; $lang['profdeleted'] = 'Contul tau a fost sters de pe acest wiki'; +$lang['profconfdelete'] = 'As dori sa sterf contul meu de pe acest Wiki.
Aceasta actiune nu poate fi anulata.'; +$lang['proffail'] = 'Profilul utilizatorului nu a fost actualizat.'; $lang['pwdforget'] = 'Parolă uitată? ObÈ›ine una nouă!'; $lang['resendna'] = 'Acest wiki nu permite retrimiterea parolei.'; $lang['resendpwd'] = 'Configurează o parolă nouă pentru'; @@ -102,6 +106,7 @@ $lang['searchmedia_in'] = 'Caută în %s'; $lang['txt_upload'] = 'Selectează fiÈ™ierul de încărcat:'; $lang['txt_filename'] = 'ÃŽncarcă fiÈ™ierul ca (opÈ›ional):'; $lang['txt_overwrt'] = 'Suprascrie fiÈ™ierul existent'; +$lang['maxuploadsize'] = 'Incarcare maxima % per fisier.'; $lang['lockedby'] = 'Momentan blocat de:'; $lang['lockexpire'] = 'Blocarea expiră la:'; $lang['js']['willexpire'] = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseÈ™te butonul de previzualizare pentru resetarea blocării.'; @@ -183,6 +188,9 @@ $lang['difflink'] = 'Link către această vizualizare comparativă' $lang['diff_type'] = 'Vezi diferenÈ›e:'; $lang['diff_inline'] = 'Succesiv'; $lang['diff_side'] = 'Alăturate'; +$lang['diffprevrev'] = 'Versiuni anterioare'; +$lang['diffnextrev'] = 'Urmatoarea versiune'; +$lang['difflastrev'] = 'Ultima versiune'; $lang['line'] = 'Linia'; $lang['breadcrumb'] = 'Traseu:'; $lang['youarehere'] = 'EÈ™ti aici:'; @@ -287,8 +295,12 @@ $lang['i_policy'] = 'Politica ACL (liste de control a accesului) in $lang['i_pol0'] = 'Wiki deschis (oricine poate citi, scrie È™i încărca fiÈ™iere)'; $lang['i_pol1'] = 'Wiki public (oricine poate citi, utilizatorii înregistraÈ›i pot scrie È™i încărca fiÈ™iere)'; $lang['i_pol2'] = 'Wiki închis (doar utilizatorii înregistraÈ›i pot citi, scrie È™i încărca fiÈ™iere)'; +$lang['i_allowreg'] = 'Permite utilizatorilor sa se inregistreze singuri.'; $lang['i_retry'] = 'ÃŽncearcă din nou'; $lang['i_license'] = 'Te rugăm să alegi licenÈ›a sub care doreÈ™ti să publici conÈ›inutul:'; +$lang['i_license_none'] = 'Nu arata nici o informatie despre licenta.'; +$lang['i_pop_field'] = 'Te rog, ajuta-ne sa imbunatatim experienta DokuWiki.'; +$lang['i_pop_label'] = 'Odata pe luna, trimite date catre dezvoltatorii DokuWiki in mod anonim.'; $lang['recent_global'] = 'ÃŽn acest moment vizualizezi modificările în interiorul spaÈ›iului de nume %s. De asemenea poÈ›i vizualiza modificările recente în întregului wiki-ul.'; $lang['years'] = 'acum %d ani'; $lang['months'] = 'acum %d luni'; @@ -321,3 +333,6 @@ $lang['media_perm_read'] = 'Ne pare rău, dar nu ai suficiente permisiuni $lang['media_perm_upload'] = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea încărca fiÈ™iere.'; $lang['media_update'] = 'ÃŽncarcă noua versiune'; $lang['media_restore'] = 'Restaurează această versiune'; +$lang['email_signature_text'] = 'Acest e-mail a fost generat de DokuWiki la +@DOKUWIKIURL@'; +$lang['searchresult'] = 'Rezultatul cautarii'; diff --git a/sources/inc/lang/ro/mailtext.txt b/sources/inc/lang/ro/mailtext.txt index 8d20a30..14a1538 100644 --- a/sources/inc/lang/ro/mailtext.txt +++ b/sources/inc/lang/ro/mailtext.txt @@ -11,7 +11,3 @@ Versiune curentă : @NEWPAGE@ Sumar editare: @SUMMARY@ @DIFF@ - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/password.txt b/sources/inc/lang/ro/password.txt index eb32520..3f8ae24 100644 --- a/sources/inc/lang/ro/password.txt +++ b/sources/inc/lang/ro/password.txt @@ -4,7 +4,3 @@ Aici se găsesc credenÈ›ialele de utilizator pentru @TITLE@ la @DOKUWIKIURL@ Login : @LOGIN@ Parola : @PASSWORD@ - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/pwconfirm.txt b/sources/inc/lang/ro/pwconfirm.txt index 0728b2e..1123b8b 100644 --- a/sources/inc/lang/ro/pwconfirm.txt +++ b/sources/inc/lang/ro/pwconfirm.txt @@ -8,7 +8,3 @@ Dacă nu ai solicitat o parolă nouă, ignoră acest e-mail. Pentru a confirma că cererea a fost într-adevăr trimisă de tine, foloseÈ™te link-ul de mai jos. @CONFIRM@ - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/registermail.txt b/sources/inc/lang/ro/registermail.txt index 2aab247..599deab 100644 --- a/sources/inc/lang/ro/registermail.txt +++ b/sources/inc/lang/ro/registermail.txt @@ -9,7 +9,3 @@ Dată : @DATE@ Browser : @BROWSER@ Adresă IP : @IPADDRESS@ Hostname : @HOSTNAME@ - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/subscr_digest.txt b/sources/inc/lang/ro/subscr_digest.txt index 8b0aac5..4e661b6 100644 --- a/sources/inc/lang/ro/subscr_digest.txt +++ b/sources/inc/lang/ro/subscr_digest.txt @@ -14,7 +14,3 @@ Pentru a anula notificarea paginii, autentifică-te pe wiki la @DOKUWIKIURL@ apoi accesează @SUBSCRIBE@ È™i dezabonează-te de la pagină È™i/sau modificările spaÈ›iului de nume. - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/subscr_list.txt b/sources/inc/lang/ro/subscr_list.txt index c343342..c561478 100644 --- a/sources/inc/lang/ro/subscr_list.txt +++ b/sources/inc/lang/ro/subscr_list.txt @@ -11,7 +11,3 @@ Pentru a anula notificarea paginii, autentificcă-te pe wiki la @DOKUWIKIURL@ apoi accesează @SUBSCRIBE@ È™i dezabonează-te de la pagină È™i/sau modificările spaÈ›iului de nume. - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/subscr_single.txt b/sources/inc/lang/ro/subscr_single.txt index 0fee1a8..6f8b2f9 100644 --- a/sources/inc/lang/ro/subscr_single.txt +++ b/sources/inc/lang/ro/subscr_single.txt @@ -17,7 +17,3 @@ Pentru a anula notificarea paginii, autentificcă-te pe wiki la @DOKUWIKIURL@ apoi accesează @SUBSCRIBE@ È™i dezabonează-te de la pagină È™i/sau modificările spaÈ›iului de nume. - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ro/uploadmail.txt b/sources/inc/lang/ro/uploadmail.txt index 81c2828..cf8e8e0 100644 --- a/sources/inc/lang/ro/uploadmail.txt +++ b/sources/inc/lang/ro/uploadmail.txt @@ -10,7 +10,3 @@ Hostname : @HOSTNAME@ Dimensiune : @SIZE@ MIME Type : @MIME@ Utilizator : @USER@ - --- -Acest e-mail a fost generat de DokuWiki la -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ru/admin.txt b/sources/inc/lang/ru/admin.txt index cd609a3..8a670d5 100644 --- a/sources/inc/lang/ru/admin.txt +++ b/sources/inc/lang/ru/admin.txt @@ -1,4 +1,4 @@ ====== Управление ====== -Ðиже вы Ñможете найти ÑпиÑок админиÑтративных операций, доÑтупных в «Докувики». +Ðиже вы Ñможете найти ÑпиÑок админиÑтративных операций, доÑтупных в «Докувики». diff --git a/sources/inc/lang/ru/conflict.txt b/sources/inc/lang/ru/conflict.txt index 6c5e33d..e813d8c 100644 --- a/sources/inc/lang/ru/conflict.txt +++ b/sources/inc/lang/ru/conflict.txt @@ -1,5 +1,5 @@ ====== СущеÑтвует более Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ ====== -СущеÑтвует более Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°, который вы редактировали. Такое ÑлучаетÑÑ, когда другой пользователь изменил документ, пока вы делали то же Ñамое. +СущеÑтвует более Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°, который вы редактировали. Такое ÑлучаетÑÑ, когда другой пользователь изменил документ, пока вы делали то же Ñамое. -Внимательно изучите различиÑ, приведенные ниже, и решите, какую верÑию оÑтавить. ЕÑли вы выберете «Сохранить», то ваша верÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñохранена. Ðажав «Отменить», вы оÑтавите текущую верÑию. +Внимательно изучите различиÑ, приведенные ниже, и решите, какую верÑию оÑтавить. ЕÑли вы выберете «Сохранить», то ваша верÑÐ¸Ñ Ð±ÑƒÐ´ÐµÑ‚ Ñохранена. Ðажав «Отменить», вы оÑтавите текущую верÑию. diff --git a/sources/inc/lang/ru/denied.txt b/sources/inc/lang/ru/denied.txt index 6b7c825..791b30b 100644 --- a/sources/inc/lang/ru/denied.txt +++ b/sources/inc/lang/ru/denied.txt @@ -1,4 +1,4 @@ ====== ДоÑтуп запрещён ====== -Извините, у Ð²Ð°Ñ Ð½Ðµ хватает прав Ð´Ð»Ñ Ñтого дейÑтвиÑ. +Извините, ÑƒÂ Ð²Ð°Ñ Ð½ÐµÂ Ñ…Ð²Ð°Ñ‚Ð°ÐµÑ‚ прав Ð´Ð»Ñ Ñтого дейÑтвиÑ. diff --git a/sources/inc/lang/ru/diff.txt b/sources/inc/lang/ru/diff.txt index 8025261..21b8a8e 100644 --- a/sources/inc/lang/ru/diff.txt +++ b/sources/inc/lang/ru/diff.txt @@ -1,4 +1,3 @@ ====== Ð Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ ====== ЗдеÑÑŒ показаны Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ Ð´Ð²ÑƒÐ¼Ñ Ð²ÐµÑ€ÑиÑми данной Ñтраницы. - diff --git a/sources/inc/lang/ru/draft.txt b/sources/inc/lang/ru/draft.txt index cb35f72..a92aa34 100644 --- a/sources/inc/lang/ru/draft.txt +++ b/sources/inc/lang/ru/draft.txt @@ -1,6 +1,5 @@ ====== Ðайден черновик ====== -ПоÑледний раз редактирование Ñтой Ñтраницы не было корректно завершено. Во Ð²Ñ€ÐµÐ¼Ñ Ð²Ð°ÑˆÐµÐ¹ работы был автоматичеÑки Ñохранён черновик, который вы теперь можете воÑÑтановить и продолжить прерванную правку. Ðиже вы видите автоматичеÑки Ñохранённую верÑию. - -ПожалуйÑта, решите, хотите ли вы //воÑÑтановить// потерÑнную верÑию, //удалить// черновик, или //отменить// редактирование. +ПоÑледний раз редактирование Ñтой Ñтраницы не было корректно завершено. Ð’Ð¾Â Ð²Ñ€ÐµÐ¼Ñ Ð²Ð°ÑˆÐµÐ¹ работы был автоматичеÑки Ñохранён черновик, который вы теперь можете воÑÑтановить и продолжить прерванную правку. Ðиже вы видите автоматичеÑки Ñохранённую верÑию. +ПожалуйÑта, решите, хотите ли вы //воÑÑтановить// потерÑнную верÑию, //удалить// черновик, или //отменить// редактирование. diff --git a/sources/inc/lang/ru/edit.txt b/sources/inc/lang/ru/edit.txt index aac399d..25ded41 100644 --- a/sources/inc/lang/ru/edit.txt +++ b/sources/inc/lang/ru/edit.txt @@ -1,2 +1 @@ -Отредактируйте Ñтраницу и нажмите «Сохранить». Прочтите [[wiki:syntax|Ñправочную Ñтраницу]] Ð´Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÑинтакÑиÑом вики. ПожалуйÑта, редактируйте только в том Ñлучае, еÑли планируете **улучшить** Ñодержимое. ЕÑли вы проÑто хотите потеÑтировать что-либо, воÑпользуйтеÑÑŒ Ñпециальной Ñтраницей: [[playground:playground]]. - +Отредактируйте Ñтраницу и нажмите «Сохранить». Прочтите [[wiki:syntax|Ñправочную Ñтраницу]] Ð´Ð»Ñ Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ ÑинтакÑиÑом вики. ПожалуйÑта, редактируйте только в том Ñлучае, еÑли планируете **улучшить** Ñодержимое. ЕÑли вы проÑто хотите потеÑтировать что-либо, воÑпользуйтеÑÑŒ Ñпециальной Ñтраницей: [[playground:playground]]. diff --git a/sources/inc/lang/ru/editrev.txt b/sources/inc/lang/ru/editrev.txt index 97b799a..ac2464d 100644 --- a/sources/inc/lang/ru/editrev.txt +++ b/sources/inc/lang/ru/editrev.txt @@ -1,2 +1,2 @@ -**Ð’Ñ‹ загрузили Ñтарую ревизию документа.** Сохранив её, вы Ñоздадите новую текущую верÑию Ñ Ñтим Ñодержимым. +**Вы загрузили Ñтарую ревизию документа.** Сохранив её, вы Ñоздадите новую текущую верÑию Ñ Ñтим Ñодержимым. ---- diff --git a/sources/inc/lang/ru/index.txt b/sources/inc/lang/ru/index.txt index ab66991..a059b28 100644 --- a/sources/inc/lang/ru/index.txt +++ b/sources/inc/lang/ru/index.txt @@ -1,4 +1,4 @@ ====== Содержание ====== -Перед вами ÑпиÑок доÑтупных Ñтраниц, упорÑдоченный по [[doku>namespaces|проÑтранÑтвам имён]]. +Перед вами ÑпиÑок доÑтупных Ñтраниц, упорÑдоченный по [[doku>namespaces|проÑтранÑтвам имён]]. diff --git a/sources/inc/lang/ru/lang.php b/sources/inc/lang/ru/lang.php index 569ea0d..0e19dfa 100644 --- a/sources/inc/lang/ru/lang.php +++ b/sources/inc/lang/ru/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuri Pimenov * @author Igor Tarasov * @author Denis Simakov @@ -33,6 +33,7 @@ * @author Nolf * @author Takumo <9206984@mail.ru> * @author RainbowSpike <1@2.ru> + * @author dimsharav */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -45,7 +46,7 @@ $lang['btn_edit'] = 'Править Ñтраницу'; $lang['btn_source'] = 'Показать иÑходный текÑÑ‚'; $lang['btn_show'] = 'Показать Ñтраницу'; $lang['btn_create'] = 'Создать Ñтраницу'; -$lang['btn_search'] = 'ПоиÑк'; +$lang['btn_search'] = 'Ðайти'; $lang['btn_save'] = 'Сохранить'; $lang['btn_preview'] = 'ПроÑмотр'; $lang['btn_top'] = 'Ðаверх'; @@ -64,9 +65,9 @@ $lang['btn_update'] = 'Обновить'; $lang['btn_delete'] = 'Удалить'; $lang['btn_back'] = 'Ðазад'; $lang['btn_backlink'] = 'СÑылки Ñюда'; -$lang['btn_subscribe'] = 'ПодпиÑатьÑÑ (вÑе правки)'; +$lang['btn_subscribe'] = 'Управление подпиÑками'; $lang['btn_profile'] = 'Профиль'; -$lang['btn_reset'] = 'СброÑ'; +$lang['btn_reset'] = 'Вернуть'; $lang['btn_resendpwd'] = 'УÑтановить новый пароль'; $lang['btn_draft'] = 'Править черновик'; $lang['btn_recover'] = 'ВоÑÑтановить черновик'; @@ -92,76 +93,78 @@ $lang['badlogin'] = 'Извините, неверное Ð¸Ð¼Ñ Ð¿Ð¾ $lang['badpassconfirm'] = 'ПроÑтите, пароль неверный'; $lang['minoredit'] = 'Ðебольшие изменениÑ'; $lang['draftdate'] = 'Черновик Ñохранён'; -$lang['nosecedit'] = 'За Ñто Ð²Ñ€ÐµÐ¼Ñ Ñтраница была изменена и Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ñекции уÑтарела. Загружена Ð¿Ð¾Ð»Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñтраницы.'; -$lang['searchcreatepage'] = 'ЕÑли вы не нашли то, что иÑкали, вы можете Ñоздать новую Ñтраницу Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼, Ñовпадающим Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñом. Чтобы Ñделать Ñто, проÑто нажмите на кнопку «Создать Ñтраницу».'; +$lang['nosecedit'] = 'За Ñто Ð²Ñ€ÐµÐ¼Ñ Ñтраница была изменена Ð¸Â Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Â Ñекции уÑтарела. Загружена Ð¿Ð¾Ð»Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñтраницы.'; +$lang['searchcreatepage'] = 'ЕÑли вы не нашли то, что иÑкали, вы можете Ñоздать новую Ñтраницу Ñ именем, Ñовпадающим Ñ запроÑом. Чтобы Ñделать Ñто, проÑто нажмите на кнопку «Создать Ñтраницу».'; $lang['regmissing'] = 'Извините, вам Ñледует заполнить вÑе полÑ.'; $lang['reguexists'] = 'Извините, пользователь Ñ Ñ‚Ð°ÐºÐ¸Ð¼ логином уже ÑущеÑтвует.'; -$lang['regsuccess'] = 'Пользователь Ñоздан; пароль выÑлан на Ð°Ð´Ñ€ÐµÑ Ñлектронной почты.'; +$lang['regsuccess'] = 'Пользователь Ñоздан; пароль выÑлан Ð½Ð°Â Ð°Ð´Ñ€ÐµÑ Ñлектронной почты.'; $lang['regsuccess2'] = 'Пользователь Ñоздан.'; -$lang['regfail'] = 'Пользователь не может быть Ñоздан.'; -$lang['regmailfail'] = 'Похоже еÑÑ‚ÑŒ проблема Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾ почте. ПожалуйÑта, Ñообщите об Ñтом админиÑтратору.'; -$lang['regbadmail'] = 'Данный вами Ð°Ð´Ñ€ÐµÑ Ñлектронной почты выглÑдит неправильным. ЕÑли вы Ñчитаете Ñто ошибкой, Ñообщите админиÑтратору.'; -$lang['regbadpass'] = 'Два введённых Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ идентичны. ПожалуйÑта, попробуйте ещё раз.'; +$lang['regfail'] = 'Пользователь не может быть Ñоздан.'; +$lang['regmailfail'] = 'Похоже еÑÑ‚ÑŒ проблема Ñ отправкой Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾Â Ð¿Ð¾Ñ‡Ñ‚Ðµ. ПожалуйÑта, Ñообщите об Ñтом админиÑтратору.'; +$lang['regbadmail'] = 'Данный вами Ð°Ð´Ñ€ÐµÑ Ñлектронной почты выглÑдит неправильным. ЕÑли вы Ñчитаете Ñто ошибкой, Ñообщите админиÑтратору.'; +$lang['regbadpass'] = 'Два введённых Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÂ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‡Ð½Ñ‹. ПожалуйÑта, попробуйте ещё раз.'; $lang['regpwmail'] = 'Ваш пароль Ð´Ð»Ñ ÑиÑтемы «Докувики»'; $lang['reghere'] = 'У Ð²Ð°Ñ ÐµÑ‰Ñ‘ нет аккаунта? ЗарегиÑтрируйтеÑÑŒ'; $lang['profna'] = 'Ð”Ð°Ð½Ð½Ð°Ñ Ð²Ð¸ÐºÐ¸ не поддерживает изменение профилÑ'; $lang['profnochange'] = 'Изменений не было внеÑено, профиль не обновлён.'; $lang['profnoempty'] = 'Логин и Ð°Ð´Ñ€ÐµÑ Ñлектронной почты не могут быть пуÑтыми.'; $lang['profchanged'] = 'Профиль Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÑƒÑпешно обновлён.'; -$lang['profnodelete'] = 'Удалённый пользователь не может работать Ñ Ñтим документом'; +$lang['profnodelete'] = 'Удалённый пользователь не может работать Ñ Ñтим документом'; $lang['profdeleteuser'] = 'Удалить аккаунт'; -$lang['profdeleted'] = 'Ваш аккаунт был удален из Ñтой вики'; -$lang['profconfdelete'] = 'Я хочу удалить Ñвой аккаунт из Ñтой вики.
Это дейÑтвие необратимо.'; -$lang['profconfdeletemissing'] = 'Флажок Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð½Ðµ уÑтановлен'; -$lang['proffail'] = 'Профиль Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½Ðµ был обновлен.'; +$lang['profdeleted'] = 'Ваш аккаунт был удалён из Ñтой вики'; +$lang['profconfdelete'] = 'Я хочу удалить Ñвой аккаунт из Ñтой вики.
+Это дейÑтвие необратимо.'; +$lang['profconfdeletemissing'] = 'Флажок Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð½ÐµÂ ÑƒÑтановлен'; +$lang['proffail'] = 'Профиль Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð½ÐµÂ Ð±Ñ‹Ð» обновлен.'; $lang['pwdforget'] = 'Забыли пароль? Получите новый'; -$lang['resendna'] = 'Ð”Ð°Ð½Ð½Ð°Ñ Ð²Ð¸ÐºÐ¸ не поддерживает повторную отправку паролÑ.'; +$lang['resendna'] = 'Ð”Ð°Ð½Ð½Ð°Ñ Ð²Ð¸ÐºÐ¸ не поддерживает повторную отправку паролÑ.'; $lang['resendpwd'] = 'УÑтановить новый пароль длÑ'; $lang['resendpwdmissing'] = 'Ð’Ñ‹ должны заполнить вÑе Ð¿Ð¾Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ñ‹.'; -$lang['resendpwdnouser'] = 'Пользователь Ñ Ñ‚Ð°ÐºÐ¸Ð¼ логином не обнаружен в нашей базе данных.'; -$lang['resendpwdbadauth'] = 'Извините, неверный код авторизации. УбедитеÑÑŒ, что вы полноÑтью Ñкопировали ÑÑылку. '; -$lang['resendpwdconfirm'] = 'СÑылка Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð±Ñ‹Ð»Ð° выÑлана по Ñлектронной почте. '; -$lang['resendpwdsuccess'] = 'Ваш новый пароль был выÑлан по Ñлектронной почте.'; -$lang['license'] = 'За иÑключением Ñлучаев, когда указано иное, Ñодержимое Ñтой вики предоÑтавлÑетÑÑ Ð½Ð° уÑловиÑÑ… Ñледующей лицензии:'; -$lang['licenseok'] = 'Примечание: Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÑ Ñту Ñтраницу, вы ÑоглашаетеÑÑŒ на иÑпользование Ñвоего вклада на уÑловиÑÑ… Ñледующей лицензии:'; -$lang['searchmedia'] = 'ПоиÑк по имени файла:'; +$lang['resendpwdnouser'] = 'Пользователь Ñ таким логином не обнаружен в нашей базе данных.'; +$lang['resendpwdbadauth'] = 'Извините, неверный код авторизации. УбедитеÑÑŒ, что вы полноÑтью Ñкопировали ÑÑылку.'; +$lang['resendpwdconfirm'] = 'СÑылка Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð±Ñ‹Ð»Ð° выÑлана по Ñлектронной почте.'; +$lang['resendpwdsuccess'] = 'Ваш новый пароль был выÑлан по Ñлектронной почте.'; +$lang['license'] = 'За иÑключением Ñлучаев, когда указано иное, Ñодержимое Ñтой вики предоÑтавлÑетÑÑ Ð½Ð°Â ÑƒÑловиÑÑ… Ñледующей лицензии:'; +$lang['licenseok'] = 'Примечание: Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÑ Ñту Ñтраницу, вы ÑоглашаетеÑÑŒ на иÑпользование Ñвоего вклада на уÑловиÑÑ… Ñледующей лицензии:'; +$lang['searchmedia'] = 'ПоиÑк по имени файла'; $lang['searchmedia_in'] = 'ПоиÑк в %s'; $lang['txt_upload'] = 'Выберите файл Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸:'; $lang['txt_filename'] = 'Введите Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в вики (необÑзательно):'; $lang['txt_overwrt'] = 'ПерезапиÑать ÑущеÑтвующий файл'; -$lang['maxuploadsize'] = 'МакÑимальный размер загружаемого файла %s'; -$lang['lockedby'] = 'Ð’ данный момент заблокирован:'; -$lang['lockexpire'] = 'Блокировка иÑтекает в:'; -$lang['js']['willexpire'] = 'Ваша блокировка Ñтой Ñтраницы на редактирование иÑтекает в течение минуты.\nЧтобы предотвратить конфликты иÑпользуйте кнопку «ПроÑмотр» Ð´Ð»Ñ ÑброÑа таймера блокировки.'; -$lang['js']['notsavedyet'] = 'ÐеÑохранённые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ потерÑны. Ð’Ñ‹ дейÑтвительно хотите продолжить?'; +$lang['maxuploadsize'] = 'МакÑ. размер загружаемого файла %s'; +$lang['lockedby'] = 'Ð’ данный момент заблокировано пользователем'; +$lang['lockexpire'] = 'Блокировка иÑтекает в'; +$lang['js']['willexpire'] = 'Ваша блокировка Ñтой Ñтраницы на редактирование иÑтекает в течение минуты.\nЧтобы предотвратить конфликты иÑпользуйте кнопку «ПроÑмотр» Ð´Ð»Ñ ÑброÑа таймера блокировки.'; +$lang['js']['notsavedyet'] = 'ÐеÑохранённые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ потерÑны. Вы дейÑтвительно хотите продолжить?'; $lang['js']['searchmedia'] = 'ПоиÑк файлов'; $lang['js']['keepopen'] = 'Ðе закрывать окно поÑле выбора'; $lang['js']['hidedetails'] = 'Скрыть детали'; -$lang['js']['mediatitle'] = 'ÐаÑтройки ÑÑылок'; +$lang['js']['mediatitle'] = 'ÐаÑтройка ÑÑылки'; $lang['js']['mediadisplay'] = 'Тип ÑÑылки'; -$lang['js']['mediaalign'] = 'Выравнивание'; -$lang['js']['mediasize'] = 'Размер изображениÑ'; -$lang['js']['mediatarget'] = 'Значение target ÑÑылки'; +$lang['js']['mediaalign'] = 'Выравнивание +'; +$lang['js']['mediasize'] = 'Размер'; +$lang['js']['mediatarget'] = 'Ð¦ÐµÐ»ÐµÐ²Ð°Ñ ÑÑылка'; $lang['js']['mediaclose'] = 'Закрыть'; $lang['js']['mediainsert'] = 'Ð’Ñтавить'; -$lang['js']['mediadisplayimg'] = 'Показывать изображение.'; -$lang['js']['mediadisplaylnk'] = 'Показывать только ÑÑылку.'; +$lang['js']['mediadisplayimg'] = 'Показывать изображение'; +$lang['js']['mediadisplaylnk'] = 'Показывать только ÑÑылку'; $lang['js']['mediasmall'] = 'ÐœÐ°Ð»Ð°Ñ Ð²ÐµÑ€ÑиÑ'; $lang['js']['mediamedium'] = 'СреднÑÑ Ð²ÐµÑ€ÑиÑ'; $lang['js']['medialarge'] = 'ÐšÑ€ÑƒÐ¿Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ'; $lang['js']['mediaoriginal'] = 'ИÑÑ…Ð¾Ð´Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ'; $lang['js']['medialnk'] = 'СÑылка на подробноÑти'; -$lang['js']['mediadirect'] = 'ПрÑÐ¼Ð°Ñ ÑÑылка на оригинал'; +$lang['js']['mediadirect'] = 'ПрÑÐ¼Ð°Ñ ÑÑылка на оригинал'; $lang['js']['medianolnk'] = 'Без ÑÑылки'; -$lang['js']['medianolink'] = 'Ðе давать ÑÑылку на изображение'; -$lang['js']['medialeft'] = 'ВыровнÑÑ‚ÑŒ изображение по левому краю.'; -$lang['js']['mediaright'] = 'ВыровнÑÑ‚ÑŒ изображение по правому краю.'; -$lang['js']['mediacenter'] = 'ВыровнÑÑ‚ÑŒ изображение по центру.'; -$lang['js']['medianoalign'] = 'Ðе выравнивать.'; -$lang['js']['nosmblinks'] = 'СÑылка на Ñетевые каталоги Windows работает только из MS Internet Explorer, но вы можете Ñкопировать ÑÑылку.'; +$lang['js']['medianolink'] = 'Ðе давать ÑÑылку на изображение'; +$lang['js']['medialeft'] = 'ВыровнÑÑ‚ÑŒ изображение по левому краю'; +$lang['js']['mediaright'] = 'ВыровнÑÑ‚ÑŒ изображение по правому краю'; +$lang['js']['mediacenter'] = 'ВыровнÑÑ‚ÑŒ изображение по центру'; +$lang['js']['medianoalign'] = 'Ðе выравнивать'; +$lang['js']['nosmblinks'] = 'СÑылка на Ñетевые каталоги Windows работает только из MS Internet Explorer, но вы можете Ñкопировать ÑÑылку.'; $lang['js']['linkwiz'] = 'МаÑтер ÑÑылок'; $lang['js']['linkto'] = 'СÑылка на:'; -$lang['js']['del_confirm'] = 'Ð’Ñ‹ на Ñамом деле желаете удалить выбранное?'; +$lang['js']['del_confirm'] = 'Вы на Ñамом деле желаете удалить выбранное?'; $lang['js']['restore_confirm'] = 'ДейÑтвительно воÑÑтановить Ñту верÑию?'; $lang['js']['media_diff'] = 'ПроÑмотр отличий:'; $lang['js']['media_diff_both'] = 'Ñ€Ñдом'; @@ -184,31 +187,31 @@ $lang['uploadbadcontent'] = 'Содержание файла не Ñоот $lang['uploadspam'] = 'Загрузка заблокирована Ñпам-фильтром.'; $lang['uploadxss'] = 'Загрузка заблокирована по ÑоображениÑм безопаÑноÑти.'; $lang['uploadsize'] = 'Загруженный файл был Ñлишком большой. (МакÑ. %s)'; -$lang['deletesucc'] = 'Файл «%s» был удалён.'; -$lang['deletefail'] = 'Ðевозможно удалить файл «%s». Проверьте права доÑтупа к файлу.'; -$lang['mediainuse'] = 'Файл «%s» не был удалён — файл вÑÑ‘ ещё иÑпользуетÑÑ.'; +$lang['deletesucc'] = 'Файл %s был удалён.'; +$lang['deletefail'] = 'Ðевозможно удалить файл %s. Проверьте права доÑтупа к файлу.'; +$lang['mediainuse'] = 'Файл %s не был удалён — файл вÑÑ‘ ещё иÑпользуетÑÑ.'; $lang['namespaces'] = 'ПроÑтранÑтва имён'; $lang['mediafiles'] = 'ДоÑтупные файлы'; $lang['accessdenied'] = 'Ð’Ñ‹ не можете проÑмотреть Ñту Ñтраницу.'; $lang['mediausage'] = 'Ð”Ð»Ñ ÑÑылки на Ñтот файл иÑпользуйте Ñледующий ÑинтакÑиÑ:'; $lang['mediaview'] = 'ПоÑмотреть иÑходный файл'; $lang['mediaroot'] = 'корень'; -$lang['mediaupload'] = 'ЗдеÑÑŒ можно загрузить файл в текущий каталог («проÑтранÑтво имён»). Чтобы Ñоздать подкаталоги, добавьте их к началу имени файла («Загрузить как»). Имена подкаталогов разделÑÑŽÑ‚ÑÑ Ð´Ð²Ð¾ÐµÑ‚Ð¾Ñ‡Ð¸Ñми. '; +$lang['mediaupload'] = 'ЗдеÑÑŒ можно загрузить файл в текущий каталог («проÑтранÑтво имён»). Чтобы Ñоздать подкаталоги, добавьте их к началу имени файла («Загрузить как»). Имена подкаталогов разделÑÑŽÑ‚ÑÑ Ð´Ð²Ð¾ÐµÑ‚Ð¾Ñ‡Ð¸Ñми.'; $lang['mediaextchange'] = 'РаÑширение изменилоÑÑŒ Ñ .%s на .%s!'; $lang['reference'] = 'СÑылки длÑ'; -$lang['ref_inuse'] = 'Этот файл не может быть удалён, так как он иÑпользуетÑÑ Ð½Ð° Ñледующих Ñтраницах:'; -$lang['ref_hidden'] = 'Ðекоторые ÑÑылки находÑÑ‚ÑÑ Ð½Ð° Ñтраницах, на чтение которых у Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа'; +$lang['ref_inuse'] = 'Этот файл не может быть удалён, так как он иÑпользуетÑÑ Ð½Ð°Â Ñледующих Ñтраницах:'; +$lang['ref_hidden'] = 'Ðекоторые ÑÑылки находÑÑ‚ÑÑ Ð½Ð°Â Ñтраницах, на чтение которых ÑƒÂ Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа'; $lang['hits'] = 'ÑоответÑтвий'; -$lang['quickhits'] = 'СоответÑÑ‚Ð²Ð¸Ñ Ð² названиÑÑ… Ñтраниц'; +$lang['quickhits'] = 'ПодходÑщие Ñтраницы'; $lang['toc'] = 'Содержание'; $lang['current'] = 'текущий'; $lang['yours'] = 'Ваша верÑиÑ'; $lang['diff'] = 'Показать Ð¾Ñ‚Ð»Ð¸Ñ‡Ð¸Ñ Ð¾Ñ‚ текущей верÑии'; $lang['diff2'] = 'Показать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ ревизиÑми '; $lang['difflink'] = 'СÑылка на Ñто Ñравнение'; -$lang['diff_type'] = 'ПоÑмотреть отличиÑ'; -$lang['diff_inline'] = 'вÑтроенный'; -$lang['diff_side'] = 'бок о бок'; +$lang['diff_type'] = 'ПоÑмотреть различиÑ'; +$lang['diff_inline'] = 'внутри текÑта'; +$lang['diff_side'] = 'Ð´Ð²ÑƒÐ¼Ñ ÐºÐ¾Ð»Ð¾Ð½ÐºÐ°Ð¼Ð¸'; $lang['diffprevrev'] = 'ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð²ÐµÑ€ÑиÑ'; $lang['diffnextrev'] = 'Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð²ÐµÑ€ÑиÑ'; $lang['difflastrev'] = 'ПоÑледнÑÑ Ð²ÐµÑ€ÑиÑ'; @@ -313,7 +316,7 @@ $lang['i_mbfuncoverload'] = 'Ð”Ð»Ñ Ð·Ð°Ð¿ÑƒÑка «Докувики» н $lang['i_permfail'] = '%s недоÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи «Докувики». Вам необходимо иÑправить ÑиÑтемные права доÑтупа Ð´Ð»Ñ Ñтой директории!'; $lang['i_confexists'] = '%s уже ÑущеÑтвует'; $lang['i_writeerr'] = 'Ðе удалоÑÑŒ Ñоздать %s. Вам необходимо проверить ÑиÑтемные права доÑтупа к файлу и директориÑм, и Ñоздать файл вручную. '; -$lang['i_badhash'] = 'dokuwiki.php не раÑпознан или изменён (Ñ…Ñш=%s)'; +$lang['i_badhash'] = 'dokuwiki.php не раÑпознан или изменён (hash=%s)'; $lang['i_badval'] = '%s — недопуÑтимое или пуÑтое значение'; $lang['i_success'] = 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¾ÑˆÐ»Ð° уÑпешно. Теперь вы можете удалить файл install.php. Переходите к Ñвоей новой «Докувики».'; @@ -338,7 +341,7 @@ $lang['minutes'] = '%d минут назад'; $lang['seconds'] = '%d Ñекунд назад'; $lang['wordblock'] = 'Ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ Ñохранены, поÑкольку они Ñодержат блокируемые Ñлова (Ñпам).'; $lang['media_uploadtab'] = 'Загрузка'; -$lang['media_searchtab'] = 'ПоиÑк'; +$lang['media_searchtab'] = 'Ðайти'; $lang['media_file'] = 'Файл'; $lang['media_viewtab'] = 'ПроÑмотр'; $lang['media_edittab'] = 'Правка'; @@ -361,10 +364,12 @@ $lang['media_perm_read'] = 'Извините, у Ð²Ð°Ñ Ð½ÐµÐ´Ð¾Ñтато $lang['media_perm_upload'] = 'Извините, у Ð²Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно прав Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файлов.'; $lang['media_update'] = 'Загрузить новую верÑию'; $lang['media_restore'] = 'ВоÑÑтановить Ñту верÑию'; -$lang['media_acl_warning'] = 'Этот ÑпиÑок может быть неполным из-за ACL ограничений и Ñкрытых Ñтраниц.'; +$lang['media_acl_warning'] = 'Этот ÑпиÑок может быть неполным из-за ограничений ÑпиÑков ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð´Ð¾Ñтупа (ACL) и Ñкрытых Ñтраниц.'; $lang['currentns'] = 'Текущее проÑтранÑтво имён'; $lang['searchresult'] = 'Результаты поиÑка'; $lang['plainhtml'] = 'ПроÑтой HTML'; $lang['wikimarkup'] = 'вики-разметка'; $lang['page_nonexist_rev'] = 'Эта Ñтраница ещё не ÑущеÑтвовала %s. Она была Ñоздана %s.'; $lang['unable_to_parse_date'] = 'Ðевозможно обработать параметр "%s".'; +$lang['email_signature_text'] = 'Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/ru/mailtext.txt b/sources/inc/lang/ru/mailtext.txt index 9291749..0eb31a1 100644 --- a/sources/inc/lang/ru/mailtext.txt +++ b/sources/inc/lang/ru/mailtext.txt @@ -10,8 +10,3 @@ IP-адреÑ: @IPADDRESS@ Пользователь: @USER@ @DIFF@ - - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ru/password.txt b/sources/inc/lang/ru/password.txt index 360201b..bee594e 100644 --- a/sources/inc/lang/ru/password.txt +++ b/sources/inc/lang/ru/password.txt @@ -4,7 +4,3 @@ Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ: @LOGIN@ Пароль: @PASSWORD@ - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ru/pwconfirm.txt b/sources/inc/lang/ru/pwconfirm.txt index de31aa9..fff6694 100644 --- a/sources/inc/lang/ru/pwconfirm.txt +++ b/sources/inc/lang/ru/pwconfirm.txt @@ -7,7 +7,3 @@ Ð”Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ, что Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð±Ñ‹Ð» дейÑтвительно Ñделан вами, пожалуйÑта, перейдите по Ñледующей ÑÑылке. @CONFIRM@ - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ru/recent.txt b/sources/inc/lang/ru/recent.txt index aa088c7..0d4d328 100644 --- a/sources/inc/lang/ru/recent.txt +++ b/sources/inc/lang/ru/recent.txt @@ -1,5 +1,5 @@ ====== Ðедавние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ====== -Эти Ñтраницы были изменены недавно. +Следующие Ñтраницы были недавно изменены diff --git a/sources/inc/lang/ru/registermail.txt b/sources/inc/lang/ru/registermail.txt index d552965..8e420aa 100644 --- a/sources/inc/lang/ru/registermail.txt +++ b/sources/inc/lang/ru/registermail.txt @@ -8,7 +8,3 @@ Браузер: @BROWSER@ ÐÐ´Ñ€ÐµÑ IP: @IPADDRESS@ ХоÑÑ‚: @HOSTNAME@ - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ diff --git a/sources/inc/lang/ru/subscr_digest.txt b/sources/inc/lang/ru/subscr_digest.txt index ac0fc05..ee313b9 100644 --- a/sources/inc/lang/ru/subscr_digest.txt +++ b/sources/inc/lang/ru/subscr_digest.txt @@ -14,7 +14,3 @@ @DOKUWIKIURL@ в раздел @SUBSCRIBE@ и отмените подпиÑку на Ñтраницу и/или проÑтранÑтво имен. - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ru/subscr_list.txt b/sources/inc/lang/ru/subscr_list.txt index 984a25e..bff3282 100644 --- a/sources/inc/lang/ru/subscr_list.txt +++ b/sources/inc/lang/ru/subscr_list.txt @@ -1,6 +1,7 @@ Привет. Страницы в проÑтранÑтве имён @PAGE@ в вики @TITLE@ были изменены. + СпиÑок изменившихÑÑ Ñтраниц: -------------------------------------------------------- @@ -11,7 +12,3 @@ @DOKUWIKIURL@ в раздел @SUBSCRIBE@ и отмените подпиÑку на Ñтраницу и/или проÑтранÑтво имён. - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ru/subscr_single.txt b/sources/inc/lang/ru/subscr_single.txt index 679ca6f..744da56 100644 --- a/sources/inc/lang/ru/subscr_single.txt +++ b/sources/inc/lang/ru/subscr_single.txt @@ -18,7 +18,3 @@ @DOKUWIKIURL@ в раздел @SUBSCRIBE@ и отмените подпиÑку на Ñтраницу и/или проÑтранÑтво имён. - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/ru/uploadmail.txt b/sources/inc/lang/ru/uploadmail.txt index 1cc5c6a..a92d855 100644 --- a/sources/inc/lang/ru/uploadmail.txt +++ b/sources/inc/lang/ru/uploadmail.txt @@ -9,7 +9,3 @@ Размер: @SIZE@ Тип MIME: @MIME@ Пользователь: @USER@ - --- -Это пиÑьмо Ñоздано «Докувики» Ñ Ñайта -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sk/lang.php b/sources/inc/lang/sk/lang.php index a78989c..6ab3184 100644 --- a/sources/inc/lang/sk/lang.php +++ b/sources/inc/lang/sk/lang.php @@ -2,11 +2,12 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Ondrej Vegh with help of the scholars from Zdruzena stredna skola polygraficka in Bratislava * @author Michal Mesko * @author exusik@gmail.com * @author Martin Michalek + * @author Michalek */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -50,8 +51,10 @@ $lang['btn_register'] = 'RegistrovaÅ¥'; $lang['btn_apply'] = 'PoužiÅ¥'; $lang['btn_media'] = 'Správa médií'; $lang['btn_deleteuser'] = 'ZruÅ¡iÅ¥ môj úÄet'; +$lang['btn_img_backto'] = 'Späť na %s'; +$lang['btn_mediaManager'] = 'PrezrieÅ¥ v správcovi médií'; $lang['loggedinas'] = 'Prihlásený(á) ako:'; -$lang['user'] = 'Užívateľské meno'; +$lang['user'] = 'Používateľské meno'; $lang['pass'] = 'Heslo'; $lang['newpass'] = 'Nové heslo'; $lang['oldpass'] = 'PotvrÄ aktuálne heslo'; @@ -59,36 +62,38 @@ $lang['passchk'] = 'EÅ¡te raz znovu'; $lang['remember'] = 'Zapamätaj si ma'; $lang['fullname'] = 'Celé meno'; $lang['email'] = 'E-Mail'; -$lang['profile'] = 'Užívateľský profil'; -$lang['badlogin'] = 'Zadané užívateľské meno a heslo nie je správne.'; +$lang['profile'] = 'Používateľský profil'; +$lang['badlogin'] = 'Zadané používateľské meno a heslo nie je správne.'; $lang['badpassconfirm'] = 'Ľutujem, heslo bolo nesprávne.'; $lang['minoredit'] = 'MenÅ¡ie zmeny'; $lang['draftdate'] = 'Koncept automaticky uložený'; $lang['nosecedit'] = 'Stránka bola medziÄasom zmenená, informácie o sekcii sú zastaralé a z tohto dôvodu bola nahraná celá stránka.'; -$lang['searchcreatepage'] = "Pokiaľ ste nenaÅ¡li, Äo hľadáte, skúste požadovanú stránku sami vytvoriÅ¥ stlaÄením tlaÄidla ''VytvoriÅ¥ stránku''."; +$lang['searchcreatepage'] = 'Pokiaľ ste nenaÅ¡li, Äo hľadáte, skúste požadovanú stránku sami vytvoriÅ¥ stlaÄením tlaÄidla \'\'VytvoriÅ¥ stránku\'\'.'; $lang['regmissing'] = 'Musíte vyplniÅ¥ vÅ¡etky údaje.'; -$lang['reguexists'] = 'Užívateľ s rovnakým menom je už zaregistrovaný.'; -$lang['regsuccess'] = 'Užívateľský úÄet bol vytvorený a heslo zaslané emailom.'; -$lang['regsuccess2'] = 'Užívateľský úÄet bol vytvorený.'; +$lang['reguexists'] = 'Používateľ s rovnakým menom je už zaregistrovaný.'; +$lang['regsuccess'] = 'Používateľský úÄet bol vytvorený a heslo zaslané emailom.'; +$lang['regsuccess2'] = 'Používateľský úÄet bol vytvorený.'; +$lang['regfail'] = 'Používateľský úÄet nemôže byÅ¥ vytvorený.'; $lang['regmailfail'] = 'Zdá sa, že nastala chyba pri posielaní mailu s heslom. Skúste kontaktovaÅ¥ správcu.'; $lang['regbadmail'] = 'Zadaná emailová adresa nie je platná. Pokiaľ si myslíte, že to je zle, skúste kontaktovaÅ¥ správcu.'; $lang['regbadpass'] = 'Zadané heslá nie sú rovnaké, zadajte ich prosím znovu.'; $lang['regpwmail'] = 'VaÅ¡e heslo do systému DokuWiki'; -$lang['reghere'] = 'Nemáte užívateľský úÄet? Vytvorte si ho'; +$lang['reghere'] = 'Nemáte používateľský úÄet? Vytvorte si ho'; $lang['profna'] = 'Táto wiki nepodporuje zmenu profilu'; $lang['profnochange'] = 'Žiadne zmeny, nie je Äo robiÅ¥.'; $lang['profnoempty'] = 'Prázdne meno alebo mailová adresa nie sú povolené.'; -$lang['profchanged'] = 'Užívateľský úÄet úspeÅ¡ne zmenený.'; +$lang['profchanged'] = 'Profil požívateľa bol úspeÅ¡ne zmenený.'; $lang['profnodelete'] = 'Táto wiki neumožňuje zruÅ¡enie používateľov.'; $lang['profdeleteuser'] = 'ZruÅ¡iÅ¥ úÄet'; $lang['profdeleted'] = 'Váš úÄet bol zruÅ¡ený v tejto wiki.'; $lang['profconfdelete'] = 'Chcem odstrániÅ¥ môj úÄet z tejto wiki.
Táto operácia je nevratná.'; $lang['profconfdeletemissing'] = 'Nebolo zavolené potvrdzovacie políÄko'; +$lang['proffail'] = 'Profil používateľa nebol aktualizovaný.'; $lang['pwdforget'] = 'Zabudli ste heslo? Získajte nové!'; $lang['resendna'] = 'Táto wiki nepodporuje opätovné zasielanie hesla.'; $lang['resendpwd'] = 'NastaviÅ¥ nové heslo pre'; $lang['resendpwdmissing'] = 'PrepáÄte, musíte vyplniÅ¥ vÅ¡etky polia.'; -$lang['resendpwdnouser'] = 'PrepáÄte, nemôžeme nájsÅ¥ zadaného užívateľa v databáze.'; +$lang['resendpwdnouser'] = 'PrepáÄte, nemôžeme nájsÅ¥ zadaného používateľa v databáze.'; $lang['resendpwdbadauth'] = 'PrepáÄte, tento autorizaÄný kód nie je platný. Uistite sa, Äi ste použili celý autorizaÄný odkaz.'; $lang['resendpwdconfirm'] = 'AutorizaÄný odkaz bol zaslaný na e-mail.'; $lang['resendpwdsuccess'] = 'VaÅ¡e nové heslo bolo zaslané na e-mail.'; @@ -181,6 +186,9 @@ $lang['difflink'] = 'Odkaz na tento prehľad zmien'; $lang['diff_type'] = 'Prehľad zmien:'; $lang['diff_inline'] = 'Vnorený'; $lang['diff_side'] = 'Vedľa seba'; +$lang['diffprevrev'] = 'Predchádzajúca revízia'; +$lang['diffnextrev'] = 'Nasledujúca revízia'; +$lang['difflastrev'] = 'Posledná revízia'; $lang['line'] = 'Riadok'; $lang['breadcrumb'] = 'História:'; $lang['youarehere'] = 'Nachádzate sa:'; @@ -202,7 +210,7 @@ $lang['sidebar'] = 'BoÄný panel'; $lang['mail_newpage'] = 'stránka pridaná:'; $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_new_user'] = 'nový používateľ:'; $lang['mail_upload'] = 'nahraný súbor:'; $lang['changes_type'] = 'Prehľad zmien'; $lang['pages_changes'] = 'Stránok'; @@ -236,7 +244,6 @@ $lang['upperns'] = 'návrat do nadradeného menného priestoru'; $lang['metaedit'] = 'UpraviÅ¥ metainformácie'; $lang['metasaveerr'] = 'Zápis metainformácií zlyhal'; $lang['metasaveok'] = 'Metainformácie uložené'; -$lang['btn_img_backto'] = 'Späť na %s'; $lang['img_title'] = 'Titul:'; $lang['img_caption'] = 'Popis:'; $lang['img_date'] = 'Dátum:'; @@ -249,7 +256,6 @@ $lang['img_camera'] = 'Fotoaparát:'; $lang['img_keywords'] = 'KľúÄové slová:'; $lang['img_width'] = 'Šírka:'; $lang['img_height'] = 'Výška:'; -$lang['btn_mediaManager'] = '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'; @@ -266,7 +272,7 @@ $lang['subscr_m_receive'] = 'DostávaÅ¥'; $lang['subscr_style_every'] = 'email pri každej zmene'; $lang['subscr_style_digest'] = 'email so zhrnutím zmien pre každú stránku (perióda %.2f dňa)'; $lang['subscr_style_list'] = 'zoznam zmenených stránok od posledného emailu (perióda %.2f dňa)'; -$lang['authtempfail'] = 'Užívateľská autentifikácia je doÄasne nedostupná. Ak táto situácia pretrváva, prosím informujte správcu systému.'; +$lang['authtempfail'] = 'Používateľská autentifikácia je doÄasne nedostupná. Ak táto situácia pretrváva, prosím informujte správcu systému.'; $lang['i_chooselang'] = 'Zvoľte váš jazyk'; $lang['i_installer'] = 'DokuWiki inÅ¡talátor'; $lang['i_wikiname'] = 'Názov Wiki'; @@ -285,8 +291,8 @@ $lang['i_success'] = 'Konfigurácia bola úspeÅ¡ne ukonÄená. Teraz $lang['i_failure'] = 'Pri zápise konfiguraÄného súboru nastali nejaké chyby. Potrebujete ich opraviÅ¥ manuálne pred tým, ako budete môcÅ¥ používaÅ¥ vaÅ¡u novú DokuWiki.'; $lang['i_policy'] = 'PoÄiatoÄná ACL politika'; $lang['i_pol0'] = 'Otvorená Wiki (Äítanie, zápis a nahrávanie pre každého)'; -$lang['i_pol1'] = 'Verejná Wiki (Äítanie pre každého, zápis a nahrávanie pre registrovaných užívateľov)'; -$lang['i_pol2'] = 'Uzatvorená Wiki (Äítanie, zápis a nahrávanie len pre registrovaných užívateľov)'; +$lang['i_pol1'] = 'Verejná Wiki (Äítanie pre každého, zápis a nahrávanie pre registrovaných používateľov)'; +$lang['i_pol2'] = 'Uzatvorená Wiki (Äítanie, zápis a nahrávanie len pre registrovaných používateľov)'; $lang['i_allowreg'] = 'Povolenie samostanej registrácie používateľov'; $lang['i_retry'] = 'SkúsiÅ¥ znovu'; $lang['i_license'] = 'Vyberte licenciu, pod ktorou chcete uložiÅ¥ váš obsah:'; @@ -329,3 +335,5 @@ $lang['currentns'] = 'Aktuálny menný priestor'; $lang['searchresult'] = 'Výsledky hľadania'; $lang['plainhtml'] = 'Jednoduché HTML'; $lang['wikimarkup'] = 'Wiki formát'; +$lang['email_signature_text'] = 'Táto správa bola zaslaná DokuWiki +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/sk/locked.txt b/sources/inc/lang/sk/locked.txt index 5063c06..fae400b 100644 --- a/sources/inc/lang/sk/locked.txt +++ b/sources/inc/lang/sk/locked.txt @@ -1,3 +1,3 @@ ====== Stránka je uzamknutá ====== -Tato stránka je práve uzamknutá pre úpravy iným užívateľom. Musíte poÄkaÅ¥ dovtedy, pokiaľ daný užívateľ dokonÄí svoje úpravy alebo pokiaľ tento zámok stratí platnosÅ¥. +Tato stránka je práve uzamknutá pre úpravy iným používateľom. Musíte poÄkaÅ¥ dovtedy, pokiaľ daný používateľ dokonÄí svoje úpravy alebo pokiaľ tento zámok stratí platnosÅ¥. diff --git a/sources/inc/lang/sk/mailtext.txt b/sources/inc/lang/sk/mailtext.txt index 30b7f5c..da2f441 100644 --- a/sources/inc/lang/sk/mailtext.txt +++ b/sources/inc/lang/sk/mailtext.txt @@ -10,8 +10,3 @@ Komentár : @SUMMARY@ User : @USER@ @DIFF@ - - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sk/mailwrap.html b/sources/inc/lang/sk/mailwrap.html index 2e42515..d257190 100644 --- a/sources/inc/lang/sk/mailwrap.html +++ b/sources/inc/lang/sk/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Táto správa bola zaslaná DokuWiki @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/sk/password.txt b/sources/inc/lang/sk/password.txt index 2b85e9c..8d0907e 100644 --- a/sources/inc/lang/sk/password.txt +++ b/sources/inc/lang/sk/password.txt @@ -3,9 +3,5 @@ Dobrý deň, Tu sú prihlasovacie informácie pre @TITLE@ (@DOKUWIKIURL@) Meno : @FULLNAME@ -Užívateľské meno : @LOGIN@ +Používateľské meno : @LOGIN@ Heslo : @PASSWORD@ - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sk/pwconfirm.txt b/sources/inc/lang/sk/pwconfirm.txt index 210740d..f8ba97a 100644 --- a/sources/inc/lang/sk/pwconfirm.txt +++ b/sources/inc/lang/sk/pwconfirm.txt @@ -9,7 +9,3 @@ Pre potvrdenie, že požiadavka bola skutoÄne odoslaná vami, použite prosím nasledujúci odkaz. @CONFIRM@ - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sk/register.txt b/sources/inc/lang/sk/register.txt index 59c225d..b939dcc 100644 --- a/sources/inc/lang/sk/register.txt +++ b/sources/inc/lang/sk/register.txt @@ -1,3 +1,3 @@ ====== Zaregistrujte sa ako nový užívateľ ====== -Aby ste získali užívateľský úÄet, vyplňte prosím vÅ¡etky informácie v nasledujúcom formulári. Zadajte **platnú** mailovú adresu, na ktorú bude zaslané heslo. Užívateľské meno musí byÅ¥ v platnom [[doku>pagename|formáte]] (ktorý je rovnaký ako formát názvu stránky). +Aby ste získali používateľský úÄet, vyplňte prosím vÅ¡etky informácie v nasledujúcom formulári. Zadajte **platnú** mailovú adresu, na ktorú bude zaslané heslo. Používateľské meno musí byÅ¥ v platnom [[doku>pagename|formáte]] (ktorý je rovnaký ako formát názvu stránky). diff --git a/sources/inc/lang/sk/registermail.txt b/sources/inc/lang/sk/registermail.txt index a0bf9e3..2be1ac3 100644 --- a/sources/inc/lang/sk/registermail.txt +++ b/sources/inc/lang/sk/registermail.txt @@ -1,6 +1,6 @@ -Nový užívateľ bol registrovaný. Tu sú detaily: +Nový používateľ bol registrovaný. Tu sú detaily: -Užívateľské meno : @NEWUSER@ +Používateľské meno : @NEWUSER@ Celé meno : @NEWNAME@ E-Mail : @NEWEMAIL@ @@ -8,7 +8,3 @@ Dátum : @DATE@ PrehliadaÄ : @BROWSER@ IP adresa : @IPADDRESS@ Meno servera : @HOSTNAME@ - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sk/showrev.txt b/sources/inc/lang/sk/showrev.txt index 0367696..b694c23 100644 --- a/sources/inc/lang/sk/showrev.txt +++ b/sources/inc/lang/sk/showrev.txt @@ -1,3 +1,2 @@ **Toto je starÅ¡ia verzia dokumentu!** ---- - diff --git a/sources/inc/lang/sk/subscr_digest.txt b/sources/inc/lang/sk/subscr_digest.txt index 273cc7e..6d336cb 100644 --- a/sources/inc/lang/sk/subscr_digest.txt +++ b/sources/inc/lang/sk/subscr_digest.txt @@ -14,7 +14,3 @@ Ak si neprajete zasielaÅ¥ tieto správy, prihláste sa do wiki @DOKUWIKIURL@, potom prejdite na @SUBSCRIBE@ a odhláste sa z informovania o zmenách stránky alebo menného priestoru. - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sk/subscr_list.txt b/sources/inc/lang/sk/subscr_list.txt index 3a5bfb5..7332e77 100644 --- a/sources/inc/lang/sk/subscr_list.txt +++ b/sources/inc/lang/sk/subscr_list.txt @@ -11,7 +11,3 @@ Ak si neprajete zasielaÅ¥ tieto správy, prihláste sa do wiki @DOKUWIKIURL@, potom prejdite na @SUBSCRIBE@ a odhláste sa z informovania o zmenách stránky alebo menného priestoru. - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sk/subscr_single.txt b/sources/inc/lang/sk/subscr_single.txt index 3abbc40..48825a4 100644 --- a/sources/inc/lang/sk/subscr_single.txt +++ b/sources/inc/lang/sk/subscr_single.txt @@ -17,7 +17,3 @@ Ak si neprajete zasielaÅ¥ tieto správy, prihláste sa do wiki @DOKUWIKIURL@, potom prejdite na @SUBSCRIBE@ a odhláste sa z informovania o zmenách stránky alebo menného priestoru. - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sk/updateprofile.txt b/sources/inc/lang/sk/updateprofile.txt index 67b823d..33b5e5b 100644 --- a/sources/inc/lang/sk/updateprofile.txt +++ b/sources/inc/lang/sk/updateprofile.txt @@ -1,4 +1,4 @@ -====== Zmena vášho užívateľského profilu ====== +====== Zmena vášho používateľského profilu ====== Potrebujete vyplniÅ¥ len tie polia, ktoré chcete zmeniÅ¥. Nemôžete zmeniÅ¥ prihlasovacie meno. diff --git a/sources/inc/lang/sk/uploadmail.txt b/sources/inc/lang/sk/uploadmail.txt index 1829379..df40967 100644 --- a/sources/inc/lang/sk/uploadmail.txt +++ b/sources/inc/lang/sk/uploadmail.txt @@ -8,7 +8,3 @@ Názov hostiteľa : @HOSTNAME@ VeľkosÅ¥ : @SIZE@ MIME Typ : @MIME@ Užívateľ : @USER@ - --- -Táto správa bola zaslaná DokuWiki -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sl/lang.php b/sources/inc/lang/sl/lang.php index 6f7a081..9baa9dd 100644 --- a/sources/inc/lang/sl/lang.php +++ b/sources/inc/lang/sl/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Jaka Kranjc * @author BoÅ¡tjan SeniÄar * @author Dejan Levec @@ -331,3 +331,5 @@ $lang['currentns'] = 'Trenutni imenski prostor'; $lang['searchresult'] = 'Rezultati iskanja'; $lang['plainhtml'] = 'Zapis HTML'; $lang['wikimarkup'] = 'Oblikovni jezik Wiki'; +$lang['email_signature_text'] = 'SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/sl/mailtext.txt b/sources/inc/lang/sl/mailtext.txt index e08d01d..9b33373 100644 --- a/sources/inc/lang/sl/mailtext.txt +++ b/sources/inc/lang/sl/mailtext.txt @@ -10,6 +10,3 @@ Povzetek urejanja: @SUMMARY@ Uporabnik : @USER@ @DIFF@ - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/password.txt b/sources/inc/lang/sl/password.txt index 61929dc..d0e1f69 100644 --- a/sources/inc/lang/sl/password.txt +++ b/sources/inc/lang/sl/password.txt @@ -4,6 +4,3 @@ Spodaj so navedeni podatki za @TITLE@ na wiki spletiÅ¡Äu @DOKUWIKIURL@ UporabniÅ¡ko ime: @LOGIN@ Geslo : @PASSWORD@ - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/pwconfirm.txt b/sources/inc/lang/sl/pwconfirm.txt index a621821..33f4787 100644 --- a/sources/inc/lang/sl/pwconfirm.txt +++ b/sources/inc/lang/sl/pwconfirm.txt @@ -6,6 +6,3 @@ S podatki vaÅ¡ega imena je bila poslana zahteva za pridobitev novega gesla za up - Za potrditev zahteve za pridobitev novega gesla, kliknite spodnjo povezavo. @CONFIRM@ - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/registermail.txt b/sources/inc/lang/sl/registermail.txt index 801b7d0..255eb62 100644 --- a/sources/inc/lang/sl/registermail.txt +++ b/sources/inc/lang/sl/registermail.txt @@ -9,6 +9,3 @@ Datum : @DATE@ Brskalnik : @BROWSER@ Naslov IP : @IPADDRESS@ Ime gostitelja : @HOSTNAME@ - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/subscr_digest.txt b/sources/inc/lang/sl/subscr_digest.txt index aeb548b..5da0042 100644 --- a/sources/inc/lang/sl/subscr_digest.txt +++ b/sources/inc/lang/sl/subscr_digest.txt @@ -14,6 +14,3 @@ Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletiÅ¡Äe @DOKUWIKIURL@ in med možnostmi naroÄanja @SUBSCRIBE@ odjaviti prejemanje poroÄil sprememb strani ali imenskega prostora. - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/subscr_list.txt b/sources/inc/lang/sl/subscr_list.txt index 253cb41..914ae15 100644 --- a/sources/inc/lang/sl/subscr_list.txt +++ b/sources/inc/lang/sl/subscr_list.txt @@ -11,6 +11,3 @@ Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletiÅ¡Äe @DOKUWIKIURL@ in med možnostmi naroÄanja @SUBSCRIBE@ odjaviti prejemanje poroÄil sprememb strani ali imenskega prostora. - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ diff --git a/sources/inc/lang/sl/subscr_single.txt b/sources/inc/lang/sl/subscr_single.txt index 9fd64be..4324b2d 100644 --- a/sources/inc/lang/sl/subscr_single.txt +++ b/sources/inc/lang/sl/subscr_single.txt @@ -17,6 +17,3 @@ Preklic obveÅ¡Äanja o spremembah strani je mogoÄe doloÄiti na Wiki naslovu @DOKUWIKIURL@ in z obiskom @NEWPAGE@, kjer se je mogoÄe odjaviti od spremljanja strani ali imenskega prostora. - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sl/uploadmail.txt b/sources/inc/lang/sl/uploadmail.txt index 0479be7..126ff2a 100644 --- a/sources/inc/lang/sl/uploadmail.txt +++ b/sources/inc/lang/sl/uploadmail.txt @@ -9,6 +9,3 @@ Ponudnik : @HOSTNAME@ Velikost : @SIZE@ Vrsta MIME: @MIME@ Uporabnik : @USER@ - --- -SporoÄilo je samodejno ustvarjeno na spletiÅ¡Äu @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/lang.php b/sources/inc/lang/sq/lang.php index 331819a..6de6af8 100644 --- a/sources/inc/lang/sq/lang.php +++ b/sources/inc/lang/sq/lang.php @@ -233,3 +233,5 @@ $lang['days'] = '%d ditë më parë'; $lang['hours'] = '%d orë më parë'; $lang['minutes'] = '%d minuta më parë'; $lang['seconds'] = '%d sekonda më parë'; +$lang['email_signature_text'] = 'Ky email u gjenerua nga DokuWiki në +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/sq/mailtext.txt b/sources/inc/lang/sq/mailtext.txt index 0746ca4..0566aaf 100644 --- a/sources/inc/lang/sq/mailtext.txt +++ b/sources/inc/lang/sq/mailtext.txt @@ -12,5 +12,5 @@ Përdoruesi: @USER@ @DIFF@ --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file +Ky email u gjenerua nga DokuWiki në +@DOKUWIKIURL@ diff --git a/sources/inc/lang/sq/password.txt b/sources/inc/lang/sq/password.txt index 1c8a869..44acfe6 100644 --- a/sources/inc/lang/sq/password.txt +++ b/sources/inc/lang/sq/password.txt @@ -6,5 +6,5 @@ Hyrje: @LOGIN@ Fjalëkalimi: @PASSWORD@ --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file +Ky email u gjenerua nga DokuWiki në +@DOKUWIKIURL@ diff --git a/sources/inc/lang/sq/pwconfirm.txt b/sources/inc/lang/sq/pwconfirm.txt index 44d6c2d..ec776d4 100644 --- a/sources/inc/lang/sq/pwconfirm.txt +++ b/sources/inc/lang/sq/pwconfirm.txt @@ -7,7 +7,3 @@ Nëse nuk kërkuat një fjalëkalim të ri atëherë thjesht injorojeni këtë e Për të konfirmuar që kërkesa u dërgua me të vërtetë nga ju, ju lutemi përdorni link-un e mëposhtëm. @CONFIRM@ - --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/registermail.txt b/sources/inc/lang/sq/registermail.txt index ef90e45..d0f7d51 100644 --- a/sources/inc/lang/sq/registermail.txt +++ b/sources/inc/lang/sq/registermail.txt @@ -8,7 +8,3 @@ Data: @DATE@ Shfletuesi: @BROWSER@ Adresa IP: @IPADDRESS@ Emri Hostit: @HOSTNAME@ - --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/subscr_digest.txt b/sources/inc/lang/sq/subscr_digest.txt index 41404cf..62ca057 100644 --- a/sources/inc/lang/sq/subscr_digest.txt +++ b/sources/inc/lang/sq/subscr_digest.txt @@ -14,7 +14,3 @@ Për të fshirë lajmërimet e faqes, mund të hyni tek wiki në @DOKUWIKIURL@ pastaj vizitoni @SUBSCRIBE@ dhe ç'regjistro faqen dhe/ose ndryshimet e hapësirës së emrit. - --- -Ky eMail është gjeneruar nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/subscr_list.txt b/sources/inc/lang/sq/subscr_list.txt index cb10d42..0677f40 100644 --- a/sources/inc/lang/sq/subscr_list.txt +++ b/sources/inc/lang/sq/subscr_list.txt @@ -7,7 +7,3 @@ Faqet në hapësirën e emrit @PAGE@ të wiki-t @TITLE@ ndryshuan. Këto janë f -------------------------------------------------------- Për të fshirë lajmërimet e faqes, hyni në wiki-n tek @DOKUWIKIURL@ dhe pastaj vizitoni @SUBSCRIBE@ dhe fshini ndryshimet e faqes dhe/ose të hapësirës së emrit. - --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/subscr_single.txt b/sources/inc/lang/sq/subscr_single.txt index df28ee1..0e4a71c 100644 --- a/sources/inc/lang/sq/subscr_single.txt +++ b/sources/inc/lang/sq/subscr_single.txt @@ -17,7 +17,3 @@ Për të fshirë lajmërimet e faqes, hyni në wiki tek @DOKUWIKIURL@ dhe pastaj vizitoni @SUBSCRIBE@ dhe fshini ndryshimet e faqes dhe/ose hapësirës së emrit. - --- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sq/uploadmail.txt b/sources/inc/lang/sq/uploadmail.txt index e7c62df..126aefc 100644 --- a/sources/inc/lang/sq/uploadmail.txt +++ b/sources/inc/lang/sq/uploadmail.txt @@ -8,7 +8,3 @@ Emri Hostit: @HOSTNAME@ Madhësia: @SIZE@ Tipi MIME: @MIME@ Përdoruesi: @USER@ - ---- -Ky email u gjenerua nga DokuWiki në -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/lang.php b/sources/inc/lang/sr/lang.php index 46088dc..80f0d36 100644 --- a/sources/inc/lang/sr/lang.php +++ b/sources/inc/lang/sr/lang.php @@ -258,3 +258,5 @@ $lang['hours'] = 'Пре %d Ñати'; $lang['minutes'] = 'Пре %d минута'; $lang['seconds'] = 'Пре %d Ñекунди'; $lang['wordblock'] = 'Ваше измене ниÑу Ñачуване јер Ñадрже забрањен текÑÑ‚ (Ñпам)'; +$lang['email_signature_text'] = 'Ову поруку је генериÑао DokuWiki sa +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/sr/mailtext.txt b/sources/inc/lang/sr/mailtext.txt index 2ed99bf..ab9d717 100644 --- a/sources/inc/lang/sr/mailtext.txt +++ b/sources/inc/lang/sr/mailtext.txt @@ -10,8 +10,3 @@ КориÑник : @USER@ @DIFF@ - - --- -Ову поруку је генериÑао DokuWiki Ñа -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/password.txt b/sources/inc/lang/sr/password.txt index 1141855..453b9b6 100644 --- a/sources/inc/lang/sr/password.txt +++ b/sources/inc/lang/sr/password.txt @@ -4,7 +4,3 @@ КориÑничко име : @LOGIN@ Шифра : @PASSWORD@ - --- -Ову поруку је генериÑао DokuWiki на -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/pwconfirm.txt b/sources/inc/lang/sr/pwconfirm.txt index 35e23b7..ce44cd5 100644 --- a/sources/inc/lang/sr/pwconfirm.txt +++ b/sources/inc/lang/sr/pwconfirm.txt @@ -7,7 +7,3 @@ У Ñупротном, да биÑте потврдили захтев кликните на Ñледећи линк: @CONFIRM@ - --- -Ову поруку је генериÑао DokuWiki sa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/registermail.txt b/sources/inc/lang/sr/registermail.txt index efdcbb5..9dca20c 100644 --- a/sources/inc/lang/sr/registermail.txt +++ b/sources/inc/lang/sr/registermail.txt @@ -8,8 +8,3 @@ Веб читач: @BROWSER@ ИП адреÑа: @IPADDRESS@ Домаћин: @HOSTNAME@ - - --- -Ову поруку је генериÑао DokuWiki sa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/subscr_digest.txt b/sources/inc/lang/sr/subscr_digest.txt index db84168..aaba525 100644 --- a/sources/inc/lang/sr/subscr_digest.txt +++ b/sources/inc/lang/sr/subscr_digest.txt @@ -14,7 +14,3 @@ Да биÑте поништили обавештења о променама Ñтраница, улогујте Ñе на Вики овде @DOKUWIKIURL@ а затим поÑетите @SUBSCRIBE@ и поништите обавештавање о променама Ñтраница и/или именÑких проÑтора.. - --- -Овај имејл је направио DokuWiki на Ñтраници -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sr/subscr_list.txt b/sources/inc/lang/sr/subscr_list.txt index b388701..09df43d 100644 --- a/sources/inc/lang/sr/subscr_list.txt +++ b/sources/inc/lang/sr/subscr_list.txt @@ -11,7 +11,3 @@ Да биÑте поништили обавештења о променама Ñтраница, улогујте Ñе на Вики овде @DOKUWIKIURL@ а затим поÑетите @SUBSCRIBE@ и поништите обавештавање о променама Ñтраница и/или именÑких проÑтора.. - --- -Овај имејл је направио DokuWiki на Ñтраници -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/subscr_single.txt b/sources/inc/lang/sr/subscr_single.txt index c0ed4d8..67102dd 100644 --- a/sources/inc/lang/sr/subscr_single.txt +++ b/sources/inc/lang/sr/subscr_single.txt @@ -17,7 +17,3 @@ Да биÑте поништили обавештења о променама Ñтраница, улогујте Ñе на Бики овде @DOKUWIKIURL@ а затим поÑетите @SUBSCRIBE@ и поништите обавештавање о променама Ñтраница и/или именÑких проÑтора.. - --- -Овај имејл је направио DokuWiki на Ñтраници -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sr/uploadmail.txt b/sources/inc/lang/sr/uploadmail.txt index 36b3bb3..0db6f9e 100644 --- a/sources/inc/lang/sr/uploadmail.txt +++ b/sources/inc/lang/sr/uploadmail.txt @@ -8,7 +8,3 @@ Величина: @SIZE@ MIME тип: @MIME@ КориÑник: @USER@ - --- -Ову поруку је генериÑао DokuWiki sa -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sv/lang.php b/sources/inc/lang/sv/lang.php index 0d1f30a..b2bb073 100644 --- a/sources/inc/lang/sv/lang.php +++ b/sources/inc/lang/sv/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Joaquim Homrighausen * @author Per Foreby * @author Nicklas Henriksson @@ -341,3 +341,5 @@ $lang['media_update'] = 'Ladda upp ny version'; $lang['media_restore'] = 'Ã…terställ denna version'; $lang['searchresult'] = 'Sökresultat'; $lang['plainhtml'] = 'Ren HTML'; +$lang['email_signature_text'] = 'Detta meddelande har skapats av DokuWiki pÃ¥ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/sv/mailtext.txt b/sources/inc/lang/sv/mailtext.txt index 616bb4e..a45bc2a 100644 --- a/sources/inc/lang/sv/mailtext.txt +++ b/sources/inc/lang/sv/mailtext.txt @@ -10,8 +10,3 @@ Redigeringskommentar : @SUMMARY@ Användare : @USER@ @DIFF@ - - --- -Detta meddelande har skapats av DokuWiki pÃ¥ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sv/mailwrap.html b/sources/inc/lang/sv/mailwrap.html index d8ab9ba..d257190 100644 --- a/sources/inc/lang/sv/mailwrap.html +++ b/sources/inc/lang/sv/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-Denna e-post har genererats av DokuWiki vid @DOKUWIKIURL@. +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/sv/password.txt b/sources/inc/lang/sv/password.txt index 934d913..f8465a4 100644 --- a/sources/inc/lang/sv/password.txt +++ b/sources/inc/lang/sv/password.txt @@ -4,7 +4,3 @@ Här är dina användaruppgifter för @TITLE@ pÃ¥ @DOKUWIKIURL@ Användarnamn : @LOGIN@ Lösenord : @PASSWORD@ - --- -Detta meddelande har skapats av DokuWiki pÃ¥ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sv/pwconfirm.txt b/sources/inc/lang/sv/pwconfirm.txt index 5414377..428cfa3 100644 --- a/sources/inc/lang/sv/pwconfirm.txt +++ b/sources/inc/lang/sv/pwconfirm.txt @@ -10,7 +10,3 @@ För att bekräfta att förfrÃ¥gan verkligen kom frÃ¥n dig, var vänlig och använd följande länk. @CONFIRM@ - --- -Detta meddelande har skapats av DokuWiki pÃ¥ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sv/registermail.txt b/sources/inc/lang/sv/registermail.txt index c0edc37..cbcf3f4 100644 --- a/sources/inc/lang/sv/registermail.txt +++ b/sources/inc/lang/sv/registermail.txt @@ -8,7 +8,3 @@ Datum : @DATE@ Webbläsare : @BROWSER@ IP-adress : @IPADDRESS@ Datornamn : @HOSTNAME@ - --- -Detta meddelande har skapats av DokuWiki pÃ¥ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/sv/subscr_digest.txt b/sources/inc/lang/sv/subscr_digest.txt index 6724726..adf6680 100644 --- a/sources/inc/lang/sv/subscr_digest.txt +++ b/sources/inc/lang/sv/subscr_digest.txt @@ -10,10 +10,6 @@ Här är ändringarna: Äldre versionen: @OLDPAGE@ Ny version: @NEWPAGE@ -För att avbryta meddelanden om sidändringar logga in till wikin @DOKUWIKIURL@, besök sedan -@SUBSCRIBE@ +För att avbryta meddelanden om sidändringar logga in till wikin @DOKUWIKIURL@, besök sedan +@SUBSCRIBE@ och avbeställ ändringar av sidor och/eller namespace. - --- -Detta meddelande har skapats av DokuWiki vid -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sv/subscr_single.txt b/sources/inc/lang/sv/subscr_single.txt index dff8834..50ef056 100644 --- a/sources/inc/lang/sv/subscr_single.txt +++ b/sources/inc/lang/sv/subscr_single.txt @@ -17,7 +17,3 @@ För att avsluta noteringar om sidor, logga in pÃ¥ wikin vid @DOKUWIKIURL@ gÃ¥ sedan till @SUBSCRIBE@ och avsluta prenumerationen av sida och/eller namnrymd ändringar. - --- -Denna e-post har genererats av DokuWiki vid -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/sv/uploadmail.txt b/sources/inc/lang/sv/uploadmail.txt index 5963adc..8db5f55 100644 --- a/sources/inc/lang/sv/uploadmail.txt +++ b/sources/inc/lang/sv/uploadmail.txt @@ -8,7 +8,3 @@ Datornamn : @HOSTNAME@ Storlek : @SIZE@ MIME-typ : @MIME@ Användare : @USER@ - --- -Detta meddelande har skapats av DokuWiki pÃ¥ -@DOKUWIKIURL@ diff --git a/sources/inc/lang/th/lang.php b/sources/inc/lang/th/lang.php index 59332f7..570d929 100644 --- a/sources/inc/lang/th/lang.php +++ b/sources/inc/lang/th/lang.php @@ -8,6 +8,7 @@ * @author Kittithat Arnontavilas * @author Thanasak Sompaisansin * @author Yuthana Tantirungrotechai + * @author Amnuay */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -48,6 +49,7 @@ $lang['btn_recover'] = 'à¸à¸¹à¹‰à¸„ืนเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸± $lang['btn_draftdel'] = 'ลบเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡'; $lang['btn_revert'] = 'à¸à¸¹à¹‰à¸„ืน'; $lang['btn_register'] = 'สร้างบัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰'; +$lang['btn_apply'] = 'นำไปใช้'; $lang['btn_media'] = 'ส่วนจัดà¸à¸²à¸£à¸ªà¸·à¹ˆà¸­à¹à¸¥à¸°à¹„ฟล์'; $lang['btn_deleteuser'] = 'ลบบัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚องฉัน'; $lang['btn_img_backto'] = 'à¸à¸¥à¸±à¸šà¹„ปยัง %s'; @@ -72,6 +74,7 @@ $lang['regmissing'] = 'ขออภัย คุณต้องà¸à¸£ $lang['reguexists'] = 'ชื่อบัà¸à¸Šà¸µà¸—ี่ใส่นั้นมีผู้อื่นได้ใช้à¹à¸¥à¹‰à¸§ à¸à¸£à¸¸à¸“าเลือà¸à¸Šà¸·à¹ˆà¸­à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸­à¸·à¹ˆà¸™'; $lang['regsuccess'] = 'ผู้ใช้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¹à¸¥à¹‰à¸§ à¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„ด้ถูà¸à¸ªà¹ˆà¸‡à¹„ปทางอีเมลà¹à¸¥à¹‰à¸§'; $lang['regsuccess2'] = 'ชื่อบัà¸à¸Šà¸µà¹„ด้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้น'; +$lang['regfail'] = 'à¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹„ม่สำเร็จ'; $lang['regmailfail'] = 'ดูเหมือนจะมีข้อผิดพลาดในà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸—างเมล์ à¸à¸£à¸¸à¸“าติดต่อผู้ดูà¹à¸¥à¸£à¸°à¸šà¸š'; $lang['regbadmail'] = 'รูปà¹à¸šà¸šà¸­à¸µà¹€à¸¡à¸¥à¹„ม่ถูà¸à¸•à¹‰à¸­à¸‡ ให้ใส่อีเมลให้ถูà¸à¸•à¹‰à¸­à¸‡à¸•à¸²à¸¡à¸£à¸¹à¸›à¹à¸šà¸šà¸­à¸µà¹€à¸¡à¸¥ หรือให้ทำช่องอีเมลให้ว่างà¹à¸—น'; $lang['regbadpass'] = 'รหัสผ่านที่ใส่ไม่ถูà¸à¸•à¹‰à¸­à¸‡'; @@ -85,8 +88,11 @@ $lang['profnodelete'] = 'วิà¸à¸´à¸™à¸µà¹‰à¹„ม่รองรั $lang['profdeleteuser'] = 'ลบบัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™'; $lang['profdeleted'] = 'บัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚องคุณได้ถูà¸à¸¥à¸šà¸­à¸­à¸à¸ˆà¸²à¸à¸§à¸´à¸à¸´à¹à¸¥à¹‰à¸§'; $lang['profconfdelete'] = 'ฉันอยาà¸à¸¥à¸šà¸šà¸±à¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚องฉันจาà¸à¸§à¸´à¸à¸´à¸™à¸µà¹‰
à¸à¸²à¸£à¸”ำเนินà¸à¸²à¸£à¸™à¸µà¹‰à¹„ม่สามารถà¹à¸à¹‰à¹„ขคืนได้ '; +$lang['profconfdeletemissing'] = 'ท่านไม่ได้ยืนยันในช่องยืนยัน'; +$lang['proffail'] = 'ข้อมูลผู้ใช้ไม่เป็นปัจจุบัน'; $lang['pwdforget'] = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ'; $lang['resendna'] = 'วิà¸à¸´à¸™à¸µà¹‰à¹„ม่รองรับà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‹à¹‰à¸³'; +$lang['resendpwd'] = 'สร้างรหัสผ่านใหม่สำหรับ'; $lang['resendpwdmissing'] = 'ขออภัย, คุณต้องà¸à¸£à¸­à¸à¸—ุà¸à¸Šà¹ˆà¸­à¸‡'; $lang['resendpwdnouser'] = 'ขออภัย, เราไม่พบผู้ใช้คนนี้ในà¸à¸²à¸™à¸‚้อมูลของเรา'; $lang['resendpwdbadauth'] = 'ขออภัย, รหัสนี้ยังใช้ไม่ได้ à¸à¸£à¸¸à¸“าตรวจสอบว่าคุณà¸à¸”ลิ้งค์ยืนยันà¹à¸¥à¹‰à¸§'; @@ -99,6 +105,7 @@ $lang['searchmedia_in'] = 'สืบค้นใน %s'; $lang['txt_upload'] = 'เลือà¸à¹„ฟล์ที่จะอัพโหลด:'; $lang['txt_filename'] = 'อัพโหลดเป็น(ตัวเลือà¸):'; $lang['txt_overwrt'] = 'เขียนทับไฟล์ที่มีอยู่à¹à¸¥à¹‰à¸§'; +$lang['maxuploadsize'] = 'อัพโหลด สูงสุด %s ต่อไฟล์'; $lang['lockedby'] = 'ตอนนี้ถูà¸à¸¥à¹Šà¸­à¸„โดย:'; $lang['lockexpire'] = 'à¸à¸²à¸£à¸¥à¹Šà¸­à¸„จะหมดอายุเมื่อ:'; $lang['js']['willexpire'] = 'à¸à¸²à¸£à¸¥à¹Šà¸­à¸„เพื่อà¹à¸à¹‰à¹„ขหน้านี้à¸à¸³à¸¥à¸±à¸‡à¸ˆà¸°à¸«à¸¡à¸”เวลาในอีภ\n นาที เพื่อที่จะหลีà¸à¹€à¸¥à¸µà¹ˆà¸¢à¸‡à¸‚้อขัดà¹à¸¢à¹‰à¸‡à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸›à¸¸à¹ˆà¸¡ "Preview" เพื่อรีเซ็ทเวลาใหม่'; @@ -106,6 +113,19 @@ $lang['js']['notsavedyet'] = 'à¸à¸²à¸£à¹à¸à¹‰à¹„ขที่ไม่ไ $lang['js']['searchmedia'] = 'ค้นหาไฟล์'; $lang['js']['keepopen'] = 'เปิดหน้าต่างไว้ระหว่างที่เลือà¸'; $lang['js']['hidedetails'] = 'ซ่อนรายละเอียด'; +$lang['js']['mediatitle'] = 'à¸à¸³à¸«à¸™à¸”ข้อมูลลิงค์'; +$lang['js']['mediadisplay'] = 'ชนิดของลิงค์'; +$lang['js']['mediaalign'] = 'à¸à¸²à¸£à¸ˆà¸±à¸”วาง'; +$lang['js']['mediasize'] = 'ขนาดรูปภาพ'; +$lang['js']['mediatarget'] = 'เป้าหมายของลิงค์'; +$lang['js']['mediaclose'] = 'ปิด'; +$lang['js']['mediainsert'] = 'à¹à¸—รà¸'; +$lang['js']['mediadisplayimg'] = 'à¹à¸ªà¸”งรูปภาพ'; +$lang['js']['mediadisplaylnk'] = 'à¹à¸ªà¸”งลิงค์ เท่านั้น'; +$lang['js']['mediasmall'] = 'รูปà¹à¸šà¸šà¸‚นาดเล็à¸'; +$lang['js']['mediamedium'] = 'รูปà¹à¸šà¸šà¸‚นาดà¸à¸¥à¸²à¸‡'; +$lang['js']['medialarge'] = 'รูปà¹à¸šà¸šà¸‚นาดใหà¸à¹ˆ'; +$lang['js']['mediaoriginal'] = 'รูปà¹à¸šà¸šà¸•à¸±à¹‰à¸‡à¸•à¹‰à¸™'; $lang['js']['nosmblinks'] = 'เชื่อมไปยังหน้าต่างà¹à¸šà¹ˆà¸‡à¸›à¸±à¸™ ทำงานได้à¸à¸±à¸šà¹€à¸‰à¸žà¸²à¸°à¹„มโครซอฟท์อินเตอร์เน็ตเอ็à¸à¸‹à¹‚ปรเรอร์(IE) คุณยังคงสามารถคัดลอà¸à¹à¸¥à¸°à¹à¸›à¸°à¸¥à¸´à¹‰à¸‡à¸„์ได้'; $lang['js']['linkwiz'] = 'ลิงค์วิเศษ'; $lang['js']['linkto'] = 'ลิงค์ไป:'; @@ -222,3 +242,5 @@ $lang['days'] = '%d วันà¸à¹ˆà¸­à¸™'; $lang['hours'] = '%d ชั่วโมงà¸à¹ˆà¸­à¸™'; $lang['minutes'] = '%d นาทีà¸à¹ˆà¸­à¸™'; $lang['seconds'] = '%d วินาทีà¸à¹ˆà¸­à¸™'; +$lang['email_signature_text'] = 'จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/th/mailtext.txt b/sources/inc/lang/th/mailtext.txt index a4af8a0..5dec222 100644 --- a/sources/inc/lang/th/mailtext.txt +++ b/sources/inc/lang/th/mailtext.txt @@ -10,8 +10,3 @@ ผู้ใช้: @USER@ @DIFF@ - - --- -จดหมายนี้สร้างขึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/th/password.txt b/sources/inc/lang/th/password.txt index 5f0dcff..e463e76 100644 --- a/sources/inc/lang/th/password.txt +++ b/sources/inc/lang/th/password.txt @@ -4,7 +4,3 @@ ล็อà¸à¸­à¸´à¸™: @LOGIN@ รหัสผ่าน : @PASSWORD@ - --- -จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/th/pwconfirm.txt b/sources/inc/lang/th/pwconfirm.txt index e6ab876..1cf42c8 100644 --- a/sources/inc/lang/th/pwconfirm.txt +++ b/sources/inc/lang/th/pwconfirm.txt @@ -8,7 +8,3 @@ หาà¸à¸•à¹‰à¸­à¸‡à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸§à¹ˆà¸²à¸™à¸µà¹ˆà¸à¸²à¸£à¸£à¹‰à¸­à¸‡à¸‚อนี้ถูà¸à¸ªà¹ˆà¸‡à¹‚ดยคุณจริงๆ à¸à¸£à¸¸à¸“าใช้ลิงค์ดังต่อไปนี้ @CONFIRM@ - --- -จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/th/registermail.txt b/sources/inc/lang/th/registermail.txt index a96026d..4cfaddd 100644 --- a/sources/inc/lang/th/registermail.txt +++ b/sources/inc/lang/th/registermail.txt @@ -8,7 +8,3 @@ บราวเซอร์ : @BROWSER@ ที่อยู่ไอพี : @IPADDRESS@ ชื่อโฮสต์ : @HOSTNAME@ - --- -จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/th/uploadmail.txt b/sources/inc/lang/th/uploadmail.txt index 0269657..9d042b9 100644 --- a/sources/inc/lang/th/uploadmail.txt +++ b/sources/inc/lang/th/uploadmail.txt @@ -8,7 +8,3 @@ ขนาด: @SIZE@ MIME Type : @MIME@ ผู้ใช้: @USER@ - --- -This mail was generated by DokuWiki at -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/tr/lang.php b/sources/inc/lang/tr/lang.php index 12d7f74..49236c5 100644 --- a/sources/inc/lang/tr/lang.php +++ b/sources/inc/lang/tr/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Selim FarsakoÄŸlu * @author Aydın CoÅŸkuner * @author Cihan Kahveci @@ -339,3 +339,5 @@ $lang['currentns'] = 'Geçerli isimalanı'; $lang['searchresult'] = 'Arama Sonucu'; $lang['plainhtml'] = 'Yalın HTML'; $lang['wikimarkup'] = 'Wiki Biçimlendirmesi'; +$lang['email_signature_text'] = 'Bu e-posta aÅŸağıdaki DokuWiki tarafından otomatik olarak oluÅŸturulmuÅŸtur +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/tr/mailtext.txt b/sources/inc/lang/tr/mailtext.txt index 7e8fc8d..dfcc39e 100644 --- a/sources/inc/lang/tr/mailtext.txt +++ b/sources/inc/lang/tr/mailtext.txt @@ -10,7 +10,3 @@ DeÄŸiÅŸtirme Özeti : @SUMMARY@ Kullanıcı : @USER@ @DIFF@ - - --- -Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı. diff --git a/sources/inc/lang/tr/password.txt b/sources/inc/lang/tr/password.txt index 956a786..852811d 100644 --- a/sources/inc/lang/tr/password.txt +++ b/sources/inc/lang/tr/password.txt @@ -5,6 +5,3 @@ Merhaba @FULLNAME@! GiriÅŸ ismi : @LOGIN@ Parola : @PASSWORD@ - --- -Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı. \ No newline at end of file diff --git a/sources/inc/lang/tr/pwconfirm.txt b/sources/inc/lang/tr/pwconfirm.txt index 22348bb..7e440e8 100644 --- a/sources/inc/lang/tr/pwconfirm.txt +++ b/sources/inc/lang/tr/pwconfirm.txt @@ -7,7 +7,3 @@ EÄŸer böyle bir talebiniz olmadıysa, bu e-postayı görmezden gelebilirsiniz. Onaylamak istiyorsanız aÅŸağıdaki linke tıklayınız. @CONFIRM@ - --- -Bu e-posta aÅŸağıdaki DokuWiki tarafından otomatik olarak oluÅŸturulmuÅŸtur. -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/tr/registermail.txt b/sources/inc/lang/tr/registermail.txt index 7754a56..26ff739 100644 --- a/sources/inc/lang/tr/registermail.txt +++ b/sources/inc/lang/tr/registermail.txt @@ -8,6 +8,3 @@ Tarih : @DATE@ Tarayıcı : @BROWSER@ IP Numarası : @IPADDRESS@ Host : @HOSTNAME@ - --- -Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı. \ No newline at end of file diff --git a/sources/inc/lang/tr/uploadmail.txt b/sources/inc/lang/tr/uploadmail.txt index 2d75345..92feef2 100644 --- a/sources/inc/lang/tr/uploadmail.txt +++ b/sources/inc/lang/tr/uploadmail.txt @@ -8,6 +8,3 @@ Host : @HOSTNAME@ Boyut : @SIZE@ MIME Type : @MIME@ Kullanıcı : @USER@ - --- -Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı. \ No newline at end of file diff --git a/sources/inc/lang/uk/lang.php b/sources/inc/lang/uk/lang.php index 74a717b..2fe447b 100644 --- a/sources/inc/lang/uk/lang.php +++ b/sources/inc/lang/uk/lang.php @@ -12,6 +12,7 @@ * @author Egor Smkv * @author Max Lyashuk * @author Pavel + * @author Maksim */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -88,6 +89,8 @@ $lang['profnochange'] = 'Ðемає змін, немає що роби $lang['profnoempty'] = 'Ð†Ð¼â€™Ñ Ð°Ð±Ð¾ e-mail не можуть бути пуÑтими.'; $lang['profchanged'] = 'Профіль уÑпішно змінено.'; $lang['profdeleteuser'] = 'Видалити аккаунт'; +$lang['profdeleted'] = 'Ваш профіль кориÑтувача буде видалено з цієї wiki.'; +$lang['proffail'] = 'Профіль кориÑтувача не вдалоÑÑ Ð¿Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸.'; $lang['pwdforget'] = 'Забули пароль? Отримайте новий'; $lang['resendna'] = 'Ð¦Ñ Ð’Ñ–ÐºÑ– не підтримує повторне Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ.'; $lang['resendpwd'] = 'Ð’Ñтановити новий пароль длÑ'; @@ -140,6 +143,7 @@ $lang['js']['linkto'] = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð°:'; $lang['js']['del_confirm'] = 'ДійÑно знищити обрані елементи?'; $lang['js']['restore_confirm'] = 'ДійÑно відновити цю верÑÑ–ÑŽ?'; $lang['js']['media_diff'] = 'ПереглÑнути різницю:'; +$lang['js']['media_diff_portions'] = 'Прогорнути'; $lang['js']['media_select'] = 'Оберіть файли'; $lang['js']['media_upload_btn'] = 'Завантажити'; $lang['js']['media_done_btn'] = 'УÑпішно'; @@ -291,6 +295,7 @@ $lang['i_pol1'] = 'Публічна Вікі (Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð´Ð» $lang['i_pol2'] = 'Закрита Вікі (читаннÑ, Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð´Ð»Ñ Ð·Ð°Ñ€ÐµÑ”Ñтрованих кориÑтувачів)'; $lang['i_retry'] = 'Повторити'; $lang['i_license'] = 'Будь лаÑка, виберіть тип ліцензії, під Ñкою Ð’Ñ– бажаєте опублікувати матеріал:'; +$lang['i_license_none'] = 'Ðе показувати жодної інформації про ліцензії.'; $lang['recent_global'] = 'Ви переглÑдаєте зміни в межах проÑтору імен %s. Також можна переглÑнути зміни в межах уÑієї Вікі.'; $lang['years'] = '%d років тому'; $lang['months'] = '%d міÑÑців тому'; @@ -300,6 +305,8 @@ $lang['hours'] = '%d годин тому'; $lang['minutes'] = '%d хвилин тому'; $lang['seconds'] = '%d Ñекунд тому'; $lang['wordblock'] = 'Ваші зміни не збережено, тому що вони розпізнані Ñк такі, що міÑÑ‚ÑÑ‚ÑŒ заблокований текÑÑ‚(Ñпам).'; +$lang['email_signature_text'] = 'Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ Ñтворене ДокуВікі з +@DOKUWIKIURL@'; $lang['media_searchtab'] = 'Пошук'; $lang['media_file'] = 'Файл'; $lang['media_viewtab'] = 'ОглÑд'; @@ -307,3 +314,11 @@ $lang['media_edittab'] = 'Редагувати'; $lang['media_historytab'] = 'ІÑторіÑ'; $lang['media_sort_name'] = 'Ім’Ñ'; $lang['media_sort_date'] = 'Дата'; +$lang['media_meta_edited'] = 'метаданні відредаговано'; +$lang['media_perm_read'] = 'Вибачте, у Ð²Ð°Ñ Ð½Ðµ доÑтатньо прав Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ файлу.'; +$lang['media_update'] = 'Завантажити нову верÑÑ–ÑŽ'; +$lang['media_restore'] = 'Відновити цю верÑÑ–ÑŽ'; +$lang['currentns'] = 'Поточний діапазон імен'; +$lang['searchresult'] = 'Результати пошуку'; +$lang['plainhtml'] = 'ПроÑтий HTML'; +$lang['wikimarkup'] = 'Wiki розмітка'; diff --git a/sources/inc/lang/uk/mailtext.txt b/sources/inc/lang/uk/mailtext.txt index 5bd25c3..4f3072c 100644 --- a/sources/inc/lang/uk/mailtext.txt +++ b/sources/inc/lang/uk/mailtext.txt @@ -10,8 +10,3 @@ КориÑтувач : @USER@ @DIFF@ - - --- -Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ Ñтворене ДокуВікі з -@DOKUWIKIURL@ diff --git a/sources/inc/lang/uk/password.txt b/sources/inc/lang/uk/password.txt index 8597d49..7db9be3 100644 --- a/sources/inc/lang/uk/password.txt +++ b/sources/inc/lang/uk/password.txt @@ -4,7 +4,3 @@ Login : @LOGIN@ Password : @PASSWORD@ - --- -Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ Ñтворене ДокуВікі з -@DOKUWIKIURL@ diff --git a/sources/inc/lang/uk/pwconfirm.txt b/sources/inc/lang/uk/pwconfirm.txt index 54d7a20..cd981f1 100644 --- a/sources/inc/lang/uk/pwconfirm.txt +++ b/sources/inc/lang/uk/pwconfirm.txt @@ -8,6 +8,3 @@ перейдіть за наÑтупним поÑиланнÑм. @CONFIRM@ - --- -Цей лиÑÑ‚ було надіÑлано за допомогою Ñлужби повідомлень DokuWiki, Ñайту @DOKUWIKIURL@ diff --git a/sources/inc/lang/uk/registermail.txt b/sources/inc/lang/uk/registermail.txt index 28735ed..14f0e4b 100644 --- a/sources/inc/lang/uk/registermail.txt +++ b/sources/inc/lang/uk/registermail.txt @@ -8,6 +8,3 @@ E-Mail : @NEWEMAIL@ Браузер : @BROWSER@ ÐдреÑа IP : @IPADDRESS@ Ðазва хоÑту : @HOSTNAME@ - --- -Цей лиÑÑ‚ було надіÑлано за допомогою Ñлужби повідомлень DokuWiki, Ñайту @DOKUWIKIURL@ diff --git a/sources/inc/lang/uk/resetpwd.txt b/sources/inc/lang/uk/resetpwd.txt new file mode 100644 index 0000000..b24e884 --- /dev/null +++ b/sources/inc/lang/uk/resetpwd.txt @@ -0,0 +1,3 @@ +====== Ð’Ñтановити новий пароль ====== + +Будь-лаÑка, введіть новий пароль Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— wiki. \ No newline at end of file diff --git a/sources/inc/lang/uk/subscr_digest.txt b/sources/inc/lang/uk/subscr_digest.txt index 3237918..c226e29 100644 --- a/sources/inc/lang/uk/subscr_digest.txt +++ b/sources/inc/lang/uk/subscr_digest.txt @@ -12,6 +12,3 @@ Щоб відмовитиÑÑ Ð²Ñ–Ð´ повідомлень про Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñторінок, зайдіть під Ñвоїм ім'Ñм на Ñайт @DOKUWIKIURL@, потім відвідайте Ñторінку @SUBSCRIBE@ та відпишітьÑÑ Ð²Ñ–Ð´ повідомлень про зміну Ñторінки та/або проÑтору імен. - --- -Цей лиÑÑ‚ було надіÑлано за допомогою Ñлужби повідомлень DokuWiki, Ñайту @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/uk/subscr_list.txt b/sources/inc/lang/uk/subscr_list.txt index 7a538bc..6c4001f 100644 --- a/sources/inc/lang/uk/subscr_list.txt +++ b/sources/inc/lang/uk/subscr_list.txt @@ -9,6 +9,3 @@ Щоб відмовитиÑÑ Ð²Ñ–Ð´ повідомлень про Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñторінок, зайдіть під Ñвоїм ім'Ñм на Ñайт @DOKUWIKIURL@, потім відвідайте Ñторінку @SUBSCRIBE@ та відпишітьÑÑ Ð²Ñ–Ð´ повідомлень про зміну Ñторінки та/або проÑтору імен. - --- -Цей лиÑÑ‚ було надіÑлано за допомогою Ñлужби повідомлень DokuWiki, Ñайту @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/uk/subscr_single.txt b/sources/inc/lang/uk/subscr_single.txt index 22a0691..658bae5 100644 --- a/sources/inc/lang/uk/subscr_single.txt +++ b/sources/inc/lang/uk/subscr_single.txt @@ -15,6 +15,3 @@ Щоб відмовитиÑÑ Ð²Ñ–Ð´ повідомлень про Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñторінок, зайдіть під Ñвоїм ім'Ñм на Ñайт @DOKUWIKIURL@, потім відвідайте Ñторінку @NEWPAGE@ та відпишітьÑÑ Ð²Ñ–Ð´ повідомлень про зміну Ñторінки та/або проÑтору імен. - --- -Цей лиÑÑ‚ було надіÑлано за допомогою Ñлужби повідомлень DokuWiki, Ñайту @DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/uk/uploadmail.txt b/sources/inc/lang/uk/uploadmail.txt index 6eb8c93..ee982c8 100644 --- a/sources/inc/lang/uk/uploadmail.txt +++ b/sources/inc/lang/uk/uploadmail.txt @@ -8,7 +8,3 @@ IP-ÐдреÑа : @IPADDRESS@ Розмір : @SIZE@ Тип MIME : @MIME@ КориÑтувач : @USER@ - --- -Цей лиÑÑ‚ автоматично Ñтворено ДокуВікі на Ñайті: -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/vi/lang.php b/sources/inc/lang/vi/lang.php index 944a9e5..ea1d053 100644 --- a/sources/inc/lang/vi/lang.php +++ b/sources/inc/lang/vi/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author James Do */ $lang['encoding'] = 'utf-8'; @@ -239,3 +239,5 @@ $lang['media_perm_read'] = 'Sorry, bạn không đủ quyá»n truy cập.' $lang['media_perm_upload'] = 'Xin lá»—i, bạn không đủ quyá»n để upload file lên.'; $lang['media_update'] = 'Tải lên phiên bản má»›i'; $lang['media_restore'] = 'Phục hồi phiên bản này'; +$lang['email_signature_text'] = 'Äiện thÆ° này tạo bởi DokuWiki ở +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/vi/mailtext.txt b/sources/inc/lang/vi/mailtext.txt index 836e02d..bcbb656 100644 --- a/sources/inc/lang/vi/mailtext.txt +++ b/sources/inc/lang/vi/mailtext.txt @@ -10,7 +10,3 @@ Edit Summary: @SUMMARY@ User : @USER@ @DIFF@ - --- -Äiện thÆ° này tạo bởi DokuWiki ở -@DOKUWIKIURL@ diff --git a/sources/inc/lang/vi/password.txt b/sources/inc/lang/vi/password.txt index 798a20d..9f80429 100644 --- a/sources/inc/lang/vi/password.txt +++ b/sources/inc/lang/vi/password.txt @@ -4,6 +4,3 @@ Thân chào bạn @FULLNAME@! Username: @LOGIN@ Password: @PASSWORD@ - --- -Äiện thÆ° này xuất phát từ @DOKUWIKIURL@. diff --git a/sources/inc/lang/zh-tw/lang.php b/sources/inc/lang/zh-tw/lang.php index b69456e..bc49b33 100644 --- a/sources/inc/lang/zh-tw/lang.php +++ b/sources/inc/lang/zh-tw/lang.php @@ -16,6 +16,7 @@ * @author Stan * @author June-Hao Hou * @author lioujheyu + * @author Liou, Jhe-Yu */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -344,3 +345,5 @@ $lang['currentns'] = 'ç›®å‰çš„命å空間'; $lang['searchresult'] = 'æœå°‹çµæžœ'; $lang['plainhtml'] = 'ç´” HTML'; $lang['wikimarkup'] = 'Wiki 語法標記'; +$lang['email_signature_text'] = '本信件由以下 DokuWiki 網站產生 +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/zh-tw/mailtext.txt b/sources/inc/lang/zh-tw/mailtext.txt index e99858c..7ffb83e 100644 --- a/sources/inc/lang/zh-tw/mailtext.txt +++ b/sources/inc/lang/zh-tw/mailtext.txt @@ -10,8 +10,3 @@ IP ä½å€ : @IPADDRESS@ 使用者 : @USER@ @DIFF@ - - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/mailwrap.html b/sources/inc/lang/zh-tw/mailwrap.html index 9cd5faa..d257190 100644 --- a/sources/inc/lang/zh-tw/mailwrap.html +++ b/sources/inc/lang/zh-tw/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-這郵件由DokuWiki at @DOKUWIKIURL@. ç”Ÿæˆ +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/password.txt b/sources/inc/lang/zh-tw/password.txt index 9c5ad2f..9898f24 100644 --- a/sources/inc/lang/zh-tw/password.txt +++ b/sources/inc/lang/zh-tw/password.txt @@ -4,7 +4,3 @@ 帳號 : @LOGIN@ 密碼 : @PASSWORD@ - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ diff --git a/sources/inc/lang/zh-tw/pwconfirm.txt b/sources/inc/lang/zh-tw/pwconfirm.txt index 6f6dcd3..93ed569 100644 --- a/sources/inc/lang/zh-tw/pwconfirm.txt +++ b/sources/inc/lang/zh-tw/pwconfirm.txt @@ -7,7 +7,3 @@ 若您真的è¦ä½¿ç”¨æ–°å¯†ç¢¼ï¼Œè«‹æ‹œè¨ªä»¥ä¸‹çš„連çµã€‚ @CONFIRM@ - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/registermail.txt b/sources/inc/lang/zh-tw/registermail.txt index a67835d..22b7ff8 100644 --- a/sources/inc/lang/zh-tw/registermail.txt +++ b/sources/inc/lang/zh-tw/registermail.txt @@ -8,7 +8,3 @@ ç€è¦½å™¨ : @BROWSER@ IP ä½å€ : @IPADDRESS@ 主機å稱 : @HOSTNAME@ - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/subscr_digest.txt b/sources/inc/lang/zh-tw/subscr_digest.txt index 1a34087..2ab0bc0 100644 --- a/sources/inc/lang/zh-tw/subscr_digest.txt +++ b/sources/inc/lang/zh-tw/subscr_digest.txt @@ -13,7 +13,3 @@ è¦å–消é é¢æ醒，請登入本 wiki @DOKUWIKIURL@ 然後拜訪 @SUBSCRIBE@ 並å–消訂閱é é¢æˆ–分類å稱的更改。 - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/subscr_list.txt b/sources/inc/lang/zh-tw/subscr_list.txt index da2fb33..8cbb24c 100644 --- a/sources/inc/lang/zh-tw/subscr_list.txt +++ b/sources/inc/lang/zh-tw/subscr_list.txt @@ -10,7 +10,3 @@ è¦å–消é é¢æ醒，請登入本 wiki @DOKUWIKIURL@ 然後拜訪 @SUBSCRIBE@ 並å–消訂閱é é¢æˆ–分類å稱的更改。 - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/subscr_single.txt b/sources/inc/lang/zh-tw/subscr_single.txt index b11841b..db9ed2d 100644 --- a/sources/inc/lang/zh-tw/subscr_single.txt +++ b/sources/inc/lang/zh-tw/subscr_single.txt @@ -16,7 +16,3 @@ è¦å–消é é¢æ醒，請登入本 wiki @DOKUWIKIURL@ 然後拜訪 @NEWPAGE@ 並å–消訂閱é é¢æˆ–分類å稱的更改。 - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh-tw/uploadmail.txt b/sources/inc/lang/zh-tw/uploadmail.txt index 0084d7a..9572681 100644 --- a/sources/inc/lang/zh-tw/uploadmail.txt +++ b/sources/inc/lang/zh-tw/uploadmail.txt @@ -8,7 +8,3 @@ IP ä½å€ : @IPADDRESS@ å¤§å° : @SIZE@ MIMEé¡žåž‹ : @MIME@ 使用者 : @USER@ - --- -本信件由以下 DokuWiki 網站產生： -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh/lang.php b/sources/inc/lang/zh/lang.php index d179ad6..a2a9e93 100644 --- a/sources/inc/lang/zh/lang.php +++ b/sources/inc/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton @@ -25,6 +25,8 @@ * @author qinghao * @author Yuwei Sun * @author Errol + * @author Garfield + * @author JellyChen <451453325@qq.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -362,3 +364,5 @@ $lang['plainhtml'] = '纯HTML'; $lang['wikimarkup'] = 'Wiki Markup 语言'; $lang['page_nonexist_rev'] = '页é¢åœ¨ %s ä¸å­˜åœ¨ã€‚它曾创建于 %s。'; $lang['unable_to_parse_date'] = '无法解æžå‚æ•° "%s"。'; +$lang['email_signature_text'] = '本邮件由 DokuWiki 自动创建 +@DOKUWIKIURL@'; diff --git a/sources/inc/lang/zh/mailtext.txt b/sources/inc/lang/zh/mailtext.txt index 311acf1..f5e6081 100644 --- a/sources/inc/lang/zh/mailtext.txt +++ b/sources/inc/lang/zh/mailtext.txt @@ -10,8 +10,3 @@ IP åœ°å€ : @IPADDRESS@ 用户 : @USER@ @DIFF@ - - --- -本邮件由 DokuWiki 自动创建 -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh/mailwrap.html b/sources/inc/lang/zh/mailwrap.html index 0f00d95..d257190 100644 --- a/sources/inc/lang/zh/mailwrap.html +++ b/sources/inc/lang/zh/mailwrap.html @@ -8,6 +8,6 @@ @HTMLBODY@
-本邮件由ä½äºŽ @DOKUWIKIURL@ çš„ Dokuwiki 自动创建。 +@EMAILSIGNATURE@ \ No newline at end of file diff --git a/sources/inc/lang/zh/password.txt b/sources/inc/lang/zh/password.txt index 9692970..39095a1 100644 --- a/sources/inc/lang/zh/password.txt +++ b/sources/inc/lang/zh/password.txt @@ -3,8 +3,3 @@ 这是您在 @TITLE@（@DOKUWIKIURL@）的用户资料 用户å：@LOGIN@ 密ç ï¼š@PASSWORD@ - --- -本邮件由 DokuWiki 自动创建 -@DOKUWIKIURL@ - diff --git a/sources/inc/lang/zh/pwconfirm.txt b/sources/inc/lang/zh/pwconfirm.txt index 7e48751..1b31636 100644 --- a/sources/inc/lang/zh/pwconfirm.txt +++ b/sources/inc/lang/zh/pwconfirm.txt @@ -7,9 +7,3 @@ 为了确认å‘é€æ–°å¯†ç è¯·æ±‚çš„ç¡®æ¥è‡ªæ‚¨ï¼Œè¯·ä½¿ç”¨ä¸‹é¢çš„链接。 @CONFIRM@ - --- -本邮件由 DokuWiki 自动创建 -@DOKUWIKIURL@ - - diff --git a/sources/inc/lang/zh/registermail.txt b/sources/inc/lang/zh/registermail.txt index 9647b5f..56568dc 100644 --- a/sources/inc/lang/zh/registermail.txt +++ b/sources/inc/lang/zh/registermail.txt @@ -8,9 +8,3 @@ E-mail : @NEWEMAIL@ æµè§ˆå™¨ : @BROWSER@ IP åœ°å€ : @IPADDRESS@ 机器å称 : @HOSTNAME@ - --- -本邮件由 DokuWiki 自动创建 -@DOKUWIKIURL@ - - diff --git a/sources/inc/lang/zh/subscr_digest.txt b/sources/inc/lang/zh/subscr_digest.txt index 3c73ff4..0428bc9 100644 --- a/sources/inc/lang/zh/subscr_digest.txt +++ b/sources/inc/lang/zh/subscr_digest.txt @@ -13,7 +13,3 @@ è¦å–消页é¢æ醒，从 @DOKUWIKIURL@ 登录维基，然åŽæµè§ˆ @SUBSCRIBE@ 并退订页é¢ä»¥åŠ/或者命å空间的更改。 - --- -本邮件由以下 DokuWiki 产生 -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh/subscr_list.txt b/sources/inc/lang/zh/subscr_list.txt index 1fc1e21..eb2db6b 100644 --- a/sources/inc/lang/zh/subscr_list.txt +++ b/sources/inc/lang/zh/subscr_list.txt @@ -10,7 +10,3 @@ è¦å–消页é¢æ醒，从 @DOKUWIKIURL@ 登录维基，然åŽæµè§ˆ @SUBSCRIBE@ 并退订页é¢ä»¥åŠ/或者命å空间的更改。 - --- -本邮件由以下 DokuWiki 产生 -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh/subscr_single.txt b/sources/inc/lang/zh/subscr_single.txt index 7da57d5..4ea4198 100644 --- a/sources/inc/lang/zh/subscr_single.txt +++ b/sources/inc/lang/zh/subscr_single.txt @@ -16,7 +16,3 @@ è¦å–消页é¢æ醒，从 @DOKUWIKIURL@ 登录维基，然åŽæµè§ˆ @SUBSCRIBE@ 并退订页é¢ä»¥åŠ/或者命å空间的更改。 - --- -本邮件由以下 DokuWiki 产生 -@DOKUWIKIURL@ \ No newline at end of file diff --git a/sources/inc/lang/zh/uploadmail.txt b/sources/inc/lang/zh/uploadmail.txt index b820cee..a5ce539 100644 --- a/sources/inc/lang/zh/uploadmail.txt +++ b/sources/inc/lang/zh/uploadmail.txt @@ -10,11 +10,3 @@ IP åœ°å€ : @IPADDRESS@ å¤§å° : @SIZE@ MIME 类型 : @MIME@ 用户 : @USER@ - --- -本邮件由 DokuWiki 自动创建 -@DOKUWIKIURL@ - - - - diff --git a/sources/inc/load.php b/sources/inc/load.php index 42a6a63..39cb0fb 100644 --- a/sources/inc/load.php +++ b/sources/inc/load.php @@ -107,14 +107,27 @@ function load_autoload($name){ ); if(isset($classes[$name])){ - require_once($classes[$name]); - return; + require ($classes[$name]); + return true; + } + + // namespace to directory conversion + $name = str_replace('\\', '/', $name); + + // plugin namespace + if(substr($name, 0, 16) == 'dokuwiki/plugin/') { + $name = str_replace('/test/', '/_test/', $name); // no underscore in test namespace + $file = DOKU_PLUGIN . substr($name, 16) . '.php'; + if(file_exists($file)) { + require $file; + return true; + } } // our own namespace - $name = str_replace('\\', '/', $name); if(substr($name, 0, 9) == 'dokuwiki/') { - require_once(substr($name, 9) . '.php'); + require substr($name, 9) . '.php'; + return true; } // Plugin loading @@ -124,9 +137,10 @@ function load_autoload($name){ $c = ((count($m) === 4) ? "/{$m[3]}" : ''); $plg = DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php"; if(file_exists($plg)){ - include_once DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php"; + require $plg; } - return; + return true; } + return false; } diff --git a/sources/inc/mail.php b/sources/inc/mail.php index e4d06fd..e2afd08 100644 --- a/sources/inc/mail.php +++ b/sources/inc/mail.php @@ -277,7 +277,7 @@ function mail_isvalid($email){ * Quoted printable encoding * * @author umu - * @link http://www.php.net/manual/en/function.imap-8bit.php#61216 + * @link http://php.net/manual/en/function.imap-8bit.php#61216 */ function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) { // split text into lines diff --git a/sources/inc/media.php b/sources/inc/media.php index e9fff14..e103bdf 100644 --- a/sources/inc/media.php +++ b/sources/inc/media.php @@ -74,13 +74,16 @@ function media_metasave($id,$auth,$data){ // add old revision to the attic media_saveOldRevision($id); } - + $filesize_old = filesize($src); if($meta->save()){ if($conf['fperm']) chmod($src, $conf['fperm']); - + @clearstatcache(true, $src); $new = @filemtime($src); + $filesize_new = filesize($src); + $sizechange = $filesize_new - $filesize_old; + // add a log entry to the media changelog - addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT, $lang['media_meta_edited']); + addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT, $lang['media_meta_edited'], '', null, $sizechange); msg($lang['metasaveok'],1); return $id; @@ -254,9 +257,11 @@ function media_delete($id,$auth){ } $data['unl'] = @unlink($file); - if($data['unl']){ - addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE, $lang['deleted']); - $data['del'] = io_sweepNS($id,'mediadir'); + if($data['unl']) { + $sizechange = 0 - $data['size']; + addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE, $lang['deleted'], '', null, $sizechange); + + $data['del'] = io_sweepNS($id, 'mediadir'); } } $evt->advise_after(); @@ -505,6 +510,8 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov // prepare directory io_createNamespace($id, 'media'); + $filesize_old = file_exists($fn) ? filesize($fn) : 0; + if($move($fn_tmp, $fn)) { @clearstatcache(true,$fn); $new = @filemtime($fn); @@ -515,12 +522,14 @@ function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'mov msg($lang['uploadsucc'],1); media_notify($id,$fn,$imime,$old); // add a log entry to the media changelog - if ($REV){ - addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, sprintf($lang['restored'], dformat($REV)), $REV); - } elseif ($overwrite) { - addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT); + $filesize_new = filesize($fn); + $sizechange = $filesize_new - $filesize_old; + if($REV) { + addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, sprintf($lang['restored'], dformat($REV)), $REV, null, $sizechange); + } elseif($overwrite) { + addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT, '', '', null, $sizechange); } else { - addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']); + addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created'], '', null, $sizechange); } return $id; }else{ @@ -549,10 +558,16 @@ function media_saveOldRevision($id){ if (!$medialog->getRevisionInfo($date)) { // there was an external edit, // there is no log entry for current version of file - if (!file_exists(mediaMetaFN($id,'.changes'))) { - addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']); + $sizechange = filesize($oldf); + if(!file_exists(mediaMetaFN($id, '.changes'))) { + addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created'], '', null, $sizechange); } else { - addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_EDIT); + $oldRev = $medialog->getRevisions(-1, 1); // from changelog + $oldRev = (int) (empty($oldRev) ? 0 : $oldRev[0]); + $filesize_old = filesize(mediaFN($id, $oldRev)); + $sizechange = $sizechange - $filesize_old; + + addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_EDIT, '', '', null, $sizechange); } } diff --git a/sources/inc/pageutils.php b/sources/inc/pageutils.php index a5bf039..68b7dab 100644 --- a/sources/inc/pageutils.php +++ b/sources/inc/pageutils.php @@ -81,7 +81,13 @@ function getID($param='id',$clean=true){ // fall back to default $id = $id.$conf['start']; } - if (isset($ACT) && $ACT === 'show') send_redirect(wl($id,'',true)); + if (isset($ACT) && $ACT === 'show') { + $urlParameters = $_GET; + if (isset($urlParameters['id'])) { + unset($urlParameters['id']); + } + send_redirect(wl($id,$urlParameters,true)); + } } if($clean) $id = cleanID($id); @@ -110,7 +116,7 @@ function cleanID($raw_id,$ascii=false){ $cache = & $cache_cleanid; // check if it's already in the memory cache - if (isset($cache[(string)$raw_id])) { + if (!$ascii && isset($cache[(string)$raw_id])) { return $cache[(string)$raw_id]; } @@ -143,7 +149,7 @@ function cleanID($raw_id,$ascii=false){ $id = preg_replace('#:[:\._\-]+#',':',$id); $id = preg_replace('#[:\._\-]+:#',':',$id); - $cache[(string)$raw_id] = $id; + if (!$ascii) $cache[(string)$raw_id] = $id; return($id); } @@ -285,14 +291,15 @@ function wikiFN($raw_id,$rev='',$clean=true){ global $cache_wikifn; $cache = & $cache_wikifn; - if (isset($cache[$raw_id]) && isset($cache[$raw_id][$rev])) { - return $cache[$raw_id][$rev]; - } - $id = $raw_id; if ($clean) $id = cleanID($id); $id = str_replace(':','/',$id); + + if (isset($cache[$id]) && isset($cache[$id][$rev])) { + return $cache[$id][$rev]; + } + if(empty($rev)){ $fn = $conf['datadir'].'/'.utf8_encodeFN($id).'.txt'; }else{ @@ -310,8 +317,8 @@ function wikiFN($raw_id,$rev='',$clean=true){ } } - if (!isset($cache[$raw_id])) { $cache[$raw_id] = array(); } - $cache[$raw_id][$rev] = $fn; + if (!isset($cache[$id])) { $cache[$id] = array(); } + $cache[$id][$rev] = $fn; return $fn; } @@ -391,9 +398,9 @@ function metaFiles($id){ * @param string|int $rev empty string or revision timestamp * @return string full path */ -function mediaFN($id, $rev=''){ +function mediaFN($id, $rev='', $clean=true){ global $conf; - $id = cleanID($id); + if ($clean) $id = cleanID($id); $id = str_replace(':','/',$id); if(empty($rev)){ $fn = $conf['mediadir'].'/'.utf8_encodeFN($id); @@ -435,7 +442,7 @@ function localeFN($id,$ext='txt'){ * instead * * Partyly based on a cleanPath function found at - * http://www.php.net/manual/en/function.realpath.php#57016 + * http://php.net/manual/en/function.realpath.php#57016 * * @author * @@ -738,24 +745,26 @@ function utf8_decodeFN($file){ /** * Find a page in the current namespace (determined from $ID) or any - * higher namespace + * higher namespace that can be accessed by the current user, + * this condition can be overriden by an optional parameter. * * Used for sidebars, but can be used other stuff as well * * @todo add event hook * * @param string $page the pagename you're looking for - * @return string|false the full page id of the found page, false if any + * @param bool $useacl only return pages readable by the current user, false to ignore ACLs + * @return false|string the full page id of the found page, false if any */ -function page_findnearest($page){ +function page_findnearest($page, $useacl = true){ if (!$page) return false; global $ID; $ns = $ID; do { $ns = getNS($ns); - $pageid = ltrim("$ns:$page",':'); - if(page_exists($pageid)){ + $pageid = cleanID("$ns:$page"); + if(page_exists($pageid) && (!$useacl || auth_quickaclcheck($pageid) >= AUTH_READ)){ return $pageid; } } while($ns); diff --git a/sources/inc/parser/handler.php b/sources/inc/parser/handler.php index 815ac39..f477d36 100644 --- a/sources/inc/parser/handler.php +++ b/sources/inc/parser/handler.php @@ -1470,12 +1470,16 @@ class Doku_Handler_Table implements Doku_Handler_CallWriter_Interface { case 'tablerow_close': // Fix broken tables by adding missing cells + $moreCalls = array(); while (++$lastCell < $this->maxCols) { - array_splice($this->tableCalls, $key, 0, array( - array('tablecell_open', array(1, null, 1), $call[2]), - array('cdata', array(''), $call[2]), - array('tablecell_close', array(), $call[2]))); - $key += 3; + $moreCalls[] = array('tablecell_open', array(1, null, 1), $call[2]); + $moreCalls[] = array('cdata', array(''), $call[2]); + $moreCalls[] = array('tablecell_close', array(), $call[2]); + } + $moreCallsLength = count($moreCalls); + if($moreCallsLength) { + array_splice($this->tableCalls, $key, 0, $moreCalls); + $key += $moreCallsLength; } if($this->countTableHeadRows == $lastRow) { diff --git a/sources/inc/parser/xhtml.php b/sources/inc/parser/xhtml.php index 9d7613f..2efb1d8 100644 --- a/sources/inc/parser/xhtml.php +++ b/sources/inc/parser/xhtml.php @@ -427,9 +427,16 @@ class Doku_Renderer_xhtml extends Doku_Renderer { /** * Open an unordered list + * + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function listu_open() { - $this->doc .= '
    '.DOKU_LF; + function listu_open($classes = null) { + $class = ''; + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class = " class=\"$classes\""; + } + $this->doc .= "".DOKU_LF; } /** @@ -441,9 +448,16 @@ class Doku_Renderer_xhtml extends Doku_Renderer { /** * Open an ordered list + * + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function listo_open() { - $this->doc .= '
      '.DOKU_LF; + function listo_open($classes = null) { + $class = ''; + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class = " class=\"$classes\""; + } + $this->doc .= "".DOKU_LF; } /** @@ -763,6 +777,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * * @param string $link The link name * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly + * * @see http://en.wikipedia.org/wiki/CamelCase */ function camelcaselink($link, $returnonly = false) { @@ -779,6 +795,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $hash hash link identifier * @param string $name name for the link * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly */ function locallink($hash, $name = null, $returnonly = false) { global $ID; @@ -900,6 +917,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $url full URL with scheme * @param string|array $name name for the link, array for media file * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly */ function externallink($url, $name = null, $returnonly = false) { global $conf; @@ -938,10 +956,12 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['more'] = ''; $link['class'] = $class; $link['url'] = $url; + $link['rel'] = ''; $link['name'] = $name; $link['title'] = $this->_xmlEntities($url); - if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"'; + if($conf['relnofollow']) $link['rel'] .= ' nofollow'; + if($conf['target']['extern']) $link['rel'] .= ' noopener'; //output formatted if($returnonly) { @@ -961,6 +981,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $wikiName indentifier (shortcut) for the remote wiki * @param string $wikiUri the fragment parsed from the original link * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly */ function interwikilink($match, $name = null, $wikiName, $wikiUri, $returnonly = false) { global $conf; @@ -971,6 +992,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['suf'] = ''; $link['more'] = ''; $link['name'] = $this->_getLinkTitle($name, $wikiUri, $isImage); + $link['rel'] = ''; //get interwiki URL $exists = null; @@ -992,9 +1014,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['class'] .= ' wikilink1'; } else { $link['class'] .= ' wikilink2'; - $link['rel'] = 'nofollow'; + $link['rel'] .= ' nofollow'; } } + if($conf['target']['interwiki']) $link['rel'] .= ' noopener'; $link['url'] = $url; $link['title'] = htmlspecialchars($link['url']); @@ -1013,6 +1036,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $url the link * @param string|array $name name for the link, array for media file * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly */ function windowssharelink($url, $name = null, $returnonly = false) { global $conf; @@ -1052,6 +1076,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $address Email-Address * @param string|array $name name for the link, array for media file * @param bool $returnonly whether to return html or write to doc attribute + * @return void|string writes to doc attribute or returns html depends on $returnonly */ function emaillink($address, $name = null, $returnonly = false) { global $conf; @@ -1103,7 +1128,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $cache cache|recache|nocache * @param string $linking linkonly|detail|nolink * @param bool $return return HTML instead of adding to $doc - * @return void|string + * @return void|string writes to doc attribute or returns html depends on $return */ function internalmedia($src, $title = null, $align = null, $width = null, $height = null, $cache = null, $linking = null, $return = false) { @@ -1157,6 +1182,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param string $cache cache|recache|nocache * @param string $linking linkonly|detail|nolink * @param bool $return return HTML instead of adding to $doc + * @return void|string writes to doc attribute or returns html depends on $return */ function externalmedia($src, $title = null, $align = null, $width = null, $height = null, $cache = null, $linking = null, $return = false) { @@ -1195,6 +1221,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { /** * Renders an RSS feed * + * @param string $url URL of the feed + * @param array $params Finetuning of the output + * * @author Andreas Gohr */ function rss($url, $params) { @@ -1286,12 +1315,17 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * * @param int $maxcols maximum number of columns * @param int $numrows NOT IMPLEMENTED - * @param int $pos byte position in the original source + * @param int $pos byte position in the original source + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function table_open($maxcols = null, $numrows = null, $pos = null) { + function table_open($maxcols = null, $numrows = null, $pos = null, $classes = null) { // initialize the row counter used for classes $this->_counter['row_counter'] = 0; $class = 'table'; + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class .= ' ' . $classes; + } if($pos !== null) { $class .= ' '.$this->startSectionEdit($pos, 'table'); } @@ -1341,11 +1375,17 @@ class Doku_Renderer_xhtml extends Doku_Renderer { /** * Open a table row + * + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function tablerow_open() { + function tablerow_open($classes = null) { // initialize the cell counter used for classes $this->_counter['cell_counter'] = 0; $class = 'row'.$this->_counter['row_counter']++; + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class .= ' ' . $classes; + } $this->doc .= DOKU_TAB.''.DOKU_LF.DOKU_TAB.DOKU_TAB; } @@ -1362,12 +1402,17 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @param int $colspan * @param string $align left|center|right * @param int $rowspan + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function tableheader_open($colspan = 1, $align = null, $rowspan = 1) { + function tableheader_open($colspan = 1, $align = null, $rowspan = 1, $classes = null) { $class = 'class="col'.$this->_counter['cell_counter']++; if(!is_null($align)) { $class .= ' '.$align.'align'; } + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class .= ' ' . $classes; + } $class .= '"'; $this->doc .= ' 1) { @@ -1390,15 +1435,20 @@ class Doku_Renderer_xhtml extends Doku_Renderer { /** * Open a table cell * - * @param int $colspan - * @param string $align left|center|right - * @param int $rowspan + * @param int $colspan + * @param string $align left|center|right + * @param int $rowspan + * @param string|string[] $classes css classes - have to be valid, do not pass unfiltered user input */ - function tablecell_open($colspan = 1, $align = null, $rowspan = 1) { + function tablecell_open($colspan = 1, $align = null, $rowspan = 1, $classes = null) { $class = 'class="col'.$this->_counter['cell_counter']++; if(!is_null($align)) { $class .= ' '.$align.'align'; } + if($classes !== null) { + if(is_array($classes)) $classes = join(' ', $classes); + $class .= ' ' . $classes; + } $class .= '"'; $this->doc .= ' 1) { @@ -1418,6 +1468,16 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $this->doc .= ''; } + /** + * Returns the current header level. + * (required e.g. by the filelist plugin) + * + * @return int The current header level + */ + function getLastlevel() { + return $this->lastlevel; + } + #region Utility functions /** @@ -1425,6 +1485,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * * Assembles all parts defined in $link returns HTML for the link * + * @param array $link attributes of a link + * @return string + * * @author Andreas Gohr */ function _formatLink($link) { @@ -1448,7 +1511,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if(!empty($link['target'])) $ret .= ' target="'.$link['target'].'"'; if(!empty($link['title'])) $ret .= ' title="'.$link['title'].'"'; if(!empty($link['style'])) $ret .= ' style="'.$link['style'].'"'; - if(!empty($link['rel'])) $ret .= ' rel="'.$link['rel'].'"'; + if(!empty($link['rel'])) $ret .= ' rel="'.trim($link['rel']).'"'; if(!empty($link['more'])) $ret .= ' '.$link['more']; $ret .= '>'; $ret .= $link['name']; @@ -1682,6 +1745,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $link['suf'] = ''; $link['more'] = ''; $link['target'] = $conf['target']['media']; + if($conf['target']['media']) $link['rel'] = 'noopener'; $link['title'] = $this->_xmlEntities($src); $link['name'] = $this->_media($src, $title, $align, $width, $height, $cache, $render); diff --git a/sources/inc/phpseclib/Crypt_Base.php b/sources/inc/phpseclib/Crypt_Base.php index 4fb9990..4e94d1e 100644 --- a/sources/inc/phpseclib/Crypt_Base.php +++ b/sources/inc/phpseclib/Crypt_Base.php @@ -346,8 +346,8 @@ class Crypt_Base { * * Only used if $engine == CRYPT_MODE_MCRYPT * - * @link http://www.php.net/mcrypt_module_open - * @link http://www.php.net/mcrypt_list_algorithms + * @link http://php.net/mcrypt_module_open + * @link http://php.net/mcrypt_list_algorithms * @see Crypt_Base::_setupMcrypt() * @var String * @access private @@ -907,7 +907,7 @@ class Crypt_Base { } if ($this->paddable) { - // we pad with chr(0) since that's what mcrypt_generic does. to quote from {@link http://www.php.net/function.mcrypt-generic}: + // we pad with chr(0) since that's what mcrypt_generic does. to quote from {@link http://php.net/function.mcrypt-generic}: // "The data is padded with "\0" to make sure the length of the data is n * blocksize." $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0)); } diff --git a/sources/inc/plugin.php b/sources/inc/plugin.php index f2ad95e..a3314d4 100644 --- a/sources/inc/plugin.php +++ b/sources/inc/plugin.php @@ -276,29 +276,6 @@ class DokuWiki_Plugin { return "$title"; } - /** - * A fallback to provide access to the old render() method - * - * Since syntax plugins provide their own render method with a different signature and they now - * inherit from Doku_Plugin we can no longer have a render() method here (Strict Standards Violation). - * Instead use render_text() - * - * @deprecated 2014-01-22 - * - * @param string $name - * @param array $arguments - * @return null|string - */ - public function __call($name, $arguments) { - if($name == 'render'){ - dbg_deprecated('render_text()'); - if(!isset($arguments[1])) $arguments[1] = 'xhtml'; - return $this->render_text($arguments[0], $arguments[1]); - } - trigger_error("no such method $name", E_USER_ERROR); - return null; - } - /** * output text string through the parser, allows dokuwiki markup to be used * very ineffecient for small pieces of data - try not to use diff --git a/sources/inc/plugincontroller.class.php b/sources/inc/plugincontroller.class.php index 8d20f88..5bb0753 100644 --- a/sources/inc/plugincontroller.class.php +++ b/sources/inc/plugincontroller.class.php @@ -172,25 +172,7 @@ class Doku_Plugin_Controller { if ($plugin[0] == '.') continue; // skip hidden entries if (is_file(DOKU_PLUGIN.$plugin)) continue; // skip files, we're only interested in directories - if (substr($plugin,-9) == '.disabled') { - // the plugin was disabled by rc2009-01-26 - // disabling mechanism was changed back very soon again - // to keep everything simple we just skip the plugin completely - continue; - } elseif (file_exists(DOKU_PLUGIN.$plugin.'/disabled')) { - /** - * treat this as a default disabled plugin(over-rideable by the plugin manager) - * @deprecated 2011-09-10 (usage of disabled files) - */ - if (empty($this->plugin_cascade['local'][$plugin])) { - $all_plugins[$plugin] = 0; - } else { - $all_plugins[$plugin] = 1; - } - $this->plugin_cascade['default'][$plugin] = 0; - - } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) || - ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){ + if (array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0){ $all_plugins[$plugin] = 0; } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) { @@ -242,7 +224,7 @@ class Doku_Plugin_Controller { $file = $this->last_local_config_file; $out = " $value) { $out .= "\$plugins['$plugin'] = $value;\n"; } diff --git a/sources/inc/remote.php b/sources/inc/remote.php index 3e03204..2d2e327 100644 --- a/sources/inc/remote.php +++ b/sources/inc/remote.php @@ -226,6 +226,7 @@ class RemoteAPI { * Perform access check for current user * * @return bool true if the current user has access to remote api. + * @throws RemoteAccessDeniedException If remote access disabled */ public function hasAccess() { global $conf; @@ -236,6 +237,9 @@ class RemoteAPI { if (!$conf['remote']) { throw new RemoteAccessDeniedException('server error. RPC server not enabled.',-32604); //should not be here,just throw } + if(trim($conf['remoteuser']) == '!!not set!!') { + return false; + } if(!$conf['useacl']) { return true; } diff --git a/sources/inc/search.php b/sources/inc/search.php index 935969d..cc3579c 100644 --- a/sources/inc/search.php +++ b/sources/inc/search.php @@ -28,6 +28,11 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1,$sort='natural'){ $files = array(); $filepaths = array(); + // safeguard against runaways #1452 + if($base == '' || $base == '/') { + throw new RuntimeException('No valid $base passed to search() - possible misconfiguration or bug'); + } + //read in directories and files $dh = @opendir($base.'/'.$dir); if(!$dh) return; diff --git a/sources/inc/template.php b/sources/inc/template.php index a1bdc8d..a5135d3 100644 --- a/sources/inc/template.php +++ b/sources/inc/template.php @@ -303,10 +303,13 @@ function tpl_metaheaders($alt = true) { // the usual stuff $head['meta'][] = array('name'=> 'generator', 'content'=> 'DokuWiki'); - $head['link'][] = array( - 'rel' => 'search', 'type'=> 'application/opensearchdescription+xml', - 'href'=> DOKU_BASE.'lib/exe/opensearch.php', 'title'=> $conf['title'] - ); + if(actionOK('search')) { + $head['link'][] = array( + 'rel' => 'search', 'type'=> 'application/opensearchdescription+xml', + 'href'=> DOKU_BASE.'lib/exe/opensearch.php', 'title'=> $conf['title'] + ); + } + $head['link'][] = array('rel'=> 'start', 'href'=> DOKU_BASE); if(actionOK('index')) { $head['link'][] = array( @@ -1433,7 +1436,7 @@ function tpl_localeFN($id) { } /** - * prints the "main content" in the mediamanger popup + * prints the "main content" in the mediamanager popup * * Depending on the user's actions this may be a list of * files in a namespace, the meta editing dialog or @@ -1600,7 +1603,7 @@ function tpl_mediaFileDetails($image, $rev) { } /** - * prints the namespace tree in the mediamanger popup + * prints the namespace tree in the mediamanager popup * * Only allowed in mediamanager.php * @@ -1709,22 +1712,26 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap = * This function is useful to populate sidebars or similar features in a * template * - * @param string $pageid - * @param bool $print - * @param bool $propagate + * @param string $pageid The page name you want to include + * @param bool $print Should the content be printed or returned only + * @param bool $propagate Search higher namespaces, too? + * @param bool $useacl Include the page only if the ACLs check out? * @return bool|null|string */ -function tpl_include_page($pageid, $print = true, $propagate = false) { - if (!$pageid) return false; - if ($propagate) $pageid = page_findnearest($pageid); +function tpl_include_page($pageid, $print = true, $propagate = false, $useacl = true) { + if($propagate) { + $pageid = page_findnearest($pageid, $useacl); + } elseif($useacl && auth_quickaclcheck($pageid) == AUTH_NONE) { + return false; + } + if(!$pageid) return false; global $TOC; $oldtoc = $TOC; $html = p_wiki_xhtml($pageid, '', false); $TOC = $oldtoc; - if(!$print) return $html; - echo $html; + if($print) echo $html; return $html; } diff --git a/sources/inc/utf8.php b/sources/inc/utf8.php index 2b6a0c4..794db2b 100644 --- a/sources/inc/utf8.php +++ b/sources/inc/utf8.php @@ -80,7 +80,7 @@ if(!function_exists('utf8_check')){ * Tries to detect if a string is in Unicode encoding * * @author - * @link http://www.php.net/manual/en/function.utf8-encode.php + * @link http://php.net/manual/en/function.utf8-encode.php * * @param string $Str * @return bool @@ -417,7 +417,7 @@ if(!function_exists('utf8_ucwords')){ * Uppercase the first character of each word in a string * * @author Harry Fuecks - * @see http://www.php.net/ucwords + * @see http://php.net/ucwords * * @param string $str * @return string with first char of each word uppercase @@ -425,7 +425,7 @@ if(!function_exists('utf8_ucwords')){ function utf8_ucwords($str) { // Note: [\x0c\x09\x0b\x0a\x0d\x20] matches; // form feeds, horizontal tabs, vertical tabs, linefeeds and carriage returns - // This corresponds to the definition of a "word" defined at http://www.php.net/ucwords + // This corresponds to the definition of a "word" defined at http://php.net/ucwords $pattern = '/(^|([\x0c\x09\x0b\x0a\x0d\x20]+))([^\x0c\x09\x0b\x0a\x0d\x20]{1})[^\x0c\x09\x0b\x0a\x0d\x20]*/u'; return preg_replace_callback($pattern, 'utf8_ucwords_callback',$str); @@ -558,7 +558,7 @@ if(!function_exists('utf8_tohtml')){ * * @author Tom N Harris * @author - * @link http://www.php.net/manual/en/function.utf8-decode.php + * @link http://php.net/manual/en/function.utf8-decode.php * * @param string $str * @return string diff --git a/sources/index.php b/sources/index.php index ad08077..689ce17 100644 --- a/sources/index.php +++ b/sources/index.php @@ -1,8 +1,68 @@ */ -header("Location: doku.php"); +if(php_sapi_name() != 'cli-server') { + header("Location: doku.php"); + exit; +} + +# ROUTER starts below + +# avoid path traversal +$_SERVER['SCRIPT_NAME'] = str_replace('/../', '/', $_SERVER['SCRIPT_NAME']); + +# routing aka. rewriting +if(preg_match('/^\/_media\/(.*)/', $_SERVER['SCRIPT_NAME'], $m)) { + # media dispatcher + $_GET['media'] = $m[1]; + require $_SERVER['DOCUMENT_ROOT'] . '/lib/exe/fetch.php'; + +} else if(preg_match('/^\/_detail\/(.*)/', $_SERVER['SCRIPT_NAME'], $m)) { + # image detail view + $_GET['media'] = $m[1]; + require $_SERVER['DOCUMENT_ROOT'] . '/lib/exe/detail.php'; + +} else if(preg_match('/^\/_media\/(.*)/', $_SERVER['SCRIPT_NAME'], $m)) { + # exports + $_GET['do'] = 'export_' . $m[1]; + $_GET['id'] = $m[2]; + require $_SERVER['DOCUMENT_ROOT'] . '/doku.php'; + +} elseif($_SERVER['SCRIPT_NAME'] == '/index.php') { + # 404s are automatically mapped to index.php + if(isset($_SERVER['PATH_INFO'])) { + $_GET['id'] = $_SERVER['PATH_INFO']; + } + require $_SERVER['DOCUMENT_ROOT'] . '/doku.php'; + +} else if(file_exists($_SERVER['DOCUMENT_ROOT'] . $_SERVER['SCRIPT_NAME'])) { + # existing files + + # access limitiations + if(preg_match('/\/([\._]ht|README$|VERSION$|COPYING$)/', $_SERVER['SCRIPT_NAME']) or + preg_match('/^\/(data|conf|bin|inc)\//', $_SERVER['SCRIPT_NAME']) + ) { + die('Access denied'); + } + + if(substr($_SERVER['SCRIPT_NAME'], -4) == '.php') { + # php scripts + require $_SERVER['DOCUMENT_ROOT'] . $_SERVER['SCRIPT_NAME']; + } else { + # static files + return false; + } +} +# 404 diff --git a/sources/install.php b/sources/install.php index 6002ec8..ad4384c 100644 --- a/sources/install.php +++ b/sources/install.php @@ -58,7 +58,8 @@ $dokuwiki_hash = array( '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', '2013-12-08' => '263c76af309fbf083867c18a34ff5214', '2014-05-05' => '263c76af309fbf083867c18a34ff5214', - '2015-08-10' => '263c76af309fbf083867c18a34ff5214' + '2015-08-10' => '263c76af309fbf083867c18a34ff5214', + '2016-06-26' => 'fd3abb6d89853dacb032907e619fbd73' ); @@ -152,7 +153,7 @@ header('Content-Type: text/html; charset=utf-8');
      driven by DokuWiki - powered by PHP + powered by PHP
      diff --git a/sources/lib/exe/ajax.php b/sources/lib/exe/ajax.php index a200a3d..b3e9a61 100644 --- a/sources/lib/exe/ajax.php +++ b/sources/lib/exe/ajax.php @@ -303,7 +303,8 @@ function ajax_mediaupload(){ ); } $json = new JSON; - echo htmlspecialchars($json->encode($result), ENT_NOQUOTES); + header('Content-Type: application/json'); + echo $json->encode($result); } /** @@ -428,7 +429,7 @@ function ajax_linkwiz(){ echo ''.$name.''; - if($item['title']){ + if(!blank($item['title'])){ echo ''.htmlspecialchars($item['title']).''; } echo ''; diff --git a/sources/lib/exe/css.php b/sources/lib/exe/css.php index 925b78a..ade1547 100644 --- a/sources/lib/exe/css.php +++ b/sources/lib/exe/css.php @@ -50,11 +50,6 @@ function css_out(){ // load styl.ini $styleini = css_styleini($tpl, $INPUT->bool('preview')); - // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility - if (isset($config_cascade['userstyle']['default'])) { - $config_cascade['userstyle']['screen'] = array($config_cascade['userstyle']['default']); - } - // cache influencers $tplinc = tpl_incdir($tpl); $cache_files = getConfigFiles('main'); @@ -296,12 +291,12 @@ function css_styleini($tpl, $preview=false) { $data = parse_ini_file($ini, true); // stylesheets - if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){ + if(isset($data['stylesheets']) && is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){ $stylesheets[$mode][$incbase.$file] = $webbase; } // replacements - if(is_array($data['replacements'])){ + if(isset($data['replacements']) && is_array($data['replacements'])){ $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase)); } } diff --git a/sources/lib/exe/indexer.php b/sources/lib/exe/indexer.php index d2a4d45..4f60f16 100644 --- a/sources/lib/exe/indexer.php +++ b/sources/lib/exe/indexer.php @@ -206,4 +206,4 @@ function sendGIF(){ //Setup VIM: ex: et ts=4 : // No trailing PHP closing tag - no output please! -// See Note at http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php +// See Note at http://php.net/manual/en/language.basic-syntax.instruction-separation.php diff --git a/sources/lib/exe/js.php b/sources/lib/exe/js.php index 16d22da..0582ddf 100644 --- a/sources/lib/exe/js.php +++ b/sources/lib/exe/js.php @@ -173,7 +173,7 @@ function js_load($file){ // is it a include_once? if($match[1]){ $base = utf8_basename($ifile); - if($loaded[$base]){ + if(array_key_exists($base, $loaded) && $loaded[$base] === true){ $data = str_replace($match[0], '' ,$data); continue; } @@ -219,18 +219,33 @@ function js_pluginscripts(){ * @return array */ function js_pluginstrings() { - global $conf; + global $conf, $config_cascade; $pluginstrings = array(); $plugins = plugin_list(); - foreach ($plugins as $p){ - if (isset($lang)) unset($lang); - if (file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) { - include DOKU_PLUGIN."$p/lang/en/lang.php"; + foreach($plugins as $p) { + $path = DOKU_PLUGIN . $p . '/lang/'; + + if(isset($lang)) unset($lang); + if(file_exists($path . "en/lang.php")) { + include $path . "en/lang.php"; } - if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) { - include DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php"; + foreach($config_cascade['lang']['plugin'] as $config_file) { + if(file_exists($config_file . $p . '/en/lang.php')) { + include($config_file . $p . '/en/lang.php'); + } } - if (isset($lang['js'])) { + if(isset($conf['lang']) && $conf['lang'] != 'en') { + if(file_exists($path . $conf['lang'] . "/lang.php")) { + include($path . $conf['lang'] . '/lang.php'); + } + foreach($config_cascade['lang']['plugin'] as $config_file) { + if(file_exists($config_file . $p . '/' . $conf['lang'] . '/lang.php')) { + include($config_file . $p . '/' . $conf['lang'] . '/lang.php'); + } + } + } + + if(isset($lang['js'])) { $pluginstrings[$p] = $lang['js']; } } @@ -247,15 +262,34 @@ function js_pluginstrings() { * @return array */ function js_templatestrings($tpl) { - global $conf; + global $conf, $config_cascade; + + $path = tpl_incdir() . 'lang/'; + $templatestrings = array(); - if (file_exists(tpl_incdir($tpl)."lang/en/lang.php")) { - include tpl_incdir($tpl)."lang/en/lang.php"; + if(file_exists($path . "en/lang.php")) { + include $path . "en/lang.php"; } - if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(tpl_incdir($tpl)."lang/".$conf['lang']."/lang.php")) { - include tpl_incdir($tpl)."lang/".$conf['lang']."/lang.php"; + foreach($config_cascade['lang']['template'] as $config_file) { + if(file_exists($config_file . $conf['template'] . '/en/lang.php')) { + include($config_file . $conf['template'] . '/en/lang.php'); + } } - if (isset($lang['js'])) { + if(isset($conf['lang']) && $conf['lang'] != 'en' && file_exists($path . $conf['lang'] . "/lang.php")) { + include $path . $conf['lang'] . "/lang.php"; + } + if(isset($conf['lang']) && $conf['lang'] != 'en') { + if(file_exists($path . $conf['lang'] . "/lang.php")) { + include $path . $conf['lang'] . "/lang.php"; + } + foreach($config_cascade['lang']['template'] as $config_file) { + if(file_exists($config_file . $conf['template'] . '/' . $conf['lang'] . '/lang.php')) { + include($config_file . $conf['template'] . '/' . $conf['lang'] . '/lang.php'); + } + } + } + + if(isset($lang['js'])) { $templatestrings[$tpl] = $lang['js']; } return $templatestrings; @@ -419,9 +453,9 @@ function js_compress($s){ // Only consider deleting whitespace if the signs before and after // are not equal and are not an operator which may not follow itself. - if ((!$lch || $s[$i+1] == ' ') + if ($i+1 < $slen && ((!$lch || $s[$i+1] == ' ') || $lch != $s[$i+1] - || strpos($ops,$s[$i+1]) === false) { + || strpos($ops,$s[$i+1]) === false)) { // leading spaces if($i+1 < $slen && (strpos($chars,$s[$i+1]) !== false)){ $i = $i + 1; diff --git a/sources/lib/exe/mediamanager.php b/sources/lib/exe/mediamanager.php index c90b6db..7222544 100644 --- a/sources/lib/exe/mediamanager.php +++ b/sources/lib/exe/mediamanager.php @@ -9,6 +9,7 @@ global $INPUT; global $lang; + global $conf; // handle passed message if($INPUT->str('msg1')) msg(hsc($INPUT->str('msg1')),1); if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1); @@ -32,7 +33,8 @@ global $INFO, $JSINFO; $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo(); - $JSINFO = array('id' => '', 'namespace' => ''); + $JSINFO['id'] = ''; + $JSINFO['namespace'] = ''; $AUTH = $INFO['perm']; // shortcut for historical reasons $tmp = array(); diff --git a/sources/lib/exe/xmlrpc.php b/sources/lib/exe/xmlrpc.php index 6a01631..6421c4a 100644 --- a/sources/lib/exe/xmlrpc.php +++ b/sources/lib/exe/xmlrpc.php @@ -11,12 +11,12 @@ if(!$conf['remote']) die('XML-RPC server not enabled.'); * XMLRPC functions. */ class dokuwiki_xmlrpc_server extends IXR_Server { - var $remote; + protected $remote; /** * Constructor. Register methods and run Server */ - function dokuwiki_xmlrpc_server(){ + public function __construct(){ $this->remote = new RemoteAPI(); $this->remote->setDateTransformation(array($this, 'toDate')); $this->remote->setFileTransformation(array($this, 'toFile')); @@ -28,7 +28,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { * @param array $args * @return IXR_Error|mixed */ - function call($methodname, $args){ + public function call($methodname, $args){ try { $result = $this->remote->call($methodname, $args); return $result; @@ -49,7 +49,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { * @param string|int $data iso date(yyyy[-]mm[-]dd[ hh:mm[:ss]]) or timestamp * @return IXR_Date */ - function toDate($data) { + public function toDate($data) { return new IXR_Date($data); } @@ -57,7 +57,7 @@ class dokuwiki_xmlrpc_server extends IXR_Server { * @param string $data * @return IXR_Base64 */ - function toFile($data) { + public function toFile($data) { return new IXR_Base64($data); } } diff --git a/sources/lib/plugins/acl/admin.php b/sources/lib/plugins/acl/admin.php index f4baec9..6edc6c6 100644 --- a/sources/lib/plugins/acl/admin.php +++ b/sources/lib/plugins/acl/admin.php @@ -649,7 +649,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin { echo ''.NL; } - /** * Returns the permission which were set for exactly the given user/group * and page/namespace. Returns null if no exact match is available diff --git a/sources/lib/plugins/acl/lang/bg/help.txt b/sources/lib/plugins/acl/lang/bg/help.txt index 2de4534..ffda1ff 100644 --- a/sources/lib/plugins/acl/lang/bg/help.txt +++ b/sources/lib/plugins/acl/lang/bg/help.txt @@ -1,11 +1,9 @@ === Помощ === От тук можете да добавÑте и премахвате права за именни проÑтранÑтва и Ñтраници във вашето Wiki. - -ЛевиÑÑ‚ панел показва вÑички налични именни проÑтранÑтва и Ñтраници. - -Формата отгоре ви позволÑва да преглеждате и променÑте правата на избран потребител или група. - -Ð’ таблицата отдолу Ñа показани вÑички актуални правила за контрол на доÑтъпа. Можете да Ñ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ за бързо изтриване или промÑна на множеÑтво правила. + * левиÑÑ‚ панел показва вÑички налични именни проÑтранÑтва и Ñтраници. + * формата отгоре ви позволÑва да преглеждате и променÑте правата на избран потребител или група. + * в таблицата долу Ñа показани вÑички актуални правила за контрол на доÑтъпа. +Можете да Ñ Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚Ðµ за бързо изтриване или промÑна на множеÑтво правила. За да разберете как работи контрола на доÑтъпа в DokuWiki Ñ‚Ñ€Ñбва да прочетете [[doku>acl|документациÑта отноÑно ACL]]. \ No newline at end of file diff --git a/sources/lib/plugins/acl/lang/cy/help.txt b/sources/lib/plugins/acl/lang/cy/help.txt new file mode 100644 index 0000000..f3d6474 --- /dev/null +++ b/sources/lib/plugins/acl/lang/cy/help.txt @@ -0,0 +1,10 @@ +=== Cymorth Byw: === + +Ar y dudalen hon, gallwch chi ychwanegu a dileu hawliau ar gyfer namespaces a thudalennau yn eich wici. + * Mae'r panel ar y chwith yn dangos pob namespace a thudalen. + * Mae'r ffurflen uchod yn eich galluogi chi i weld a newid hawliau defnyddiwr neu grŵp a ddewiswyd. + * Yn y tabl isod, dengys pob rheol rheoli mynediad sydd wedi'u gosod yn bresennol. Gallwch chi ei ddefnyddio i ddileu neu newid sawl rheol ar y tro. + +Gall darllen [[doku>acl|dogfennaeth swyddogol ar ACL]] fod o fudd er mwyn eich helpu chi ddeall yn llawn sut mae rheolaeth mynediad yn gweithio mewn DokuWiki. + + diff --git a/sources/lib/plugins/acl/lang/cy/lang.php b/sources/lib/plugins/acl/lang/cy/lang.php new file mode 100644 index 0000000..add3ca4 --- /dev/null +++ b/sources/lib/plugins/acl/lang/cy/lang.php @@ -0,0 +1,47 @@ + + * @author Anika Henke + * @author Matthias Grimm + * @author Alan Davies + */ + +$lang['admin_acl'] = 'Rheolaeth Rhestr Rheoli Mynediad'; +$lang['acl_group'] = 'Grŵp:'; +$lang['acl_user'] = 'Defnyddiwr:'; +$lang['acl_perms'] = 'Hawliau'; +$lang['page'] = 'Tudalen'; +$lang['namespace'] = 'Namespace'; //namespace + +$lang['btn_select'] = 'Dewis'; + +$lang['p_user_id'] = 'Mae gan y defnyddiwr %s yr hawliau canlynol yn bresennol ar dudalen %s: %s.'; +$lang['p_user_ns'] = 'Mae gan y defnyddiwr %s yr hawliau canlynol yn bresennol mewn namespace %s: %s.';//namespace +$lang['p_group_id'] = 'Mae gan aelodau grŵp %s yr hawliau canlynol yn bresennol ar dudalen %s: %s.'; +$lang['p_group_ns'] = 'Mae gan aelodau grŵp %s yr hawliau canlynol yn bresennol mewn namespace %s: %s.';//namespace + +$lang['p_choose_id'] = 'Rhowch ddefnyddiwr neu grŵp yn y ffurflen uchod i weld neu golugu\'r hawliau sydd wedi\'u gosod ar gyfer y dudalen %s.'; +$lang['p_choose_ns'] = 'Rhowch ddefnyddiwr neu grŵp yn y ffurflen uchod i weld neu golugu\'r hawliau sydd wedi\'u gosod ar gyfer y namespace %s.';//namespace + + +$lang['p_inherited'] = 'Sylw: Doedd yr hawliau hynny heb eu gosod yn uniongyrchol ond cawsant eu hetifeddu o grwpiau eraill neu namespaces uwch.';//namespace +$lang['p_isadmin'] = 'Sylw: Mae gan y grŵp neu\'r defnyddiwr hawliau llawn oherwydd mae wedi\'i ffurfweddu fel uwchddefnyddiwr.'; +$lang['p_include'] = 'Mae hawliau uwch yn cynnwys rhai is. Mae Creu, Lanlwytho a Dileu yn berthnasol i namespaces yn unig, nid tudalennau.';//namespace + +$lang['current'] = 'Rheolau ACL Cyfredol'; +$lang['where'] = 'Tudalen/Namespace';//namespace +$lang['who'] = 'Defnyddiwr/Grŵp'; +$lang['perm'] = 'Hawliau'; + +$lang['acl_perm0'] = 'Dim'; +$lang['acl_perm1'] = 'Darllen'; +$lang['acl_perm2'] = 'Golygu'; +$lang['acl_perm4'] = 'Creu'; +$lang['acl_perm8'] = 'Lanlwytho'; +$lang['acl_perm16'] = 'Dileu'; +$lang['acl_new'] = 'Ychwanegu Cofnod Newydd'; +$lang['acl_mod'] = 'Newid Cofnod'; +//Setup VIM: ex: et ts=2 : diff --git a/sources/lib/plugins/acl/lang/da/lang.php b/sources/lib/plugins/acl/lang/da/lang.php index 2f8086a..287356f 100644 --- a/sources/lib/plugins/acl/lang/da/lang.php +++ b/sources/lib/plugins/acl/lang/da/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author koeppe * @author Jon Bendtsen * @author Lars Næsbye Christensen diff --git a/sources/lib/plugins/acl/lang/de/lang.php b/sources/lib/plugins/acl/lang/de/lang.php index f25a2ea..f4d7cc9 100644 --- a/sources/lib/plugins/acl/lang/de/lang.php +++ b/sources/lib/plugins/acl/lang/de/lang.php @@ -21,6 +21,7 @@ * @author Christian Wichmann * @author Paul Lachewsky * @author Pierre Corell + * @author Michael Große */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe:'; @@ -36,7 +37,7 @@ $lang['p_group_ns'] = 'Mitglieder der Gruppe %seinen Benutzer oder eine Gruppe an, um die Berechtigungen für die Seite %s zu sehen oder zu ändern.'; $lang['p_choose_ns'] = 'Bitte geben Sie in obigem Formular eine einen Benutzer oder eine Gruppe an, um die Berechtigungen für den Namensraum %s zu sehen oder zu ändern.'; $lang['p_inherited'] = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt, sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.'; -$lang['p_isadmin'] = 'Hinweis: Die ausgewählte Gruppe oder Benutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.'; +$lang['p_isadmin'] = 'Hinweis: Die ausgewählte Gruppe oder Benutzer haben immer alle Berechtigungen, da sie als Superuser konfiguriert wurden.'; $lang['p_include'] = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten'; $lang['current'] = 'Momentane Zugriffsregeln'; $lang['where'] = 'Seite/Namensraum'; diff --git a/sources/lib/plugins/acl/lang/es/help.txt b/sources/lib/plugins/acl/lang/es/help.txt index c683477..01f7a2e 100644 --- a/sources/lib/plugins/acl/lang/es/help.txt +++ b/sources/lib/plugins/acl/lang/es/help.txt @@ -2,7 +2,7 @@ En esta página puede agregar o retirar permisos para los espacios de nombres y páginas en su wiki. -El panel de la izquierda muiestra todos los espacios de nombres y páginas +El panel de la izquierda muestra todos los espacios de nombres y páginas El formulario inferior permite ver y modificar los permisos del usuario o grupo elegido. diff --git a/sources/lib/plugins/acl/lang/ja/lang.php b/sources/lib/plugins/acl/lang/ja/lang.php index 203ab96..24a3639 100644 --- a/sources/lib/plugins/acl/lang/ja/lang.php +++ b/sources/lib/plugins/acl/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Davilin(Yuji Takenaka) * @author Yuji Takenaka * @author Ikuo Obataya diff --git a/sources/lib/plugins/acl/lang/ko/lang.php b/sources/lib/plugins/acl/lang/ko/lang.php index 40b6ff3..0227584 100644 --- a/sources/lib/plugins/acl/lang/ko/lang.php +++ b/sources/lib/plugins/acl/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Andreas Gohr * @author Anika Henke * @author Matthias Grimm diff --git a/sources/lib/plugins/acl/lang/pt-br/lang.php b/sources/lib/plugins/acl/lang/pt-br/lang.php index 2279275..2ef34f7 100644 --- a/sources/lib/plugins/acl/lang/pt-br/lang.php +++ b/sources/lib/plugins/acl/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Luis Fernando Enciso * @author Alauton/Loug * @author Frederico Gonçalves Guimarães diff --git a/sources/lib/plugins/acl/lang/sk/lang.php b/sources/lib/plugins/acl/lang/sk/lang.php index 0012183..4775bfb 100644 --- a/sources/lib/plugins/acl/lang/sk/lang.php +++ b/sources/lib/plugins/acl/lang/sk/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Ondrej Vegh * @author Michal Mesko * @author exusik@gmail.com diff --git a/sources/lib/plugins/acl/lang/zh/lang.php b/sources/lib/plugins/acl/lang/zh/lang.php index 4294e60..5a893a3 100644 --- a/sources/lib/plugins/acl/lang/zh/lang.php +++ b/sources/lib/plugins/acl/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/sources/lib/plugins/acl/remote.php b/sources/lib/plugins/acl/remote.php index 031686f..3771d47 100644 --- a/sources/lib/plugins/acl/remote.php +++ b/sources/lib/plugins/acl/remote.php @@ -12,7 +12,12 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin { */ public function _getMethods() { return array( - 'addAcl' => array( + 'listAcls' => array( + 'args' => array(), + 'return' => 'Array of ACLs {scope, user, permission}', + 'name' => 'listAcl', + 'doc' => 'Get the list of all ACLs', + ),'addAcl' => array( 'args' => array('string','string','int'), 'return' => 'int', 'name' => 'addAcl', @@ -26,6 +31,22 @@ class remote_plugin_acl extends DokuWiki_Remote_Plugin { ); } + /** + * List all ACL config entries + * + * @throws RemoteAccessDeniedException + * @return dictionary {Scope: ACL}, where ACL = dictionnary {user/group: permissions_int} + */ + public function listAcls(){ + if(!auth_isadmin()) { + throw new RemoteAccessDeniedException('You are not allowed to access ACLs, superuser permission is required', 114); + } + /** @var admin_plugin_acl $apa */ + $apa = plugin_load('admin', 'acl'); + $apa->_init_acl_config(); + return $apa->acl; + } + /** * Add a new entry to ACL config * diff --git a/sources/lib/plugins/auth.php b/sources/lib/plugins/auth.php index 036cb0d..0cd965b 100644 --- a/sources/lib/plugins/auth.php +++ b/sources/lib/plugins/auth.php @@ -435,23 +435,4 @@ class DokuWiki_Auth_Plugin extends DokuWiki_Plugin { global $conf; return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge')); } - - /** - * Overrides the standard config loading to integrate old auth module style configs - * - * @deprecated 2012-11-09 - */ - public function loadConfig() { - global $conf; - $plugin = $this->getPluginName(); - $oldname = preg_replace('/^auth/', '', $plugin); - - $default = $this->readDefaultSettings(); - $oldconf = array(); - if(isset($conf['auth'][$oldname])) $oldconf = (array) $conf['auth'][$oldname]; - $conf['plugin'][$plugin] = array_merge($default, $oldconf, (array) $conf['plugin'][$plugin]); - - $this->conf =& $conf['plugin'][$plugin]; - $this->configloaded = true; - } } diff --git a/sources/lib/plugins/authad/adLDAP/adLDAP.php b/sources/lib/plugins/authad/adLDAP/adLDAP.php index 5563e4f..c84a4f4 100644 --- a/sources/lib/plugins/authad/adLDAP/adLDAP.php +++ b/sources/lib/plugins/authad/adLDAP/adLDAP.php @@ -526,7 +526,7 @@ class adLDAP { public function setUseSSO($useSSO) { if ($useSSO === true && !$this->ldapSaslSupported()) { - throw new adLDAPException('No LDAP SASL support for PHP. See: http://www.php.net/ldap_sasl_bind'); + throw new adLDAPException('No LDAP SASL support for PHP. See: http://php.net/ldap_sasl_bind'); } $this->useSSO = $useSSO; } @@ -598,7 +598,7 @@ class adLDAP { } if ($this->ldapSupported() === false) { - throw new adLDAPException('No LDAP support for PHP. See: http://www.php.net/ldap'); + throw new adLDAPException('No LDAP support for PHP. See: http://php.net/ldap'); } return $this->connect(); diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php index 839fd59..dc3ebd7 100644 --- a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php +++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php @@ -314,14 +314,14 @@ class adLDAPUsers { * * @param string $username The username to query * @param book $isGUID Is the username passed a GUID or a samAccountName - * @requires bcmath http://www.php.net/manual/en/book.bc.php + * @requires bcmath http://php.net/manual/en/book.bc.php * @return array */ public function passwordExpiry($username, $isGUID = false) { if ($username === NULL) { return "Missing compulsory field [username]"; } if (!$this->adldap->getLdapBind()) { return false; } - if (!function_exists('bcmod')) { throw new adLDAPException("Missing function support [bcmod] http://www.php.net/manual/en/book.bc.php"); }; + if (!function_exists('bcmod')) { throw new adLDAPException("Missing function support [bcmod] http://php.net/manual/en/book.bc.php"); }; $userInfo = $this->info($username, array("pwdlastset", "useraccountcontrol"), $isGUID); $pwdLastSet = $userInfo[0]['pwdlastset'][0]; diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php index 5e86441..6f94fe2 100644 --- a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php +++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php @@ -99,19 +99,23 @@ class adLDAPUtils { * @author Port by Andreas Gohr * @return string */ - public function ldapSlashes($str){ - return preg_replace('/([\x00-\x1F\*\(\)\\\\])/e', - '"\\\\\".join("",unpack("H2","$1"))', - $str); + public function ldapSlashes($str) { + // see https://github.com/adldap/adLDAP/issues/22 + return preg_replace_callback( + '/([\x00-\x1F\*\(\)\\\\])/', + function ($matches) { + return "\\".join("", unpack("H2", $matches[1])); + }, + $str + ); } - /** * Converts a string GUID to a hexdecimal value so it can be queried - * + * * @param string $strGUID A string representation of a GUID * @return string */ - public function strGuidToHex($strGUID) + public function strGuidToHex($strGUID) { $strGUID = str_replace('-', '', $strGUID); @@ -261,4 +265,4 @@ class adLDAPUtils { } } -?> \ No newline at end of file +?> diff --git a/sources/lib/plugins/authad/auth.php b/sources/lib/plugins/authad/auth.php index 60c68ef..50f7084 100644 --- a/sources/lib/plugins/authad/auth.php +++ b/sources/lib/plugins/authad/auth.php @@ -119,8 +119,8 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { } // other can do's are changed in $this->_loadServerConfig() base on domain setup - $this->cando['modName'] = true; - $this->cando['modMail'] = true; + $this->cando['modName'] = (bool)$this->conf['update_name']; + $this->cando['modMail'] = (bool)$this->conf['update_mail']; $this->cando['getUserCount'] = true; } @@ -642,6 +642,7 @@ class auth_plugin_authad extends DokuWiki_Auth_Plugin { // compatibility with old option name if(empty($opts['admin_username']) && !empty($opts['ad_username'])) $opts['admin_username'] = $opts['ad_username']; if(empty($opts['admin_password']) && !empty($opts['ad_password'])) $opts['admin_password'] = $opts['ad_password']; + $opts['admin_password'] = conf_decodeString($opts['admin_password']); // deobfuscate // we can change the password if SSL is set if($opts['use_ssl'] || $opts['use_tls']) { diff --git a/sources/lib/plugins/authad/conf/default.php b/sources/lib/plugins/authad/conf/default.php index 6fb4c91..f2834c8 100644 --- a/sources/lib/plugins/authad/conf/default.php +++ b/sources/lib/plugins/authad/conf/default.php @@ -13,3 +13,5 @@ $conf['use_tls'] = 0; $conf['debug'] = 0; $conf['expirywarn'] = 0; $conf['additional'] = ''; +$conf['update_name'] = 0; +$conf['update_mail'] = 0; diff --git a/sources/lib/plugins/authad/conf/metadata.php b/sources/lib/plugins/authad/conf/metadata.php index 560d253..6b0fc16 100644 --- a/sources/lib/plugins/authad/conf/metadata.php +++ b/sources/lib/plugins/authad/conf/metadata.php @@ -6,10 +6,12 @@ $meta['domain_controllers'] = array('string','_caution' => 'danger'); $meta['sso'] = array('onoff','_caution' => 'danger'); $meta['sso_charset'] = array('string','_caution' => 'danger'); $meta['admin_username'] = array('string','_caution' => 'danger'); -$meta['admin_password'] = array('password','_caution' => 'danger'); +$meta['admin_password'] = array('password','_caution' => 'danger','_code' => 'base64'); $meta['real_primarygroup'] = array('onoff','_caution' => 'danger'); $meta['use_ssl'] = array('onoff','_caution' => 'danger'); $meta['use_tls'] = array('onoff','_caution' => 'danger'); $meta['debug'] = array('onoff','_caution' => 'security'); $meta['expirywarn'] = array('numeric', '_min'=>0,'_caution' => 'danger'); $meta['additional'] = array('string','_caution' => 'danger'); +$meta['update_name'] = array('onoff','_caution' => 'danger'); +$meta['update_mail'] = array('onoff','_caution' => 'danger'); diff --git a/sources/lib/plugins/authad/lang/cs/lang.php b/sources/lib/plugins/authad/lang/cs/lang.php index 85bc41f..6223868 100644 --- a/sources/lib/plugins/authad/lang/cs/lang.php +++ b/sources/lib/plugins/authad/lang/cs/lang.php @@ -9,4 +9,5 @@ $lang['domain'] = 'PÅ™ihlaÅ¡ovací doména'; $lang['authpwdexpire'] = 'Platnost vaÅ¡eho hesla vyprší za %d dní, mÄ›li byste ho zmÄ›nit co nejdříve.'; $lang['passchangefail'] = 'ZmÄ›na hesla selhala. Možná nebyla dodržena pravidla pro jejich tvorbu?'; +$lang['userchangefail'] = 'ZmÄ›na atributů uživatele selhala. Možná nemá váš úÄet dostateÄná oprávnÄ›ní pro provádÄ›ní zmÄ›n. '; $lang['connectfail'] = 'PÅ™ipojení k serveru Active Directory selhalo.'; diff --git a/sources/lib/plugins/authad/lang/cy/lang.php b/sources/lib/plugins/authad/lang/cy/lang.php new file mode 100644 index 0000000..8cc3746 --- /dev/null +++ b/sources/lib/plugins/authad/lang/cy/lang.php @@ -0,0 +1,16 @@ + + * @author Alan Davies + */ + +$lang['domain'] = 'Parth Mewngofnodi'; +$lang['authpwdexpire'] = 'Bydd eich cyfrinair yn dod i ben mewn %d diwrnod, dylech chi ei newid e\'n fuan.'; +$lang['passchangefail'] = 'Methodd newid y cyfrinair. Posib roedd y cyfrinair yn annilys?'; +$lang['userchangefail'] = 'Methodd newid priodoleddau defnyddiwr. Posib \'sdim hawliau \'da chi i wneud newidiadau?'; +$lang['connectfail'] = 'Methodd y cysylltiad i weinydd yr Active Directory.'; + +//Setup VIM: ex: et ts=4 : diff --git a/sources/lib/plugins/authad/lang/cy/settings.php b/sources/lib/plugins/authad/lang/cy/settings.php new file mode 100644 index 0000000..e343485 --- /dev/null +++ b/sources/lib/plugins/authad/lang/cy/settings.php @@ -0,0 +1,15 @@ +@my.domain.org'; +$lang['base_dn'] = 'Sail eich DN. Eg. DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'Rhestr gwahanwyd gan goma o reolwyr Parth. Ee. srv1.domain.org,srv2.domain.org'; +$lang['admin_username'] = 'Defnyddiwr Active Directory breintiedig gyda mynediad i ddata pob defnyddiwr arall. Yn opsiynol, ond yn hanfodol ar gyfer gweithredoedd penodol fel anfon ebyst tanysgrifio.'; +$lang['admin_password'] = 'Cyfrinair y defnyddiwr uchod.'; +$lang['sso'] = 'A ddylai Mewngofnodi-Unigol gan Kerberos neu NTLM gael ei ddefnyddio?'; +$lang['sso_charset'] = 'Y set nod mae\'ch gweinydd gwe yn pasio defnyddair Kerberos neu NTLM ynddi. Gwag ar gyfer UTF-8 neu latin-1. Bydd angen estyniad iconv.'; +$lang['real_primarygroup'] = 'Os ydy\'r prif grŵp real yn cael ei hadfer yn hytrach na thybio "Defnyddwyr Parth" (arafach).'; +$lang['use_ssl'] = 'Defnyddio cysylltiad SSL? Os ydych chi\'n defnyddio hwn, peidiwch â galluogi TLS isod.'; +$lang['use_tls'] = 'Defnyddio cysylltiad TLS? Os ydych chi\'n defnyddio hwn, peidiwch â galluogi SSL uchod.'; +$lang['debug'] = 'Dangos allbwn dadfygio ychwanegol ar wallau?'; +$lang['expirywarn'] = 'Diwrnodau o flaen llaw i rybuddio defnyddwyr o ran cyfrinair yn dod i ben. 0 i analluogi.'; +$lang['additional'] = 'Rhestr a wahanwyd gan goma o briodoleddau AD ychwanegol i nôl o ddata defnyddiwr. Defnyddiwyd gan rai ategion.'; diff --git a/sources/lib/plugins/authad/lang/da/lang.php b/sources/lib/plugins/authad/lang/da/lang.php index 3d07302..6badbaf 100644 --- a/sources/lib/plugins/authad/lang/da/lang.php +++ b/sources/lib/plugins/authad/lang/da/lang.php @@ -2,9 +2,11 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Jacob Palm * @author Mikael Lyngvig */ $lang['domain'] = 'Logondomæne'; $lang['authpwdexpire'] = 'Din adgangskode vil udløbe om %d dage, du bør ændre det snart.'; +$lang['passchangefail'] = 'Kunne ikke skifte adgangskoden. MÃ¥ske blev adgangskodepolitikken ikke opfyldt?'; +$lang['connectfail'] = 'Kunne ikke forbinde til Active Directory serveren.'; diff --git a/sources/lib/plugins/authad/lang/da/settings.php b/sources/lib/plugins/authad/lang/da/settings.php index f50abf1..8b2d624 100644 --- a/sources/lib/plugins/authad/lang/da/settings.php +++ b/sources/lib/plugins/authad/lang/da/settings.php @@ -2,9 +2,10 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Soren Birk * @author Jens Hyllegaard + * @author Jacob Palm */ $lang['account_suffix'] = 'Dit konto suffiks. F.eks. @mit.domæne.dk'; $lang['base_dn'] = 'Dit grund DN. F.eks. DC=mit,DC=domæne,DC=dk'; @@ -18,3 +19,5 @@ $lang['use_tls'] = 'Benyt TLS forbindelse? hvis ja, vælg ikke SSL $lang['debug'] = 'Vis yderligere debug output ved fejl?'; $lang['expirywarn'] = 'Dage før brugere skal advares om udløben adgangskode. 0 for at deaktivere.'; $lang['additional'] = 'En kommasepareret liste over yderligere AD attributter der skal hentes fra brugerdata. Brug af nogen udvidelser.'; +$lang['update_name'] = 'Tillad at brugere opdaterer deres visningnavn i AD?'; +$lang['update_mail'] = 'Tillad at brugere opdaterer deres e-mail adresse?'; diff --git a/sources/lib/plugins/authad/lang/de/lang.php b/sources/lib/plugins/authad/lang/de/lang.php index 93a6566..ec73ac7 100644 --- a/sources/lib/plugins/authad/lang/de/lang.php +++ b/sources/lib/plugins/authad/lang/de/lang.php @@ -5,8 +5,10 @@ * * @author Andreas Gohr * @author Philip Knack + * @author Uwe Benzelrath */ $lang['domain'] = 'Anmelde-Domäne'; $lang['authpwdexpire'] = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es frühzeitig ändern.'; $lang['passchangefail'] = 'Kennwortänderung fehlgeschlagen. Entspricht das Kennwort der Richtlinie?'; +$lang['userchangefail'] = 'Änderung der Nutzerattribute fehlgeschlagen. Möglicherweise hat ihr Benutzerkonto nicht die nötigen Rechte um diese Änderungen durchzuführen'; $lang['connectfail'] = 'Verbindung zum Active Directory Server fehlgeschlagen.'; diff --git a/sources/lib/plugins/authad/lang/en/lang.php b/sources/lib/plugins/authad/lang/en/lang.php index 751aa9f..3e8a9e2 100644 --- a/sources/lib/plugins/authad/lang/en/lang.php +++ b/sources/lib/plugins/authad/lang/en/lang.php @@ -9,6 +9,7 @@ $lang['domain'] = 'Logon Domain'; $lang['authpwdexpire'] = 'Your password will expire in %d days, you should change it soon.'; $lang['passchangefail'] = 'Failed to change the password. Maybe the password policy was not met?'; +$lang['userchangefail'] = 'Failed to change user attributes. Maybe your account does not have permissions to make changes?'; $lang['connectfail'] = 'Failed to connect to Active Directory server.'; //Setup VIM: ex: et ts=4 : diff --git a/sources/lib/plugins/authad/lang/en/settings.php b/sources/lib/plugins/authad/lang/en/settings.php index 92e9ac4..9e7a7c3 100644 --- a/sources/lib/plugins/authad/lang/en/settings.php +++ b/sources/lib/plugins/authad/lang/en/settings.php @@ -13,3 +13,5 @@ $lang['use_tls'] = 'Use TLS connection? If used, do not enable SSL ab $lang['debug'] = 'Display additional debugging output on errors?'; $lang['expirywarn'] = 'Days in advance to warn user about expiring password. 0 to disable.'; $lang['additional'] = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.'; +$lang['update_name'] = 'Allow users to update their AD display name?'; +$lang['update_mail'] = 'Allow users to update their email address?'; diff --git a/sources/lib/plugins/authad/lang/es/lang.php b/sources/lib/plugins/authad/lang/es/lang.php index 0ad262c..d3d540b 100644 --- a/sources/lib/plugins/authad/lang/es/lang.php +++ b/sources/lib/plugins/authad/lang/es/lang.php @@ -6,8 +6,10 @@ * @author Juan De La Cruz * @author Gerardo Zamudio * @author Mauricio Segura + * @author Romano */ $lang['domain'] = 'Dominio de inicio'; $lang['authpwdexpire'] = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible'; $lang['passchangefail'] = 'Error al cambiar la contraseña. ¿Tal vez no se cumplió la directiva de contraseñas?'; +$lang['userchangefail'] = 'Falló al intentar modificar los atributos del usuario. Puede ser que su cuenta no tiene permisos para realizar cambios?'; $lang['connectfail'] = 'Error al conectar con el servidor de Active Directory.'; diff --git a/sources/lib/plugins/authad/lang/es/settings.php b/sources/lib/plugins/authad/lang/es/settings.php index 970259c..b63c1d2 100644 --- a/sources/lib/plugins/authad/lang/es/settings.php +++ b/sources/lib/plugins/authad/lang/es/settings.php @@ -7,6 +7,7 @@ * @author Antonio Bueno * @author Juan De La Cruz * @author Eloy + * @author David Roy */ $lang['account_suffix'] = 'Su cuenta, sufijo. Ejem. @ my.domain.org '; $lang['base_dn'] = 'Su base DN. Ejem. DC=my,DC=dominio,DC=org'; @@ -21,3 +22,5 @@ $lang['use_tls'] = '¿Usar conexión TLS? Si se usa, no habilitar $lang['debug'] = 'Mostrar información adicional de depuración sobre los errores?'; $lang['expirywarn'] = 'Días por adelantado para avisar al usuario de que contraseña expirará. 0 para deshabilitar.'; $lang['additional'] = 'Una lista separada por comas de atributos AD adicionales a obtener de los datos de usuario. Usado por algunos plugins.'; +$lang['update_name'] = '¿Permitir a los usuarios actualizar su nombre de AD?'; +$lang['update_mail'] = '¿Permitir a los usuarios actualizar su email?'; diff --git a/sources/lib/plugins/authad/lang/fa/lang.php b/sources/lib/plugins/authad/lang/fa/lang.php index 6461423..ca1c8e8 100644 --- a/sources/lib/plugins/authad/lang/fa/lang.php +++ b/sources/lib/plugins/authad/lang/fa/lang.php @@ -5,6 +5,10 @@ * * @author Hamid * @author Milad DZand + * @author Mohmmad Razavi */ $lang['domain'] = 'دامنه‌ی ورود'; $lang['authpwdexpire'] = 'کلمه عبور شما در %d روز منقضی خواهد شد ØŒ شما باید آن را زود تغییر دهید'; +$lang['passchangefail'] = 'تغیر رمزعبور با خطا مواجه شد. شاید سیاستهای مربوط به گذاشتن نام کاربری درست رعایت نشده است.'; +$lang['userchangefail'] = 'تغییر ویژگی‌های کابر با خطا مواجه شد. شاید حساب کاربری شما مجاز به انجام این تغییرات نیست.'; +$lang['connectfail'] = 'ارتباط با سرور Active Directory با خطا مواجه شد.'; diff --git a/sources/lib/plugins/authad/lang/fa/settings.php b/sources/lib/plugins/authad/lang/fa/settings.php index 161479a..fdf9479 100644 --- a/sources/lib/plugins/authad/lang/fa/settings.php +++ b/sources/lib/plugins/authad/lang/fa/settings.php @@ -4,7 +4,21 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Omid Hezaveh + * @author Mohmmad Razavi + * @author Masoud Sadrnezhaad */ +$lang['account_suffix'] = 'پسوند حساب کاربری شما. به عنوان مثال @my.domain.org'; +$lang['base_dn'] = 'DN پایه شما. به عنوان مثال DC=my,DC=domain,DC=org'; +$lang['domain_controllers'] = 'لیست کنترل کننده‌های دامنه Ú©Ù‡ با کاما ازهم جدا شده اند. به عنوان مثال srv1.domain.org,srv2.domain.org */ - $lang['authpwdexpire'] = 'Salasanasi vanhenee %d pv:n päästä, vaihda salasanasi pikaisesti.'; diff --git a/sources/lib/plugins/authad/lang/fr/lang.php b/sources/lib/plugins/authad/lang/fr/lang.php index 8b3b95b..1ab523f 100644 --- a/sources/lib/plugins/authad/lang/fr/lang.php +++ b/sources/lib/plugins/authad/lang/fr/lang.php @@ -6,8 +6,10 @@ * @author ggallon * @author Yannick Aure * @author Pietroni + * @author Schplurtz le Déboulonné */ $lang['domain'] = 'Domaine de connexion'; $lang['authpwdexpire'] = 'Votre mot de passe expirera dans %d jours, vous devriez le changer bientôt.'; $lang['passchangefail'] = 'Impossible de changer le mot de passe. Il est possible que les règles de sécurité des mots de passe n\'aient pas été respectées.'; +$lang['userchangefail'] = 'Impossible de modifier les attributs de l\'utilisateur. Votre compte n\'a peut-être pas les permissions d\'effectuer des changements.'; $lang['connectfail'] = 'Impossible de se connecter au serveur Active Directory.'; diff --git a/sources/lib/plugins/authad/lang/fr/settings.php b/sources/lib/plugins/authad/lang/fr/settings.php index 84e0d00..d52e305 100644 --- a/sources/lib/plugins/authad/lang/fr/settings.php +++ b/sources/lib/plugins/authad/lang/fr/settings.php @@ -5,6 +5,7 @@ * * @author Bruno Veilleux * @author Momo50 + * @author Schplurtz le Déboulonné */ $lang['account_suffix'] = 'Le suffixe de votre compte. Ex.: @mon.domaine.org'; $lang['base_dn'] = 'Votre nom de domaine de base. DC=mon,DC=domaine,DC=org'; @@ -19,3 +20,5 @@ $lang['use_tls'] = 'Utiliser une connexion TLS? Si utilisée, n\'a $lang['debug'] = 'Afficher des informations de débogage supplémentaires pour les erreurs?'; $lang['expirywarn'] = 'Jours d\'avance pour l\'avertissement envoyé aux utilisateurs lorsque leur mot de passe va expirer. 0 pour désactiver.'; $lang['additional'] = 'Une liste séparée par des virgules d\'attributs AD supplémentaires à récupérer dans les données utilisateur. Utilisée par certains modules.'; +$lang['update_name'] = 'Autoriser les utilisateurs à modifier leur nom affiché de l\'AD ?'; +$lang['update_mail'] = 'Autoriser les utilisateurs à modifier leur adresse de courriel ?'; diff --git a/sources/lib/plugins/authad/lang/he/lang.php b/sources/lib/plugins/authad/lang/he/lang.php index ac8fbcb..5b193ed 100644 --- a/sources/lib/plugins/authad/lang/he/lang.php +++ b/sources/lib/plugins/authad/lang/he/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author tomer * @author Menashe Tomer */ diff --git a/sources/lib/plugins/authad/lang/hr/lang.php b/sources/lib/plugins/authad/lang/hr/lang.php index 99c5c16..f05b038 100644 --- a/sources/lib/plugins/authad/lang/hr/lang.php +++ b/sources/lib/plugins/authad/lang/hr/lang.php @@ -8,4 +8,5 @@ $lang['domain'] = 'Domena za prijavu'; $lang['authpwdexpire'] = 'VaÅ¡a lozinka će isteći za %d dana, trebate ju promijeniti.'; $lang['passchangefail'] = 'Ne mogu izmijeniti lozinku. Možda nije zadovoljen set pravila za lozinke?'; +$lang['userchangefail'] = 'GreÅ¡ka pri promjeni atributa korisnika. Možda VaÅ¡ korisnik nema autorizacije da bi radio promjene?'; $lang['connectfail'] = 'Ne mogu se povezati s Active Directory poslužiteljem.'; diff --git a/sources/lib/plugins/authad/lang/hr/settings.php b/sources/lib/plugins/authad/lang/hr/settings.php index a024b10..5efa9a2 100644 --- a/sources/lib/plugins/authad/lang/hr/settings.php +++ b/sources/lib/plugins/authad/lang/hr/settings.php @@ -18,3 +18,5 @@ $lang['use_tls'] = 'Koristi TLS vezu? Ako da, gore ne koristi SSL! $lang['debug'] = 'Prikaži dodatni debug ispis u sluÄaju greÅ¡ke? '; $lang['expirywarn'] = 'Upozori korisnike o isteku lozinke ovoliko dana. 0 za onemogućavanje. '; $lang['additional'] = 'Zarezom odvojena lista dodatnih AD atributa koji se dohvaćaju iz korisniÄkih podataka. Koristi se u nekim dodatcima (plugin).'; +$lang['update_name'] = 'Omogućiti korisnicima da izmjene svoje ime u AD-u?'; +$lang['update_mail'] = 'Omogućiti korisnicima da izmjene svoju email adresu?'; diff --git a/sources/lib/plugins/authad/lang/it/lang.php b/sources/lib/plugins/authad/lang/it/lang.php index 5f1a03c..a30cd7c 100644 --- a/sources/lib/plugins/authad/lang/it/lang.php +++ b/sources/lib/plugins/authad/lang/it/lang.php @@ -4,5 +4,10 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Matteo Pasotti + * @author Torpedo */ +$lang['domain'] = 'Dominio di accesso'; $lang['authpwdexpire'] = 'La tua password scadrà in %d giorni, dovresti cambiarla quanto prima.'; +$lang['passchangefail'] = 'Cambio password fallito. Forse non sono state rispettate le regole adottate per le password'; +$lang['userchangefail'] = 'Cambio attributi utente fallito. Forse il tuo account non ha i permessi per eseguire delle modifiche?'; +$lang['connectfail'] = 'Connessione fallita al server Active Directory'; diff --git a/sources/lib/plugins/authad/lang/it/settings.php b/sources/lib/plugins/authad/lang/it/settings.php index 2d68dad..3a92fcb 100644 --- a/sources/lib/plugins/authad/lang/it/settings.php +++ b/sources/lib/plugins/authad/lang/it/settings.php @@ -4,6 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Edmondo Di Tucci + * @author Torpedo */ $lang['account_suffix'] = 'Il suffisso del tuo account. Eg. @my.domain.org'; $lang['base_dn'] = 'Il tuo DN. base Eg. DC=my,DC=domain,DC=org'; @@ -11,6 +12,8 @@ $lang['domain_controllers'] = 'Elenco separato da virgole di Domain Controlle $lang['admin_username'] = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.'; $lang['admin_password'] = 'La password dell\'utente soprascritto.'; $lang['sso'] = 'Deve essere usato Single-Sign-On via Kerberos oppure NTLM?'; +$lang['sso_charset'] = 'Il set di caratteri che il tuo web server passera nel nome utente Kerberos o NTLM. Lasciare vuoto per UTF-8 p latin-1. Richiesta estensione iconv. '; +$lang['real_primarygroup'] = 'Se il vero gruppo primario dovesse essere risolo invece di assumere "Domain Users" (lento).'; $lang['use_ssl'] = 'Usare la connessione SSL? Se usata, non abilitare TSL qui sotto.'; $lang['use_tls'] = 'Usare la connessione TSL? Se usata, non abilitare SSL qui sopra.'; $lang['debug'] = 'Visualizzare output addizionale di debug per gli errori?'; diff --git a/sources/lib/plugins/authad/lang/ja/lang.php b/sources/lib/plugins/authad/lang/ja/lang.php index e82ca37..602b079 100644 --- a/sources/lib/plugins/authad/lang/ja/lang.php +++ b/sources/lib/plugins/authad/lang/ja/lang.php @@ -2,12 +2,14 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author PzF_X * @author Osaka * @author Ikuo Obataya + * @author Hideaki SAWADA */ $lang['domain'] = 'ログオン時ã®ãƒ‰ãƒ¡ã‚¤ãƒ³'; $lang['authpwdexpire'] = 'ã‚ãªãŸã®ãƒ‘スワードã¯ã€ã‚ã¨%dæ—¥ã§æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚Œã¾ã™ã€‚パスワードを変更ã—ã¦ãã ã•ã„。'; $lang['passchangefail'] = 'パスワードを変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚パスワードã®ãƒ«ãƒ¼ãƒ«ã«åˆã‚ãªã‹ã£ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。'; +$lang['userchangefail'] = 'ユーザー属性を変更ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ãŠãらãã€å¤‰æ›´æ¨©é™ã®ãªã„アカウントã§ã™ã€‚'; $lang['connectfail'] = 'Active Directoryサーãƒãƒ¼ã«æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚'; diff --git a/sources/lib/plugins/authad/lang/ja/settings.php b/sources/lib/plugins/authad/lang/ja/settings.php index 118e834..0dc5649 100644 --- a/sources/lib/plugins/authad/lang/ja/settings.php +++ b/sources/lib/plugins/authad/lang/ja/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Satoshi Sahara * @author Hideaki SAWADA * @author PzF_X @@ -20,3 +20,5 @@ $lang['use_tls'] = 'TLS接続を使用ã—ã¾ã™ã‹ï¼Ÿä½¿ç”¨ã—㟠$lang['debug'] = 'エラー時ã«è¿½åŠ ã®ãƒ‡ãƒãƒƒã‚°å‡ºåŠ›ã‚’表示ã™ã‚‹ï¼Ÿ'; $lang['expirywarn'] = '何日å‰ã‹ã‚‰ãƒ‘スワードã®æœ‰åŠ¹æœŸé™ã‚’ユーザーã«è­¦å‘Šã™ã‚‹ã€‚0 ã®å ´åˆã¯ç„¡åŠ¹'; $lang['additional'] = 'ユーザデータã‹ã‚‰å–å¾—ã™ã‚‹è¿½åŠ AD属性ã®ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šä¸€è¦§ã€‚ã„ãã¤ã‹ã®ãƒ—ラグインãŒä½¿ç”¨ã™ã‚‹ã€‚'; +$lang['update_name'] = 'ユーザー自身ã«AD表示åã®å¤‰æ›´ã‚’許å¯ã—ã¾ã™ã‹ï¼Ÿ'; +$lang['update_mail'] = 'ユーザー自身ã«ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®å¤‰æ›´ã‚’許å¯ã—ã¾ã™ã‹ï¼Ÿ'; diff --git a/sources/lib/plugins/authad/lang/ko/lang.php b/sources/lib/plugins/authad/lang/ko/lang.php index 7e9b22f..0a652ad 100644 --- a/sources/lib/plugins/authad/lang/ko/lang.php +++ b/sources/lib/plugins/authad/lang/ko/lang.php @@ -2,10 +2,12 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin + * @author Erial */ $lang['domain'] = '로그온 ë„ë©”ì¸'; $lang['authpwdexpire'] = '비밀번호를 바꾼지 %dì¼ì´ 지났으며, 비밀번호를 곧 바꿔야 합니다.'; -$lang['passchangefail'] = '비밀번호를 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 비밀번호 ì •ì±…ì„ ë”°ë¥´ì§€ 않았나요?'; +$lang['passchangefail'] = '비밀번호를 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 비밀번호 ì •ì±…ì„ ë”°ë¥´ì§€ ì•Šì€ ê±´ ì•„ë‹ê¹Œìš”?'; +$lang['userchangefail'] = 'ì‚¬ìš©ìž íŠ¹ì„±ì„ ë°”ê¾¸ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. ë‹¹ì‹ ì˜ ê³„ì •ì— ë°”ê¿€ ê¶Œí•œì´ ì—†ëŠ” ê±´ ì•„ë‹ê¹Œìš”?'; $lang['connectfail'] = 'Active Directory ì„œë²„ì— ì—°ê²°í•˜ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.'; diff --git a/sources/lib/plugins/authad/lang/ko/settings.php b/sources/lib/plugins/authad/lang/ko/settings.php index b104371..605819f 100644 --- a/sources/lib/plugins/authad/lang/ko/settings.php +++ b/sources/lib/plugins/authad/lang/ko/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin * @author Garam */ @@ -19,3 +19,5 @@ $lang['use_tls'] = 'TLS ì—°ê²°ì„ ì‚¬ìš©í•©ë‹ˆê¹Œ? 사용한다면 $lang['debug'] = 'ì˜¤ë¥˜ì— ëŒ€í•œ 추가ì ì¸ 디버그 정보를 ë³´ì´ê² ìŠµë‹ˆê¹Œ?'; $lang['expirywarn'] = '미리 비밀번호 만료를 사용ìžì—게 경고할 날짜. 0ì¼ ê²½ìš° 비활성화합니다.'; $lang['additional'] = 'ì‚¬ìš©ìž ë°ì´í„°ì—ì„œ 가져올 추가ì ì¸ AD ì†ì„±ì˜ 쉼표로 구분한 목ë¡. ì¼ë¶€ 플러그ì¸ì´ 사용합니다.'; +$lang['update_name'] = '사용ìžê°€ ìžì‹ ì˜ AD 표시 ì´ë¦„ì„ ì—…ë°ì´íŠ¸í•  수 있ë„ë¡ í•˜ê² ìŠµë‹ˆê¹Œ?'; +$lang['update_mail'] = '사용ìžê°€ ìžì‹ ì˜ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ì—…ë°ì´íŠ¸í•  수 있ë„ë¡ í•˜ê² ìŠµë‹ˆê¹Œ?'; diff --git a/sources/lib/plugins/authad/lang/nl/lang.php b/sources/lib/plugins/authad/lang/nl/lang.php index 341a403..4e87320 100644 --- a/sources/lib/plugins/authad/lang/nl/lang.php +++ b/sources/lib/plugins/authad/lang/nl/lang.php @@ -6,8 +6,10 @@ * @author Rene * @author Dion Nicolaas * @author Hugo Smet + * @author Wesley de Weerd */ $lang['domain'] = 'Inlog Domein'; $lang['authpwdexpire'] = 'Je wachtwoord verloopt in %d dagen, je moet het binnenkort veranderen'; $lang['passchangefail'] = 'Wijziging van het paswoord is mislukt. Wellicht beantwoord het paswoord niet aan de voorwaarden. '; +$lang['userchangefail'] = 'Kan gebruiker attributen veranderen . Misschien heeft uw account geen rechten om wijzigingen aan te brengen?'; $lang['connectfail'] = 'Connectie met Active Directory server mislukt.'; diff --git a/sources/lib/plugins/authad/lang/pt-br/lang.php b/sources/lib/plugins/authad/lang/pt-br/lang.php index 16fc396..8a30102 100644 --- a/sources/lib/plugins/authad/lang/pt-br/lang.php +++ b/sources/lib/plugins/authad/lang/pt-br/lang.php @@ -2,11 +2,13 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Felipe Castro * @author Frederico Gonçalves Guimarães + * @author Guilherme Cardoso */ $lang['domain'] = 'Domínio de "Logon"'; $lang['authpwdexpire'] = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.'; $lang['passchangefail'] = 'Não foi possível alterar a senha. Pode ser algum conflito com a política de senhas.'; +$lang['userchangefail'] = 'Falha ao mudar os atributos do usuário. Talvez a sua conta não tenha permissões para fazer mudanças.'; $lang['connectfail'] = 'Não foi possível conectar ao servidor Active Directory.'; diff --git a/sources/lib/plugins/authad/lang/pt-br/settings.php b/sources/lib/plugins/authad/lang/pt-br/settings.php index cdc7480..1231077 100644 --- a/sources/lib/plugins/authad/lang/pt-br/settings.php +++ b/sources/lib/plugins/authad/lang/pt-br/settings.php @@ -2,10 +2,11 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Victor Westmann * @author Frederico Guimarães * @author Juliano Marconi Lanigra + * @author Viliam Dias */ $lang['account_suffix'] = 'Sufixo de sua conta. Eg. @meu.domínio.org'; $lang['base_dn'] = 'Sua base DN. Eg. DC=meu,DC=domínio,DC=org'; @@ -20,3 +21,5 @@ $lang['use_tls'] = 'Usar conexão TLS? se usar, não habilitar SSL $lang['debug'] = 'Mostrar saída adicional de depuração em mensagens de erros?'; $lang['expirywarn'] = 'Dias com antecedência para avisar o usuário de uma senha que vai expirar. 0 para desabilitar.'; $lang['additional'] = 'Uma lista separada de vírgulas de atributos adicionais AD para pegar dados de usuários. Usados por alguns plugins.'; +$lang['update_name'] = 'Permitir aos usuários que atualizem seus nomes de exibição AD?'; +$lang['update_mail'] = 'Permitir aos usuários que atualizem seu endereço de e-mail?'; diff --git a/sources/lib/plugins/authad/lang/ro/lang.php b/sources/lib/plugins/authad/lang/ro/lang.php index 28a0e1e..65df92f 100644 --- a/sources/lib/plugins/authad/lang/ro/lang.php +++ b/sources/lib/plugins/authad/lang/ro/lang.php @@ -4,5 +4,8 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Razvan Deaconescu + * @author Adrian Vesa */ $lang['authpwdexpire'] = 'Parola va expira în %d zile, ar trebui să o schimbi în curând.'; +$lang['passchangefail'] = 'Parola nu a putu fi schimbata. Poate politica pentru parole nu a fost indeplinita ?'; +$lang['userchangefail'] = 'Nu am putu schimba atributiile pentru acest utilizator. Poate nu ai permisiunea sa faci aceste schimbari ?'; diff --git a/sources/lib/plugins/authad/lang/ru/lang.php b/sources/lib/plugins/authad/lang/ru/lang.php index fe56be2..ebce005 100644 --- a/sources/lib/plugins/authad/lang/ru/lang.php +++ b/sources/lib/plugins/authad/lang/ru/lang.php @@ -5,8 +5,10 @@ * * @author Aleksandr Selivanov * @author Takumo <9206984@mail.ru> + * @author dimsharav */ $lang['domain'] = 'Домен'; $lang['authpwdexpire'] = 'ДейÑтвие вашего Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¸Ñтекает через %d дней. Ð’Ñ‹ должны изменить его как можно Ñкорее'; $lang['passchangefail'] = 'Ðе удалоÑÑŒ изменить пароль. Возможно, он не ÑоответÑтвует требованиÑм к паролю.'; +$lang['userchangefail'] = 'Ошибка при изменении атрибутов пользователÑ. Возможно, у Вашей учетной запиÑи недоÑтаточно прав?'; $lang['connectfail'] = 'Ðевозможно ÑоединитьÑÑ Ñ Ñервером AD.'; diff --git a/sources/lib/plugins/authad/lang/ru/settings.php b/sources/lib/plugins/authad/lang/ru/settings.php index c791bd7..d9cf1fd 100644 --- a/sources/lib/plugins/authad/lang/ru/settings.php +++ b/sources/lib/plugins/authad/lang/ru/settings.php @@ -14,7 +14,7 @@ */ $lang['account_suffix'] = 'Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð²Ð°ÑˆÐµÐ³Ð¾ аккаунта. Ðапример, @my.domain.org'; $lang['base_dn'] = 'Ваш базовый DN. Ðапример: DC=my,DC=domain,DC=org'; -$lang['domain_controllers'] = 'СпиÑок DNS-Ñерверов, разделенных запÑтой. Ðапример:srv1.domain.org,srv2.domain.org'; +$lang['domain_controllers'] = 'СпиÑок DNS-Ñерверов, разделённых запÑтой. Ðапример:srv1.domain.org,srv2.domain.org'; $lang['admin_username'] = 'Привилегированный пользователь Active Directory Ñ Ð´Ð¾Ñтупом ко вÑем оÑтальным пользовательÑким данным. ÐеобÑзательно, однако необходимо Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ñ… дейÑтвий вроде отправки почтовой подпиÑки.'; $lang['admin_password'] = 'Пароль Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ пользователÑ.'; $lang['sso'] = 'ИÑпользовать SSO (Single-Sign-On) через Kerberos или NTLM?'; diff --git a/sources/lib/plugins/authad/lang/sk/lang.php b/sources/lib/plugins/authad/lang/sk/lang.php index cb0698f..7197dcb 100644 --- a/sources/lib/plugins/authad/lang/sk/lang.php +++ b/sources/lib/plugins/authad/lang/sk/lang.php @@ -2,7 +2,10 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek + * @author Michalek */ $lang['authpwdexpire'] = 'PlatnosÅ¥ hesla vyprší za %d dní, mali by ste ho zmeniÅ¥ Äo najskôr.'; +$lang['passchangefail'] = 'Nepodarilo sa zmeniÅ¥ heslo. Možno neboli splnené podmienky'; +$lang['userchangefail'] = 'Nepodarilo sa zmeniÅ¥ atribúty používateľa. Možno tvoj úÄet nemá oprávnenia na vykonanie týchto zmien?'; diff --git a/sources/lib/plugins/authad/lang/sk/settings.php b/sources/lib/plugins/authad/lang/sk/settings.php index 266b372..26362e1 100644 --- a/sources/lib/plugins/authad/lang/sk/settings.php +++ b/sources/lib/plugins/authad/lang/sk/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek */ $lang['account_suffix'] = 'Prípona používateľského úÄtu. Napr. @my.domain.org'; diff --git a/sources/lib/plugins/authad/lang/zh/lang.php b/sources/lib/plugins/authad/lang/zh/lang.php index df1a7a7..31024c4 100644 --- a/sources/lib/plugins/authad/lang/zh/lang.php +++ b/sources/lib/plugins/authad/lang/zh/lang.php @@ -2,11 +2,12 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme * @author Errol */ $lang['domain'] = '登录域'; $lang['authpwdexpire'] = '您的密ç å°†åœ¨ %d 天内过期，请尽快更改'; $lang['passchangefail'] = '密ç æ›´æ”¹å¤±è´¥ã€‚是ä¸æ˜¯å¯†ç è§„则ä¸ç¬¦åˆï¼Ÿ'; +$lang['userchangefail'] = '更改用户属性失败。或许您的å¸å·æ²¡æœ‰åšæ­¤æ›´æ”¹çš„æƒé™ï¼Ÿ'; $lang['connectfail'] = '无法连接到Active DirectoryæœåŠ¡å™¨ã€‚'; diff --git a/sources/lib/plugins/authad/lang/zh/settings.php b/sources/lib/plugins/authad/lang/zh/settings.php index 52ba213..5daa5ce 100644 --- a/sources/lib/plugins/authad/lang/zh/settings.php +++ b/sources/lib/plugins/authad/lang/zh/settings.php @@ -2,9 +2,10 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme * @author oott123 + * @author JellyChen <451453325@qq.com> */ $lang['account_suffix'] = '您的账户åŽç¼€ã€‚例如 @my.domain.org'; $lang['base_dn'] = '您的基本分辨å。例如 DC=my,DC=domain,DC=org'; @@ -19,3 +20,4 @@ $lang['use_tls'] = '使用 TLS 连接？如果是 ，ä¸è¦æ¿€æ´» $lang['debug'] = '有错误时显示é¢å¤–的调试信æ¯ï¼Ÿ'; $lang['expirywarn'] = 'æå‰å¤šå°‘天警告用户密ç å³å°†åˆ°æœŸã€‚0 则ç¦ç”¨ã€‚'; $lang['additional'] = '需è¦ä»Žç”¨æˆ·æ•°æ®ä¸­èŽ·å–çš„é¢å¤– AD 属性的列表，以逗å·åˆ†éš”。用于æŸäº›æ’件。'; +$lang['update_mail'] = '是å¦å…许用户更新他们的电å­é‚®ä»¶åœ°å€ï¼Ÿ'; diff --git a/sources/lib/plugins/authldap/auth.php b/sources/lib/plugins/authldap/auth.php index 247a0fe..bf83dd7 100644 --- a/sources/lib/plugins/authldap/auth.php +++ b/sources/lib/plugins/authldap/auth.php @@ -60,7 +60,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { // indirect user bind if($this->getConf('binddn') && $this->getConf('bindpw')) { // use superuser credentials - if(!@ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'))) { + if(!@ldap_bind($this->con, $this->getConf('binddn'), conf_decodeString($this->getConf('bindpw')))) { $this->_debug('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__); return false; } @@ -165,7 +165,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { // force superuser bind if wanted and not bound as superuser yet if($this->getConf('binddn') && $this->getConf('bindpw') && $this->bound < 2) { // use superuser credentials - if(!@ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'))) { + if(!@ldap_bind($this->con, $this->getConf('binddn'), conf_decodeString($this->getConf('bindpw')))) { $this->_debug('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__); return false; } @@ -275,6 +275,10 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { /** * Definition of the function modifyUser in order to modify the password + * + * @param string $user nick of the user to be changed + * @param array $changes array of field/value pairs to be changed (password will be clear text) + * @return bool true on success, false on error */ function modifyUser($user,$changes){ @@ -307,7 +311,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { } elseif ($this->getConf('binddn') && $this->getConf('bindpw')) { // we are changing the password on behalf of the user (eg: forgotten password) // bind with the superuser ldap - if (!@ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'))){ + if (!@ldap_bind($this->con, $this->getConf('binddn'), conf_decodeString($this->getConf('bindpw')))){ $this->_debug('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__); return false; } @@ -463,9 +467,12 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { * @return string */ protected function _filterEscape($string) { - return preg_replace( - '/([\x00-\x1F\*\(\)\\\\])/e', - '"\\\\\".join("",unpack("H2","$1"))', + // see https://github.com/adldap/adLDAP/issues/22 + return preg_replace_callback( + '/([\x00-\x1F\*\(\)\\\\])/', + function ($matches) { + return "\\".join("", unpack("H2", $matches[1])); + }, $string ); } @@ -479,6 +486,10 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { protected function _openLDAP() { if($this->con) return true; // connection already established + if($this->getConf('debug')) { + ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7); + } + $this->bound = 0; $port = $this->getConf('port'); @@ -543,7 +554,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { } if($this->getConf('binddn') && $this->getConf('bindpw')) { - $bound = @ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw')); + $bound = @ldap_bind($this->con, $this->getConf('binddn'), conf_decodeString($this->getConf('bindpw'))); $this->bound = 2; } else { $bound = @ldap_bind($this->con); @@ -555,6 +566,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { if(!$bound) { msg("LDAP: couldn't connect to LDAP server", -1); + $this->_debug(ldap_error($this->con), 0, __LINE__, __FILE__); return false; } diff --git a/sources/lib/plugins/authldap/conf/metadata.php b/sources/lib/plugins/authldap/conf/metadata.php index a67b11c..f32aed1 100644 --- a/sources/lib/plugins/authldap/conf/metadata.php +++ b/sources/lib/plugins/authldap/conf/metadata.php @@ -10,7 +10,7 @@ $meta['starttls'] = array('onoff','_caution' => 'danger'); $meta['referrals'] = array('multichoice','_choices' => array(-1,0,1),'_caution' => 'danger'); $meta['deref'] = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger'); $meta['binddn'] = array('string','_caution' => 'danger'); -$meta['bindpw'] = array('password','_caution' => 'danger'); +$meta['bindpw'] = array('password','_caution' => 'danger','_code'=>'base64'); //$meta['mapping']['name'] unsupported in config manager //$meta['mapping']['grps'] unsupported in config manager $meta['userscope'] = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger'); diff --git a/sources/lib/plugins/authldap/lang/cy/lang.php b/sources/lib/plugins/authldap/lang/cy/lang.php new file mode 100644 index 0000000..f6c5cf6 --- /dev/null +++ b/sources/lib/plugins/authldap/lang/cy/lang.php @@ -0,0 +1,11 @@ +localhost) neu\'r URL llawn (ldap://server.tld:389)'; +$lang['port'] = 'Porth gweinydd LDAP os nac oes URL llawn wedi\'i gyflwyno uchod'; +$lang['usertree'] = 'Ble i ddarganfod cyfrifon defnyddwyr. Ee. ou=People, dc=server, dc=tld'; +$lang['grouptree'] = 'Ble i ddarganfod y grwpiau defnyddiwr. Eg. ou=Group, dc=server, dc=tld'; +$lang['userfilter'] = 'Hidlydd LDAP i ddarganfod cyfrifon defnyddwyr. Eg. (&(uid=%{user})(objectClass=posixAccount))'; +$lang['groupfilter'] = 'Hidlydd LDAP i chwilio am grwpiau. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; +$lang['version'] = 'Y fersiwn protocol i\'w ddefnyddio. Efallai bydd angen gosod hwn i 3'; +$lang['starttls'] = 'Defnyddio cysylltiadau TLS?'; +$lang['referrals'] = 'Dilyn cyfeiriadau (referrals)?'; +$lang['deref'] = 'Sut i ddadgyfeirio alias?'; //alias - enw arall? +$lang['binddn'] = 'DN rhwymiad defnyddiwr opsiynol os ydy rhwymiad anhysbys yn annigonol. Ee. cn=admin, dc=my, dc=home'; +$lang['bindpw'] = 'Cyfrinair y defnyddiwr uchod'; +$lang['userscope'] = 'Cyfyngu sgôp chwiliadau ar gyfer chwiliad defnyddwyr'; +$lang['groupscope'] = 'Cyfyngu sgôp chwiliadau ar gyfer chwiliad grwpiau'; +$lang['userkey'] = 'Priodoledd yn denodi\'r defnyddair; rhaid iddo fod yn gyson i \'r hidlydd defnyddwyr.'; +$lang['groupkey'] = 'Aelodaeth grŵp o unrhyw briodoledd defnyddiwr (yn hytrach na grwpiau AD safonol) e.e. grŵp o adran neu rif ffôn'; +$lang['modPass'] = 'Gall cyfrinair LDAP gael ei newid gan DokuWiki?'; +$lang['debug'] = 'Dangos gwybodaeth dadfygio ychwanegol gyda gwallau'; + + +$lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; +$lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; +$lang['deref_o_2'] = 'LDAP_DEREF_FINDING'; +$lang['deref_o_3'] = 'LDAP_DEREF_ALWAYS'; + +$lang['referrals_o_-1'] = 'defnyddio\'r diofyn'; +$lang['referrals_o_0'] = 'peidio dilyn cyfeiriadau'; +$lang['referrals_o_1'] = 'dilyn cyfeiriadau'; \ No newline at end of file diff --git a/sources/lib/plugins/authldap/lang/da/lang.php b/sources/lib/plugins/authldap/lang/da/lang.php new file mode 100644 index 0000000..03ae2eb --- /dev/null +++ b/sources/lib/plugins/authldap/lang/da/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['connectfail'] = 'LDAP kan ikke forbinde: %s'; diff --git a/sources/lib/plugins/authldap/lang/da/settings.php b/sources/lib/plugins/authldap/lang/da/settings.php index a9fce3a..777b5e3 100644 --- a/sources/lib/plugins/authldap/lang/da/settings.php +++ b/sources/lib/plugins/authldap/lang/da/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Jens Hyllegaard * @author soer9648 * @author Jacob Palm diff --git a/sources/lib/plugins/authldap/lang/es/lang.php b/sources/lib/plugins/authldap/lang/es/lang.php index 20de155..bf6ff6c 100644 --- a/sources/lib/plugins/authldap/lang/es/lang.php +++ b/sources/lib/plugins/authldap/lang/es/lang.php @@ -4,5 +4,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Mauricio Segura + * @author David Roy */ $lang['connectfail'] = 'LDAP no se puede conectar: %s'; +$lang['domainfail'] = 'LDAP no puede encontrar el DN de tu usuario'; diff --git a/sources/lib/plugins/authldap/lang/fa/lang.php b/sources/lib/plugins/authldap/lang/fa/lang.php new file mode 100644 index 0000000..fdf4f6d --- /dev/null +++ b/sources/lib/plugins/authldap/lang/fa/lang.php @@ -0,0 +1,9 @@ + + */ +$lang['connectfail'] = 'LDAP نمیتواند وصل شود: %s'; +$lang['domainfail'] = 'LDAP نمیتواند کاربر شما را پیدا کند'; diff --git a/sources/lib/plugins/authldap/lang/fa/settings.php b/sources/lib/plugins/authldap/lang/fa/settings.php index 49d485a..72eccb0 100644 --- a/sources/lib/plugins/authldap/lang/fa/settings.php +++ b/sources/lib/plugins/authldap/lang/fa/settings.php @@ -5,6 +5,32 @@ * * @author Mohammad Sadegh * @author Omid Hezaveh + * @author Mohmmad Razavi + * @author Masoud Sadrnezhaad */ +$lang['server'] = 'سرور LDAP شما. Ú†Ù‡ به صورت '; +$lang['port'] = 'درگاه سرور LDAP اگر Ú©Ù‡ URL کامل در بالا نوشته نشده'; +$lang['usertree'] = 'محل حساب‌های کاربری. برای مثال ou=People, dc=server, dc=tld'; +$lang['grouptree'] = 'محل گروه‌های کاربری. برای مثال ou=Group, dc=server, dc=tld'; +$lang['userfilter'] = 'Ùیتلرهای LDAP برای جستجوی حساب‌های کاربری. برای مثال (&(uid=%{user})(objectClass=posixAccount))'; +$lang['groupfilter'] = 'Ùیلتر LDAP برای جستجوی گروه‌ها. برای مثال (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; +$lang['version'] = 'نسخهٔ پروتوکل برای استÙاده. احتمالا این را باید 3 وارد کنید.'; $lang['starttls'] = 'از تی‌ال‌اس (TLS) استÙاده می‌کنید؟'; +$lang['referrals'] = 'آیا ارجاعات باید دنبال شوند؟'; +$lang['deref'] = 'نام‌های مستعار چطور ارجاع یابی شوند؟'; +$lang['binddn'] = ' DN برای کاربر اتصال اگر اتصال ناشناخته کاÙÛŒ نیست. مثال +cn=admin, dc=my, dc=home'; $lang['bindpw'] = 'رمزعبور کاربر بالا'; +$lang['userscope'] = 'محدود کردن محدودهٔ جستجو به جستجوی کاربر'; +$lang['groupscope'] = 'محدود کردن محدودهٔ جستجو به جستجوی گروه'; +$lang['userkey'] = 'صÙتی Ú©Ù‡ نشان‌دهندهٔ نام کاربر است؛ باید با userfilter نامتناقض باشد.'; +$lang['groupkey'] = 'عضویت در گروه برمبنای هر کدام از صÙات کاربر (به جای گروه‌های استاندارد AD) برای مثال گروه برمبنای دپارتمان یا شماره تلÙÙ†'; +$lang['modPass'] = 'آیا پسورد LDAP می‌تواند توسط داکو ویکی تغییر کند؟'; +$lang['debug'] = 'نمایش اطلاعات بیشتر برای خطایابی در ارورها'; +$lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; +$lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; +$lang['deref_o_2'] = 'LDAP_DEREF_FINDING'; +$lang['deref_o_3'] = 'LDAP_DEREF_ALWAYS'; +$lang['referrals_o_-1'] = 'استÙاده از پیشÙرض'; +$lang['referrals_o_0'] = 'ارجاعات را دنبال Ù†Ú©Ù†'; +$lang['referrals_o_1'] = 'ارجاعات را دنبال Ú©Ù†'; diff --git a/sources/lib/plugins/authldap/lang/it/lang.php b/sources/lib/plugins/authldap/lang/it/lang.php new file mode 100644 index 0000000..9832e93 --- /dev/null +++ b/sources/lib/plugins/authldap/lang/it/lang.php @@ -0,0 +1,9 @@ + + */ +$lang['connectfail'] = 'LDAP non è in grado di connettere: %s'; +$lang['domainfail'] = 'LDAP non è in grado di trovare il tuo DN utente'; diff --git a/sources/lib/plugins/authldap/lang/it/settings.php b/sources/lib/plugins/authldap/lang/it/settings.php index 2dbcedf..58bf497 100644 --- a/sources/lib/plugins/authldap/lang/it/settings.php +++ b/sources/lib/plugins/authldap/lang/it/settings.php @@ -16,10 +16,15 @@ $lang['userfilter'] = 'Filtro per cercare l\'account utente LDAP. Eg. $lang['groupfilter'] = 'Filtro per cercare i gruppi LDAP. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; $lang['version'] = 'Versione protocollo da usare. Pu3'; $lang['starttls'] = 'Usare la connessione TSL?'; +$lang['referrals'] = 'Possono i reindirizzamenti essere seguiti?'; $lang['deref'] = 'Come differenziare un alias?'; +$lang['binddn'] = 'DN di un utente bind opzionale se un bind anonimo non è sufficiente. E.g. cn=admin, dc=casa, dc=mia'; $lang['bindpw'] = 'Password del utente di cui sopra'; $lang['userscope'] = 'Limita il contesto di ricerca per la ricerca degli utenti'; $lang['groupscope'] = 'Limita il contesto di ricerca per la ricerca dei gruppi'; +$lang['userkey'] = 'Attributo indicante il nome utente; deve essere consistente con il filtro utente.'; +$lang['groupkey'] = 'Gruppo di appartenenza sulla base di qualunque attributo utente (invece di gruppo AD standard) e.g. gruppo in base al dipartimento o al numero di telefono'; +$lang['modPass'] = 'Può la password LDAP essere cambiata attraverso DokuWiki?'; $lang['debug'] = 'In caso di errori mostra ulteriori informazioni di debug'; $lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; $lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; diff --git a/sources/lib/plugins/authldap/lang/ja/lang.php b/sources/lib/plugins/authldap/lang/ja/lang.php index aeeb6c7..c602b43 100644 --- a/sources/lib/plugins/authldap/lang/ja/lang.php +++ b/sources/lib/plugins/authldap/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hideaki SAWADA */ $lang['connectfail'] = 'LDAP ã«æŽ¥ç¶šã§ãã¾ã›ã‚“： %s'; diff --git a/sources/lib/plugins/authldap/lang/ja/settings.php b/sources/lib/plugins/authldap/lang/ja/settings.php index 99a70de..fd7ad76 100644 --- a/sources/lib/plugins/authldap/lang/ja/settings.php +++ b/sources/lib/plugins/authldap/lang/ja/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Satoshi Sahara * @author Hideaki SAWADA * @author Hideaki SAWADA diff --git a/sources/lib/plugins/authldap/lang/ko/lang.php b/sources/lib/plugins/authldap/lang/ko/lang.php index 3c6722a..1e1bef4 100644 --- a/sources/lib/plugins/authldap/lang/ko/lang.php +++ b/sources/lib/plugins/authldap/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin */ $lang['connectfail'] = 'LDAPê°€ ì—°ê²°í•  수 없습니다: %s'; diff --git a/sources/lib/plugins/authldap/lang/ko/settings.php b/sources/lib/plugins/authldap/lang/ko/settings.php index d3e93ff..b988436 100644 --- a/sources/lib/plugins/authldap/lang/ko/settings.php +++ b/sources/lib/plugins/authldap/lang/ko/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin */ $lang['server'] = 'LDAP 서버. 호스트 ì´ë¦„(localhost)ì´ë‚˜ ì „ì²´ ìžê²© URL(ldap://server.tld:389) 중 하나'; diff --git a/sources/lib/plugins/authldap/lang/pt-br/lang.php b/sources/lib/plugins/authldap/lang/pt-br/lang.php index 20f5ec3..63e276a 100644 --- a/sources/lib/plugins/authldap/lang/pt-br/lang.php +++ b/sources/lib/plugins/authldap/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães */ $lang['connectfail'] = 'Não foi possível conectar ao LDAP: %s'; diff --git a/sources/lib/plugins/authldap/lang/pt-br/settings.php b/sources/lib/plugins/authldap/lang/pt-br/settings.php index f35ed8e..03469e5 100644 --- a/sources/lib/plugins/authldap/lang/pt-br/settings.php +++ b/sources/lib/plugins/authldap/lang/pt-br/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Victor Westmann * @author Frederico Guimarães * @author Hudson FAS diff --git a/sources/lib/plugins/authldap/lang/ru/settings.php b/sources/lib/plugins/authldap/lang/ru/settings.php index 067ec9d..0b6ad4a 100644 --- a/sources/lib/plugins/authldap/lang/ru/settings.php +++ b/sources/lib/plugins/authldap/lang/ru/settings.php @@ -19,15 +19,15 @@ $lang['userfilter'] = 'LDAP-фильтр Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка акка $lang['groupfilter'] = 'LDAP-фильтр Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка групп. Ðапример: (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))'; $lang['version'] = 'ВерÑÐ¸Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð°. Возможно, вам нужно указать 3'; $lang['starttls'] = 'ИÑпользовать TLS-подключениÑ?'; -$lang['referrals'] = 'Следовать за referrals ?'; +$lang['referrals'] = 'Следовать за referrals?'; $lang['deref'] = 'Как раÑшифровывать пÑевдонимы?'; -$lang['binddn'] = 'DN вторичного bind пользователÑ, еÑли anonymous bind недоÑтаточно. Ðапример: cn=admin, dc=my, dc=home'; +$lang['binddn'] = 'DN вторичного bind-пользователÑ, еÑли anonymous bind недоÑтаточно. Ðапример: cn=admin, dc=my, dc=home'; $lang['bindpw'] = 'Пароль Ð´Ð»Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ пользователÑ'; $lang['userscope'] = 'Ограничить облаÑÑ‚ÑŒ поиÑка при поиÑке пользователей'; $lang['groupscope'] = 'Ограничить облаÑÑ‚ÑŒ поиÑка при поиÑке групп'; $lang['userkey'] = 'Ðтрибут означающий Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ; должен быть таким же как в userfilter'; $lang['groupkey'] = 'ИÑпользовать любой атрибут Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð² группу (вмеÑто Ñтандартного AD groups) Ðапример из атрибута department или telephone number'; -$lang['modPass'] = 'Может ли LDAP пароль быть поменÑн через dokuwiki?'; +$lang['modPass'] = 'Может ли пароль LDAP быть изменён через «Докувики»?'; $lang['debug'] = 'Показывать дополнительную отладочную информацию при ошибках'; $lang['deref_o_0'] = 'LDAP_DEREF_NEVER'; $lang['deref_o_1'] = 'LDAP_DEREF_SEARCHING'; @@ -35,4 +35,4 @@ $lang['deref_o_2'] = 'LDAP_DEREF_FINDING'; $lang['deref_o_3'] = 'LDAP_DEREF_ALWAYS'; $lang['referrals_o_-1'] = 'иÑользовать по умолчанию'; $lang['referrals_o_0'] = 'не Ñледовать за referrals'; -$lang['referrals_o_1'] = 'Следовать за referrals'; +$lang['referrals_o_1'] = 'Ñледовать за referrals'; diff --git a/sources/lib/plugins/authldap/lang/sk/settings.php b/sources/lib/plugins/authldap/lang/sk/settings.php index 26c8d9e..e8d3465 100644 --- a/sources/lib/plugins/authldap/lang/sk/settings.php +++ b/sources/lib/plugins/authldap/lang/sk/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek */ $lang['server'] = 'LDAP server. Adresa (localhost) alebo úplné URL (ldap://server.tld:389)'; diff --git a/sources/lib/plugins/authldap/lang/zh-tw/settings.php b/sources/lib/plugins/authldap/lang/zh-tw/settings.php index dcbbace..cb0bb71 100644 --- a/sources/lib/plugins/authldap/lang/zh-tw/settings.php +++ b/sources/lib/plugins/authldap/lang/zh-tw/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author syaoranhinata@gmail.com */ $lang['server'] = '您的 LDAP 伺æœå™¨ã€‚填寫主機å稱 (localhost) 或完整的 URL (ldap://server.tld:389)'; diff --git a/sources/lib/plugins/authldap/lang/zh/lang.php b/sources/lib/plugins/authldap/lang/zh/lang.php index ef72749..c736056 100644 --- a/sources/lib/plugins/authldap/lang/zh/lang.php +++ b/sources/lib/plugins/authldap/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Errol */ $lang['connectfail'] = 'LDAP 无法连接: %s'; diff --git a/sources/lib/plugins/authldap/lang/zh/settings.php b/sources/lib/plugins/authldap/lang/zh/settings.php index 7bb6397..04388bf 100644 --- a/sources/lib/plugins/authldap/lang/zh/settings.php +++ b/sources/lib/plugins/authldap/lang/zh/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme * @author oott123 * @author Errol diff --git a/sources/lib/plugins/authmysql/auth.php b/sources/lib/plugins/authmysql/auth.php index 1b7d0bf..999542a 100644 --- a/sources/lib/plugins/authmysql/auth.php +++ b/sources/lib/plugins/authmysql/auth.php @@ -874,7 +874,7 @@ class auth_plugin_authmysql extends DokuWiki_Auth_Plugin { */ protected function _openDB() { if(!$this->dbcon) { - $con = @mysql_connect($this->getConf('server'), $this->getConf('user'), $this->getConf('password')); + $con = @mysql_connect($this->getConf('server'), $this->getConf('user'), conf_decodeString($this->getConf('password'))); if($con) { if((mysql_select_db($this->getConf('database'), $con))) { if((preg_match('/^(\d+)\.(\d+)\.(\d+).*/', mysql_get_server_info($con), $result)) == 1) { diff --git a/sources/lib/plugins/authmysql/conf/metadata.php b/sources/lib/plugins/authmysql/conf/metadata.php index 54d6f14..bad34e6 100644 --- a/sources/lib/plugins/authmysql/conf/metadata.php +++ b/sources/lib/plugins/authmysql/conf/metadata.php @@ -2,7 +2,7 @@ $meta['server'] = array('string','_caution' => 'danger'); $meta['user'] = array('string','_caution' => 'danger'); -$meta['password'] = array('password','_caution' => 'danger'); +$meta['password'] = array('password','_caution' => 'danger','_code' => 'base64'); $meta['database'] = array('string','_caution' => 'danger'); $meta['charset'] = array('string','_caution' => 'danger'); $meta['debug'] = array('multichoice','_choices' => array(0,1,2),'_caution' => 'security'); @@ -31,4 +31,4 @@ $meta['UpdateEmail'] = array('string','_caution' => 'danger'); $meta['UpdateName'] = array('string','_caution' => 'danger'); $meta['UpdateTarget'] = array('string','_caution' => 'danger'); $meta['delUserGroup'] = array('','_caution' => 'danger'); -$meta['getGroupID'] = array('','_caution' => 'danger'); \ No newline at end of file +$meta['getGroupID'] = array('','_caution' => 'danger'); diff --git a/sources/lib/plugins/authmysql/lang/cy/lang.php b/sources/lib/plugins/authmysql/lang/cy/lang.php new file mode 100644 index 0000000..a96715c --- /dev/null +++ b/sources/lib/plugins/authmysql/lang/cy/lang.php @@ -0,0 +1,13 @@ + + */ +$lang['connectfail'] = 'Kunne ikke forbinde til databasen.'; +$lang['userexists'] = 'Beklager, en bruger med dette login findes allerede.'; +$lang['usernotexists'] = 'Beklager, brugeren eksisterer ikke.'; diff --git a/sources/lib/plugins/authmysql/lang/da/settings.php b/sources/lib/plugins/authmysql/lang/da/settings.php index 5fd66db..158765c 100644 --- a/sources/lib/plugins/authmysql/lang/da/settings.php +++ b/sources/lib/plugins/authmysql/lang/da/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Jens Hyllegaard * @author soer9648 * @author Jacob Palm diff --git a/sources/lib/plugins/authmysql/lang/fa/lang.php b/sources/lib/plugins/authmysql/lang/fa/lang.php new file mode 100644 index 0000000..c73c053 --- /dev/null +++ b/sources/lib/plugins/authmysql/lang/fa/lang.php @@ -0,0 +1,12 @@ + + * @author Masoud Sadrnezhaad + */ +$lang['connectfail'] = 'خطا در اتصال به دیتابیس'; +$lang['userexists'] = 'با عرض پوزش، یک کاربر با این نام از قبل وجود دارد.'; +$lang['usernotexists'] = 'با عرض پوزش، آن کاربر وجود نداشت.'; +$lang['writefail'] = 'امکان تغییر داده کاربر وجود نداشت. لطÙا مسئول Wiki را آگاه کنید.'; diff --git a/sources/lib/plugins/authmysql/lang/fa/settings.php b/sources/lib/plugins/authmysql/lang/fa/settings.php index 68ad5ce..bca4bbf 100644 --- a/sources/lib/plugins/authmysql/lang/fa/settings.php +++ b/sources/lib/plugins/authmysql/lang/fa/settings.php @@ -4,7 +4,40 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Mohamad Mehdi Habibi + * @author Mohmmad Razavi */ $lang['server'] = 'سرور MySQL'; $lang['user'] = 'نام کاربری MySQL'; +$lang['password'] = 'رمزعبور کاربر بالا'; $lang['database'] = 'پایگاه داده مورد استÙاده'; +$lang['charset'] = 'مجموعه کاراکترهایی (Character set) Ú©Ù‡ در پایگاه داده بکار رÙته'; +$lang['debug'] = 'نمایش اطلاعات بیشتر برای دیباگ'; +$lang['forwardClearPass'] = 'بجای استÙاده از گزینه passcryptØŒ رمزعبورهای کاربر را بصورت آشکار به دستور SQL زیر پاس دهید.'; +$lang['TablesToLock'] = 'لیست جدولهایی Ú©Ù‡ هنگام عملیات نوشتن باید Ù‚ÙÙ„ شود Ú©Ù‡ با کاما از هم جدا شده اند'; +$lang['checkPass'] = 'دستور SQL برای بررسی رمزعبورها'; +$lang['getUserInfo'] = 'دستور SQL برای دریاÙت اطلاعات نام کاربری'; +$lang['getGroups'] = 'دستور SQL برای دریاÙت گروه‌های عضویت یک کاربر'; +$lang['getUsers'] = 'دستور SQL برای گرÙتن لیست تمامی کاربران'; +$lang['FilterLogin'] = 'عبارت SQL برای Ùیلتر کردن کاربران با نام کاربری (login name)'; +$lang['FilterName'] = 'عبارت SQL برای Ùیلتر کردن کاربران با نام کامل'; +$lang['FilterEmail'] = 'عبارت SQL برای Ùیلتر کردن کابران با آدرس ایمیل'; +$lang['FilterGroup'] = 'عبارت SQL برای Ùیلتر کاربران با گروه عضویتشان'; +$lang['SortOrder'] = 'عبارت SQL برای مرتب کردن کاربران'; +$lang['addUser'] = 'دستور SQL برای اضاÙÙ‡ کردن کاربر جدید'; +$lang['addGroup'] = 'دستور SQL برای اضاÙÙ‡ کردن گروه جدید'; +$lang['addUserGroup'] = 'دستور SQL برای اضاÙÙ‡ کردن یک کاربر به یک گروه موجود از قبل'; +$lang['delGroup'] = 'دستور SQL برای حذ٠یک گروه'; +$lang['getUserID'] = 'دستور SQL برای گرÙتن کلید اصلی (primary key) یک کاربر'; +$lang['delUser'] = 'دستور SQL برای حذ٠یک کاربر'; +$lang['delUserRefs'] = 'دستور SQL برای حذ٠یک کابر از تمامی گروه‌ها'; +$lang['updateUser'] = 'دستور SQL برای بروزرسانی پروÙایل یک کاربر'; +$lang['UpdateLogin'] = 'عبارت Update برای بروزرسانی نام کاربری (login name)'; +$lang['UpdatePass'] = 'عبارت Update برای بروزرسانی رمزعبور کاربر'; +$lang['UpdateEmail'] = 'عبارت Update برای بروزرسانی ادرسی ایمیل کاربر'; +$lang['UpdateName'] = 'عبارت Update برای بروزرسانی نام کامل کاربر'; +$lang['UpdateTarget'] = 'عبارت Limit برای شناسایی کابر هنگام بروزرسانی'; +$lang['delUserGroup'] = 'دستور SQL برای حذ٠یک کاربر '; +$lang['getGroupID'] = 'دستور SQL برای گرÙتن کلید اصلی (primary key) گروه داده شده'; +$lang['debug_o_0'] = 'هیچ'; +$lang['debug_o_1'] = 'Ùقط هنگام خطا'; +$lang['debug_o_2'] = 'تمام پرس‌وجوهای SQL'; diff --git a/sources/lib/plugins/authmysql/lang/it/settings.php b/sources/lib/plugins/authmysql/lang/it/settings.php index 4339baf..1e93077 100644 --- a/sources/lib/plugins/authmysql/lang/it/settings.php +++ b/sources/lib/plugins/authmysql/lang/it/settings.php @@ -21,11 +21,11 @@ $lang['checkPass'] = 'Istruzione SQL per il controllo password'; $lang['getUserInfo'] = 'Istruzione SQL per recuperare le informazioni utente'; $lang['getGroups'] = 'Istruzione SQL per recuperare il gruppo di appartenenza di un utente'; $lang['getUsers'] = 'Istruzione SQL per listare tutti gli utenti'; -$lang['FilterLogin'] = 'Istruzione SQL per per filtrare gli utenti in funzione del "login name"'; +$lang['FilterLogin'] = 'Condizione SQL per per filtrare gli utenti in funzione del "login name"'; $lang['FilterName'] = 'Condizione SQL per filtrare gli utenti in base al nome completo'; $lang['FilterEmail'] = 'Condizione SQL per filtrare gli utenti in base all\'indirizzo e-mail'; -$lang['FilterGroup'] = 'Clausola SQL per filtrare gli utenti in base all\'appartenenza al gruppo'; -$lang['SortOrder'] = 'Istruzione SQL per ordinare gli utenti'; +$lang['FilterGroup'] = 'Condizione SQL per filtrare gli utenti in base al gruppo di appartenenza'; +$lang['SortOrder'] = 'Condizione SQL per ordinare gli utenti'; $lang['addUser'] = 'Istruzione SQL per aggiungere un nuovo utente'; $lang['addGroup'] = 'Istruzione SQL per aggiungere un nuovo gruppo'; $lang['addUserGroup'] = 'Istruzione SQL per aggiungere un utente ad un gruppo esistente'; @@ -34,10 +34,11 @@ $lang['getUserID'] = 'Istruzione SQL per recuperare la primary key d $lang['delUser'] = 'Istruzione SQL per cancellare un utente'; $lang['delUserRefs'] = 'Istruzione SQL per rimuovere un utente da tutti i gruppi'; $lang['updateUser'] = 'Istruzione SQL per aggiornare il profilo utente'; -$lang['UpdateLogin'] = 'Clausola per aggiornare il "login name" dell\'utente'; -$lang['UpdatePass'] = 'Clausola per aggiornare la password utente'; -$lang['UpdateEmail'] = 'Clausola per aggiornare l\'email utente'; -$lang['UpdateName'] = 'Clausola per aggiornare il nome completo'; +$lang['UpdateLogin'] = 'Condizione SQL per aggiornare il nome di accesso dell\'utente'; +$lang['UpdatePass'] = 'Condizione SQL per aggiornare la password utente'; +$lang['UpdateEmail'] = 'Condizione SQL per aggiornare l\'e-mail utente'; +$lang['UpdateName'] = 'Condizione SQL per aggiornare il nome completo dell\'utente'; +$lang['UpdateTarget'] = 'Condizione SQL per identificare l\'utente quando aggiornato'; $lang['delUserGroup'] = 'Istruzione SQL per rimuovere un utente da un dato gruppo'; $lang['getGroupID'] = 'Istruzione SQL per avere la primary key di un dato gruppo'; $lang['debug_o_0'] = 'Nulla'; diff --git a/sources/lib/plugins/authmysql/lang/ja/lang.php b/sources/lib/plugins/authmysql/lang/ja/lang.php index a2348f2..55c908b 100644 --- a/sources/lib/plugins/authmysql/lang/ja/lang.php +++ b/sources/lib/plugins/authmysql/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hideaki SAWADA */ $lang['connectfail'] = 'データベースã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚'; diff --git a/sources/lib/plugins/authmysql/lang/ja/settings.php b/sources/lib/plugins/authmysql/lang/ja/settings.php index 6bc3f9a..cc0146b 100644 --- a/sources/lib/plugins/authmysql/lang/ja/settings.php +++ b/sources/lib/plugins/authmysql/lang/ja/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Satoshi Sahara */ $lang['server'] = 'MySQL ã®ãƒ›ã‚¹ãƒˆå'; diff --git a/sources/lib/plugins/authmysql/lang/ko/lang.php b/sources/lib/plugins/authmysql/lang/ko/lang.php index d07d583..5e96a44 100644 --- a/sources/lib/plugins/authmysql/lang/ko/lang.php +++ b/sources/lib/plugins/authmysql/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author hyeonsoft * @author Myeongjin */ diff --git a/sources/lib/plugins/authmysql/lang/ko/settings.php b/sources/lib/plugins/authmysql/lang/ko/settings.php index b3479ad..ee7c1ef 100644 --- a/sources/lib/plugins/authmysql/lang/ko/settings.php +++ b/sources/lib/plugins/authmysql/lang/ko/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin * @author Garam */ diff --git a/sources/lib/plugins/authmysql/lang/pt-br/lang.php b/sources/lib/plugins/authmysql/lang/pt-br/lang.php index 6b1a4c3..02c4b9e 100644 --- a/sources/lib/plugins/authmysql/lang/pt-br/lang.php +++ b/sources/lib/plugins/authmysql/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães */ $lang['connectfail'] = 'Não foi possível conectar ao banco de dados.'; diff --git a/sources/lib/plugins/authmysql/lang/pt-br/settings.php b/sources/lib/plugins/authmysql/lang/pt-br/settings.php index 1181a0b..cc637d6 100644 --- a/sources/lib/plugins/authmysql/lang/pt-br/settings.php +++ b/sources/lib/plugins/authmysql/lang/pt-br/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Victor Westmann * @author Frederico Guimarães */ diff --git a/sources/lib/plugins/authmysql/lang/ru/lang.php b/sources/lib/plugins/authmysql/lang/ru/lang.php index 75b5613..e2160c3 100644 --- a/sources/lib/plugins/authmysql/lang/ru/lang.php +++ b/sources/lib/plugins/authmysql/lang/ru/lang.php @@ -4,8 +4,9 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Takumo <9206984@mail.ru> + * @author Aleksandr Selivanov */ $lang['connectfail'] = 'Ошибка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ Ð±Ð°Ð·Ð¾Ð¹ данных.'; $lang['userexists'] = 'Извините, пользователь Ñ Ñ‚Ð°ÐºÐ¸Ð¼ логином уже ÑущеÑтвует.'; $lang['usernotexists'] = 'Извините, такой пользователь не ÑущеÑтвует.'; -$lang['writefail'] = 'Ðевозможно изменить данные пользователÑ. Сообщите об Ñтом админиÑтратору Вики.'; +$lang['writefail'] = 'Ðевозможно изменить данные пользователÑ. Сообщите об Ñтом админиÑтратору вики.'; diff --git a/sources/lib/plugins/authmysql/lang/sk/lang.php b/sources/lib/plugins/authmysql/lang/sk/lang.php new file mode 100644 index 0000000..9f70381 --- /dev/null +++ b/sources/lib/plugins/authmysql/lang/sk/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Nepodarilo sa pripojiÅ¥ k databáze.'; +$lang['userexists'] = 'Ľutujem, ale používateľ s týmto prihlasovacím menom už existuje.'; +$lang['writefail'] = 'Nie je možné zmeniÅ¥ údaje používateľa, informujte prosím administrátora Wiki.'; diff --git a/sources/lib/plugins/authmysql/lang/sk/settings.php b/sources/lib/plugins/authmysql/lang/sk/settings.php index 8042c69..4def5d6 100644 --- a/sources/lib/plugins/authmysql/lang/sk/settings.php +++ b/sources/lib/plugins/authmysql/lang/sk/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek */ $lang['server'] = 'MySQL server'; diff --git a/sources/lib/plugins/authmysql/lang/zh/lang.php b/sources/lib/plugins/authmysql/lang/zh/lang.php index 044fe6d..d96b7ba 100644 --- a/sources/lib/plugins/authmysql/lang/zh/lang.php +++ b/sources/lib/plugins/authmysql/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Errol */ $lang['connectfail'] = '连接数æ®åº“失败'; diff --git a/sources/lib/plugins/authmysql/lang/zh/settings.php b/sources/lib/plugins/authmysql/lang/zh/settings.php index b58159e..26ecc6b 100644 --- a/sources/lib/plugins/authmysql/lang/zh/settings.php +++ b/sources/lib/plugins/authmysql/lang/zh/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme */ $lang['server'] = '您的 MySQL æœåŠ¡å™¨'; diff --git a/sources/lib/plugins/authmysql/plugin.info.txt b/sources/lib/plugins/authmysql/plugin.info.txt index 1658d7a..5f8493d 100644 --- a/sources/lib/plugins/authmysql/plugin.info.txt +++ b/sources/lib/plugins/authmysql/plugin.info.txt @@ -2,6 +2,6 @@ base authmysql author Andreas Gohr email andi@splitbrain.org date 2015-07-13 -name MYSQL Auth Plugin -desc Provides user authentication against a MySQL database +name [DEPRECATED] MYSQL Auth Plugin +desc â–¶This plugin will be removed from DokuWiki in a future release! Use authpdo instead.â—€ Provides user authentication against a MySQL database url http://www.dokuwiki.org/plugin:authmysql diff --git a/sources/lib/plugins/upgrade/README b/sources/lib/plugins/authpdo/README similarity index 82% rename from sources/lib/plugins/upgrade/README rename to sources/lib/plugins/authpdo/README index 079d627..c99bfbf 100644 --- a/sources/lib/plugins/upgrade/README +++ b/sources/lib/plugins/authpdo/README @@ -1,10 +1,12 @@ -upgrade Plugin for DokuWiki +authpdo Plugin for DokuWiki + +Authenticate against a database via PDO All documentation for this plugin can be found at -http://www.dokuwiki.org/plugin:upgrade +https://www.dokuwiki.org/plugin:authpdo If you install this plugin manually, make sure it is installed in -lib/plugins/upgrade/ - if the folder is called different it +lib/plugins/authpdo/ - if the folder is called different it will not work! Please refer to http://www.dokuwiki.org/plugins for additional info diff --git a/sources/lib/plugins/authpdo/auth.php b/sources/lib/plugins/authpdo/auth.php new file mode 100644 index 0000000..b78b0e7 --- /dev/null +++ b/sources/lib/plugins/authpdo/auth.php @@ -0,0 +1,751 @@ + + */ + +// must be run within Dokuwiki +if(!defined('DOKU_INC')) die(); + +/** + * Class auth_plugin_authpdo + */ +class auth_plugin_authpdo extends DokuWiki_Auth_Plugin { + + /** @var PDO */ + protected $pdo; + + /** @var null|array The list of all groups */ + protected $groupcache = null; + + /** + * Constructor. + */ + public function __construct() { + parent::__construct(); // for compatibility + + if(!class_exists('PDO')) { + $this->_debug('PDO extension for PHP not found.', -1, __LINE__); + $this->success = false; + return; + } + + if(!$this->getConf('dsn')) { + $this->_debug('No DSN specified', -1, __LINE__); + $this->success = false; + return; + } + + try { + $this->pdo = new PDO( + $this->getConf('dsn'), + $this->getConf('user'), + conf_decodeString($this->getConf('pass')), + array( + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, // always fetch as array + PDO::ATTR_EMULATE_PREPARES => true, // emulating prepares allows us to reuse param names + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, // we want exceptions, not error codes + ) + ); + } catch(PDOException $e) { + $this->_debug($e); + msg($this->getLang('connectfail'), -1); + $this->success = false; + return; + } + + // can Users be created? + $this->cando['addUser'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'select-groups', + 'insert-user', + 'insert-group', + 'join-group' + ) + ); + + // can Users be deleted? + $this->cando['delUser'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'select-groups', + 'leave-group', + 'delete-user' + ) + ); + + // can login names be changed? + $this->cando['modLogin'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'update-user-login' + ) + ); + + // can passwords be changed? + $this->cando['modPass'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'update-user-pass' + ) + ); + + // can real names and emails be changed? + $this->cando['modName'] = $this->cando['modMail'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'update-user-info' + ) + ); + + // can groups be changed? + $this->cando['modGroups'] = $this->_chkcnf( + array( + 'select-user', + 'select-user-groups', + 'select-groups', + 'leave-group', + 'join-group', + 'insert-group' + ) + ); + + // can a filtered list of users be retrieved? + $this->cando['getUsers'] = $this->_chkcnf( + array( + 'list-users' + ) + ); + + // can the number of users be retrieved? + $this->cando['getUserCount'] = $this->_chkcnf( + array( + 'count-users' + ) + ); + + // can a list of available groups be retrieved? + $this->cando['getGroups'] = $this->_chkcnf( + array( + 'select-groups' + ) + ); + + $this->success = true; + } + + /** + * Check user+password + * + * @param string $user the user name + * @param string $pass the clear text password + * @return bool + */ + public function checkPass($user, $pass) { + + $data = $this->_selectUser($user); + if($data == false) return false; + + if(isset($data['hash'])) { + // hashed password + $passhash = new PassHash(); + return $passhash->verify_hash($pass, $data['hash']); + } else { + // clear text password in the database O_o + return ($pass == $data['clear']); + } + } + + /** + * Return user info + * + * Returns info about the given user needs to contain + * at least these fields: + * + * name string full name of the user + * mail string email addres of the user + * grps array list of groups the user is in + * + * @param string $user the user name + * @param bool $requireGroups whether or not the returned data must include groups + * @return array|bool containing user data or false + */ + public function getUserData($user, $requireGroups = true) { + $data = $this->_selectUser($user); + if($data == false) return false; + + if(isset($data['hash'])) unset($data['hash']); + if(isset($data['clean'])) unset($data['clean']); + + if($requireGroups) { + $data['grps'] = $this->_selectUserGroups($data); + if($data['grps'] === false) return false; + } + + return $data; + } + + /** + * Create a new User [implement only where required/possible] + * + * Returns false if the user already exists, null when an error + * occurred and true if everything went well. + * + * The new user HAS TO be added to the default group by this + * function! + * + * Set addUser capability when implemented + * + * @param string $user + * @param string $clear + * @param string $name + * @param string $mail + * @param null|array $grps + * @return bool|null + */ + public function createUser($user, $clear, $name, $mail, $grps = null) { + global $conf; + + if(($info = $this->getUserData($user, false)) !== false) { + msg($this->getLang('userexists'), -1); + return false; // user already exists + } + + // prepare data + if($grps == null) $grps = array(); + array_unshift($grps, $conf['defaultgroup']); + $grps = array_unique($grps); + $hash = auth_cryptPassword($clear); + $userdata = compact('user', 'clear', 'hash', 'name', 'mail'); + + // action protected by transaction + $this->pdo->beginTransaction(); + { + // insert the user + $ok = $this->_query($this->getConf('insert-user'), $userdata); + if($ok === false) goto FAIL; + $userdata = $this->getUserData($user, false); + if($userdata === false) goto FAIL; + + // create all groups that do not exist, the refetch the groups + $allgroups = $this->_selectGroups(); + foreach($grps as $group) { + if(!isset($allgroups[$group])) { + $ok = $this->addGroup($group); + if($ok === false) goto FAIL; + } + } + $allgroups = $this->_selectGroups(); + + // add user to the groups + foreach($grps as $group) { + $ok = $this->_joinGroup($userdata, $allgroups[$group]); + if($ok === false) goto FAIL; + } + } + $this->pdo->commit(); + return true; + + // something went wrong, rollback + FAIL: + $this->pdo->rollBack(); + $this->_debug('Transaction rolled back', 0, __LINE__); + msg($this->getLang('writefail'), -1); + return null; // return error + } + + /** + * Modify user data + * + * @param string $user nick of the user to be changed + * @param array $changes array of field/value pairs to be changed (password will be clear text) + * @return bool + */ + public function modifyUser($user, $changes) { + // secure everything in transaction + $this->pdo->beginTransaction(); + { + $olddata = $this->getUserData($user); + $oldgroups = $olddata['grps']; + unset($olddata['grps']); + + // changing the user name? + if(isset($changes['user'])) { + if($this->getUserData($changes['user'], false)) goto FAIL; + $params = $olddata; + $params['newlogin'] = $changes['user']; + + $ok = $this->_query($this->getConf('update-user-login'), $params); + if($ok === false) goto FAIL; + } + + // changing the password? + if(isset($changes['pass'])) { + $params = $olddata; + $params['clear'] = $changes['pass']; + $params['hash'] = auth_cryptPassword($changes['pass']); + + $ok = $this->_query($this->getConf('update-user-pass'), $params); + if($ok === false) goto FAIL; + } + + // changing info? + if(isset($changes['mail']) || isset($changes['name'])) { + $params = $olddata; + if(isset($changes['mail'])) $params['mail'] = $changes['mail']; + if(isset($changes['name'])) $params['name'] = $changes['name']; + + $ok = $this->_query($this->getConf('update-user-info'), $params); + if($ok === false) goto FAIL; + } + + // changing groups? + if(isset($changes['grps'])) { + $allgroups = $this->_selectGroups(); + + // remove membership for previous groups + foreach($oldgroups as $group) { + if(!in_array($group, $changes['grps']) && isset($allgroups[$group])) { + $ok = $this->_leaveGroup($olddata, $allgroups[$group]); + if($ok === false) goto FAIL; + } + } + + // create all new groups that are missing + $added = 0; + foreach($changes['grps'] as $group) { + if(!isset($allgroups[$group])) { + $ok = $this->addGroup($group); + if($ok === false) goto FAIL; + $added++; + } + } + // reload group info + if($added > 0) $allgroups = $this->_selectGroups(); + + // add membership for new groups + foreach($changes['grps'] as $group) { + if(!in_array($group, $oldgroups)) { + $ok = $this->_joinGroup($olddata, $allgroups[$group]); + if($ok === false) goto FAIL; + } + } + } + + } + $this->pdo->commit(); + return true; + + // something went wrong, rollback + FAIL: + $this->pdo->rollBack(); + $this->_debug('Transaction rolled back', 0, __LINE__); + msg($this->getLang('writefail'), -1); + return false; // return error + } + + /** + * Delete one or more users + * + * Set delUser capability when implemented + * + * @param array $users + * @return int number of users deleted + */ + public function deleteUsers($users) { + $count = 0; + foreach($users as $user) { + if($this->_deleteUser($user)) $count++; + } + return $count; + } + + /** + * Bulk retrieval of user data [implement only where required/possible] + * + * Set getUsers capability when implemented + * + * @param int $start index of first user to be returned + * @param int $limit max number of users to be returned + * @param array $filter array of field/pattern pairs, null for no filter + * @return array list of userinfo (refer getUserData for internal userinfo details) + */ + public function retrieveUsers($start = 0, $limit = -1, $filter = null) { + if($limit < 0) $limit = 10000; // we don't support no limit + if(is_null($filter)) $filter = array(); + + foreach(array('user', 'name', 'mail', 'group') as $key) { + if(!isset($filter[$key])) { + $filter[$key] = '%'; + } else { + $filter[$key] = '%' . $filter[$key] . '%'; + } + } + $filter['start'] = (int) $start; + $filter['end'] = (int) $start + $limit; + $filter['limit'] = (int) $limit; + + $result = $this->_query($this->getConf('list-users'), $filter); + if(!$result) return array(); + $users = array(); + foreach($result as $row) { + if(!isset($row['user'])) { + $this->_debug("Statement did not return 'user' attribute", -1, __LINE__); + return array(); + } + $users[] = $row['user']; + } + return $users; + } + + /** + * Return a count of the number of user which meet $filter criteria + * + * @param array $filter array of field/pattern pairs, empty array for no filter + * @return int + */ + public function getUserCount($filter = array()) { + if(is_null($filter)) $filter = array(); + + foreach(array('user', 'name', 'mail', 'group') as $key) { + if(!isset($filter[$key])) { + $filter[$key] = '%'; + } else { + $filter[$key] = '%' . $filter[$key] . '%'; + } + } + + $result = $this->_query($this->getConf('count-users'), $filter); + if(!$result || !isset($result[0]['count'])) { + $this->_debug("Statement did not return 'count' attribute", -1, __LINE__); + } + return isset($result[0]['count']); + } + + /** + * Create a new group with the given name + * + * @param string $group + * @return bool + */ + public function addGroup($group) { + $sql = $this->getConf('insert-group'); + + $result = $this->_query($sql, array(':group' => $group)); + $this->_clearGroupCache(); + if($result === false) return false; + return true; + } + + /** + * Retrieve groups + * + * Set getGroups capability when implemented + * + * @param int $start + * @param int $limit + * @return array + */ + public function retrieveGroups($start = 0, $limit = 0) { + $groups = array_keys($this->_selectGroups()); + if($groups === false) return array(); + + if(!$limit) { + return array_splice($groups, $start); + } else { + return array_splice($groups, $start, $limit); + } + } + + /** + * Select data of a specified user + * + * @param string $user the user name + * @return bool|array user data, false on error + */ + protected function _selectUser($user) { + $sql = $this->getConf('select-user'); + + $result = $this->_query($sql, array(':user' => $user)); + if(!$result) return false; + + if(count($result) > 1) { + $this->_debug('Found more than one matching user', -1, __LINE__); + return false; + } + + $data = array_shift($result); + $dataok = true; + + if(!isset($data['user'])) { + $this->_debug("Statement did not return 'user' attribute", -1, __LINE__); + $dataok = false; + } + if(!isset($data['hash']) && !isset($data['clear'])) { + $this->_debug("Statement did not return 'clear' or 'hash' attribute", -1, __LINE__); + $dataok = false; + } + if(!isset($data['name'])) { + $this->_debug("Statement did not return 'name' attribute", -1, __LINE__); + $dataok = false; + } + if(!isset($data['mail'])) { + $this->_debug("Statement did not return 'mail' attribute", -1, __LINE__); + $dataok = false; + } + + if(!$dataok) return false; + return $data; + } + + /** + * Delete a user after removing all their group memberships + * + * @param string $user + * @return bool true when the user was deleted + */ + protected function _deleteUser($user) { + $this->pdo->beginTransaction(); + { + $userdata = $this->getUserData($user); + if($userdata === false) goto FAIL; + $allgroups = $this->_selectGroups(); + + // remove group memberships (ignore errors) + foreach($userdata['grps'] as $group) { + if(isset($allgroups[$group])) { + $this->_leaveGroup($userdata, $allgroups[$group]); + } + } + + $ok = $this->_query($this->getConf('delete-user'), $userdata); + if($ok === false) goto FAIL; + } + $this->pdo->commit(); + return true; + + FAIL: + $this->pdo->rollBack(); + return false; + } + + /** + * Select all groups of a user + * + * @param array $userdata The userdata as returned by _selectUser() + * @return array|bool list of group names, false on error + */ + protected function _selectUserGroups($userdata) { + global $conf; + $sql = $this->getConf('select-user-groups'); + $result = $this->_query($sql, $userdata); + if($result === false) return false; + + $groups = array($conf['defaultgroup']); // always add default config + foreach($result as $row) { + if(!isset($row['group'])) { + $this->_debug("No 'group' field returned in select-user-groups statement"); + return false; + } + $groups[] = $row['group']; + } + + $groups = array_unique($groups); + sort($groups); + return $groups; + } + + /** + * Select all available groups + * + * @return array|bool list of all available groups and their properties + */ + protected function _selectGroups() { + if($this->groupcache) return $this->groupcache; + + $sql = $this->getConf('select-groups'); + $result = $this->_query($sql); + if($result === false) return false; + + $groups = array(); + foreach($result as $row) { + if(!isset($row['group'])) { + $this->_debug("No 'group' field returned from select-groups statement", -1, __LINE__); + return false; + } + + // relayout result with group name as key + $group = $row['group']; + $groups[$group] = $row; + } + + ksort($groups); + return $groups; + } + + /** + * Remove all entries from the group cache + */ + protected function _clearGroupCache() { + $this->groupcache = null; + } + + /** + * Adds the user to the group + * + * @param array $userdata all the user data + * @param array $groupdata all the group data + * @return bool + */ + protected function _joinGroup($userdata, $groupdata) { + $data = array_merge($userdata, $groupdata); + $sql = $this->getConf('join-group'); + $result = $this->_query($sql, $data); + if($result === false) return false; + return true; + } + + /** + * Removes the user from the group + * + * @param array $userdata all the user data + * @param array $groupdata all the group data + * @return bool + */ + protected function _leaveGroup($userdata, $groupdata) { + $data = array_merge($userdata, $groupdata); + $sql = $this->getConf('leave-group'); + $result = $this->_query($sql, $data); + if($result === false) return false; + return true; + } + + /** + * Executes a query + * + * @param string $sql The SQL statement to execute + * @param array $arguments Named parameters to be used in the statement + * @return array|int|bool The result as associative array for SELECTs, affected rows for others, false on error + */ + protected function _query($sql, $arguments = array()) { + $sql = trim($sql); + if(empty($sql)) { + $this->_debug('No SQL query given', -1, __LINE__); + return false; + } + + // execute + $params = array(); + $sth = $this->pdo->prepare($sql); + try { + // prepare parameters - we only use those that exist in the SQL + foreach($arguments as $key => $value) { + if(is_array($value)) continue; + if(is_object($value)) continue; + if($key[0] != ':') $key = ":$key"; // prefix with colon if needed + if(strpos($sql, $key) === false) continue; // skip if parameter is missing + + if(is_int($value)) { + $sth->bindValue($key, $value, PDO::PARAM_INT); + } else { + $sth->bindValue($key, $value); + } + $params[$key] = $value; //remember for debugging + } + + $sth->execute(); + if(strtolower(substr($sql, 0, 6)) == 'select') { + $result = $sth->fetchAll(); + } else { + $result = $sth->rowCount(); + } + } catch(Exception $e) { + // report the caller's line + $trace = debug_backtrace(); + $line = $trace[0]['line']; + $dsql = $this->_debugSQL($sql, $params, !defined('DOKU_UNITTEST')); + $this->_debug($e, -1, $line); + $this->_debug("SQL: 
      $dsql
      ", -1, $line); + $result = false; + } + $sth->closeCursor(); + $sth = null; + + return $result; + } + + /** + * Wrapper around msg() but outputs only when debug is enabled + * + * @param string|Exception $message + * @param int $err + * @param int $line + */ + protected function _debug($message, $err = 0, $line = 0) { + if(!$this->getConf('debug')) return; + if(is_a($message, 'Exception')) { + $err = -1; + $msg = $message->getMessage(); + if(!$line) $line = $message->getLine(); + } else { + $msg = $message; + } + + if(defined('DOKU_UNITTEST')) { + printf("\n%s, %s:%d\n", $msg, __FILE__, $line); + } else { + msg('authpdo: ' . $msg, $err, $line, __FILE__); + } + } + + /** + * Check if the given config strings are set + * + * @author Matthias Grimm + * + * @param string[] $keys + * @return bool + */ + protected function _chkcnf($keys) { + foreach($keys as $key) { + if(!trim($this->getConf($key))) return false; + } + + return true; + } + + /** + * create an approximation of the SQL string with parameters replaced + * + * @param string $sql + * @param array $params + * @param bool $htmlescape Should the result be escaped for output in HTML? + * @return string + */ + protected function _debugSQL($sql, $params, $htmlescape = true) { + foreach($params as $key => $val) { + if(is_int($val)) { + $val = $this->pdo->quote($val, PDO::PARAM_INT); + } elseif(is_bool($val)) { + $val = $this->pdo->quote($val, PDO::PARAM_BOOL); + } elseif(is_null($val)) { + $val = 'NULL'; + } else { + $val = $this->pdo->quote($val); + } + $sql = str_replace($key, $val, $sql); + } + if($htmlescape) $sql = hsc($sql); + return $sql; + } +} + +// vim:ts=4:sw=4:et: diff --git a/sources/lib/plugins/authpdo/conf/default.php b/sources/lib/plugins/authpdo/conf/default.php new file mode 100644 index 0000000..4e25037 --- /dev/null +++ b/sources/lib/plugins/authpdo/conf/default.php @@ -0,0 +1,110 @@ + + */ + +$conf['debug'] = 0; +$conf['dsn'] = ''; +$conf['user'] = ''; +$conf['pass'] = ''; + +/** + * statement to select a single user identified by its login name + * + * input: :user + * return: user, name, mail, (clear|hash), [uid], [*] + */ +$conf['select-user'] = ''; + +/** + * statement to select a single user identified by its login name + * + * input: :user, [uid] + * return: group + */ +$conf['select-user-groups'] = ''; + +/** + * Select all the existing group names + * + * return: group, [gid], [*] + */ +$conf['select-groups'] = ''; + +/** + * Create a new user + * + * input: :user, :name, :mail, (:clear|:hash) + */ +$conf['insert-user'] = ''; + +/** + * Remove a user + * + * input: :user, [:uid], [*] + */ +$conf['delete-user'] = ''; + +/** + * list user names matching the given criteria + * + * Make sure the list is distinct and sorted by user name. Apply the given limit and offset + * + * input: :user, :name, :mail, :group, :start, :end, :limit + * out: user + */ +$conf['list-users'] = ''; + +/** + * count user names matching the given criteria + * + * Make sure the counted list is distinct + * + * input: :user, :name, :mail, :group + * out: count + */ +$conf['count-users'] = ''; + +/** + * Update user data (except password and user name) + * + * input: :user, :name, :mail, [:uid], [*] + */ +$conf['update-user-info'] = ''; + +/** + * Update user name aka login + * + * input: :user, :newlogin, [:uid], [*] + */ +$conf['update-user-login'] = ''; + +/** + * Update user password + * + * input: :user, :clear, :hash, [:uid], [*] + */ +$conf['update-user-pass'] = ''; + +/** + * Create a new group + * + * input: :group + */ +$conf['insert-group'] = ''; + +/** + * Make user join group + * + * input: :user, [:uid], group, [:gid], [*] + */ +$conf['join-group'] = ''; + +/** + * Make user leave group + * + * input: :user, [:uid], group, [:gid], [*] + */ +$conf['leave-group'] = ''; diff --git a/sources/lib/plugins/authpdo/conf/metadata.php b/sources/lib/plugins/authpdo/conf/metadata.php new file mode 100644 index 0000000..85d1c59 --- /dev/null +++ b/sources/lib/plugins/authpdo/conf/metadata.php @@ -0,0 +1,26 @@ + + */ + +$meta['debug'] = array('onoff', '_caution' => 'security'); +$meta['dsn'] = array('string', '_caution' => 'danger'); +$meta['user'] = array('string', '_caution' => 'danger'); +$meta['pass'] = array('password', '_caution' => 'danger', '_code' => 'base64'); +$meta['select-user'] = array('', '_caution' => 'danger'); +$meta['select-user-groups'] = array('', '_caution' => 'danger'); +$meta['select-groups'] = array('', '_caution' => 'danger'); +$meta['insert-user'] = array('', '_caution' => 'danger'); +$meta['delete-user'] = array('', '_caution' => 'danger'); +$meta['list-users'] = array('', '_caution' => 'danger'); +$meta['count-users'] = array('', '_caution' => 'danger'); +$meta['update-user-info'] = array('', '_caution' => 'danger'); +$meta['update-user-login'] = array('', '_caution' => 'danger'); +$meta['update-user-pass'] = array('', '_caution' => 'danger'); +$meta['insert-group'] = array('', '_caution' => 'danger'); +$meta['join-group'] = array('', '_caution' => 'danger'); +$meta['leave-group'] = array('', '_caution' => 'danger'); + + diff --git a/sources/lib/plugins/authpdo/lang/bg/lang.php b/sources/lib/plugins/authpdo/lang/bg/lang.php new file mode 100644 index 0000000..f6532c4 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/bg/lang.php @@ -0,0 +1,9 @@ + + */ +$lang['connectfail'] = 'Свързването Ñ Ð±Ð°Ð·Ð°Ñ‚Ð° данни Ñе провали.'; +$lang['userexists'] = 'За Ñъжаление вече ÑъщеÑтвува потребител Ñ Ñ‚Ð¾Ð²Ð° име.'; diff --git a/sources/lib/plugins/authpdo/lang/cs/lang.php b/sources/lib/plugins/authpdo/lang/cs/lang.php new file mode 100644 index 0000000..cf52a18 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/cs/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Selhalo pÅ™ipojení k databázi.'; +$lang['userexists'] = 'Omlouváme se, ale uživatel s tímto jménem již existuje.'; +$lang['writefail'] = 'Nelze zmÄ›nit údaje uživatele. Informujte prosím správce wiki'; diff --git a/sources/lib/plugins/authpdo/lang/cy/lang.php b/sources/lib/plugins/authpdo/lang/cy/lang.php new file mode 100644 index 0000000..449e3ef --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/cy/lang.php @@ -0,0 +1,12 @@ + + * @author Hendrik Diel + * @author Philip Knack + */ +$lang['connectfail'] = 'Verbindung zur Datenbank fehlgeschlagen.'; +$lang['userexists'] = 'Entschuldigung, aber dieser Benutzername ist bereits vergeben.'; +$lang['writefail'] = 'Die Benutzerdaten konnten nicht geändert werden. Bitte wenden Sie sich an den Wiki-Admin.'; diff --git a/sources/lib/plugins/authpdo/lang/en/lang.php b/sources/lib/plugins/authpdo/lang/en/lang.php new file mode 100644 index 0000000..3e1482e --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/en/lang.php @@ -0,0 +1,12 @@ + + */ + +$lang['debug'] = 'Print out detailed error messages. Should be disabled after setup.'; +$lang['dsn'] = 'The DSN to connect to the database.'; +$lang['user'] = 'The user for the above database connection (empty for sqlite)'; +$lang['pass'] = 'The password for the above database connection (empty for sqlite)'; +$lang['select-user'] = 'SQL Statement to select the data of a single user'; +$lang['select-user-groups'] = 'SQL Statement to select all groups of a single user'; +$lang['select-groups'] = 'SQL Statement to select all available groups'; +$lang['insert-user'] = 'SQL Statement to insert a new user into the database'; +$lang['delete-user'] = 'SQL Statement to remove a single user from the database'; +$lang['list-users'] = 'SQL Statement to list users matching a filter'; +$lang['count-users'] = 'SQL Statement to count users matching a filter'; +$lang['update-user-info'] = 'SQL Statement to update the full name and email address of a single user'; +$lang['update-user-login'] = 'SQL Statement to update the login name of a single user'; +$lang['update-user-pass'] = 'SQL Statement to update the password of a single user'; +$lang['insert-group'] = 'SQL Statement to insert a new group into the database'; +$lang['join-group'] = 'SQL Statement to add a user to an exisitng group'; +$lang['leave-group'] = 'SQL Statement to remove a user from a group'; diff --git a/sources/lib/plugins/authpdo/lang/es/lang.php b/sources/lib/plugins/authpdo/lang/es/lang.php new file mode 100644 index 0000000..9bd9211 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/es/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Error al conectar con la base de datos.'; +$lang['userexists'] = 'Lo sentimos, ya existe un usuario con ese inicio de sesión.'; +$lang['writefail'] = 'No es posible modificar los datos del usuario. Por favor, informa al Administrador del Wiki'; diff --git a/sources/lib/plugins/authpdo/lang/fa/lang.php b/sources/lib/plugins/authpdo/lang/fa/lang.php new file mode 100644 index 0000000..b26e836 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/fa/lang.php @@ -0,0 +1,11 @@ + + * @author Masoud Sadrnezhaad + */ +$lang['connectfail'] = 'خطا در اتصال به دیتابیس'; +$lang['userexists'] = 'با عرض پوزش، یک کاربر با این نام از قبل وجود دارد.'; +$lang['writefail'] = 'امکان تغییر داده کاربر وجود نداشت. لطÙا مسئول Wiki را آگاه کنید.'; diff --git a/sources/lib/plugins/authpdo/lang/fr/lang.php b/sources/lib/plugins/authpdo/lang/fr/lang.php new file mode 100644 index 0000000..ee87b0d --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/fr/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Impossible de se connecter à la base de données.'; +$lang['userexists'] = 'Désolé, un utilisateur avec cet identifiant existe déjà.'; +$lang['writefail'] = 'Impossible de modifier les données utilisateur. Veuillez en informer l\'administrateur du Wiki.'; diff --git a/sources/lib/plugins/authpdo/lang/hr/lang.php b/sources/lib/plugins/authpdo/lang/hr/lang.php new file mode 100644 index 0000000..3acdbf4 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/hr/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Ne mogu se spojiti na bazu.'; +$lang['userexists'] = 'Oprostite ali korisnik s ovom prijavom već postoji.'; +$lang['writefail'] = 'Ne mogu izmijeniti podatke. Molim obavijestite Wiki administratora'; diff --git a/sources/lib/plugins/authpdo/lang/hu/lang.php b/sources/lib/plugins/authpdo/lang/hu/lang.php new file mode 100644 index 0000000..1a2098e --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/hu/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Az adatbázishoz való csatlakozás sikertelen.'; +$lang['userexists'] = 'Sajnos már létezik ilyen azonosítójú felhasználó.'; +$lang['writefail'] = 'A felhasználói adatok módosítása sikertelen. Kérlek, fordulj a wiki rendszergazdájához!'; diff --git a/sources/lib/plugins/authpdo/lang/it/lang.php b/sources/lib/plugins/authpdo/lang/it/lang.php new file mode 100644 index 0000000..5c0a3f1 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/it/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Connessione fallita al database.'; +$lang['userexists'] = 'Spiacente, esiste già un utente con queste credenziali.'; +$lang['writefail'] = 'Non è possibile cambiare le informazioni utente. Si prega di informare l\'Amministratore del wiki'; diff --git a/sources/lib/plugins/authpdo/lang/ja/lang.php b/sources/lib/plugins/authpdo/lang/ja/lang.php new file mode 100644 index 0000000..1cd441b --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/ja/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'データベースã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚'; +$lang['userexists'] = 'ã“ã®ãƒ­ã‚°ã‚¤ãƒ³åã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒæ—¢ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚'; +$lang['writefail'] = 'ユーザーデータを変更ã§ãã¾ã›ã‚“。Wiki ã®ç®¡ç†è€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。'; diff --git a/sources/lib/plugins/authpdo/lang/ko/lang.php b/sources/lib/plugins/authpdo/lang/ko/lang.php new file mode 100644 index 0000000..0b14197 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/ko/lang.php @@ -0,0 +1,11 @@ + + * @author Myeongjin + */ +$lang['connectfail'] = 'ë°ì´í„°ë² ì´ìŠ¤ì— 연결하는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.'; +$lang['userexists'] = '죄송하지만 ì´ ê³„ì •ìœ¼ë¡œ ì´ë¯¸ 로그ì¸í•œ 사용ìžê°€ 있습니다.'; +$lang['writefail'] = 'ì‚¬ìš©ìž ë°ì´í„°ë¥¼ 수정할 수 없습니다. 위키 관리ìžì—게 문ì˜í•˜ì‹œê¸° ë°”ëžë‹ˆë‹¤'; diff --git a/sources/lib/plugins/authpdo/lang/nl/lang.php b/sources/lib/plugins/authpdo/lang/nl/lang.php new file mode 100644 index 0000000..b426f6b --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/nl/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Connectie met de database mislukt.'; +$lang['userexists'] = 'Sorry, een gebruiker met deze login bestaat reeds.'; +$lang['writefail'] = 'Onmogelijk om de gebruikers data te wijzigen. Gelieve de Wiki-Admin te informeren.'; diff --git a/sources/lib/plugins/authpdo/lang/pt-br/lang.php b/sources/lib/plugins/authpdo/lang/pt-br/lang.php new file mode 100644 index 0000000..2008ae6 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/pt-br/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Não foi possível conectar ao banco de dados.'; +$lang['userexists'] = 'Desculpe, mas já existe esse nome de usuário.'; +$lang['writefail'] = 'Não foi possível modificar os dados do usuário. Por favor, informe ao administrador do Wiki.'; diff --git a/sources/lib/plugins/authpdo/lang/pt/lang.php b/sources/lib/plugins/authpdo/lang/pt/lang.php new file mode 100644 index 0000000..f2eca8f --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/pt/lang.php @@ -0,0 +1,9 @@ + + */ +$lang['connectfail'] = 'Falha ao conectar com o banco de dados.'; +$lang['userexists'] = 'Desculpe, esse login já está sendo usado.'; diff --git a/sources/lib/plugins/authpdo/lang/ru/lang.php b/sources/lib/plugins/authpdo/lang/ru/lang.php new file mode 100644 index 0000000..9f75d17 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/ru/lang.php @@ -0,0 +1,11 @@ + + * @author Aleksandr Selivanov + */ +$lang['connectfail'] = 'Ошибка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ Ð±Ð°Ð·Ð¾Ð¹ данных.'; +$lang['userexists'] = 'Извините, пользователь Ñ Ñ‚Ð°ÐºÐ¸Ð¼ логином уже ÑущеÑтвует.'; +$lang['writefail'] = 'Ðевозможно изменить данные пользователÑ. Сообщите об Ñтом админиÑтратору вики.'; diff --git a/sources/lib/plugins/authpdo/lang/sk/lang.php b/sources/lib/plugins/authpdo/lang/sk/lang.php new file mode 100644 index 0000000..d143bbf --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/sk/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = 'Nepodarilo sa pripojiÅ¥ k databáze.'; +$lang['userexists'] = 'Ľutujem, ale používateľ s týmto prihlasovacím menom už existuje.'; +$lang['writefail'] = 'Nie je možné zmeniÅ¥ údaje používateľa, informujte prosím administrátora Wiki.'; diff --git a/sources/lib/plugins/authpdo/lang/tr/lang.php b/sources/lib/plugins/authpdo/lang/tr/lang.php new file mode 100644 index 0000000..30576c0 --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/tr/lang.php @@ -0,0 +1,8 @@ + + */ +$lang['connectfail'] = 'Veritabanına baÄŸlantı kurulamadı.'; diff --git a/sources/lib/plugins/authpdo/lang/zh/lang.php b/sources/lib/plugins/authpdo/lang/zh/lang.php new file mode 100644 index 0000000..06c258f --- /dev/null +++ b/sources/lib/plugins/authpdo/lang/zh/lang.php @@ -0,0 +1,10 @@ + + */ +$lang['connectfail'] = '连接数æ®åº“失败'; +$lang['userexists'] = '抱歉，用户å已被使用。'; +$lang['writefail'] = '无法修改用户数æ®ã€‚请通知管ç†å‘˜'; diff --git a/sources/lib/plugins/authpdo/plugin.info.txt b/sources/lib/plugins/authpdo/plugin.info.txt new file mode 100644 index 0000000..6784fd0 --- /dev/null +++ b/sources/lib/plugins/authpdo/plugin.info.txt @@ -0,0 +1,7 @@ +base authpdo +author Andreas Gohr +email andi@splitbrain.org +date 2016-01-29 +name authpdo plugin +desc Authenticate against a database via PDO +url https://www.dokuwiki.org/plugin:authpdo diff --git a/sources/lib/plugins/authpgsql/auth.php b/sources/lib/plugins/authpgsql/auth.php index 4cb280a..7b677d3 100644 --- a/sources/lib/plugins/authpgsql/auth.php +++ b/sources/lib/plugins/authpgsql/auth.php @@ -303,7 +303,7 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql { $dsn .= ' port='.$this->conf['port']; $dsn .= ' dbname='.$this->conf['database']; $dsn .= ' user='.$this->conf['user']; - $dsn .= ' password='.$this->conf['password']; + $dsn .= ' password='.conf_decodeString($this->conf['password']); $con = @pg_connect($dsn); if($con) { @@ -428,4 +428,4 @@ class auth_plugin_authpgsql extends auth_plugin_authmysql { } return $string; } -} \ No newline at end of file +} diff --git a/sources/lib/plugins/authpgsql/conf/metadata.php b/sources/lib/plugins/authpgsql/conf/metadata.php index fbd0512..cb9c456 100644 --- a/sources/lib/plugins/authpgsql/conf/metadata.php +++ b/sources/lib/plugins/authpgsql/conf/metadata.php @@ -3,7 +3,7 @@ $meta['server'] = array('string','_caution' => 'danger'); $meta['port'] = array('numeric','_caution' => 'danger'); $meta['user'] = array('string','_caution' => 'danger'); -$meta['password'] = array('password','_caution' => 'danger'); +$meta['password'] = array('password','_caution' => 'danger','_code'=>'base64'); $meta['database'] = array('string','_caution' => 'danger'); $meta['debug'] = array('onoff','_caution' => 'security'); $meta['forwardClearPass'] = array('onoff','_caution' => 'danger'); @@ -30,4 +30,4 @@ $meta['UpdateEmail'] = array('string','_caution' => 'danger'); $meta['UpdateName'] = array('string','_caution' => 'danger'); $meta['UpdateTarget'] = array('string','_caution' => 'danger'); $meta['delUserGroup'] = array('','_caution' => 'danger'); -$meta['getGroupID'] = array('','_caution' => 'danger'); \ No newline at end of file +$meta['getGroupID'] = array('','_caution' => 'danger'); diff --git a/sources/lib/plugins/authpgsql/lang/cy/settings.php b/sources/lib/plugins/authpgsql/lang/cy/settings.php new file mode 100644 index 0000000..0c32ad7 --- /dev/null +++ b/sources/lib/plugins/authpgsql/lang/cy/settings.php @@ -0,0 +1,33 @@ + * @author soer9648 */ diff --git a/sources/lib/plugins/authpgsql/lang/fa/settings.php b/sources/lib/plugins/authpgsql/lang/fa/settings.php index 8134939..5afe811 100644 --- a/sources/lib/plugins/authpgsql/lang/fa/settings.php +++ b/sources/lib/plugins/authpgsql/lang/fa/settings.php @@ -4,5 +4,37 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Mohamad Mehdi Habibi + * @author Mohmmad Razavi + * @author Masoud Sadrnezhaad */ +$lang['server'] = 'سرور PostgreSQL شما'; +$lang['port'] = 'پورت سرور PostgreSQL شما'; +$lang['user'] = 'نام کاربری PostgreSQL'; +$lang['password'] = 'رمزعبور کابر بالا'; $lang['database'] = 'پایگاه داده مورد استÙاده'; +$lang['debug'] = 'نمایش اطلاعات بیشتر برای خطایابی'; +$lang['forwardClearPass'] = 'به جای استÙاده از امکان رمزنگاری، پسورد کاربران به صورت متنی به دستورات SQL ارسال شود'; +$lang['checkPass'] = 'دستور SQL برای Ú†Ú© کردن پسورد'; +$lang['getUserInfo'] = 'دستور SQL برای دریاÙت اطلاعات کاربران'; +$lang['getGroups'] = 'دستور SQL برای دریاÙت گروه‌های یک کاربر'; +$lang['getUsers'] = 'دستور SQL برای Ùهرست کردن تمام کاربران'; +$lang['FilterLogin'] = 'کلاز SQL برای Ùیلتر کردن کاربران با نام کاربری'; +$lang['FilterName'] = 'کلاز SQL برای Ùیلتر کردن کاربران با نام کامل'; +$lang['FilterEmail'] = 'کلاز SQL برای Ùیلتر کردن کاربران با آدرس ایمیل'; +$lang['FilterGroup'] = 'کلاز SQL برای Ùیلتر کردن کاربران با عضویت در گروه'; +$lang['SortOrder'] = 'کلاز SQL برای مرتب کردن کاربران'; +$lang['addUser'] = 'دستور SQL برای اÙزودن کاربر جدید'; +$lang['addGroup'] = 'دستور SQL برای اÙزودن گروه جدید'; +$lang['addUserGroup'] = 'دستور SQL برای اÙزودن یک کاربر به یک گروه موجود'; +$lang['delGroup'] = 'دستور SQL برای پاک کردن یک گروه'; +$lang['getUserID'] = 'دستور SQL برای گرÙتن کلید اصلی یک کاربر'; +$lang['delUser'] = 'دستور SQL برای حذ٠یک کاربر'; +$lang['delUserRefs'] = 'دستور SQL برای پاک کردن یک کاربر از تمام گروه‌ها'; +$lang['updateUser'] = 'دستور SQL برای به‌روزرسانی پروÙایل کاربر'; +$lang['UpdateLogin'] = 'کلاز Update برای به روز کردن نام کاربری'; +$lang['UpdatePass'] = 'کلاز Update برای به روز کردن پسورد کاربر'; +$lang['UpdateEmail'] = 'کلاز Update برای به روز کردن ایمیل کاربر'; +$lang['UpdateName'] = 'کلاز Update برای به روز کردن نام کامل کاربر'; +$lang['UpdateTarget'] = 'کلاز Limit برای شناسایی کاربر هنگام به روز رسانی'; +$lang['delUserGroup'] = 'دستور SQL برای حذ٠یک کاربر از یک گروه'; +$lang['getGroupID'] = 'دستور SQL برای گرÙتن کلید اصلی یک گروه'; diff --git a/sources/lib/plugins/authpgsql/lang/it/settings.php b/sources/lib/plugins/authpgsql/lang/it/settings.php index 26e9a86..e786f2f 100644 --- a/sources/lib/plugins/authpgsql/lang/it/settings.php +++ b/sources/lib/plugins/authpgsql/lang/it/settings.php @@ -18,7 +18,7 @@ $lang['checkPass'] = 'Istruzione SQL per il controllo password'; $lang['getUserInfo'] = 'Istruzione SQL per recuperare le informazioni utente'; $lang['getGroups'] = 'Istruzione SQL per recuperare il gruppo di appartenenza di un utente'; $lang['getUsers'] = 'Istruzione SQL per elencare tutti gli utenti'; -$lang['FilterLogin'] = 'Condizione SQL per filtrare gli utenti in base al nome di autenticazione'; +$lang['FilterLogin'] = 'Condizione SQL per filtrare gli utenti in base al nome di accesso'; $lang['FilterName'] = 'Condizione SQL per filtrare gli utenti in base al nome completo'; $lang['FilterEmail'] = 'Condizione SQL per filtrare gli utenti in base all\'indirizzo e-mail'; $lang['FilterGroup'] = 'Condizione SQL per filtrare gli utenti in base al gruppo di appartenenza'; @@ -31,5 +31,10 @@ $lang['getUserID'] = 'Istruzione SQL per recuperare la primary key d $lang['delUser'] = 'Istruzione SQL per cancellare un utente'; $lang['delUserRefs'] = 'Istruzione SQL per rimuovere un utente da tutti i gruppi'; $lang['updateUser'] = 'Istruzione SQL per aggiornare il profilo utente'; +$lang['UpdateLogin'] = 'Condizione SQL per aggiornare il nome di accesso dell\'utente'; +$lang['UpdatePass'] = 'Condizione SQL per aggiornare la password utente'; +$lang['UpdateEmail'] = 'Condizione SQL per aggiornare l\'e-mail utente'; +$lang['UpdateName'] = 'Condizione SQL per aggiornare il nome completo dell\'utente'; +$lang['UpdateTarget'] = 'Condizione SQL per identificare l\'utente quando aggiornato'; $lang['delUserGroup'] = 'Istruzione SQL per rimuovere un utente da un dato gruppo'; $lang['getGroupID'] = 'Istruzione SQL per avere la primary key di un dato gruppo'; diff --git a/sources/lib/plugins/authpgsql/lang/ja/settings.php b/sources/lib/plugins/authpgsql/lang/ja/settings.php index c4a82a1..001008c 100644 --- a/sources/lib/plugins/authpgsql/lang/ja/settings.php +++ b/sources/lib/plugins/authpgsql/lang/ja/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Satoshi Sahara */ $lang['server'] = 'PostgreSQL ã®ã‚µãƒ¼ãƒãƒ¼å'; diff --git a/sources/lib/plugins/authpgsql/lang/ko/settings.php b/sources/lib/plugins/authpgsql/lang/ko/settings.php index bdf38b3..fd45bfa 100644 --- a/sources/lib/plugins/authpgsql/lang/ko/settings.php +++ b/sources/lib/plugins/authpgsql/lang/ko/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin * @author Garam */ diff --git a/sources/lib/plugins/authpgsql/lang/pt-br/settings.php b/sources/lib/plugins/authpgsql/lang/pt-br/settings.php index 8d77253..a06ce0e 100644 --- a/sources/lib/plugins/authpgsql/lang/pt-br/settings.php +++ b/sources/lib/plugins/authpgsql/lang/pt-br/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Victor Westmann * @author Frederico Guimarães */ diff --git a/sources/lib/plugins/authpgsql/lang/sk/settings.php b/sources/lib/plugins/authpgsql/lang/sk/settings.php index 9013a75..acdc2d7 100644 --- a/sources/lib/plugins/authpgsql/lang/sk/settings.php +++ b/sources/lib/plugins/authpgsql/lang/sk/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek */ $lang['server'] = 'PostgreSQL server'; diff --git a/sources/lib/plugins/authpgsql/lang/zh/settings.php b/sources/lib/plugins/authpgsql/lang/zh/settings.php index 32adb37..5140d11 100644 --- a/sources/lib/plugins/authpgsql/lang/zh/settings.php +++ b/sources/lib/plugins/authpgsql/lang/zh/settings.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme */ $lang['server'] = '您的 PostgreSQL æœåŠ¡å™¨'; diff --git a/sources/lib/plugins/authpgsql/plugin.info.txt b/sources/lib/plugins/authpgsql/plugin.info.txt index 1d53ca0..033c291 100644 --- a/sources/lib/plugins/authpgsql/plugin.info.txt +++ b/sources/lib/plugins/authpgsql/plugin.info.txt @@ -2,6 +2,6 @@ base authpgsql author Andreas Gohr email andi@splitbrain.org date 2015-07-13 -name PostgreSQL Auth Plugin -desc Provides user authentication against a PostgreSQL database +name [DEPRECATED] PostgreSQL Auth Plugin +desc â–¶This plugin will be removed from DokuWiki in a future release! Use authpdo instead.â—€ Provides user authentication against a PostgreSQL database url http://www.dokuwiki.org/plugin:authpgsql diff --git a/sources/lib/plugins/authplain/auth.php b/sources/lib/plugins/authplain/auth.php index 8ec632d..7dfa43a 100644 --- a/sources/lib/plugins/authplain/auth.php +++ b/sources/lib/plugins/authplain/auth.php @@ -173,6 +173,13 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { msg($this->getLang('usernotexists'), -1); return false; } + + // don't modify protected users + if(!empty($userinfo['protected'])) { + msg(sprintf($this->getLang('protected'), hsc($user)), -1); + return false; + } + if(!is_array($changes) || !count($changes)) return true; // update userinfo with new data, remembering to encrypt any password @@ -215,6 +222,11 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { $deleted = array(); foreach($users as $user) { + // don't delete protected users + if(!empty($this->users[$user]['protected'])) { + msg(sprintf($this->getLang('protected'), hsc($user)), -1); + continue; + } if(isset($this->users[$user])) $deleted[] = preg_quote($user, '/'); } @@ -324,28 +336,48 @@ class auth_plugin_authplain extends DokuWiki_Auth_Plugin { protected function _loadUserData() { global $config_cascade; - $this->users = array(); + $this->users = $this->_readUserFile($config_cascade['plainauth.users']['default']); - if(!file_exists($config_cascade['plainauth.users']['default'])) return; + // support protected users + if(!empty($config_cascade['plainauth.users']['protected'])) { + $protected = $this->_readUserFile($config_cascade['plainauth.users']['protected']); + foreach(array_keys($protected) as $key) { + $protected[$key]['protected'] = true; + } + $this->users = array_merge($this->users, $protected); + } + } - $lines = file($config_cascade['plainauth.users']['default']); + /** + * Read user data from given file + * + * ignores non existing files + * + * @param string $file the file to load data from + * @return array + */ + protected function _readUserFile($file) { + $users = array(); + if(!file_exists($file)) return $users; + + $lines = file($file); foreach($lines as $line) { $line = preg_replace('/#.*$/', '', $line); //ignore comments $line = trim($line); if(empty($line)) continue; - /* NB: preg_split can be deprecated/replaced with str_getcsv once dokuwiki is min php 5.3 */ $row = $this->_splitUserData($line); $row = str_replace('\\:', ':', $row); $row = str_replace('\\\\', '\\', $row); $groups = array_values(array_filter(explode(",", $row[4]))); - $this->users[$row[0]]['pass'] = $row[1]; - $this->users[$row[0]]['name'] = urldecode($row[2]); - $this->users[$row[0]]['mail'] = $row[3]; - $this->users[$row[0]]['grps'] = $groups; + $users[$row[0]]['pass'] = $row[1]; + $users[$row[0]]['name'] = urldecode($row[2]); + $users[$row[0]]['mail'] = $row[3]; + $users[$row[0]]['grps'] = $groups; } + return $users; } protected function _splitUserData($line){ diff --git a/sources/lib/plugins/authplain/lang/cy/lang.php b/sources/lib/plugins/authplain/lang/cy/lang.php new file mode 100644 index 0000000..7f789e5 --- /dev/null +++ b/sources/lib/plugins/authplain/lang/cy/lang.php @@ -0,0 +1,8 @@ + */ -$lang['userexists'] = 'نام کاربری‌ای Ú©Ù‡ وارد کردید قبلن استÙاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.'; +$lang['userexists'] = 'نام کاربری‌ای Ú©Ù‡ وارد کردید قبلن استÙاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.'; +$lang['usernotexists'] = 'متاسÙانه این کاربر وجود ندارد.'; +$lang['writefail'] = 'امکان ویرایش اطلاعات کاربر وجود ندارد. لطÙا ادمین ویکی را مطلع نمایید.'; diff --git a/sources/lib/plugins/authplain/lang/fi/lang.php b/sources/lib/plugins/authplain/lang/fi/lang.php index 3a77f3e..abdaf67 100644 --- a/sources/lib/plugins/authplain/lang/fi/lang.php +++ b/sources/lib/plugins/authplain/lang/fi/lang.php @@ -1,6 +1,7 @@ * @author Nicolas Friedli + * @author Schplurtz le Déboulonné */ $lang['userexists'] = 'Désolé, ce nom d\'utilisateur est déjà pris.'; $lang['usernotexists'] = 'Désolé, cet utilisateur n\'existe pas.'; $lang['writefail'] = 'Impossible de modifier les données utilisateur. Merci d\'en informer l\'administrateur du wiki.'; +$lang['protected'] = 'Les données du compte d\'utilisateur %s sont protégées et ne peuvent être ni modifiées ni supprimées.'; diff --git a/sources/lib/plugins/authplain/lang/he/lang.php b/sources/lib/plugins/authplain/lang/he/lang.php index 01d877b..160968e 100644 --- a/sources/lib/plugins/authplain/lang/he/lang.php +++ b/sources/lib/plugins/authplain/lang/he/lang.php @@ -1,6 +1,7 @@ */ -$lang['userexists'] = 'Korisnik s tim korisniÄkim imenom već postoji.'; +$lang['userexists'] = 'Korisnik s tim korisniÄkim imenom već postoji.'; +$lang['usernotexists'] = 'Nažalost korisnik ne postoji'; +$lang['writefail'] = 'Ne mogu izmijeniti korisniÄke podatke. Molim obavijestite svog Wiki administratora'; +$lang['protected'] = 'Podaci za korisnika %s su zaÅ¡tićeni i ne mogu biti izmijenjeni ili obrisani.'; diff --git a/sources/lib/plugins/authplain/lang/it/lang.php b/sources/lib/plugins/authplain/lang/it/lang.php index 610b512..59c8c30 100644 --- a/sources/lib/plugins/authplain/lang/it/lang.php +++ b/sources/lib/plugins/authplain/lang/it/lang.php @@ -3,5 +3,8 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * + * @author Torpedo */ $lang['userexists'] = 'Il nome utente inserito esiste già.'; +$lang['usernotexists'] = 'Spiacente, quell\'utente non esiste.'; +$lang['writefail'] = 'Impossibile modificare i dati utente. Per favore informa l\'Amministratore del Wiki'; diff --git a/sources/lib/plugins/authplain/lang/ja/lang.php b/sources/lib/plugins/authplain/lang/ja/lang.php index 6aa0be7..f290cba 100644 --- a/sources/lib/plugins/authplain/lang/ja/lang.php +++ b/sources/lib/plugins/authplain/lang/ja/lang.php @@ -2,9 +2,10 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hideaki SAWADA */ $lang['userexists'] = 'ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¯æ—¢ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚'; $lang['usernotexists'] = 'ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯æœªç™»éŒ²ã§ã™ã€‚'; $lang['writefail'] = 'ユーザーデータを変更ã§ãã¾ã›ã‚“。管ç†è€…ã«å•ã„åˆã‚ã›ã¦ãã ã•ã„。'; +$lang['protected'] = 'ユーザ %s ã®ãƒ‡ãƒ¼ã‚¿ã¯ä¿è­·ã•ã‚Œã¦ãŠã‚Šã€å¤‰æ›´ãƒ»å‰Šé™¤ã¯ã§ãã¾ã›ã‚“。'; diff --git a/sources/lib/plugins/authplain/lang/ko/lang.php b/sources/lib/plugins/authplain/lang/ko/lang.php index 5066982..402a963 100644 --- a/sources/lib/plugins/authplain/lang/ko/lang.php +++ b/sources/lib/plugins/authplain/lang/ko/lang.php @@ -2,9 +2,10 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin */ $lang['userexists'] = '죄송하지만 ê°™ì€ ì´ë¦„ì„ ì‚¬ìš©í•˜ëŠ” 사용ìžê°€ 있습니다.'; $lang['usernotexists'] = '죄송하지만 해당 사용ìžê°€ 존재하지 않습니다.'; $lang['writefail'] = 'ì‚¬ìš©ìž ë°ì´í„°ë¥¼ 수정할 수 없습니다. 위키 관리ìžì—게 문ì˜í•˜ì‹œê¸° ë°”ëžë‹ˆë‹¤'; +$lang['protected'] = '%s 사용ìžì˜ ë°ì´í„°ëŠ” 잠겨 있어 수정하거나 삭제할 수 없습니다.'; diff --git a/sources/lib/plugins/authplain/lang/pt-br/lang.php b/sources/lib/plugins/authplain/lang/pt-br/lang.php index 654ec2b..ee42b83 100644 --- a/sources/lib/plugins/authplain/lang/pt-br/lang.php +++ b/sources/lib/plugins/authplain/lang/pt-br/lang.php @@ -2,9 +2,11 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães + * @author Felipe Castro */ $lang['userexists'] = 'Desculpe, mas já existe um usuário com esse nome.'; $lang['usernotexists'] = 'Desculpe, mas esse usuário não existe.'; $lang['writefail'] = 'Não foi possível modificar os dados do usuário. Por favor, informe ao administrador do Wiki.'; +$lang['protected'] = 'Dados para o usuário %s estão protegidos e não podem ser modificados ou apagados.'; diff --git a/sources/lib/plugins/authplain/lang/ro/lang.php b/sources/lib/plugins/authplain/lang/ro/lang.php index eb243a1..ece72b1 100644 --- a/sources/lib/plugins/authplain/lang/ro/lang.php +++ b/sources/lib/plugins/authplain/lang/ro/lang.php @@ -1,6 +1,7 @@ + * @author Aleksandr Selivanov */ $lang['userexists'] = 'Извините, пользователь Ñ Ñ‚Ð°ÐºÐ¸Ð¼ логином уже ÑущеÑтвует.'; -$lang['usernotexists'] = 'Этот пользователь незарегиÑтрирован.'; +$lang['usernotexists'] = 'Этот пользователь не зарегиÑтрирован.'; $lang['writefail'] = 'Ðевозможно обновить данные пользователÑ. СвÑжитеÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратором вики'; diff --git a/sources/lib/plugins/authplain/lang/sk/lang.php b/sources/lib/plugins/authplain/lang/sk/lang.php index 5153fc1..713b321 100644 --- a/sources/lib/plugins/authplain/lang/sk/lang.php +++ b/sources/lib/plugins/authplain/lang/sk/lang.php @@ -1,6 +1,9 @@ */ -$lang['userexists'] = 'Užívateľ s rovnakým menom je už zaregistrovaný.'; +$lang['userexists'] = 'Užívateľ s rovnakým menom je už zaregistrovaný.'; +$lang['writefail'] = 'Nie je možné zmeniÅ¥ údaje používateľa, informujte prosím administrátora Wiki.'; diff --git a/sources/lib/plugins/authplain/lang/th/lang.php b/sources/lib/plugins/authplain/lang/th/lang.php index c7aaf68..463a279 100644 --- a/sources/lib/plugins/authplain/lang/th/lang.php +++ b/sources/lib/plugins/authplain/lang/th/lang.php @@ -1,6 +1,7 @@ */ $lang['userexists'] = '对ä¸èµ·ï¼Œè¯¥ç”¨æˆ·åå·²ç»å­˜åœ¨ã€‚'; diff --git a/sources/lib/plugins/captcha/.travis.yml b/sources/lib/plugins/captcha/.travis.yml deleted file mode 100644 index a19b387..0000000 --- a/sources/lib/plugins/captcha/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: php -php: - - "5.6" - - "5.5" - - "5.4" - - "5.3" -env: - - DOKUWIKI=master - - DOKUWIKI=stable - - DOKUWIKI=old-stable -before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh -install: sh travis.sh -script: cd _test && phpunit --stderr --group plugin_captcha diff --git a/sources/lib/plugins/captcha/README b/sources/lib/plugins/captcha/README deleted file mode 100644 index 237f135..0000000 --- a/sources/lib/plugins/captcha/README +++ /dev/null @@ -1,25 +0,0 @@ -captcha Plugin for DokuWiki - -All documentation for this plugin can be found at -http://www.dokuwiki.org/plugin:captcha - -If you install this plugin manually, make sure it is installed in -lib/plugins/captcha/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - ----- -Copyright (C) Andreas Gohr - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/sources/lib/plugins/captcha/action.php b/sources/lib/plugins/captcha/action.php deleted file mode 100644 index 6fdf2f2..0000000 --- a/sources/lib/plugins/captcha/action.php +++ /dev/null @@ -1,199 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/'); - -class action_plugin_captcha extends DokuWiki_Action_Plugin { - - /** - * register the eventhandlers - */ - public function register(Doku_Event_Handler $controller) { - // check CAPTCHA success - $controller->register_hook( - 'ACTION_ACT_PREPROCESS', - 'BEFORE', - $this, - 'handle_captcha_input', - array() - ); - - // inject in edit form - $controller->register_hook( - 'HTML_EDITFORM_OUTPUT', - 'BEFORE', - $this, - 'handle_form_output', - array() - ); - - // inject in user registration - $controller->register_hook( - 'HTML_REGISTERFORM_OUTPUT', - 'BEFORE', - $this, - 'handle_form_output', - array() - ); - - // inject in password reset - $controller->register_hook( - 'HTML_RESENDPWDFORM_OUTPUT', - 'BEFORE', - $this, - 'handle_form_output', - array() - ); - - if($this->getConf('loginprotect')) { - // inject in login form - $controller->register_hook( - 'HTML_LOGINFORM_OUTPUT', - 'BEFORE', - $this, - 'handle_form_output', - array() - ); - // check on login - $controller->register_hook( - 'AUTH_LOGIN_CHECK', - 'BEFORE', - $this, - 'handle_login', - array() - ); - } - } - - /** - * Check if the current mode should be handled by CAPTCHA - * - * Note: checking needs to be done when a form has been submitted, not when the form - * is shown for the first time. Except for the editing process this is not determined - * by $act alone but needs to inspect other input variables. - * - * @param string $act cleaned action mode - * @return bool - */ - protected function needs_checking($act) { - global $INPUT; - - switch($act) { - case 'save': - return true; - case 'register': - case 'resendpwd': - return $INPUT->bool('save'); - case 'login': - // we do not handle this here, but in handle_login() - default: - return false; - } - } - - /** - * Aborts the given mode - * - * Aborting depends on the mode. It might unset certain input parameters or simply switch - * the mode to something else (giving as return which needs to be passed back to the - * ACTION_ACT_PREPROCESS event) - * - * @param string $act cleaned action mode - * @return string the new mode to use - */ - protected function abort_action($act) { - global $INPUT; - - switch($act) { - case 'save': - return 'preview'; - case 'register': - case 'resendpwd': - $INPUT->post->set('save', false); - return $act; - case 'login': - // we do not handle this here, but in handle_login() - default: - return $act; - } - } - - /** - * Handles CAPTCHA check in login - * - * Logins happen very early in the DokuWiki lifecycle, so we have to intercept them - * in their own event. - * - * @param Doku_Event $event - * @param $param - */ - public function handle_login(Doku_Event $event, $param) { - global $INPUT; - if(!$this->getConf('loginprotect')) return; // no protection wanted - if(!$INPUT->bool('u')) return; // this login was not triggered by a form - - // we need to have $ID set for the captcha check - global $ID; - $ID = getID(); - - /** @var helper_plugin_captcha $helper */ - $helper = plugin_load('helper', 'captcha'); - if(!$helper->check()) { - $event->data['silent'] = true; // we have our own message - $event->result = false; // login fail - $event->preventDefault(); - $event->stopPropagation(); - } - } - - /** - * Intercept all actions and check for CAPTCHA first. - */ - public function handle_captcha_input(Doku_Event $event, $param) { - $act = act_clean($event->data); - if(!$this->needs_checking($act)) return; - - // do nothing if logged in user and no CAPTCHA required - if(!$this->getConf('forusers') && $_SERVER['REMOTE_USER']) { - return; - } - - // check captcha - /** @var helper_plugin_captcha $helper */ - $helper = plugin_load('helper', 'captcha'); - if(!$helper->check()) { - $event->data = $this->abort_action($act); - } - } - - /** - * Inject the CAPTCHA in a DokuForm - */ - public function handle_form_output(Doku_Event $event, $param) { - // get position of submit button - $pos = $event->data->findElementByAttribute('type', 'submit'); - if(!$pos) return; // no button -> source view mode - - // do nothing if logged in user and no CAPTCHA required - if(!$this->getConf('forusers') && $_SERVER['REMOTE_USER']) { - return; - } - - // get the CAPTCHA - /** @var helper_plugin_captcha $helper */ - $helper = plugin_load('helper', 'captcha'); - $out = $helper->getHTML(); - - // new wiki - insert after the submit button - $event->data->insertElement($pos + 1, $out); - } - -} - diff --git a/sources/lib/plugins/captcha/conf/default.php b/sources/lib/plugins/captcha/conf/default.php deleted file mode 100644 index a46580b..0000000 --- a/sources/lib/plugins/captcha/conf/default.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ - -$conf['mode'] = 'js'; -$conf['forusers'] = 0; -$conf['loginprotect']= 0; -$conf['lettercount'] = 5; -$conf['width'] = 115; -$conf['height'] = 22; -$conf['question'] = 'What\'s the answer to life, the universe and everything?'; -$conf['answer'] = '42'; diff --git a/sources/lib/plugins/captcha/conf/metadata.php b/sources/lib/plugins/captcha/conf/metadata.php deleted file mode 100644 index 84ddfaf..0000000 --- a/sources/lib/plugins/captcha/conf/metadata.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ - -$meta['mode'] = array('multichoice', '_choices' => array('js', 'text', 'math', 'question', 'image', 'audio', 'figlet')); -$meta['forusers'] = array('onoff'); -$meta['loginprotect']= array('onoff'); -$meta['lettercount'] = array('numeric', '_min' => 3, '_max' => 16); -$meta['width'] = array('numeric', '_pattern' => '/[0-9]+/'); -$meta['height'] = array('numeric', '_pattern' => '/[0-9]+/'); -$meta['question'] = array('string'); -$meta['answer'] = array('string'); diff --git a/sources/lib/plugins/captcha/figlet.flf b/sources/lib/plugins/captcha/figlet.flf deleted file mode 100644 index 24284b8..0000000 --- a/sources/lib/plugins/captcha/figlet.flf +++ /dev/null @@ -1,1097 +0,0 @@ -flf2a$ 5 4 14 15 10 0 22415 96 -SmSlant by Glenn Chappell 6/93 - based on Small & Slant -Includes ISO Latin-1 -figlet release 2.1 -- 12 Aug 1994 -Permission is hereby given to modify this font, as long as the -modifier's name is placed on a comment line. - -Modified by Paul Burton 12/96 to include new parameter -supported by FIGlet and FIGWin. May also be slightly modified for better use -of new full-width/kern/smush alternatives, but default output is NOT changed. - - $@ - $ @ - $ @ - $ @ -$ @@ - __@ - / /@ - /_/ @ -(_) @ - @@ - _ _ @ -( | )@ -|/|/ @ -$ @ - @@ - ____ @ - __/ / /_@ - /_ . __/@ -/_ __/ @ - /_/_/ @@ - @ - _//@ - (_-<@ -/ __/@ -// @@ - _ __@ -(_)_/_/@ - _/_/_ @ -/_/ (_)@ - @@ - ____ @ - / __/___@ - > _/_ _/@ -|_____/ @ - @@ - _ @ -( )@ -|/ @ -$ @ - @@ - __@ - _/_/@ - / / @ -/ / @ -|_| @@ - _ @ - | |@ - / /@ - _/_/ @ -/_/ @@ - @ - _/|@ -> _<@ -|/ @ - @@ - __ @ - __/ /_@ -/_ __/@ - /_/ @ - @@ - @ - @ - _ @ -( )@ -|/ @@ - @ - ____@ -/___/@ - $ @ - @@ - @ - @ - _ @ -(_)@ - @@ - __@ - _/_/@ - _/_/ @ -/_/ @ - @@ - ___ @ - / _ \@ -/ // /@ -\___/ @ - @@ - ___@ - < /@ - / / @ -/_/ @ - @@ - ___ @ - |_ |@ - / __/ @ -/____/ @ - @@ - ____@ - |_ /@ - _/_ < @ -/____/ @ - @@ - ____@ - / / /@ -/_ _/@ - /_/ @ - @@ - ____@ - / __/@ - /__ \ @ -/____/ @ - @@ - ____@ - / __/@ -/ _ \ @ -\___/ @ - @@ - ____@ -/_ /@ - / / @ -/_/ @ - @@ - ___ @ - ( _ )@ -/ _ |@ -\___/ @ - @@ - ___ @ - / _ \@ - \_, /@ -/___/ @ - @@ - _ @ - (_)@ - _ @ -(_) @ - @@ - _ @ - (_)@ - _ @ -( ) @ -|/ @@ - __@ - / /@ -< < @ - \_\@ - @@ - @ - ____@ - /___/@ -/___/ @ - @@ -__ @ -\ \ @ - > >@ -/_/ @ - @@ - ___ @ -/__ \@ - /__/@ -(_) @ - @@ - _____ @ - / ___ \@ -/ / _ `/@ -\ \_,_/ @ - \___/ @@ - ___ @ - / _ |@ - / __ |@ -/_/ |_|@ - @@ - ___ @ - / _ )@ - / _ |@ -/____/ @ - @@ - _____@ - / ___/@ -/ /__ @ -\___/ @ - @@ - ___ @ - / _ \@ - / // /@ -/____/ @ - @@ - ____@ - / __/@ - / _/ @ -/___/ @ - @@ - ____@ - / __/@ - / _/ @ -/_/ @ - @@ - _____@ - / ___/@ -/ (_ / @ -\___/ @ - @@ - __ __@ - / // /@ - / _ / @ -/_//_/ @ - @@ - ____@ - / _/@ - _/ / @ -/___/ @ - @@ - __@ - __ / /@ -/ // / @ -\___/ @ - @@ - __ __@ - / //_/@ - / ,< @ -/_/|_| @ - @@ - __ @ - / / @ - / /__@ -/____/@ - @@ - __ ___@ - / |/ /@ - / /|_/ / @ -/_/ /_/ @ - @@ - _ __@ - / |/ /@ - / / @ -/_/|_/ @ - @@ - ____ @ - / __ \@ -/ /_/ /@ -\____/ @ - @@ - ___ @ - / _ \@ - / ___/@ -/_/ @ - @@ - ____ @ - / __ \@ -/ /_/ /@ -\___\_\@ - @@ - ___ @ - / _ \@ - / , _/@ -/_/|_| @ - @@ - ____@ - / __/@ - _\ \ @ -/___/ @ - @@ - ______@ -/_ __/@ - / / @ -/_/ @ - @@ - __ __@ - / / / /@ -/ /_/ / @ -\____/ @ - @@ - _ __@ - | | / /@ - | |/ / @ - |___/ @ - @@ - _ __@ - | | /| / /@ - | |/ |/ / @ - |__/|__/ @ - @@ - _ __@ - | |/_/@ - _> < @ -/_/|_| @ - @@ - __ __@ - \ \/ /@ - \ / @ - /_/ @ - @@ - ____@ - /_ /@ - / /_@ - /___/@ - @@ - ___@ - / _/@ - / / @ - / / @ -/__/ @@ -__ @ -\ \ @ - \ \ @ - \_\@ - @@ - ___@ - / /@ - / / @ - _/ / @ -/__/ @@ - //|@ -|/||@ - $ @ -$ @ - @@ - @ - @ - @ - ____@ -/___/@@ - _ @ -( )@ - V @ -$ @ - @@ - @ - ___ _@ -/ _ `/@ -\_,_/ @ - @@ - __ @ - / / @ - / _ \@ -/_.__/@ - @@ - @ - ____@ -/ __/@ -\__/ @ - @@ - __@ - ___/ /@ -/ _ / @ -\_,_/ @ - @@ - @ - ___ @ -/ -_)@ -\__/ @ - @@ - ___@ - / _/@ - / _/ @ -/_/ @ - @@ - @ - ___ _@ - / _ `/@ - \_, / @ -/___/ @@ - __ @ - / / @ - / _ \@ -/_//_/@ - @@ - _ @ - (_)@ - / / @ -/_/ @ - @@ - _ @ - (_)@ - / / @ - __/ / @ -|___/ @@ - __ @ - / /__@ - / '_/@ -/_/\_\ @ - @@ - __@ - / /@ - / / @ -/_/ @ - @@ - @ - __ _ @ - / ' \@ -/_/_/_/@ - @@ - @ - ___ @ - / _ \@ -/_//_/@ - @@ - @ - ___ @ -/ _ \@ -\___/@ - @@ - @ - ___ @ - / _ \@ - / .__/@ -/_/ @@ - @ - ___ _@ -/ _ `/@ -\_, / @ - /_/ @@ - @ - ____@ - / __/@ -/_/ @ - @@ - @ - ___@ - (_-<@ -/___/@ - @@ - __ @ - / /_@ -/ __/@ -\__/ @ - @@ - @ - __ __@ -/ // /@ -\_,_/ @ - @@ - @ - _ __@ -| |/ /@ -|___/ @ - @@ - @ - _ __@ -| |/|/ /@ -|__,__/ @ - @@ - @ - __ __@ - \ \ /@ -/_\_\ @ - @@ - @ - __ __@ - / // /@ - \_, / @ -/___/ @@ - @ - ___@ -/_ /@ -/__/@ - @@ - __@ - _/_/@ -_/ / @ -/ / @ -\_\ @@ - __@ - / /@ - / / @ - / / @ -/_/ @@ - __ @ - \ \ @ - / /_@ - _/_/ @ -/_/ @@ - /\//@ -//\/ @ - $ @ -$ @ - @@ - _ _ @ - (_)(_)@ - / - | @ -/_/|_| @ - @@ - _ _ @ - (_)_(_)@ -/ __ \ @ -\____/ @ - @@ - _ _ @ - (_) (_)@ -/ /_/ / @ -\____/ @ - @@ - _ _ @ - (_)(_)@ -/ _ `/ @ -\_,_/ @ - @@ - _ _ @ - (_)(_)@ -/ _ \ @ -\___/ @ - @@ - _ _ @ - (_)(_)@ -/ // / @ -\_,_/ @ - @@ - ____ @ - / _ )@ - / /< < @ - / //__/ @ -/_/ @@ -160 NO-BREAK SPACE - $@ - $ @ - $ @ - $ @ -$ @@ -161 INVERTED EXCLAMATION MARK - _ @ - (_)@ - / / @ -/_/ @ - @@ -162 CENT SIGN - @ - __//@ -/ __/@ -\ _/ @ -// @@ -163 POUND SIGN - __ @ - __/__|@ - /_ _/_ @ -(_,___/ @ - @@ -164 CURRENCY SIGN - /|_/|@ - | . / @ - /_ | @ -|/ |/ @ - @@ -165 YEN SIGN - ____@ - _| / /@ - /_ __/@ -/_ __/ @ - /_/ @@ -166 BROKEN BAR - __@ - / /@ - /_/ @ - / / @ -/_/ @@ -167 SECTION SIGN - __ @ - _/ _)@ - / | | @ - | |_/ @ -(__/ @@ -168 DIAERESIS - _ _ @ -(_) (_)@ - $ $ @ -$ $ @ - @@ -169 COPYRIGHT SIGN - ____ @ - / ___\ @ - / / _/ |@ -| |__/ / @ - \____/ @@ -170 FEMININE ORDINAL INDICATOR - ___ _@ - / _ `/@ - _\_,_/ @ -/____/ @ - @@ -171 LEFT-POINTING DOUBLE ANGLE QUOTATION MARK - ____@ - / / /@ -< < < @ - \_\_\@ - @@ -172 NOT SIGN - @ - ____@ -/_ /@ - /_/ @ - @@ -173 SOFT HYPHEN - @ - ___@ -/__/@ - $ @ - @@ -174 REGISTERED SIGN - ____ @ - / __ \ @ - / / -) |@ -| //\\ / @ - \____/ @@ -175 MACRON - ____@ -/___/@ - $ @ -$ @ - @@ -176 DEGREE SIGN - __ @ - /. |@ -|__/ @ - $ @ - @@ -177 PLUS-MINUS SIGN - __ @ - __/ /_@ - /_ __/@ - __/_/_ @ -/_____/ @@ -178 SUPERSCRIPT TWO - __ @ - |_ )@ -/__| @ - $ @ - @@ -179 SUPERSCRIPT THREE - ___@ - |_ /@ -/__) @ - $ @ - @@ -180 ACUTE ACCENT - __@ -/_/@ - $ @ -$ @ - @@ -181 MICRO SIGN - @ - __ __@ - / // /@ - / .,_/ @ -/_/ @@ -182 PILCROW SIGN - _____@ - / /@ -|_ / / @ -/_/_/ @ - @@ -183 MIDDLE DOT - @ - _ @ -(_)@ -$ @ - @@ -184 CEDILLA - @ - @ - @ - _ @ -/_)@@ -185 SUPERSCRIPT ONE - __@ - < /@ -/_/ @ -$ @ - @@ -186 MASCULINE ORDINAL INDICATOR - ___ @ - / _ \@ - _\___/@ -/____/ @ - @@ -187 RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -____ @ -\ \ \ @ - > > >@ -/_/_/ @ - @@ -188 VULGAR FRACTION ONE QUARTER - __ __ @ - < /_/_/___@ -/_//_//_' /@ - /_/ /_/ @ - @@ -189 VULGAR FRACTION ONE HALF - __ __ @ - < /_/_/_ @ -/_//_/|_ )@ - /_/ /__| @ - @@ -190 VULGAR FRACTION THREE QUARTERS - ___ __ @ - |_ /_/_/___@ -/__)/_//_' /@ - /_/ /_/ @ - @@ -191 INVERTED QUESTION MARK - _ @ - _(_)@ -/ _/_@ -\___/@ - @@ -192 LATIN CAPITAL LETTER A WITH GRAVE - __ @ - _\_\@ - / - |@ -/_/|_|@ - @@ -193 LATIN CAPITAL LETTER A WITH ACUTE - __@ - _/_/@ - / - |@ -/_/|_|@ - @@ -194 LATIN CAPITAL LETTER A WITH CIRCUMFLEX - //|@ - _|/||@ - / - | @ -/_/|_| @ - @@ -195 LATIN CAPITAL LETTER A WITH TILDE - /\//@ - _//\/ @ - / - | @ -/_/|_| @ - @@ -196 LATIN CAPITAL LETTER A WITH DIAERESIS - _ _ @ - (_)(_)@ - / - | @ -/_/|_| @ - @@ -197 LATIN CAPITAL LETTER A WITH RING ABOVE - (())@ - / _ |@ - / __ |@ -/_/ |_|@ - @@ -198 LATIN CAPITAL LETTER AE - _______@ - / _ __/@ - / _ _/ @ -/_//___/ @ - @@ -199 LATIN CAPITAL LETTER C WITH CEDILLA - _____@ - / ___/@ -/ /__ @ -\___/ @ -/_) @@ -200 LATIN CAPITAL LETTER E WITH GRAVE - __ @ - \_\@ - / -<@ -/__< @ - @@ -201 LATIN CAPITAL LETTER E WITH ACUTE - __@ - _/_/@ - / -< @ -/__< @ - @@ -202 LATIN CAPITAL LETTER E WITH CIRCUMFLEX - //|@ - |/||@ - / -< @ -/__< @ - @@ -203 LATIN CAPITAL LETTER E WITH DIAERESIS - _ _ @ - (_)(_)@ - / -< @ -/__< @ - @@ -204 LATIN CAPITAL LETTER I WITH GRAVE - __ @ - _\_\ @ - /_ __/@ -/____/ @ - @@ -205 LATIN CAPITAL LETTER I WITH ACUTE - __@ - __/_/@ - /_ __/@ -/____/ @ - @@ -206 LATIN CAPITAL LETTER I WITH CIRCUMFLEX - //|@ - _|/||@ - /_ __/@ -/____/ @ - @@ -207 LATIN CAPITAL LETTER I WITH DIAERESIS - _ _ @ - (_)(_)@ - /_ __/ @ -/____/ @ - @@ -208 LATIN CAPITAL LETTER ETH - ____ @ - _/ __ \@ -/_ _// /@ -/_____/ @ - @@ -209 LATIN CAPITAL LETTER N WITH TILDE - /\//@ - __//\/ @ - / |/ / @ -/_/|__/ @ - @@ -210 LATIN CAPITAL LETTER O WITH GRAVE - __ @ - _\_\ @ -/ __ \@ -\____/@ - @@ -211 LATIN CAPITAL LETTER O WITH ACUTE - __@ - __/_/@ -/ __ \@ -\____/@ - @@ -212 LATIN CAPITAL LETTER O WITH CIRCUMFLEX - //|@ - _|/||@ -/ __ \@ -\____/@ - @@ -213 LATIN CAPITAL LETTER O WITH TILDE - /\//@ - _//\/ @ -/ __ \ @ -\____/ @ - @@ -214 LATIN CAPITAL LETTER O WITH DIAERESIS - _ _ @ - (_)_(_)@ -/ __ \ @ -\____/ @ - @@ -215 MULTIPLICATION SIGN - @ - /|/|@ - > < @ -|/|/ @ - @@ -216 LATIN CAPITAL LETTER O WITH STROKE - _____ @ - / _// \@ -/ //// /@ -\_//__/ @ - @@ -217 LATIN CAPITAL LETTER U WITH GRAVE - __ @ - __\_\ @ -/ /_/ /@ -\____/ @ - @@ -218 LATIN CAPITAL LETTER U WITH ACUTE - __@ - __ /_/@ -/ /_/ /@ -\____/ @ - @@ -219 LATIN CAPITAL LETTER U WITH CIRCUMFLEX - //|@ - __|/||@ -/ /_/ /@ -\____/ @ - @@ -220 LATIN CAPITAL LETTER U WITH DIAERESIS - _ _ @ - (_) (_)@ -/ /_/ / @ -\____/ @ - @@ -221 LATIN CAPITAL LETTER Y WITH ACUTE - __@ -__/_/@ -\ V /@ - /_/ @ - @@ -222 LATIN CAPITAL LETTER THORN - __ @ - / / @ - / -_)@ -/_/ @ - @@ -223 LATIN SMALL LETTER SHARP S - ____ @ - / _ )@ - / /< < @ - / //__/ @ -/_/ @@ -224 LATIN SMALL LETTER A WITH GRAVE - __ @ - _\_\_@ -/ _ `/@ -\_,_/ @ - @@ -225 LATIN SMALL LETTER A WITH ACUTE - __@ - __/_/@ -/ _ `/@ -\_,_/ @ - @@ -226 LATIN SMALL LETTER A WITH CIRCUMFLEX - //|@ - _|/||@ -/ _ `/@ -\_,_/ @ - @@ -227 LATIN SMALL LETTER A WITH TILDE - /\//@ - _//\/ @ -/ _ `/ @ -\_,_/ @ - @@ -228 LATIN SMALL LETTER A WITH DIAERESIS - _ _ @ - (_)(_)@ -/ _ `/ @ -\_,_/ @ - @@ -229 LATIN SMALL LETTER A WITH RING ABOVE - __ @ - _(())@ -/ _ `/@ -\_,_/ @ - @@ -230 LATIN SMALL LETTER AE - @ - ___ ___ @ -/ _ ` -_)@ -\_,____/ @ - @@ -231 LATIN SMALL LETTER C WITH CEDILLA - @ - ____@ -/ __/@ -\__/ @ -/_) @@ -232 LATIN SMALL LETTER E WITH GRAVE - __ @ - _\_\@ -/ -_)@ -\__/ @ - @@ -233 LATIN SMALL LETTER E WITH ACUTE - __@ - _/_/@ -/ -_)@ -\__/ @ - @@ -234 LATIN SMALL LETTER E WITH CIRCUMFLEX - //|@ - |/||@ -/ -_)@ -\__/ @ - @@ -235 LATIN SMALL LETTER E WITH DIAERESIS - _ _ @ -(_)(_)@ -/ -_) @ -\__/ @ - @@ -236 LATIN SMALL LETTER I WITH GRAVE - __ @ - \_\@ - / / @ -/_/ @ - @@ -237 LATIN SMALL LETTER I WITH ACUTE - __@ - /_/@ - / / @ -/_/ @ - @@ -238 LATIN SMALL LETTER I WITH CIRCUMFLEX - //|@ - |/||@ - / / @ -/_/ @ - @@ -239 LATIN SMALL LETTER I WITH DIAERESIS - _ _ @ -(_)_(_)@ - / / @ -/_/ @ - @@ -240 LATIN SMALL LETTER ETH - _||_@ - __ || @ -/ _` | @ -\___/ @ - @@ -241 LATIN SMALL LETTER N WITH TILDE - /\//@ - _//\/ @ - / _ \ @ -/_//_/ @ - @@ -242 LATIN SMALL LETTER O WITH GRAVE - __ @ - _\_\@ -/ _ \@ -\___/@ - @@ -243 LATIN SMALL LETTER O WITH ACUTE - __@ - _/_/@ -/ _ \@ -\___/@ - @@ -244 LATIN SMALL LETTER O WITH CIRCUMFLEX - //|@ - _|/||@ -/ _ \ @ -\___/ @ - @@ -245 LATIN SMALL LETTER O WITH TILDE - /\//@ - _//\/ @ -/ _ \ @ -\___/ @ - @@ -246 LATIN SMALL LETTER O WITH DIAERESIS - _ _ @ - (_)(_)@ -/ _ \ @ -\___/ @ - @@ -247 DIVISION SIGN - _ @ - _(_)@ -/___/@ -(_) @ - @@ -248 LATIN SMALL LETTER O WITH STROKE - @ - ___ @ -/ //\@ -\//_/@ - @@ -249 LATIN SMALL LETTER U WITH GRAVE - __ @ - __\_\@ -/ // /@ -\_,_/ @ - @@ -250 LATIN SMALL LETTER U WITH ACUTE - __@ - __/_/@ -/ // /@ -\_,_/ @ - @@ -251 LATIN SMALL LETTER U WITH CIRCUMFLEX - //|@ - _|/||@ -/ // /@ -\_,_/ @ - @@ -252 LATIN SMALL LETTER U WITH DIAERESIS - _ _ @ - (_)(_)@ -/ // / @ -\_,_/ @ - @@ -253 LATIN SMALL LETTER Y WITH ACUTE - __@ - __/_/@ - / // /@ - \_, / @ -/___/ @@ -254 LATIN SMALL LETTER THORN - __ @ - / / @ - / _ \@ - / .__/@ -/_/ @@ -255 LATIN SMALL LETTER Y WITH DIAERESIS - _ _ @ - (_)(_)@ - / // / @ - \_, / @ -/___/ @@ diff --git a/sources/lib/plugins/captcha/figlet.php b/sources/lib/plugins/captcha/figlet.php deleted file mode 100644 index bd7692b..0000000 --- a/sources/lib/plugins/captcha/figlet.php +++ /dev/null @@ -1,169 +0,0 @@ -loadFont("fonts/standard.flf")) { - * $phpFiglet->display("Hello World"); - * } else { - * trigger_error("Could not load font file"); - * } - * - */ - - -class phpFiglet -{ - - /* - * Internal variables - */ - - var $signature; - var $hardblank; - var $height; - var $baseline; - var $maxLenght; - var $oldLayout; - var $commentLines; - var $printDirection; - var $fullLayout; - var $codeTagCount; - var $fontFile; - - - /* - * Contructor - */ - - function phpFiglet() - { - - } - - - /* - * Load an flf font file. Return true on success, false on error. - */ - - function loadfont($fontfile) - { - $this->fontFile = @file($fontfile); - if (!$this->fontFile) return false; - - $hp = explode(" ", $this->fontFile[0]); // get header - - $this->signature = substr($hp[0], 0, strlen($hp[0]) -1); - $this->hardblank = substr($hp[0], strlen($hp[0]) -1, 1); - $this->height = $hp[1]; - $this->baseline = $hp[2]; - $this->maxLenght = $hp[3]; - $this->oldLayout = $hp[4]; - $this->commentLines = $hp[5] + 1; - $this->printDirection = $hp[6]; - $this->fullLayout = $hp[7]; - $this->codeTagCount = $hp[8]; - - unset($hp); - - if ($this->signature != "flf2a") { - return false; - } else { - return true; - } - } - - - /* - * Get a character as a string, or an array with one line - * for each font height. - */ - - function getCharacter($character, $asarray = false) - { - $asciValue = ord($character); - $start = $this->commentLines + ($asciValue - 32) * $this->height; - $data = ($asarray) ? array() : ""; - - for ($a = 0; $a < $this->height; $a++) - { - $tmp = $this->fontFile[$start + $a]; - $tmp = str_replace("@", "", $tmp); - //$tmp = trim($tmp); - $tmp = str_replace($this->hardblank, " ", $tmp); - - if ($asarray) { - $data[] = $tmp; - } else { - $data .= $tmp; - } - } - - return $data; - } - - - /* - * Returns a figletized line of characters. - */ - - function fetch($line) - { - $ret = ""; - - for ($i = 0; $i < (strlen($line)); $i++) - { - $data[] = $this->getCharacter($line[$i], true); - } - - @reset($data); - - for ($i = 0; $i < $this->height; $i++) - { - while (list($k, $v) = each($data)) - { - $ret .= str_replace("\n", "", $v[$i]); - } - reset($data); - $ret .= "\n"; - } - - return $ret; - } - - - /* - * Display (print) a figletized line of characters. - */ - - function display($line) - { - print $this->fetch($line); - } - -} -?> diff --git a/sources/lib/plugins/captcha/fonts/README b/sources/lib/plugins/captcha/fonts/README deleted file mode 100644 index 69edcbe..0000000 --- a/sources/lib/plugins/captcha/fonts/README +++ /dev/null @@ -1,8 +0,0 @@ -All fonts placed in this directory will be used randomly for the image captcha. -The more and exotic fonts you use, the harder it will be to OCR. However you -should be aware that most fonts are very hard to read when used for small sizes. - -Provided fonts: - -VeraSe.ttf - Bitsream Vera, http://www-old.gnome.org/fonts/ -Rufscript010.ttf - Rufscript, http://openfontlibrary.org/en/font/rufscript diff --git a/sources/lib/plugins/captcha/fonts/Rufscript010.ttf b/sources/lib/plugins/captcha/fonts/Rufscript010.ttf deleted file mode 100644 index 887a449..0000000 Binary files a/sources/lib/plugins/captcha/fonts/Rufscript010.ttf and /dev/null differ diff --git a/sources/lib/plugins/captcha/fonts/VeraSe.ttf b/sources/lib/plugins/captcha/fonts/VeraSe.ttf deleted file mode 100644 index 4b4ecc6..0000000 Binary files a/sources/lib/plugins/captcha/fonts/VeraSe.ttf and /dev/null differ diff --git a/sources/lib/plugins/captcha/helper.php b/sources/lib/plugins/captcha/helper.php deleted file mode 100644 index 2b34a25..0000000 --- a/sources/lib/plugins/captcha/helper.php +++ /dev/null @@ -1,342 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/'); - - -class helper_plugin_captcha extends DokuWiki_Plugin { - - protected $field_in = 'plugin__captcha'; - protected $field_sec = 'plugin__captcha_secret'; - protected $field_hp = 'plugin__captcha_honeypot'; - - /** - * Constructor. Initializes field names - */ - public function __construct() { - $this->field_in = md5($this->_fixedIdent().$this->field_in); - $this->field_sec = md5($this->_fixedIdent().$this->field_sec); - $this->field_hp = md5($this->_fixedIdent().$this->field_hp); - } - - /** - * Check if the CAPTCHA should be used. Always check this before using the methods below. - * - * @return bool true when the CAPTCHA should be used - */ - public function isEnabled() { - if(!$this->getConf('forusers') && $_SERVER['REMOTE_USER']) return false; - return true; - } - - /** - * Returns the HTML to display the CAPTCHA with the chosen method - */ - public function getHTML() { - global $ID; - - $rand = (float) (rand(0, 10000)) / 10000; - if($this->getConf('mode') == 'math') { - $code = $this->_generateMATH($this->_fixedIdent(), $rand); - $code = $code[0]; - $text = $this->getLang('fillmath'); - } elseif($this->getConf('mode') == 'question') { - $text = $this->getConf('question'); - } else { - $code = $this->_generateCAPTCHA($this->_fixedIdent(), $rand); - $text = $this->getLang('fillcaptcha'); - } - $secret = $this->encrypt($rand); - - $txtlen = $this->getConf('lettercount'); - - $out = ''; - $out .= '
      '; - $out .= ''; - $out .= ' '; - - switch($this->getConf('mode')) { - case 'math': - case 'text': - $out .= $this->_obfuscateText($code); - break; - case 'js': - $out .= ''.$this->_obfuscateText($code).''; - break; - case 'image': - $out .= ' '; - break; - case 'audio': - $out .= ' '; - $out .= ''; - $out .= ''.$this->getLang('soundlink').''; - break; - case 'figlet': - require_once(dirname(__FILE__).'/figlet.php'); - $figlet = new phpFiglet(); - if($figlet->loadfont(dirname(__FILE__).'/figlet.flf')) { - $out .= '
      ';
-                    $out .= rtrim($figlet->fetch($code));
-                    $out .= '
      '; - } else { - msg('Failed to load figlet.flf font file. CAPTCHA broken', -1); - } - break; - } - $out .= ' '; - - // add honeypot field - $out .= ''; - $out .= '
      '; - return $out; - } - - /** - * Checks if the the CAPTCHA was solved correctly - * - * @param bool $msg when true, an error will be signalled through the msg() method - * @return bool true when the answer was correct, otherwise false - */ - public function check($msg = true) { - global $INPUT; - - $code = ''; - $field_sec = $INPUT->str($this->field_sec); - $field_in = $INPUT->str($this->field_in); - $field_hp = $INPUT->str($this->field_hp); - - // reconstruct captcha from provided $field_sec - $rand = $this->decrypt($field_sec); - - if($this->getConf('mode') == 'math') { - $code = $this->_generateMATH($this->_fixedIdent(), $rand); - $code = $code[1]; - } elseif($this->getConf('mode') == 'question') { - $code = $this->getConf('answer'); - } else { - $code = $this->_generateCAPTCHA($this->_fixedIdent(), $rand); - } - - // compare values - if(!$field_sec || - !$field_in || - $rand === false || - utf8_strtolower($field_in) != utf8_strtolower($code) || - trim($field_hp) !== '' - ) { - if($msg) msg($this->getLang('testfailed'), -1); - return false; - } - return true; - } - - /** - * Build a semi-secret fixed string identifying the current page and user - * - * This string is always the same for the current user when editing the same - * page revision, but only for one day. Editing a page before midnight and saving - * after midnight will result in a failed CAPTCHA once, but makes sure it can - * not be reused which is especially important for the registration form where the - * $ID usually won't change. - * - * @return string - */ - public function _fixedIdent() { - global $ID; - $lm = @filemtime(wikiFN($ID)); - $td = date('Y-m-d'); - return auth_browseruid(). - auth_cookiesalt(). - $ID.$lm.$td; - } - - /** - * Adds random space characters within the given text - * - * Keeps subsequent numbers without spaces (for math problem) - * - * @param $text - * @return string - */ - protected function _obfuscateText($text) { - $new = ''; - - $spaces = array( - "\r", - "\n", - "\r\n", - ' ', - "\xC2\xA0", // \u00A0 NO-BREAK SPACE - "\xE2\x80\x80", // \u2000 EN QUAD - "\xE2\x80\x81", // \u2001 EM QUAD - "\xE2\x80\x82", // \u2002 EN SPACE - // "\xE2\x80\x83", // \u2003 EM SPACE - "\xE2\x80\x84", // \u2004 THREE-PER-EM SPACE - "\xE2\x80\x85", // \u2005 FOUR-PER-EM SPACE - "\xE2\x80\x86", // \u2006 SIX-PER-EM SPACE - "\xE2\x80\x87", // \u2007 FIGURE SPACE - "\xE2\x80\x88", // \u2008 PUNCTUATION SPACE - "\xE2\x80\x89", // \u2009 THIN SPACE - "\xE2\x80\x8A", // \u200A HAIR SPACE - "\xE2\x80\xAF", // \u202F NARROW NO-BREAK SPACE - "\xE2\x81\x9F", // \u205F MEDIUM MATHEMATICAL SPACE - - "\xE1\xA0\x8E\r\n", // \u180E MONGOLIAN VOWEL SEPARATOR - "\xE2\x80\x8B\r\n", // \u200B ZERO WIDTH SPACE - "\xEF\xBB\xBF\r\n", // \uFEFF ZERO WIDTH NO-BREAK SPACE - ); - - $len = strlen($text); - for($i = 0; $i < $len - 1; $i++) { - $new .= $text{$i}; - - if(!is_numeric($text{$i + 1})) { - $new .= $spaces[array_rand($spaces)]; - } - } - $new .= $text{$len - 1}; - return $new; - } - - /** - * Generate some numbers from a known string and random number - * - * @param $fixed string the fixed part, any string - * @param $rand float some random number between 0 and 1 - * @return string - */ - protected function _generateNumbers($fixed, $rand) { - $fixed = hexdec(substr(md5($fixed), 5, 5)); // use part of the md5 to generate an int - $rand = $rand * 0xFFFFF; // bitmask from the random number - return md5($rand ^ $fixed); // combine both values - } - - /** - * Generates a random char string - * - * @param $fixed string the fixed part, any string - * @param $rand float some random number between 0 and 1 - * @return string - */ - public function _generateCAPTCHA($fixed, $rand) { - $numbers = $this->_generateNumbers($fixed, $rand); - - // now create the letters - $code = ''; - $lettercount = $this->getConf('lettercount') * 2; - if($lettercount > strlen($numbers)) $lettercount = strlen($numbers); - for($i = 0; $i < $lettercount; $i += 2) { - $code .= chr(floor(hexdec($numbers[$i].$numbers[$i + 1]) / 10) + 65); - } - - return $code; - } - - /** - * Create a mathematical task and its result - * - * @param $fixed string the fixed part, any string - * @param $rand float some random number between 0 and 1 - * @return array taks, result - */ - protected function _generateMATH($fixed, $rand) { - $numbers = $this->_generateNumbers($fixed, $rand); - - // first letter is the operator (+/-) - $op = (hexdec($numbers[0]) > 8) ? -1 : 1; - $num = array(hexdec($numbers[1].$numbers[2]), hexdec($numbers[3])); - - // we only want positive results - if(($op < 0) && ($num[0] < $num[1])) rsort($num); - - // prepare result and task text - $res = $num[0] + ($num[1] * $op); - $task = $num[0].(($op < 0) ? '-' : '+').$num[1].'=?'; - - return array($task, $res); - } - - /** - * Create a CAPTCHA image - * - * @param string $text the letters to display - */ - public function _imageCAPTCHA($text) { - $w = $this->getConf('width'); - $h = $this->getConf('height'); - - $fonts = glob(dirname(__FILE__).'/fonts/*.ttf'); - - // create a white image - $img = imagecreatetruecolor($w, $h); - $white = imagecolorallocate($img, 255, 255, 255); - imagefill($img, 0, 0, $white); - - // add some lines as background noise - for($i = 0; $i < 30; $i++) { - $color = imagecolorallocate($img, rand(100, 250), rand(100, 250), rand(100, 250)); - imageline($img, rand(0, $w), rand(0, $h), rand(0, $w), rand(0, $h), $color); - } - - // draw the letters - $txtlen = strlen($text); - for($i = 0; $i < $txtlen; $i++) { - $font = $fonts[array_rand($fonts)]; - $color = imagecolorallocate($img, rand(0, 100), rand(0, 100), rand(0, 100)); - $size = rand(floor($h / 1.8), floor($h * 0.7)); - $angle = rand(-35, 35); - - $x = ($w * 0.05) + $i * floor($w * 0.9 / $txtlen); - $cheight = $size + ($size * 0.5); - $y = floor($h / 2 + $cheight / 3.8); - - imagettftext($img, $size, $angle, $x, $y, $color, $font, $text[$i]); - } - - header("Content-type: image/png"); - imagepng($img); - imagedestroy($img); - } - - /** - * Encrypt the given string with the cookie salt - * - * @param string $data - * @return string - */ - public function encrypt($data) { - if(function_exists('auth_encrypt')) { - $data = auth_encrypt($data, auth_cookiesalt()); // since binky - } else { - $data = PMA_blowfish_encrypt($data, auth_cookiesalt()); // deprecated - } - - return base64_encode($data); - } - - /** - * Decrypt the given string with the cookie salt - * - * @param string $data - * @return string - */ - public function decrypt($data) { - $data = base64_decode($data); - if($data === false || $data === '') return false; - - if(function_exists('auth_decrypt')) { - return auth_decrypt($data, auth_cookiesalt()); // since binky - } else { - return PMA_blowfish_decrypt($data, auth_cookiesalt()); // deprecated - } - } -} diff --git a/sources/lib/plugins/captcha/img.php b/sources/lib/plugins/captcha/img.php deleted file mode 100644 index e0efcb7..0000000 --- a/sources/lib/plugins/captcha/img.php +++ /dev/null @@ -1,22 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../../'); -define('NOSESSION', true); -define('DOKU_DISABLE_GZIP_OUTPUT', 1); -require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/auth.php'); - -$ID = $_REQUEST['id']; -/** @var helper_plugin_captcha $plugin */ -$plugin = plugin_load('helper', 'captcha'); -$rand = $plugin->decrypt($_REQUEST['secret']); -$code = $plugin->_generateCAPTCHA($plugin->_fixedIdent(), $rand); -$plugin->_imageCAPTCHA($code); - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/sources/lib/plugins/captcha/lang/ar/lang.php b/sources/lib/plugins/captcha/lang/ar/lang.php deleted file mode 100644 index 54984c6..0000000 --- a/sources/lib/plugins/captcha/lang/ar/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'عذراً، لكن لم يكن الرد على كلمة التحقق بشكل صحيح.'; -$lang['fillcaptcha'] = 'الرجاء تعبئة كاÙØ© الأحر٠ÙÙŠ المربع.'; -$lang['fillmath'] = 'الرجاء حل المعادلة التالية.'; -$lang['soundlink'] = 'إذا كنت لا تستطيع قراءة الحرو٠على الصورة، تحميل مل٠الصوت يساعدك على قراءة الأحرÙ.'; -$lang['honeypot'] = 'الرجاء الحÙاظ على هذا الحقل Ùارغاً:'; diff --git a/sources/lib/plugins/captcha/lang/ar/settings.php b/sources/lib/plugins/captcha/lang/ar/settings.php deleted file mode 100644 index d5fbea1..0000000 --- a/sources/lib/plugins/captcha/lang/ar/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author habiiibo - */ -$lang['mode'] = 'أي نوع من كلمة التحقق استخدامها؟'; -$lang['mode_o_js'] = 'نص (مملوءة مسبقا مع جاÙا سكريبت)'; -$lang['mode_o_text'] = 'النص (دليل Ùقط)'; -$lang['mode_o_math'] = 'مشكلة الرياضيات'; -$lang['mode_o_question'] = 'مسألة ثابتة'; -$lang['mode_o_image'] = 'الصورة (أسوأ إمكانية الوصول)'; -$lang['mode_o_audio'] = 'الصورة + الصوت (Ø£Ùضل إمكانية الوصول)'; -$lang['mode_o_figlet'] = 'برنامج صنع الكلمات (تعذر الوصول)'; -$lang['forusers'] = 'استخدام كلمة التحقق ÙÙŠ تسجيل المستخدمين، أيضا؟'; -$lang['loginprotect'] = 'لا بد من ادخال كود التحقق او كابتشا لمتابعة تسجيل الدخول؟'; -$lang['lettercount'] = 'عدد من الرسائل لاستخدام (3-16). إذا قمت بزيادة كمية، ومن المؤكد أن زيادة العرض ÙÙŠ الصورة أدناه كذلك.'; -$lang['width'] = 'عرض الصورة كلمة التحقق (بالبكسل)'; -$lang['height'] = 'ارتÙاع الصورة كلمة التحقق (بالبكسل)'; -$lang['question'] = 'سؤال لوضع مسألة ثابتة'; -$lang['answer'] = 'جواب المسألة الثابتة'; diff --git a/sources/lib/plugins/captcha/lang/cs/lang.php b/sources/lib/plugins/captcha/lang/cs/lang.php deleted file mode 100644 index e03223f..0000000 --- a/sources/lib/plugins/captcha/lang/cs/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author Jaroslav Lichtblau - */ -$lang['testfailed'] = 'Bohužel, ale na CAPTCHA nebylo odpovÄ›zeno správnÄ›. Jste vůbec ÄlovÄ›k?'; -$lang['fillcaptcha'] = 'Vyplňte, prosím, vÅ¡echna písmena v poli, abyste dokázali, že nejste robot.'; -$lang['fillmath'] = 'Prosíme, vyÅ™eÅ¡te nasledující rovnici, abyste dokázali, že nejste robot.'; -$lang['soundlink'] = 'Pokud nedokážete pÅ™eÄíst písmena na obrázku, stáhnÄ›te si tento .wav soubor, kde je text pÅ™eÄtený.'; -$lang['honeypot'] = 'Ponechte prosím toto pole prázdné:'; diff --git a/sources/lib/plugins/captcha/lang/cs/settings.php b/sources/lib/plugins/captcha/lang/cs/settings.php deleted file mode 100644 index 5167538..0000000 --- a/sources/lib/plugins/captcha/lang/cs/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author Jaroslav Lichtblau - */ -$lang['mode'] = 'Který typ CAPTCHA se má použít?'; -$lang['mode_o_js'] = 'Text (pÅ™edvyplnÄ›ný JavaScriptem)'; -$lang['mode_o_text'] = 'Text (pouze manuálnÄ› vložený)'; -$lang['mode_o_math'] = 'Matematický problém'; -$lang['mode_o_question'] = 'Vlastní otázka'; -$lang['mode_o_image'] = 'Obrázek (Å¡patná přístupnost)'; -$lang['mode_o_audio'] = 'Obrázek (lepší přístupnost)'; -$lang['mode_o_figlet'] = 'ASCII art figlet (Å¡patná přístupnost) '; -$lang['forusers'] = 'Používat CAPTCHA i pro registrované uživatele?'; -$lang['loginprotect'] = 'Vyžadovat pro pÅ™ihlášení CAPTCHA?'; -$lang['lettercount'] = 'PoÄet použitých písmen (3-16). Pokud navýšíte množství, ujistÄ›te se, že jste navýšili i šířku obrázku níže.'; -$lang['width'] = 'Šírka CAPTCHA obrázku (v bodech)'; -$lang['height'] = 'Výška CAPTCHA obrázku (v bodech)'; -$lang['question'] = 'Otázka pro režim vlastní otázky'; -$lang['answer'] = 'OdpovÄ›Ä pro režim vlastní otázky'; diff --git a/sources/lib/plugins/captcha/lang/da/lang.php b/sources/lib/plugins/captcha/lang/da/lang.php deleted file mode 100644 index 1820eb8..0000000 --- a/sources/lib/plugins/captcha/lang/da/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Desværre, CAPTCHA blev ikke besvaret korrekt. Du er muligvis ikke et menneske?'; -$lang['fillcaptcha'] = 'Skriv venligst alle bogstaverne i boksen for at bevise at du er et menneske.'; -$lang['fillmath'] = 'Løs venligst følgende ligning for at bevise at du er et menneske.'; -$lang['soundlink'] = 'Hvis du ikke kan læse bogstaverne pÃ¥ skærmen, kan du downloade denne .wav-fil, for at fÃ¥ dem læst op.'; -$lang['honeypot'] = 'Hold venligst dette felt tomt:'; diff --git a/sources/lib/plugins/captcha/lang/da/settings.php b/sources/lib/plugins/captcha/lang/da/settings.php deleted file mode 100644 index 651b08b..0000000 --- a/sources/lib/plugins/captcha/lang/da/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['mode'] = 'Hvilken type CAPTCHA skal benyttes?'; -$lang['mode_o_js'] = 'Tekst (præudfyldt af JavaScript)'; -$lang['mode_o_text'] = 'Tekst (kun manuelt)'; -$lang['mode_o_math'] = 'Matematikproblem'; -$lang['mode_o_question'] = 'Løsning'; -$lang['mode_o_image'] = 'Billede (dÃ¥rlig tilgængelighed)'; -$lang['mode_o_audio'] = 'Billede+Audio (bedre tilgængelighed)'; -$lang['mode_o_figlet'] = 'Figlet ASCII Art (dÃ¥rlig tilgængelighed)'; -$lang['forusers'] = 'Benyt ogsÃ¥ CAPTCHA til brugere der er logget ind?'; -$lang['lettercount'] = 'Antal af bogstaver der skal benyttes (3-16). Hvis du øger antallet, skal du ogsÃ¥ huske at øge bredden af billedet herunder.'; -$lang['width'] = 'Bredden af CAPTCHA-billedet (pixel)'; -$lang['height'] = 'Højden af CAPTCHA-billedet (pixel)'; -$lang['question'] = 'SpørgsmÃ¥l til fast-spørgsmÃ¥l-tilstand'; -$lang['answer'] = 'Svar til fast-spørgsmÃ¥l-tilstand'; diff --git a/sources/lib/plugins/captcha/lang/de-informal/lang.php b/sources/lib/plugins/captcha/lang/de-informal/lang.php deleted file mode 100644 index 867031e..0000000 --- a/sources/lib/plugins/captcha/lang/de-informal/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Das CAPTCHA wurde nicht korrekt beantwortet.'; -$lang['fillcaptcha'] = 'Bitte übertrage die Buchstaben in das Eingabefeld.'; -$lang['fillmath'] = 'Bitte löse folgende Gleichung:'; -$lang['soundlink'] = 'Wenn Du die Buchstaben auf dem Bild nicht lesen kannst, lade diese .wav Datei herunter, um sie vorgelesen zu bekommen.'; -$lang['honeypot'] = 'Dieses Feld bitte leer lassen'; diff --git a/sources/lib/plugins/captcha/lang/de-informal/settings.php b/sources/lib/plugins/captcha/lang/de-informal/settings.php deleted file mode 100644 index 5191906..0000000 --- a/sources/lib/plugins/captcha/lang/de-informal/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['mode'] = 'Welcher CAPTCHA-Typ soll benutzt werden?'; -$lang['mode_o_js'] = 'Text (automatisch ausgefüllt via JavaScript)'; -$lang['mode_o_text'] = 'Text (manuell auszufüllen)'; -$lang['mode_o_math'] = 'Mathe-Aufgabe'; -$lang['mode_o_question'] = 'Feste Frage'; -$lang['mode_o_image'] = 'Bild (nicht barrierefrei)'; -$lang['mode_o_audio'] = 'Bild+Audio (barrierefrei)'; -$lang['mode_o_figlet'] = 'Figlet ASCII-Kunst (nicht barrierefrei)'; -$lang['forusers'] = 'CAPTCHA auch für angemeldete Benutzer verwenden?'; -$lang['lettercount'] = 'Anzahl der zu verwendenen Buchstaben (3-16). Wenn Du die Anzahl erhöhst, denke daran auch die Breite des Bildes im nächsten Feld zu erhöhen.'; -$lang['width'] = 'Breite des CAPTCHA Bildes (in Pixel)'; -$lang['height'] = 'Höhe des CAPTCHA Bildes (in Pixel)'; -$lang['question'] = 'Frage für den "Feste Frage" Modus.'; -$lang['answer'] = 'Antwort für den "Feste Frage" Modus.'; diff --git a/sources/lib/plugins/captcha/lang/de/lang.php b/sources/lib/plugins/captcha/lang/de/lang.php deleted file mode 100644 index ac6fa4a..0000000 --- a/sources/lib/plugins/captcha/lang/de/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Das CAPTCHA wurde nicht korrekt beantwortet.'; -$lang['fillcaptcha'] = 'Bitte übertragen Sie die Buchstaben in das Eingabefeld.'; -$lang['fillmath'] = 'Bitte lösen Sie folgende Gleichung:'; -$lang['soundlink'] = 'Wenn Sie die Buchstaben auf dem Bild nicht lesen können, laden Sie diese .wav Datei herunter, um sie vorgelesen zu bekommen.'; -$lang['honeypot'] = 'Dieses Feld bitte leer lassen'; diff --git a/sources/lib/plugins/captcha/lang/de/settings.php b/sources/lib/plugins/captcha/lang/de/settings.php deleted file mode 100644 index 549a53d..0000000 --- a/sources/lib/plugins/captcha/lang/de/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author Thomas Templin - * @author Leo Rudin - */ -$lang['mode'] = 'Welcher CAPTCHA-Typ soll benutzt werden?'; -$lang['mode_o_js'] = 'Text (automatisch ausgefüllt via JavaScript)'; -$lang['mode_o_text'] = 'Text (manuell auszufüllen)'; -$lang['mode_o_math'] = 'Mathe-Aufgabe'; -$lang['mode_o_question'] = 'Feste Frage'; -$lang['mode_o_image'] = 'Bild (nicht barrierefrei)'; -$lang['mode_o_audio'] = 'Bild+Audio (barrierefrei)'; -$lang['mode_o_figlet'] = 'Figlet ASCII-Kunst (nicht barrierefrei)'; -$lang['forusers'] = 'Soll das CAPTCHA auch für eingeloggte Benutzer gebraucht werden?'; -$lang['loginprotect'] = 'Benötigt es ein CAPTCHA um sich einzuloggen?'; -$lang['lettercount'] = 'Anzahl der zu verwendenen Buchstaben (3-16). Wenn Sie die Anzahl erhöhen, denken Sie daran auch die Breite des Bildes im nächsten Feld zu erhöhen.'; -$lang['width'] = 'Weite des CAPTCHA Bildes (pixel)'; -$lang['height'] = 'Höhe des CAPTCHA Bildes (pixel)'; -$lang['question'] = 'Frage für den "Feste Frage" Modus.'; -$lang['answer'] = 'Antwort für den "Feste Frage" Modus.'; diff --git a/sources/lib/plugins/captcha/lang/en/audio/LICENSE b/sources/lib/plugins/captcha/lang/en/audio/LICENSE deleted file mode 100644 index e97f8cc..0000000 --- a/sources/lib/plugins/captcha/lang/en/audio/LICENSE +++ /dev/null @@ -1,4 +0,0 @@ -This work is licensed under the Creative Commons Sampling Plus 1.0 License. To -view a copy of this license, visit -http://creativecommons.org/licenses/sampling+/1.0/ or send a letter to Creative -Commons, 543 Howard Street, 5th Floor, San Francisco, California, 94105, USA. diff --git a/sources/lib/plugins/captcha/lang/en/audio/README b/sources/lib/plugins/captcha/lang/en/audio/README deleted file mode 100644 index 979c5f0..0000000 --- a/sources/lib/plugins/captcha/lang/en/audio/README +++ /dev/null @@ -1,13 +0,0 @@ -Author: Michael Klier -Link: http://www.chimeric.de/projects/npa -Voice: Christian Spellenberg - -These samples represent the NATO phonetical alphabet. They are protected -by the Creative Commons Sampling Plus 1.0 License. You are free to use -and redistribute these samples under the conditions defined by the -license. For further information read the LICENSE file and visit -http://www.creativecommons.org. - -Note: The original high quality wave files were downsampled and converted - to 8-Bit mono files for distribution with the CAPTCHA plugin. Visit - the link above for the original files. diff --git a/sources/lib/plugins/captcha/lang/en/audio/a.wav b/sources/lib/plugins/captcha/lang/en/audio/a.wav deleted file mode 100644 index e7505ca..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/a.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/b.wav b/sources/lib/plugins/captcha/lang/en/audio/b.wav deleted file mode 100644 index eb9fffa..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/b.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/c.wav b/sources/lib/plugins/captcha/lang/en/audio/c.wav deleted file mode 100644 index 117fc93..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/c.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/d.wav b/sources/lib/plugins/captcha/lang/en/audio/d.wav deleted file mode 100644 index 9a1ea52..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/d.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/e.wav b/sources/lib/plugins/captcha/lang/en/audio/e.wav deleted file mode 100644 index 0770161..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/e.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/f.wav b/sources/lib/plugins/captcha/lang/en/audio/f.wav deleted file mode 100644 index dc4ff2b..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/f.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/g.wav b/sources/lib/plugins/captcha/lang/en/audio/g.wav deleted file mode 100644 index df4d6d4..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/g.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/h.wav b/sources/lib/plugins/captcha/lang/en/audio/h.wav deleted file mode 100644 index 50365bb..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/h.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/i.wav b/sources/lib/plugins/captcha/lang/en/audio/i.wav deleted file mode 100644 index bb1875a..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/i.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/j.wav b/sources/lib/plugins/captcha/lang/en/audio/j.wav deleted file mode 100644 index 56a9535..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/j.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/k.wav b/sources/lib/plugins/captcha/lang/en/audio/k.wav deleted file mode 100644 index 28e0fd9..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/k.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/l.wav b/sources/lib/plugins/captcha/lang/en/audio/l.wav deleted file mode 100644 index a56a314..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/l.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/m.wav b/sources/lib/plugins/captcha/lang/en/audio/m.wav deleted file mode 100644 index d081c81..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/m.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/n.wav b/sources/lib/plugins/captcha/lang/en/audio/n.wav deleted file mode 100644 index bd4304d..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/n.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/o.wav b/sources/lib/plugins/captcha/lang/en/audio/o.wav deleted file mode 100644 index 02ffa9b..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/o.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/p.wav b/sources/lib/plugins/captcha/lang/en/audio/p.wav deleted file mode 100644 index 1863235..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/p.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/q.wav b/sources/lib/plugins/captcha/lang/en/audio/q.wav deleted file mode 100644 index 24fc9c0..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/q.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/r.wav b/sources/lib/plugins/captcha/lang/en/audio/r.wav deleted file mode 100644 index 8f55782..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/r.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/s.wav b/sources/lib/plugins/captcha/lang/en/audio/s.wav deleted file mode 100644 index c92e5ba..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/s.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/t.wav b/sources/lib/plugins/captcha/lang/en/audio/t.wav deleted file mode 100644 index 4fc1955..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/t.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/u.wav b/sources/lib/plugins/captcha/lang/en/audio/u.wav deleted file mode 100644 index cc142fd..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/u.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/v.wav b/sources/lib/plugins/captcha/lang/en/audio/v.wav deleted file mode 100644 index 246553d..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/v.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/w.wav b/sources/lib/plugins/captcha/lang/en/audio/w.wav deleted file mode 100644 index b0d7659..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/w.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/x.wav b/sources/lib/plugins/captcha/lang/en/audio/x.wav deleted file mode 100644 index 726fedc..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/x.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/y.wav b/sources/lib/plugins/captcha/lang/en/audio/y.wav deleted file mode 100644 index 4edf31f..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/y.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/audio/z.wav b/sources/lib/plugins/captcha/lang/en/audio/z.wav deleted file mode 100644 index f329629..0000000 Binary files a/sources/lib/plugins/captcha/lang/en/audio/z.wav and /dev/null differ diff --git a/sources/lib/plugins/captcha/lang/en/lang.php b/sources/lib/plugins/captcha/lang/en/lang.php deleted file mode 100644 index 7163928..0000000 --- a/sources/lib/plugins/captcha/lang/en/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ - -$lang['testfailed'] = "Sorry, but the CAPTCHA wasn't answered correctly. Maybe you're not human at all?"; -$lang['fillcaptcha'] = "Please fill all the letters into the box to prove you're human."; -$lang['fillmath'] = "Please solve the following equation to prove you're human."; -$lang['soundlink'] = "If you can't read the letters on the image, download this .wav file to get them read to you."; -$lang['honeypot'] = "Please keep this field empty: "; diff --git a/sources/lib/plugins/captcha/lang/en/settings.php b/sources/lib/plugins/captcha/lang/en/settings.php deleted file mode 100644 index fe1714c..0000000 --- a/sources/lib/plugins/captcha/lang/en/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - */ - -$lang['mode'] = "Which type of CAPTCHA to use?"; -$lang['mode_o_js'] = "Text (prefilled with JavaScript)"; -$lang['mode_o_text'] = "Text (manual only)"; -$lang['mode_o_math'] = "Math Problem"; -$lang['mode_o_question'] = "Fixed Question"; -$lang['mode_o_image'] = "Image (bad accessibility)"; -$lang['mode_o_audio'] = "Image+Audio (better accessibility)"; -$lang['mode_o_figlet'] = "Figlet ASCII Art (bad accessibility)"; - -$lang['forusers'] = "Use CAPTCHA for logged in users, too?"; -$lang['loginprotect'] = "Require a CAPTCHA to login?"; -$lang['lettercount']= "Number of letters to use (3-16). If you increase the amount, be sure to increase the width of the image below as well."; -$lang['width'] = "Width of the CAPTCHA image (pixel)"; -$lang['height'] = "Height of the CAPTCHA image (pixel)"; -$lang['question'] = "Question for fixed question mode"; -$lang['answer'] = "Answer for fixed question mode"; diff --git a/sources/lib/plugins/captcha/lang/eo/lang.php b/sources/lib/plugins/captcha/lang/eo/lang.php deleted file mode 100644 index 01ed128..0000000 --- a/sources/lib/plugins/captcha/lang/eo/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author Robert Bogenschneider - */ -$lang['testfailed'] = 'Pardonon, sed CAPTCHA ne respondis korekte. Eble vi tute ne estas homo, ĉu?'; -$lang['fillcaptcha'] = 'Bonvolu tajpi ĉiujn literojn en la kampeton, por pruvi ke vi estas homo.'; -$lang['fillmath'] = 'Bonvolu solvi sekvan ekvacion por pruvi, ke vi estas homa.'; -$lang['soundlink'] = 'Se vi ne povas legi la literojn en la bildo, ÅarÄu tiun .wav-dosieron por aÅ­di ilin.'; -$lang['honeypot'] = 'Bonvolu lasi tiun kampon malplena:'; diff --git a/sources/lib/plugins/captcha/lang/eo/settings.php b/sources/lib/plugins/captcha/lang/eo/settings.php deleted file mode 100644 index c197757..0000000 --- a/sources/lib/plugins/captcha/lang/eo/settings.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @author Robert Bogenschneider - */ -$lang['mode'] = 'Kiun varianton de CAPTCHA uzi?'; -$lang['mode_o_js'] = 'Teksto (prilaborita per Java-skripto)'; -$lang['mode_o_text'] = 'Teksto (nur permane)'; -$lang['mode_o_math'] = 'Matematika problemo'; -$lang['mode_o_question'] = 'Fiksa demando'; -$lang['mode_o_image'] = 'Bildo (malbona alirebleco)'; -$lang['mode_o_audio'] = 'Bildo+Sono (pli bona alirebleco)'; -$lang['mode_o_figlet'] = 'Figlet ASCII - arto (malbona alirebleco)'; -$lang['forusers'] = 'Uzi CAPTCHA-n ankaÅ­ por ensalutintaj uzantoj?'; -$lang['lettercount'] = 'Kvanto da uzendaj literoj (3-16). Se vi pligrandigas la kvanton, certigu ke vi same pligrandigas la larÄecon de la suba bildo.'; -$lang['width'] = 'LarÄeco de CAPTCHA-bildo (pikseloj)'; -$lang['height'] = 'Alteco de CAPTCHA-bildo (pikseloj)'; -$lang['question'] = 'Demando por fiks-demanda funkciado'; -$lang['answer'] = 'Respondo por fiks-demanda funkciado'; diff --git a/sources/lib/plugins/captcha/lang/es/lang.php b/sources/lib/plugins/captcha/lang/es/lang.php deleted file mode 100644 index 91f5396..0000000 --- a/sources/lib/plugins/captcha/lang/es/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Lo sentimos, pero el CAPTCHA no fue respondido correctamente. Tal vez no eres una persona.'; -$lang['fillcaptcha'] = 'Por favor, complete todas las letras de la caja para demostrar que eres una persona.'; -$lang['fillmath'] = 'Por favor, resuelve la siguiente ecuación para demostrar que eres una persona.'; -$lang['soundlink'] = 'Si no puede leer toda las letras de la imagen, descargue el archivo wav que lo leerá por ti.'; -$lang['honeypot'] = 'Por favor, mantenga este campo vacío: '; diff --git a/sources/lib/plugins/captcha/lang/es/settings.php b/sources/lib/plugins/captcha/lang/es/settings.php deleted file mode 100644 index 8e02dd3..0000000 --- a/sources/lib/plugins/captcha/lang/es/settings.php +++ /dev/null @@ -1,20 +0,0 @@ - - */ -$lang['mode'] = '¿Qué tipo de CAPTCHA usará?'; -$lang['mode_o_js'] = 'Texto (rellenados con JavaScript)'; -$lang['mode_o_text'] = 'Texto (manual)'; -$lang['mode_o_math'] = 'Problemas de matemáticas'; -$lang['mode_o_question'] = 'Pregunta fija'; -$lang['mode_o_image'] = 'Imagen (peor accesibilidad)'; -$lang['mode_o_audio'] = 'Imagen + Audio (peor accesibilidad)'; -$lang['forusers'] = '¿Utilizar CAPTCHA para los usuarios registrados también?'; -$lang['lettercount'] = 'Número de letras para usar (3-16). Si aumenta la cantidad, asegúrese de incrementar el ancho de la imagen de abajo también.'; -$lang['width'] = 'Ancho de la imagen CAPTCHA (pixel)'; -$lang['height'] = 'Altura de la imagen CAPTCHA (pixel)'; -$lang['question'] = 'Pregunta para el modo de pregunta fija'; -$lang['answer'] = 'Responda al modo de pregunta fija'; diff --git a/sources/lib/plugins/captcha/lang/fr/lang.php b/sources/lib/plugins/captcha/lang/fr/lang.php deleted file mode 100644 index a1b3e53..0000000 --- a/sources/lib/plugins/captcha/lang/fr/lang.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @author bruno - * @author Fabrice Dejaigher - */ -$lang['testfailed'] = 'Désolé, vous n\'avez pas répondu correctement au test anti-spam. Peut-être n\'êtes vous pas humain ?'; -$lang['fillcaptcha'] = 'Merci de recopier le code ci-contre pour prouver que vous êtes humain :'; -$lang['fillmath'] = 'S\'il vous plaît résolvez l\'équation suivante pour prouver que vous êtes humain.'; -$lang['soundlink'] = 'Si vous ne pouvez pas lire le code, téléchargez ce fichier .wav pour l\'écouter.'; -$lang['honeypot'] = 'Merci de laisser ce champ vide : '; diff --git a/sources/lib/plugins/captcha/lang/fr/settings.php b/sources/lib/plugins/captcha/lang/fr/settings.php deleted file mode 100644 index 70fc879..0000000 --- a/sources/lib/plugins/captcha/lang/fr/settings.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @author bruno - * @author Fabrice Dejaigher - * @author Pietroni - */ -$lang['mode'] = 'Quel type de CAPTCHA utiliser ?'; -$lang['mode_o_js'] = 'Texte (prérempli avec JavaScript)'; -$lang['mode_o_text'] = 'Texte (remplissage manuel)'; -$lang['mode_o_math'] = 'Problème mathématique'; -$lang['mode_o_question'] = 'Question fixe'; -$lang['mode_o_image'] = 'Image (mauvaise accessibilité)'; -$lang['mode_o_audio'] = 'Image + Audio (meilleure accessibilité)'; -$lang['mode_o_figlet'] = 'ASCII Art (mauvaise accessibilité)'; -$lang['forusers'] = 'Utiliser également le CAPTCHA pour les utilisateurs connectés ?'; -$lang['loginprotect'] = 'Exiger un CAPTCHA pour se connecter?'; -$lang['lettercount'] = 'Nombre de lettres à utiliser (3 à 16). Pensez à augmenter la taille de l\'image ci-dessous en adéquation avec le nombre de lettres afin que celles-ci soient correctement affichées.'; -$lang['width'] = 'Largeur de l\'image du CAPTCHA (en pixels)'; -$lang['height'] = 'Hauteur de l\'image du CAPTCHA (en pixels)'; -$lang['question'] = 'Question pour le mode \'question fixe\''; -$lang['answer'] = 'Réponse pour le mode \'question fixe\''; diff --git a/sources/lib/plugins/captcha/lang/hu/lang.php b/sources/lib/plugins/captcha/lang/hu/lang.php deleted file mode 100644 index 49bd062..0000000 --- a/sources/lib/plugins/captcha/lang/hu/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Rosszul válaszoltál a CAPTCHA-ra. Lehet, hogy nem is ember vagy?'; -$lang['fillcaptcha'] = 'Kérlek írd be az összes betűt a dobozba, hogy bebizonyítsd, ember vagy.'; -$lang['fillmath'] = 'Kérlek oldd meg az alábbi egyenletet, hogy bebizonyítsd, ember vagy.'; -$lang['soundlink'] = 'Ha nem látod a képen szereplÅ‘ szöveget, töltsd le ezt a .wav fájlt, amiben felolvassák.'; -$lang['honeypot'] = 'Ezt a mezÅ‘t kérlek hagyd üresen:'; diff --git a/sources/lib/plugins/captcha/lang/hu/settings.php b/sources/lib/plugins/captcha/lang/hu/settings.php deleted file mode 100644 index 348363c..0000000 --- a/sources/lib/plugins/captcha/lang/hu/settings.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @author Marina Vladi - */ -$lang['mode'] = 'Milyen CAPTCHA-t használjunk?'; -$lang['mode_o_js'] = 'Szöveg (JavaScript által kitöltve)'; -$lang['mode_o_text'] = 'Szöveg (kézzel kitöltendÅ‘)'; -$lang['mode_o_math'] = 'Matematikai feladat'; -$lang['mode_o_question'] = 'Biztonsági kérdés'; -$lang['mode_o_image'] = 'Kép (nehezen érthetÅ‘)'; -$lang['mode_o_audio'] = 'Kép+hang (jobban érthetÅ‘)'; -$lang['mode_o_figlet'] = 'FIGlet-betűrajz (nehezen érthetÅ‘)'; -$lang['forusers'] = 'Bejelentkezett felhasználóknál is használjunk CAPTCHA-t?'; -$lang['lettercount'] = 'Felhasználandó betűk száma (3-16). Ha növeled a karakterek számát, ne felejtsd el a kép szélességét is megváltoztatni.'; -$lang['width'] = 'CAPTCHA-hoz felhasznált kép szélessége (pixel)'; -$lang['height'] = 'CAPTCHA-hoz felhasznált kép magassága (pixel)'; -$lang['question'] = 'Biztonsági kérdés mód kérdése'; -$lang['answer'] = 'Válasz a biztonsági kérdésre'; diff --git a/sources/lib/plugins/captcha/lang/is/lang.php b/sources/lib/plugins/captcha/lang/is/lang.php deleted file mode 100644 index 652978c..0000000 --- a/sources/lib/plugins/captcha/lang/is/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Því miður, en staðfestingarkóðanum var ekki rétt svarað. Kannski ertu ekki mennsk(ur) þrátt fyrir allt?'; -$lang['fillcaptcha'] = 'Vinsamlegast ritaðu alla stafina inn í reitinn til að sanna að þú sért manneskja.'; -$lang['fillmath'] = 'Vinsamlegast leystu eftirfarandi jöfnu til að sanna að þú sért manneskja.'; -$lang['soundlink'] = 'Ef þú getur ekki lesið stafina á myndinni, sæktu þá þessa .wav skrá til að fá stafina lesna fyrir þig.'; -$lang['honeypot'] = 'Vinsamlegast skildu þennan reit eftir auðan:'; diff --git a/sources/lib/plugins/captcha/lang/is/settings.php b/sources/lib/plugins/captcha/lang/is/settings.php deleted file mode 100644 index 2867f30..0000000 --- a/sources/lib/plugins/captcha/lang/is/settings.php +++ /dev/null @@ -1,22 +0,0 @@ - - */ -$lang['mode'] = 'Hverslags stafestingarkóða á að nota?'; -$lang['mode_o_js'] = 'Texta (fylltan fyrirfram með JavaScript)'; -$lang['mode_o_text'] = 'Texta (aðeins handvirkt)'; -$lang['mode_o_math'] = 'Stærðfræðiþraut'; -$lang['mode_o_question'] = 'Fyrirfram ákveðin spurning'; -$lang['mode_o_image'] = 'Mynd (slæmt aðgengi fatlaðra)'; -$lang['mode_o_audio'] = 'Mynd og hljóð (betra aðgengi fatlaðra)'; -$lang['mode_o_figlet'] = 'Figlet ASCII mynd (slæmt aðgengi fatlaðra)'; -$lang['forusers'] = 'à að nota staðfestingarkóða fyrir innskráða notendur líka?'; -$lang['loginprotect'] = 'Þarf að nota staðfestingarkóða til að skrá inn?'; -$lang['lettercount'] = 'Fjöldi stafa sem á að nota (3-16). Ef þú eykur fjöldann, vertu þá viss um að auka breidd myndarinnar að neðan einnig.'; -$lang['width'] = 'Breidd staðfestingarmyndarinnar í punktum'; -$lang['height'] = 'Hæð staðfestingarmyndarinnar í punktum'; -$lang['question'] = 'Spurning fyrir fyrir ákveðnu staðfestingarspurninguna'; -$lang['answer'] = 'Svar fyrir fyrirfram ákveðnu staðfestingarspurninguna'; diff --git a/sources/lib/plugins/captcha/lang/it/lang.php b/sources/lib/plugins/captcha/lang/it/lang.php deleted file mode 100644 index 444023c..0000000 --- a/sources/lib/plugins/captcha/lang/it/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - */ -$lang['testfailed'] = 'Spiacente, ma non hai risposto correttamente a CAPTCHA. Potresti non essere del tutto umano.'; -$lang['fillcaptcha'] = 'Per favore inserisci le lettere nel box accanto per provare che sei una persona reale.'; -$lang['fillmath'] = 'Per favore risolvi la seguente equazione per dimostrare che sei un essere umano.'; -$lang['soundlink'] = 'Se non riesci a leggere le lettere nell\'immagine, scarica questo file .wav ed eseguilo, leggerà le lettere per te.'; -$lang['honeypot'] = 'Per favore lascia questo campo vuoto:'; diff --git a/sources/lib/plugins/captcha/lang/it/settings.php b/sources/lib/plugins/captcha/lang/it/settings.php deleted file mode 100644 index b45b957..0000000 --- a/sources/lib/plugins/captcha/lang/it/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - */ -$lang['mode'] = 'Che tipo di CAPTCHA vuoi usare?'; -$lang['mode_o_js'] = 'Testo (precompilato con JavaScript)'; -$lang['mode_o_text'] = 'Testo (Solo Manuale)'; -$lang['mode_o_math'] = 'Problema di matematica'; -$lang['mode_o_question'] = 'Domanda Immutabile'; -$lang['mode_o_image'] = 'Immagine (Non molto Accessibile)'; -$lang['mode_o_audio'] = 'Immagine + Audio (Migliore Accessibilità)'; -$lang['mode_o_figlet'] = 'Immagine ASCII FIGlet (Non molto Accessibile)'; -$lang['forusers'] = 'Vuoi usare CAPTCHA anche per gli utenti loggati?'; -$lang['loginprotect'] = 'Richiedere un CAPTCHA per l\'accesso?'; -$lang['lettercount'] = 'Numero di lettere da usare (3-16). Se aumenti il numero, accertati di aumentare anche la larghezza dell\'immagine qui sotto.'; -$lang['width'] = 'Larghezza dell\'immagine di CAPTCHA (pixel)'; -$lang['height'] = 'Altezza dell\'immagine di CAPTCHA (pixel)'; -$lang['question'] = 'Domanda per la modalità Domanda Immutabile'; -$lang['answer'] = 'Risposta per la modalità Domanda Immutabile'; diff --git a/sources/lib/plugins/captcha/lang/ja/lang.php b/sources/lib/plugins/captcha/lang/ja/lang.php deleted file mode 100644 index 7e7fd25..0000000 --- a/sources/lib/plugins/captcha/lang/ja/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author Hideaki SAWADA - */ -$lang['testfailed'] = '申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€CAPTCHAã«å¯¾ã—ã¦é©åˆ‡ã«å¿œç­”ã—ã¦ã„ã¾ã›ã‚“。ãŠãらãã§ã™ãŒäººã§ã¯ã‚ã‚Šã¾ã›ã‚“ã­ï¼Ÿ'; -$lang['fillcaptcha'] = '人間ã®è¨¼æ˜Žã¨ã—ã¦ã€ãƒœãƒƒã‚¯ã‚¹å†…ã®å…¨ã¦ã®æ–‡å­—を入力ã—ã¦ãã ã•ã„。'; -$lang['fillmath'] = '人間ã®è¨¼æ˜Žã¨ã—ã¦ã€ä»¥ä¸‹ã®æ•°å¼ã®ç­”ãˆã‚’入力ã—ã¦ä¸‹ã•ã„。'; -$lang['soundlink'] = 'ç”»åƒã®æ–‡å­—ãŒèª­ã‚ãªã‘ã‚Œã°ã€æ–‡å­—を読んã .wavファイルをダウンロードã—ã¦ä¸‹ã•ã„。'; -$lang['honeypot'] = 'ã“ã®é …ç›®ã¯ç©ºã®ã¾ã¾ã«ã—ã¦ä¸‹ã•ã„：'; diff --git a/sources/lib/plugins/captcha/lang/ja/settings.php b/sources/lib/plugins/captcha/lang/ja/settings.php deleted file mode 100644 index 1fb5372..0000000 --- a/sources/lib/plugins/captcha/lang/ja/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author Hideaki SAWADA - * @author Ikuo Obataya - */ -$lang['mode'] = 'èªè¨¼ã®æ–¹å¼'; -$lang['mode_o_js'] = '文字 (JavaScriptã«ã‚ˆã‚‹è‡ªå‹•å…¥åŠ›)'; -$lang['mode_o_text'] = '文字 (手動入力)'; -$lang['mode_o_math'] = '計算å¼'; -$lang['mode_o_question'] = '固定質å•'; -$lang['mode_o_image'] = 'ç”»åƒ (低アクセシビリティ)'; -$lang['mode_o_audio'] = 'ç”»åƒ+音声 (中アクセシビリティ)'; -$lang['mode_o_figlet'] = 'Figlet [アルファベットAA] (低アクセシビリティ)'; -$lang['forusers'] = 'ログインユーザーã«å¯¾ã—ã¦ã‚‚CAPTCHAèªè¨¼ã‚’è¡Œã†'; -$lang['loginprotect'] = 'ログインã«CAPTCHAã‚’è¦æ±‚ã—ã¾ã™ã‹ï¼Ÿ'; -$lang['lettercount'] = '使用ã™ã‚‹æ–‡å­—数（3～16）。文字数を増やã™å ´åˆã¯ä¸‹ã®ç”»åƒã®å¹…ã‚‚åŒæ§˜ã«å¢—ã‚„ã—ã¦ä¸‹ã•ã„。'; -$lang['width'] = 'CAPTCHAç”»åƒã®å¹…　(ピクセル)'; -$lang['height'] = 'CAPTCHAç”»åƒã®é«˜ã•(ピクセル)'; -$lang['question'] = '固定質å•æ–¹å¼ã®è³ªå•'; -$lang['answer'] = '固定質å•æ–¹å¼ã®å›žç­”'; diff --git a/sources/lib/plugins/captcha/lang/ko/lang.php b/sources/lib/plugins/captcha/lang/ko/lang.php deleted file mode 100644 index 165499d..0000000 --- a/sources/lib/plugins/captcha/lang/ko/lang.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @author Myeongjin - * @author chobkwon - */ -$lang['testfailed'] = '죄송하지만 CAPTCHA(캡차)ê°€ 올바르지 않습니다. ì•„ë§ˆë„ ì¸ê°„ì´ ì•„ë‹ˆì£ ?'; -$lang['fillcaptcha'] = 'ì¸ê°„ìž„ì„ ì¦ëª…하기 위해 ìƒìžì— 있는 모든 글ìžë¥¼ 채워주세요.'; -$lang['fillmath'] = 'ì¸ê°„ìž„ì„ ì¦ëª…하기 위해 ë‹¤ìŒ ë°©ì •ì‹ì„ 푸세요.'; -$lang['soundlink'] = 'ê·¸ë¦¼ì— ìžˆëŠ” 글ìžë¥¼ ì½ì„ 수 없다면, 당신ì—게 들려줄 ì´ .wav 파ì¼ì„ 다운로드하세요.'; -$lang['honeypot'] = 'ì´ í•„ë“œëŠ” 비어 있ë„ë¡ ìœ ì§€í•˜ì„¸ìš”:'; diff --git a/sources/lib/plugins/captcha/lang/ko/settings.php b/sources/lib/plugins/captcha/lang/ko/settings.php deleted file mode 100644 index 9a7255e..0000000 --- a/sources/lib/plugins/captcha/lang/ko/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author Myeongjin - * @author chobkwon - */ -$lang['mode'] = 'ì–´ë–¤ CAPTCHA(캡차) 종류를 사용하겠습니까?'; -$lang['mode_o_js'] = 'ê¸€ìž (ìžë°”스í¬ë¦½íŠ¸ë¡œ 미리 채워ì§)'; -$lang['mode_o_text'] = 'ê¸€ìž (설명서만)'; -$lang['mode_o_math'] = '수학 문제'; -$lang['mode_o_question'] = 'ê³ ì •ëœ ì§ˆë¬¸'; -$lang['mode_o_image'] = '그림 (ì ‘ê·¼ì„±ì´ ë‚®ìŒ)'; -$lang['mode_o_audio'] = '그림+소리 (ì ‘ê·¼ì„±ì´ ë” ë‚˜ìŒ)'; -$lang['mode_o_figlet'] = 'Figlet ASCII 아트 (ì ‘ê·¼ì„±ì´ ë‚®ìŒ)'; -$lang['forusers'] = '로그ì¸í•œ 사용ìžë„ CAPTCHA(캡차)를 사용하겠습니까?'; -$lang['loginprotect'] = '로그ì¸í•˜ë ¤ë©´ CAPTCHA(캡차)ê°€ 필요합니까?'; -$lang['lettercount'] = '사용할 ê¸€ìž ìˆ˜. (3-16) ì–‘ì„ ì¦ê°€í•˜ë©´, 아래 ê·¸ë¦¼ì˜ ë„ˆë¹„ë„ ì¦ê°€í•´ì•¼ 합니다.'; -$lang['width'] = 'CAPTCHA(캡차) ê·¸ë¦¼ì˜ ë„ˆë¹„ (픽셀)'; -$lang['height'] = 'CAPTCHA(캡차) ê·¸ë¦¼ì˜ ë†’ì´ (픽셀)'; -$lang['question'] = 'ê³ ì •ëœ ì§ˆë¬¸ ëª¨ë“œì— ëŒ€í•œ 질문'; -$lang['answer'] = 'ê³ ì •ëœ ì§ˆë¬¸ ëª¨ë“œì— ëŒ€í•œ 답변'; diff --git a/sources/lib/plugins/captcha/lang/nl/lang.php b/sources/lib/plugins/captcha/lang/nl/lang.php deleted file mode 100644 index bf07a56..0000000 --- a/sources/lib/plugins/captcha/lang/nl/lang.php +++ /dev/null @@ -1,14 +0,0 @@ - - * @author Mark C. Prins - * @author Mark Prins - */ -$lang['testfailed'] = 'Sorry, maar de CAPTCHA is onjuist beantwoord. Misschien ben je toch geen mens?'; -$lang['fillcaptcha'] = 'Tik de letters in het onderstaande vakje over om aan te tonen dat je een mens bent.'; -$lang['fillmath'] = 'Geef antwoord op de rekensom om aan te tonen dat je een mens bent.'; -$lang['soundlink'] = 'Als je de letters in de afbeelding niet kunt lezen kun je dit .wav bestand downloaden om ze te laten voorlezen.'; -$lang['honeypot'] = 'Dit veld leeg laten'; diff --git a/sources/lib/plugins/captcha/lang/nl/settings.php b/sources/lib/plugins/captcha/lang/nl/settings.php deleted file mode 100644 index 0050236..0000000 --- a/sources/lib/plugins/captcha/lang/nl/settings.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @author Mark C. Prins - * @author Mark Prins - * @author Johan Wijnker - */ -$lang['mode'] = 'Welk type CAPTCHA wil je gebruiken?'; -$lang['mode_o_js'] = 'Tekst (automatisch ingevuld via JavaScript)'; -$lang['mode_o_text'] = 'Tekst (handmatig overtikken)'; -$lang['mode_o_math'] = 'Wiskunde opgave (eenvoudige rekensom)'; -$lang['mode_o_question'] = 'Vaste vraag'; -$lang['mode_o_image'] = 'Afbeelding (slechte toegankelijkhied)'; -$lang['mode_o_audio'] = 'Afbeelding+Audio (betere toegankelijkheid)'; -$lang['mode_o_figlet'] = 'Figlet ASCII Art (slechte toegankelijkheid)'; -$lang['forusers'] = 'Ook CAPTCHA voor ingelogde gebruikers gebruiken?'; -$lang['loginprotect'] = 'Vereis een CAPTCHA om in te loggen?'; -$lang['lettercount'] = 'Aantal te gebruiken letters (3-16). Let er op ook de breedte van de afbeelding hieronder te vergroten als het aantal wordt verhoogd'; -$lang['width'] = 'Breedte van de CAPTCHA afbeelding (pixels)'; -$lang['height'] = 'Hoogte van de CAPTCHA afbeelding (pixels)'; -$lang['question'] = 'Vraag voor de vaste vraag modus'; -$lang['answer'] = 'Antwoord voor de vaste vraag modus'; diff --git a/sources/lib/plugins/captcha/lang/no/lang.php b/sources/lib/plugins/captcha/lang/no/lang.php deleted file mode 100644 index 6269d34..0000000 --- a/sources/lib/plugins/captcha/lang/no/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Dessverre, du svarte ikke rett pÃ¥ CAPTCHAen. Kanskje du ikke er et menneske likevel?'; -$lang['fillcaptcha'] = 'Vennligst fyll inn alle bokstavene i feltet for Ã¥ bevise at du er et menneske.'; -$lang['fillmath'] = 'Vennligst løys denne ligninga for Ã¥ bevise at du er et menneske.'; -$lang['soundlink'] = 'Derosm du ikke kan lese bokstavene pÃ¥ bildet, last ned denne .wav-fila for Ã¥ fÃ¥ de opplest.'; -$lang['honeypot'] = 'Vennligst hold dette feltet tomt.'; diff --git a/sources/lib/plugins/captcha/lang/no/settings.php b/sources/lib/plugins/captcha/lang/no/settings.php deleted file mode 100644 index c9c35a9..0000000 --- a/sources/lib/plugins/captcha/lang/no/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author Daniel Raknes - */ -$lang['mode'] = 'Hvilken type CAPTCHA vil du bruke?'; -$lang['mode_o_js'] = 'Tekst (forfylt med JavaScript)'; -$lang['mode_o_text'] = 'Tekst (bare manuelt)'; -$lang['mode_o_math'] = 'Matteproblem'; -$lang['mode_o_question'] = 'Fast spørsmÃ¥l'; -$lang['mode_o_image'] = 'Bilde (vanskelig tilgjengelig)'; -$lang['mode_o_audio'] = 'Bilde og lyd (bedre tilgjengelighet)'; -$lang['mode_o_figlet'] = 'Figlet ASCII-kunst (vanskelig tilgjengelig)'; -$lang['forusers'] = 'Bruke CAPTCHA for innlogga brukere?'; -$lang['loginprotect'] = 'Kreve CAPTCHA ved innlogging?'; -$lang['lettercount'] = 'Antall bokstaver (3-16). Om du øker antallet mÃ¥ du ogsÃ¥ øke bredden av bildet under.'; -$lang['width'] = 'Bredde pÃ¥ CAPTCHA-bildet (i piksler)'; -$lang['height'] = 'Høyde pÃ¥ CAPTCHA-bildet (i piksler)'; -$lang['question'] = 'Fast spørsmÃ¥l'; -$lang['answer'] = 'Svar pÃ¥ fast spørsmÃ¥l'; diff --git a/sources/lib/plugins/captcha/lang/pl/lang.php b/sources/lib/plugins/captcha/lang/pl/lang.php deleted file mode 100644 index cb23f92..0000000 --- a/sources/lib/plugins/captcha/lang/pl/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Wybacz, ale CAPTCHA nie zostaÅ‚a uzupeÅ‚niona poprawnie. Może wcale nie jesteÅ› czÅ‚owiekiem?'; -$lang['fillcaptcha'] = 'ProszÄ™ wprowadzić wszystkie znaki w pole, by udowodnić, że jesteś czÅ‚owiekiem.'; -$lang['fillmath'] = 'ProszÄ™ rozwiÄ…zać poniższe równanie, by udowodnić, że jesteś czÅ‚owiekiem.'; -$lang['soundlink'] = 'Jeżeli nie jesteÅ› w stanie przeczytać znaków widocznych na obrazie pobierz plik .wav, w którym zawarta jest ich gÅ‚osowa reprezentacja.'; -$lang['honeypot'] = 'ProszÄ™ pozostawić to pole puste.'; diff --git a/sources/lib/plugins/captcha/lang/pl/settings.php b/sources/lib/plugins/captcha/lang/pl/settings.php deleted file mode 100644 index 33605ed..0000000 --- a/sources/lib/plugins/captcha/lang/pl/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - * @author Mati - */ -$lang['mode'] = 'Jaki typ CAPTCHA zastosować?'; -$lang['mode_o_text'] = 'Tekst (tylko rÄ™cznie)'; -$lang['mode_o_math'] = 'Problem matematyczny'; -$lang['mode_o_question'] = 'StaÅ‚e pytanie'; -$lang['mode_o_image'] = 'Obraz (sÅ‚aba dostÄ™pność)'; -$lang['mode_o_audio'] = 'Obraz+DźwiÄ™k (lepsza dostÄ™pność)'; -$lang['mode_o_figlet'] = 'Sztuka figletowych ASCII (sÅ‚aba dostÄ™pność)'; -$lang['forusers'] = 'Stosować CAPTCHA również dla zalogowanych użytkowników?'; -$lang['lettercount'] = 'Wykorzystywane liczby i litery (3-16). PamiÄ™taj by wraz ze wzrostem ich iloÅ›ci zwiÄ™kszać również szerokość obrazu poniżej.'; -$lang['width'] = 'Szerokość obrazu CAPTCHA (w pikselach)'; -$lang['height'] = 'Wysokość obrazu CAPTCHA (w pikselach)'; -$lang['question'] = 'Pytanie stosowane w trybie staÅ‚ego pytania'; -$lang['answer'] = 'Odpowiedź na staÅ‚e pytanie'; diff --git a/sources/lib/plugins/captcha/lang/pt-br/lang.php b/sources/lib/plugins/captcha/lang/pt-br/lang.php deleted file mode 100644 index 7a37dd1..0000000 --- a/sources/lib/plugins/captcha/lang/pt-br/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Desculpe, mas o CAPTCHA não foi preenchido corretamente. Talvez você não seja humano?'; -$lang['fillcaptcha'] = 'Por favor preencha todas as letras dentro da caixa para provar que você é humano.'; -$lang['fillmath'] = 'Por favor resolva a seguinte equação para provar que você é humano.'; -$lang['soundlink'] = 'Se você não pode ler as letras na imagem, faça o download desse .wav para que elas sejam lidas para você.'; -$lang['honeypot'] = 'Por favor deixe esse campo em branco:'; diff --git a/sources/lib/plugins/captcha/lang/pt-br/settings.php b/sources/lib/plugins/captcha/lang/pt-br/settings.php deleted file mode 100644 index 0efa958..0000000 --- a/sources/lib/plugins/captcha/lang/pt-br/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['mode'] = 'Qual tipo de CAPTCHA usar?'; -$lang['mode_o_js'] = 'Texto (pré-preenchido com JavaScript)'; -$lang['mode_o_text'] = 'Texto (somente manual)'; -$lang['mode_o_math'] = 'Problema de Matemática'; -$lang['mode_o_question'] = 'Questão Resolvida'; -$lang['mode_o_image'] = 'Imagem (acessibilidade ruim)'; -$lang['mode_o_audio'] = 'Imagem+Ãudio (acessibilidade melhor)'; -$lang['mode_o_figlet'] = 'Figlet ASCII Art (acessibilidade ruim)'; -$lang['forusers'] = 'Também usar CAPTCHA para usuários logados?'; -$lang['lettercount'] = 'Número de letras para usar (3-16). Se você aumentar a quantidade, lembre de também aumentar a largura da imagem abaixo.'; -$lang['width'] = 'Largura da imagem do CAPTCHA (pixel)'; -$lang['height'] = 'Altura da imagem do CAPTCHA (pixel)'; -$lang['question'] = 'Pergunta para o modo de pergunta fixa'; -$lang['answer'] = 'Resposta para o modo de pergunta fixa'; diff --git a/sources/lib/plugins/captcha/lang/pt/lang.php b/sources/lib/plugins/captcha/lang/pt/lang.php deleted file mode 100644 index 3ee95d5..0000000 --- a/sources/lib/plugins/captcha/lang/pt/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Infelizmente o CAPTCHA não foi respondido corretamente. Talvez você afinal não seja humano?'; -$lang['fillcaptcha'] = 'Por favor preencha todas as letras na caixa para provar que é humano.'; -$lang['fillmath'] = 'Por favor resolva a seguinte equação para provar que é humano.'; -$lang['soundlink'] = 'Se não pode ler as letras na imagem, descarregue este ficheiro .wav para as ouvir.'; -$lang['honeypot'] = 'Por favor mantenha este campo vazio:'; diff --git a/sources/lib/plugins/captcha/lang/pt/settings.php b/sources/lib/plugins/captcha/lang/pt/settings.php deleted file mode 100644 index 4682f81..0000000 --- a/sources/lib/plugins/captcha/lang/pt/settings.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author ANeves - */ -$lang['mode'] = 'Que tipo de CAPTCHA usar?'; -$lang['mode_o_js'] = 'Texto (pré-preenchido com JavaScript)'; -$lang['mode_o_text'] = 'Texto (somente manual)'; -$lang['mode_o_math'] = 'Problema Matemático'; -$lang['mode_o_question'] = 'Pergunta Fixa'; -$lang['mode_o_image'] = 'Imagem (má acessibilidade)'; -$lang['mode_o_audio'] = 'Imagem+Ãudio (melhor acessibilidade)'; -$lang['mode_o_figlet'] = 'Arte em ASCII Figlet (má acessibilidade)'; -$lang['forusers'] = 'Também usar CAPTCHA para utilizadores autenticados?'; -$lang['loginprotect'] = 'Exigir um CAPTCHA para se autenticar.'; -$lang['lettercount'] = 'Número de letras a usar (3-16). Se aumentar a quantidade, assegure-se de aumentar também a largura da imagem, abaixo.'; -$lang['width'] = 'Largura da imagem CAPTCHA (pixel)'; -$lang['height'] = 'Altura da imagem CAPTCHA (pixel)'; -$lang['question'] = 'Pergunta para o modo de pergunta fixa'; -$lang['answer'] = 'Resposta para o modo de pergunta fixa'; diff --git a/sources/lib/plugins/captcha/lang/ru/lang.php b/sources/lib/plugins/captcha/lang/ru/lang.php deleted file mode 100644 index 4810ec3..0000000 --- a/sources/lib/plugins/captcha/lang/ru/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author Ilya Rozhkov - */ -$lang['testfailed'] = 'Извините, код Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð²Ð²ÐµÐ´Ñ‘Ð½ неверно.'; -$lang['fillcaptcha'] = 'ПожалуйÑта, введите код подтверждениÑ, чтобы доказать, что вы не робот:'; -$lang['fillmath'] = 'Ответьте пожалуйÑта на вопроÑ, чтобы доказать, что вы человек.'; -$lang['soundlink'] = 'ЕÑли вы не можете прочитать Ñимволы на изображении, загрузите и воÑпроизведите wav-файл.'; -$lang['honeypot'] = 'ПожалуйÑта, оÑтавьте Ñто поле пуÑтым:'; diff --git a/sources/lib/plugins/captcha/lang/ru/settings.php b/sources/lib/plugins/captcha/lang/ru/settings.php deleted file mode 100644 index dc01396..0000000 --- a/sources/lib/plugins/captcha/lang/ru/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author Ilya Rozhkov - * @author Shpak Andrey - */ -$lang['mode'] = 'Какой тип CAPTCHA иÑпользовать?'; -$lang['mode_o_js'] = 'ТекÑÑ‚ (заполнение JavaScript)'; -$lang['mode_o_text'] = 'ТекÑÑ‚ (ручной ввод)'; -$lang['mode_o_math'] = 'МатематичеÑÐºÐ°Ñ Ð·Ð°Ð´Ð°Ñ‡Ð°'; -$lang['mode_o_question'] = 'Конкретный вопроÑ'; -$lang['mode_o_image'] = 'Изображение (Ñ…Ð¾Ñ€Ð¾ÑˆÐ°Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ð°)'; -$lang['mode_o_audio'] = 'Изображение и звук (Ð¿Ð»Ð¾Ñ…Ð°Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ð°)'; -$lang['mode_o_figlet'] = 'Figlet ASCII Art (Ñ…Ð¾Ñ€Ð¾ÑˆÐ°Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ð°)'; -$lang['forusers'] = 'ИÑпользоватьÑÑ CAPTCHA Ð´Ð»Ñ Ð·Ð°Ñ€ÐµÐ³Ð¸Ñтрированных пользователей?'; -$lang['loginprotect'] = 'Требовать ввод CAPTCHA Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð°?'; -$lang['lettercount'] = 'КоличеÑтво букв (3-16). ЕÑли вы увеличиваете количеÑтво букв, не забудьте увеличить ширину Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ.'; -$lang['width'] = 'Ширина Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ CAPTCHA (пикÑель)'; -$lang['height'] = 'Ð’Ñ‹Ñота Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ CAPTCHA (пикÑель)'; -$lang['question'] = 'Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° конкретного вопроÑа'; -$lang['answer'] = 'Ответ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° конкретного вопроÑа '; diff --git a/sources/lib/plugins/captcha/lang/sk/lang.php b/sources/lib/plugins/captcha/lang/sk/lang.php deleted file mode 100644 index f04ab4c..0000000 --- a/sources/lib/plugins/captcha/lang/sk/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author Martin Michalek - */ -$lang['testfailed'] = 'Ľutujem, ale na CAPTCHA nebolo odpovedané správne. Je možné, že by ste vôbec neboli Älovekom?'; -$lang['fillcaptcha'] = 'Vyplňte prosím vÅ¡etky písmená v poli, aby ste dokázali, že nie ste skript.'; -$lang['fillmath'] = 'Prosím vyrieÅ¡te nasledujúcu rovnicu, aby sme vás odlíšili od automatických web nástrojov.'; -$lang['soundlink'] = 'Ak nedokážete preÄítaÅ¥ písmená na obrázku, stiahnite si tento .wav súbor a text vám preÄítame.'; -$lang['honeypot'] = 'Prosím nechajte toto pole prázdne:'; diff --git a/sources/lib/plugins/captcha/lang/sk/settings.php b/sources/lib/plugins/captcha/lang/sk/settings.php deleted file mode 100644 index 2f6c582..0000000 --- a/sources/lib/plugins/captcha/lang/sk/settings.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @author Martin Michalek - */ -$lang['mode'] = 'Ktorý typ CAPTCHA sa má použiÅ¥?'; -$lang['mode_o_js'] = 'Text (predvyplnený JavaScriptom)'; -$lang['mode_o_text'] = 'Text (iba manuálne vložený)'; -$lang['mode_o_math'] = 'Matematický problém'; -$lang['mode_o_question'] = 'Pevne zadaná otázka'; -$lang['mode_o_image'] = 'Obrázok (pre ľudí s postihom)'; -$lang['mode_o_audio'] = 'Obrázok a zvuk (pre ľudí s menším postihom)'; -$lang['mode_o_figlet'] = 'ASCII obrázok (pre ľudí s postihom)'; -$lang['forusers'] = 'PoužívaÅ¥ CAPTCHA aj pre registrovaných užívateľov?'; -$lang['lettercount'] = 'PoÄet písmen (3-16). Ak zvýšite poÄet, zväÄÅ¡ite tiež šírku obrázka uvedeného nižšie.'; -$lang['width'] = 'Šírka CAPTCHA obrázku (v bodoch)'; -$lang['height'] = 'Výška CAPTCHA obrázku (v bodoch)'; -$lang['question'] = 'Otázka pre typ pevne zadanej otázky'; -$lang['answer'] = 'OdpoveÄ pre typ pevne zadanej otázky'; diff --git a/sources/lib/plugins/captcha/lang/tr/lang.php b/sources/lib/plugins/captcha/lang/tr/lang.php deleted file mode 100644 index 5132d09..0000000 --- a/sources/lib/plugins/captcha/lang/tr/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Ãœzgünüz, CAPTCHA doÄŸru cevaplanmadı. Belki bir insan deÄŸilsiniz (bot\'sunuz)?'; -$lang['fillcaptcha'] = 'Ä°nsan olduÄŸunuzu kanıtlamak için lütfen bütün harfleri kutuya giriniz.'; -$lang['fillmath'] = 'Lütfen ÅŸu eÅŸitliÄŸi çözünüz ki insan olduÄŸunuzu ispatlayınız.'; -$lang['soundlink'] = 'EÄŸer resimdeki harfleri okuyamıyorsanız, bu .wav dosyasını size okuması için indiriniz.'; -$lang['honeypot'] = 'Lütfen bu alanı boÅŸ bırakınız: '; diff --git a/sources/lib/plugins/captcha/lang/tr/settings.php b/sources/lib/plugins/captcha/lang/tr/settings.php deleted file mode 100644 index 3ab73a2..0000000 --- a/sources/lib/plugins/captcha/lang/tr/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author Ozan Hacibekiroglu - * @author Ä°lker R. Kapaç - */ -$lang['mode'] = 'Ne çeÅŸit CAPTCHA kullanılacak?'; -$lang['mode_o_js'] = 'Metin (JavaScript ile önceden doldurulur)'; -$lang['mode_o_text'] = 'Metin (sadece manuel)'; -$lang['mode_o_math'] = 'Matematik Problemi'; -$lang['mode_o_question'] = 'Sabit Soru'; -$lang['mode_o_image'] = 'Resim (Kötü eriÅŸebilirlik)'; -$lang['mode_o_audio'] = 'Resim+Ses (iyi eriÅŸebilirlik)'; -$lang['mode_o_figlet'] = 'Figlet ASCII Art (kötü eriÅŸebilirlik)'; -$lang['forusers'] = 'CAPTCHA giriÅŸ yapmış kullanıcılar için de kullanılsın mı?'; -$lang['loginprotect'] = 'Oturum açılışında CAPTCHA sorulsun mu?'; -$lang['lettercount'] = 'Kullanılacak harf sayısı (3-16). Karakter sayısını artırırsanız, resim geniÅŸliÄŸinin de arttığından emin olunuz.'; -$lang['width'] = 'CAPTCHA resminin geniÅŸliÄŸi (piksel)'; -$lang['height'] = 'CAPTCHA resminin yüksekliÄŸi (piksel)'; -$lang['question'] = 'Sabit soru modu için soru'; -$lang['answer'] = 'Sabit soru modu için cevap'; diff --git a/sources/lib/plugins/captcha/lang/uk/lang.php b/sources/lib/plugins/captcha/lang/uk/lang.php deleted file mode 100644 index 898a138..0000000 --- a/sources/lib/plugins/captcha/lang/uk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['testfailed'] = 'Вибачте, ви дали неправильну CAPTCHA-відповідь. Може ви взагалі не людина?'; -$lang['fillcaptcha'] = 'Будь лаÑка неберіть вÑÑ– Ñимволи аби підтвердити, що ви людина.'; -$lang['fillmath'] = 'Розв\'жіть, будь лаÑка це рівнÑÐ½Ð½Ñ Ð°Ð±Ð¸ підтвердити, що ви людина.'; -$lang['soundlink'] = 'Якщо ви не можете прочитати літери на картинці, завантажте цей .wav файл Ñ– проÑлухайте.'; -$lang['honeypot'] = 'Залиште це поле порожнім:'; diff --git a/sources/lib/plugins/captcha/lang/uk/settings.php b/sources/lib/plugins/captcha/lang/uk/settings.php deleted file mode 100644 index 949c615..0000000 --- a/sources/lib/plugins/captcha/lang/uk/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['mode'] = 'Який тип CAPTCHA викориÑтати?'; -$lang['mode_o_js'] = 'ТекÑÑ‚ (заповнений JavaScript)'; -$lang['mode_o_text'] = 'ТекÑÑ‚ (лише вручну)'; -$lang['mode_o_math'] = 'Математична задача'; -$lang['mode_o_question'] = 'ФікÑоване питаннÑ'; -$lang['mode_o_image'] = 'Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ (погана впізнаваніÑÑ‚ÑŒ)'; -$lang['mode_o_audio'] = 'ЗображеннÑ+аудіо (краща впізнаваніÑÑ‚ÑŒ)'; -$lang['mode_o_figlet'] = 'Картинка з ASCII-Ñимволів (погана впізнаваніÑÑ‚ÑŒ)'; -$lang['forusers'] = 'ВикориÑтовувати CAPTCHA Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ… кориÑтувачів?'; -$lang['lettercount'] = 'КількіÑÑ‚ÑŒ Ñимволів (3-16). Якщо ви збільшуєте кількіÑÑ‚ÑŒ, розширте також картинку нижче.'; -$lang['width'] = 'Ширина CAPTCHA-Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ (пікÑелів)'; -$lang['height'] = 'ВиÑота CAPTCHA-Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ (пікÑелів)'; -$lang['question'] = 'ÐŸÐ¸Ñ‚Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ фікÑованого питаннÑ'; -$lang['answer'] = 'Відповідь Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ñƒ фікÑованого питаннÑ'; diff --git a/sources/lib/plugins/captcha/lang/zh-tw/lang.php b/sources/lib/plugins/captcha/lang/zh-tw/lang.php deleted file mode 100644 index f1816a0..0000000 --- a/sources/lib/plugins/captcha/lang/zh-tw/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author lioujheyu - */ -$lang['testfailed'] = '很抱歉，您沒有輸入正確的 CAPTCHA 驗證碼。'; -$lang['fillcaptcha'] = '請將字æ¯å¡«å…¥æ–¹æ¡†ã€‚'; -$lang['fillmath'] = '請解開下列方程å¼ä»¥è­‰æ˜Žä½ æ˜¯äººé¡ž'; -$lang['soundlink'] = '如果您無法閱讀圖片中的字æ¯ï¼Œè«‹ä¸‹è¼‰æ”¶è½é€™å€‹ WAV 檔。'; -$lang['honeypot'] = 'è«‹ä¿æŒé€™å€‹æ¬„ä½ç©ºç™½'; diff --git a/sources/lib/plugins/captcha/lang/zh-tw/settings.php b/sources/lib/plugins/captcha/lang/zh-tw/settings.php deleted file mode 100644 index ef84846..0000000 --- a/sources/lib/plugins/captcha/lang/zh-tw/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author lioujheyu - */ -$lang['mode'] = '使用哪種 CAPTCHA 類型？'; -$lang['mode_o_js'] = '文字 (é å…ˆç”¨ Javascript å¡«å…¥)'; -$lang['mode_o_text'] = '文字 (手動填入)'; -$lang['mode_o_math'] = '數學å•é¡Œ'; -$lang['mode_o_image'] = '圖片 (易用性差)'; -$lang['mode_o_audio'] = '圖片+è²éŸ³ (易用性較佳)'; -$lang['mode_o_figlet'] = 'Figlet ASCII è—è¡“å­— (易用性差)'; -$lang['forusers'] = 'å·²ç™»å…¥ä½¿ç”¨è€…ä¹Ÿè¦ CAPTCHA 驗證嗎？'; -$lang['lettercount'] = '多少字æ¯æœƒè¢«ä½¿ç”¨(3-16)。如果你增加使用個數，請確ä¿åŒæ™‚加寬圖片長度'; -$lang['width'] = 'CAPTCHA 圖片寬度 (åƒç´ )'; -$lang['height'] = 'CAPTCHA 圖片高度 (åƒç´ )'; diff --git a/sources/lib/plugins/captcha/lang/zh/lang.php b/sources/lib/plugins/captcha/lang/zh/lang.php deleted file mode 100644 index 7a01198..0000000 --- a/sources/lib/plugins/captcha/lang/zh/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author lainme - */ -$lang['testfailed'] = '抱歉，您输入的验è¯ç ä¸æ­£ç¡®ã€‚'; -$lang['fillcaptcha'] = '请在输入框中填入验è¯ç ä»¥è¯æ˜Žæ‚¨ä¸æ˜¯æœºå™¨äººã€‚'; -$lang['fillmath'] = '请填入算å¼çš„结果以è¯æ˜Žæ‚¨ä¸æ˜¯æœºå™¨äººã€‚'; -$lang['soundlink'] = '如果您无法阅读图片中的字æ¯ï¼Œè¯·ä¸‹è½½æ­¤ .wav 文件。'; -$lang['honeypot'] = '请将此区域留空：'; diff --git a/sources/lib/plugins/captcha/lang/zh/settings.php b/sources/lib/plugins/captcha/lang/zh/settings.php deleted file mode 100644 index 03548d9..0000000 --- a/sources/lib/plugins/captcha/lang/zh/settings.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @author lainme - * @author æ©™å­ç‹¼ <2949384951@qq.com> - */ -$lang['mode'] = '使用什么类型的验è¯ç ï¼Ÿ'; -$lang['mode_o_js'] = '文本 (预先由 JavaScript 填写)'; -$lang['mode_o_text'] = '文本 (手动输入)'; -$lang['mode_o_math'] = '算术题'; -$lang['mode_o_question'] = '固定问题'; -$lang['mode_o_image'] = '图片 (æ— éšœç¢æ€§å·®)'; -$lang['mode_o_audio'] = '图片+音频 (更好的无障ç¢æ€§)'; -$lang['mode_o_figlet'] = 'Figlet ASCII 艺术 (æ— éšœç¢æ€§å·®)'; -$lang['forusers'] = '对已登入的用户也适用å—？'; -$lang['loginprotect'] = '请输入验è¯ç '; -$lang['lettercount'] = '使用字æ¯çš„æ•°ç›® (3-16)。如果您增加数目，请确ä¿åŒæ—¶å¢žåŠ å›¾ç‰‡çš„宽度。'; -$lang['width'] = '验è¯ç å›¾ç‰‡å®½åº¦ (åƒç´ )'; -$lang['height'] = '验è¯ç å›¾ç‰‡é«˜åº¦ (åƒç´ )'; -$lang['question'] = '固定问题模å¼çš„问题'; -$lang['answer'] = '固定问题模å¼çš„答案'; diff --git a/sources/lib/plugins/captcha/plugin.info.txt b/sources/lib/plugins/captcha/plugin.info.txt deleted file mode 100644 index b975dcf..0000000 --- a/sources/lib/plugins/captcha/plugin.info.txt +++ /dev/null @@ -1,8 +0,0 @@ -base captcha -author Andreas Gohr -email andi@splitbrain.org -date 2015-10-05 -name CAPTCHA Plugin -desc Use a CAPTCHA challenge to protect DokuWiki against automated spam -url http://www.dokuwiki.org/plugin:captcha - diff --git a/sources/lib/plugins/captcha/script.js b/sources/lib/plugins/captcha/script.js deleted file mode 100644 index 3cb402c..0000000 --- a/sources/lib/plugins/captcha/script.js +++ /dev/null @@ -1,32 +0,0 @@ - -jQuery(function () { - var $wrap = jQuery('#plugin__captcha_wrapper'); - if(!$wrap.length) return; - - /** - * Autofill and hide the whole CAPTCHA stuff in the simple JS mode - */ - var $code = jQuery('#plugin__captcha_code'); - if ($code.length) { - var $box = $wrap.find('input[type=text]'); - $box.first().val($code.text().replace(/([^A-Z])+/g, '')); - $wrap.hide(); - } - - /** - * Add a HTML5 player for the audio version of the CAPTCHA - */ - var $audiolink = $wrap.find('a'); - if($audiolink.length) { - var audio = document.createElement('audio'); - if(audio) { - audio.src = $audiolink.attr('href'); - $wrap.append(audio); - $audiolink.click(function (e) { - audio.play(); - e.preventDefault(); - e.stopPropagation(); - }); - } - } -}); diff --git a/sources/lib/plugins/captcha/sound.png b/sources/lib/plugins/captcha/sound.png deleted file mode 100644 index 6056d23..0000000 Binary files a/sources/lib/plugins/captcha/sound.png and /dev/null differ diff --git a/sources/lib/plugins/captcha/style.css b/sources/lib/plugins/captcha/style.css deleted file mode 100644 index 9f6ec0c..0000000 --- a/sources/lib/plugins/captcha/style.css +++ /dev/null @@ -1,23 +0,0 @@ -.dokuwiki #plugin__captcha_wrapper img { - margin: 1px; - vertical-align: bottom; - border: 1px solid __border__; -} - -.dokuwiki #plugin__captcha_wrapper pre { - font-size: 70%; - font-family: monospace; - font-weight: bold; - border: none; - background-color: __background__; - color: __text__; - padding: 0; -} - -.dokuwiki #plugin__captcha_wrapper .no { - display: none; -} - -.dokuwiki #plugin__captcha_wrapper { -clear: left; -} diff --git a/sources/lib/plugins/captcha/wav.php b/sources/lib/plugins/captcha/wav.php deleted file mode 100644 index 996d52a..0000000 --- a/sources/lib/plugins/captcha/wav.php +++ /dev/null @@ -1,88 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../../'); -define('NOSESSION', true); -define('DOKU_DISABLE_GZIP_OUTPUT', 1); -require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/auth.php'); - -$ID = $_REQUEST['id']; -/** @var $plugin helper_plugin_captcha */ -$plugin = plugin_load('helper', 'captcha'); - -if($plugin->getConf('mode') != 'audio') { - http_status(404); - exit; -} - -$rand = $plugin->decrypt($_REQUEST['secret']); -$code = strtolower($plugin->_generateCAPTCHA($plugin->_fixedIdent(), $rand)); - -// prepare an array of wavfiles -$lc = dirname(__FILE__).'/lang/'.$conf['lang'].'/audio/'; -$en = dirname(__FILE__).'/lang/en/audio/'; -$wavs = array(); -$lettercount = $plugin->getConf('lettercount'); -if($lettercount > strlen($code)) $lettercount = strlen($code); -for($i = 0; $i < $lettercount; $i++) { - $file = $lc.$code{$i}.'.wav'; - if(!@file_exists($file)) $file = $en.$code{$i}.'.wav'; - $wavs[] = $file; -} - -header('Content-type: audio/x-wav'); -header('Content-Disposition: attachment;filename=captcha.wav'); - -echo joinwavs($wavs); - -/** - * Join multiple wav files - * - * All wave files need to have the same format and need to be uncompressed. - * The headers of the last file will be used (with recalculated datasize - * of course) - * - * @link http://ccrma.stanford.edu/CCRMA/Courses/422/projects/WaveFormat/ - * @link http://www.thescripts.com/forum/thread3770.html - */ -function joinwavs($wavs) { - $fields = join( - '/', array( - 'H8ChunkID', 'VChunkSize', 'H8Format', - 'H8Subchunk1ID', 'VSubchunk1Size', - 'vAudioFormat', 'vNumChannels', 'VSampleRate', - 'VByteRate', 'vBlockAlign', 'vBitsPerSample' - ) - ); - - $data = ''; - foreach($wavs as $wav) { - $fp = fopen($wav, 'rb'); - $header = fread($fp, 36); - $info = unpack($fields, $header); - - // read optional extra stuff - if($info['Subchunk1Size'] > 16) { - $header .= fread($fp, ($info['Subchunk1Size'] - 16)); - } - - // read SubChunk2ID - $header .= fread($fp, 4); - - // read Subchunk2Size - $size = unpack('vsize', fread($fp, 4)); - $size = $size['size']; - - // read data - $data .= fread($fp, $size); - } - - return $header.pack('V', strlen($data)).$data; -} - diff --git a/sources/lib/plugins/config/admin.php b/sources/lib/plugins/config/admin.php index ec8ee0b..e760a41 100644 --- a/sources/lib/plugins/config/admin.php +++ b/sources/lib/plugins/config/admin.php @@ -354,7 +354,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { // build toc $t = array(); - $t[] = html_mktocitem('configuration_manager', $this->getLang('_configuration_manager'), 1); + $check = false; + $title = $this->getLang('_configuration_manager'); + $t[] = html_mktocitem(sectionID($title, $check), $title, 1); $t[] = html_mktocitem('dokuwiki_settings', $this->getLang('_header_dokuwiki'), 1); /** @var setting $setting */ foreach($toc['conf'] as $setting) { diff --git a/sources/lib/plugins/config/lang/ar/lang.php b/sources/lib/plugins/config/lang/ar/lang.php index 66bb424..69e843f 100644 --- a/sources/lib/plugins/config/lang/ar/lang.php +++ b/sources/lib/plugins/config/lang/ar/lang.php @@ -55,7 +55,7 @@ $lang['breadcrumbs'] = 'عدد العناقيد للزيارات'; $lang['youarehere'] = 'عناقيد هرمية'; $lang['fullpath'] = 'اظهر المحتوى الكامل للصÙحات ÙÙŠ '; $lang['typography'] = 'اعمل استبدالات طبوغراÙية'; -$lang['dformat'] = 'تنسيق التاريخ (انظر وظيÙØ© PHP,s strftime)'; +$lang['dformat'] = 'تنسيق التاريخ (انظر وظيÙØ© PHP,s strftime)'; $lang['signature'] = 'التوقيع'; $lang['showuseras'] = 'الذي يعرض لاظهار المستخدم الذي قام بآخر تحرير لصÙحة'; $lang['toptoclevel'] = 'المستوى الأعلى لمحتويات الجدول'; @@ -129,7 +129,7 @@ $lang['autoplural'] = 'تحقق من صيغ الجمع ÙÙŠ الرو $lang['compression'] = 'طريقة الغضط لملÙات attic'; $lang['gzip_output'] = 'استخدم ترميز-محتوى gzip Ù„ xhtml'; $lang['compress'] = 'رÙص مخرجات CSS Ùˆ جاÙا سكربت'; -$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة ÙÙŠ CSS التي ستÙضمن ÙÙŠ صÙحة-التنسيق لخÙض طلبات HTTP. لن تعمل هذه التقنية ÙÙŠ IE 7 أو أقل! 400 إلى 600 بايت تعد قيمة جيدة. اضبط إلى 0 لتعطلها.'; +$lang['cssdatauri'] = 'الحجم بالبايتات للصور المذكورة ÙÙŠ CSS التي ستÙضمن ÙÙŠ صÙحة-التنسيق لخÙض طلبات HTTP. 400 إلى 600 بايت تعد قيمة جيدة. اضبط إلى 0 لتعطلها.'; $lang['send404'] = 'ارسل "HTTP 404/Page Not Found" للصÙحات غير الموجودة'; $lang['broken_iua'] = 'هل الوظيÙØ© ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل Ùهرسة البحث. IIS+PHP/CGI تعر٠بأنها لاتعمل. أنظر العلة 852 لمزيد من المعلومات.'; $lang['xsendfile'] = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملÙات ثابتة؟ يجب أن يكون خادم الوب داعما له.'; diff --git a/sources/lib/plugins/config/lang/bg/lang.php b/sources/lib/plugins/config/lang/bg/lang.php index 0426df0..75508a5 100644 --- a/sources/lib/plugins/config/lang/bg/lang.php +++ b/sources/lib/plugins/config/lang/bg/lang.php @@ -56,7 +56,7 @@ $lang['breadcrumbs'] = 'Брой на Ñледите. За изклю $lang['youarehere'] = 'Йерархични Ñледи (в този Ñлучай можете да изключите горната опциÑ)'; $lang['fullpath'] = 'Показване на Ð¿ÑŠÐ»Ð½Ð¸Ñ Ð¿ÑŠÑ‚ до Ñтраниците в Ð´Ð¾Ð»Ð½Ð¸Ñ ÐºÐ¾Ð»Ð¾Ð½Ñ‚Ð¸Ñ‚ÑƒÐ».'; $lang['typography'] = 'ЗамÑна на поÑледователноÑÑ‚ от Ñимволи Ñ Ñ‚Ð¸Ð¿Ð¾Ð³Ñ€Ð°Ñ„Ñки еквивалент'; -$lang['dformat'] = 'Формат на датата (виж. strftime функциÑта на PHP)'; +$lang['dformat'] = 'Формат на датата (виж. strftime функциÑта на PHP)'; $lang['signature'] = 'ÐŸÐ¾Ð´Ð¿Ð¸Ñ - какво да внаÑÑ Ð±ÑƒÑ‚Ð¾Ð½Ð° "Вмъкване на подпиÑ" от редактора'; $lang['showuseras'] = 'Какво да Ñе показва за потребителÑ, който поÑледно е променил дадена Ñтраницата'; $lang['toptoclevel'] = 'Главно ниво (заглавие) за Ñъдържанието'; diff --git a/sources/lib/plugins/config/lang/ca-valencia/lang.php b/sources/lib/plugins/config/lang/ca-valencia/lang.php index b6ceadd..db86dc9 100644 --- a/sources/lib/plugins/config/lang/ca-valencia/lang.php +++ b/sources/lib/plugins/config/lang/ca-valencia/lang.php @@ -50,7 +50,7 @@ $lang['youarehere'] = 'Rastre jeràrquic'; $lang['typography'] = 'Fer substitucions tipogràfiques'; $lang['htmlok'] = 'Permetre HTML'; $lang['phpok'] = 'Permetre PHP'; -$lang['dformat'] = 'Format de data (vore la funció date de PHP)'; +$lang['dformat'] = 'Format de data (vore la funció date de PHP)'; $lang['signature'] = 'Firma'; $lang['toptoclevel'] = 'Nivell superior de la taula de continguts'; $lang['tocminheads'] = 'Número mínim de titulars que generen una TDC'; diff --git a/sources/lib/plugins/config/lang/ca/lang.php b/sources/lib/plugins/config/lang/ca/lang.php index 404d3ea..bbcd26e 100644 --- a/sources/lib/plugins/config/lang/ca/lang.php +++ b/sources/lib/plugins/config/lang/ca/lang.php @@ -58,7 +58,7 @@ $lang['breadcrumbs'] = 'Nombre d\'engrunes'; $lang['youarehere'] = 'Camí d\'engrunes jeràrquic'; $lang['fullpath'] = 'Mostra el camí complet de les pàgines al peu'; $lang['typography'] = 'Substitucions tipogràfiques'; -$lang['dformat'] = 'Format de data (vg. la funció PHP strftime)'; +$lang['dformat'] = 'Format de data (vg. la funció PHP strftime)'; $lang['signature'] = 'Signatura'; $lang['showuseras'] = 'Què cal visualitzar quan es mostra el darrer usuari que ha editat la pàgina'; $lang['toptoclevel'] = 'Nivell superior per a la taula de continguts'; diff --git a/sources/lib/plugins/config/lang/cs/lang.php b/sources/lib/plugins/config/lang/cs/lang.php index d7a7362..aecb34f 100644 --- a/sources/lib/plugins/config/lang/cs/lang.php +++ b/sources/lib/plugins/config/lang/cs/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Bohumir Zamecnik * @author Zbynek Krivka * @author tomas@valenta.cz @@ -67,7 +67,7 @@ $lang['breadcrumbs'] = 'PoÄet odkazů na navÅ¡tívené stránky'; $lang['youarehere'] = 'Hierarchická "drobeÄková" navigace'; $lang['fullpath'] = 'Ukazovat plnou cestu ke stránkám v patiÄce'; $lang['typography'] = 'ProvádÄ›t typografické nahrazování'; -$lang['dformat'] = 'Formát data (viz PHP funkci strftime)'; +$lang['dformat'] = 'Formát data (viz PHP funkci strftime)'; $lang['signature'] = 'Podpis'; $lang['showuseras'] = 'Co se má pÅ™esnÄ› zobrazit, když se ukazuje uživatel, který naposledy editoval stránku'; $lang['toptoclevel'] = 'Nejvyšší úroveň, kterou zaÄít automaticky generovaný obsah'; @@ -149,7 +149,7 @@ $lang['autoplural'] = 'Kontrolovat plurálové tvary v odkazech'; $lang['compression'] = 'Metoda komprese pro staré verze'; $lang['gzip_output'] = 'Používat pro xhtml Content-Encoding gzip'; $lang['compress'] = 'Zahustit CSS a JavaScript výstup'; -$lang['cssdatauri'] = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro uÅ¡etÅ™ení HTTP požadavku vestavÄ›ny do stylu. Tato technika nefunguje v IE 7 a starším. DoporuÄená hodnota je mezi 400 a 600 bajty. Pro vypnutí nastavte na 0.'; +$lang['cssdatauri'] = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro uÅ¡etÅ™ení HTTP požadavku vestavÄ›ny do stylu. DoporuÄená hodnota je mezi 400 a 600 bajty. Pro vypnutí nastavte na 0.'; $lang['send404'] = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky'; $lang['broken_iua'] = 'Je na vaÅ¡em systému funkce ignore_user_abort porouchaná? To může způsobovat nefunkÄnost vyhledávacího indexu. O kombinaci IIS+PHP/CGI je známo, že nefunguje správnÄ›. Viz Bug 852 pro více informací.'; $lang['xsendfile'] = 'Používat X-Sendfile hlavniÄky pro download statických souborů z webserveru? Je vÅ¡ak požadována podpora této funkce na stranÄ› VaÅ¡eho webserveru.'; @@ -204,6 +204,7 @@ $lang['xsendfile_o_2'] = 'Standardní hlaviÄka X-Sendfile'; $lang['xsendfile_o_3'] = 'Proprietární hlaviÄka Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'PÅ™ihlaÅ¡ovací jméno'; $lang['showuseras_o_username'] = 'Celé jméno uživatele'; +$lang['showuseras_o_username_link'] = 'Celé uživatelské jméno jako odkaz mezi wiki'; $lang['showuseras_o_email'] = 'E-mailová adresa uživatele ("zamaskována" aktuálnÄ› nastavenou metodou)'; $lang['showuseras_o_email_link'] = 'E-mailová adresa uživatele jako mailto: odkaz'; $lang['useheading_o_0'] = 'Nikdy'; diff --git a/sources/lib/plugins/config/lang/cy/intro.txt b/sources/lib/plugins/config/lang/cy/intro.txt new file mode 100644 index 0000000..02ccec5 --- /dev/null +++ b/sources/lib/plugins/config/lang/cy/intro.txt @@ -0,0 +1,7 @@ +====== Rheolwr Ffurfwedd ====== + +Defnyddiwch y dudalen hon i reoli gosodiadau eich arsefydliad DokuWiki. Am gymorth ar osodiadau unigol ewch i [[doku>config]]. Am wybodaeth bellach ar yr ategyn hwn ewch i [[doku>plugin:config]]. + +Mae gosodiadau gyda chefndir coch golau wedi\'u hamddiffyn a \'sdim modd eu newid gyda\'r ategyn hwn. Mae gosodiaadau gyda chefndir glas yn dynodi gwerthoedd diofyn ac mae gosodiadau gyda chefndir gwyn wedi\'u gosod yn lleol ar gyfer yr arsefydliad penodol hwn. Mae modd newid gosodiadau gwyn a glas. + +Cofiwch bwyso y botwm **Cadw** cyn gadael y dudalen neu caiff eich newidiadau eu colli. diff --git a/sources/lib/plugins/config/lang/cy/lang.php b/sources/lib/plugins/config/lang/cy/lang.php new file mode 100644 index 0000000..4fa8ab8 --- /dev/null +++ b/sources/lib/plugins/config/lang/cy/lang.php @@ -0,0 +1,262 @@ + + * @author Matthias Schulte + * @author Alan Davies + */ + +// for admin plugins, the menu prompt to be displayed in the admin menu +// if set here, the plugin doesn't need to override the getMenuText() method +$lang['menu'] = 'Gosodiadau Ffurwedd'; + +$lang['error'] = 'Gosodiadau heb eu diweddaru oherwydd gwerth annilys, gwiriwch eich newidiadau ac ailgyflwyno. +
      Caiff y gwerth(oedd) anghywir ei/eu dangos gydag ymyl coch.'; +$lang['updated'] = 'Diweddarwyd gosodiadau\'n llwyddiannus.'; +$lang['nochoice'] = '(dim dewisiadau eraill ar gael)'; +$lang['locked'] = '\'Sdim modd diweddaru\'r ffeil osodiadau, os ydy hyn yn anfwriadol,
      + sicrhewch fod enw\'r ffeil osodiadau a\'r hawliau lleol yn gywir.'; + +$lang['danger'] = 'Perygl: Gall newid yr opsiwn hwn wneud eich wici a\'r ddewislen ffurfwedd yn anghyraeddadwy.'; +$lang['warning'] = 'Rhybudd: Gall newid yr opsiwn hwn achosi ymddygiad anfwriadol.'; +$lang['security'] = 'Rhybudd Diogelwch: Gall newid yr opsiwn hwn achosi risg diogelwch.'; + +/* --- Config Setting Headers --- */ +$lang['_configuration_manager'] = 'Rheolwr Ffurfwedd'; //same as heading in intro.txt +$lang['_header_dokuwiki'] = 'DokuWiki'; +$lang['_header_plugin'] = 'Ategyn'; +$lang['_header_template'] = 'Templed'; +$lang['_header_undefined'] = 'Gosodiadau Amhenodol'; + +/* --- Config Setting Groups --- */ +$lang['_basic'] = 'Sylfaenol'; +$lang['_display'] = 'Dangos'; +$lang['_authentication'] = 'Dilysiad'; +$lang['_anti_spam'] = 'Gwrth-Sbam'; +$lang['_editing'] = 'Yn Golygu'; +$lang['_links'] = 'Dolenni'; +$lang['_media'] = 'Cyfrwng'; +$lang['_notifications'] = 'Hysbysiad'; +$lang['_syndication'] = 'Syndication (RSS)'; //angen newid +$lang['_advanced'] = 'Uwch'; +$lang['_network'] = 'Rhwydwaith'; + +/* --- Undefined Setting Messages --- */ +$lang['_msg_setting_undefined'] = 'Dim gosodiad metadata.'; +$lang['_msg_setting_no_class'] = 'Dim gosodiad dosbarth.'; +$lang['_msg_setting_no_default'] = 'Dim gwerth diofyn.'; + +/* -------------------- Config Options --------------------------- */ + +/* Basic Settings */ +$lang['title'] = 'Teitl y wici h.y. enw\'ch wici'; +$lang['start'] = 'Enw\'r dudalen i\'w defnyddio fel man cychwyn ar gyfer pob namespace'; //namespace +$lang['lang'] = 'Iaith y rhyngwyneb'; +$lang['template'] = 'Templed h.y. dyluniad y wici.'; +$lang['tagline'] = 'Taglinell (os yw\'r templed yn ei gynnal)'; +$lang['sidebar'] = 'Enw tudalen y bar ochr (os yw\'r templed yn ei gynnal), Mae maes gwag yn analluogi\'r bar ochr'; +$lang['license'] = 'O dan ba drwydded dylai\'ch cynnwys gael ei ryddhau?'; +$lang['savedir'] = 'Ffolder ar gyfer cadw data'; +$lang['basedir'] = 'Llwybr y gweinydd (ee. /dokuwiki/). Gadewch yn wag ar gyfer awtoddatgeliad.'; +$lang['baseurl'] = 'URL y gweinydd (ee. http://www.yourserver.com). Gadewch yn wag ar gyfer awtoddatgeliad.'; +$lang['cookiedir'] = 'Llwybr cwcis. Gadewch yn wag i ddefnyddio \'baseurl\'.'; +$lang['dmode'] = 'Modd creu ffolderi'; +$lang['fmode'] = 'Modd creu ffeiliau'; +$lang['allowdebug'] = 'Caniatáu dadfygio. Analluogwch os nac oes angen hwn!'; + +/* Display Settings */ +$lang['recent'] = 'Nifer y cofnodion y dudalen yn y newidiadau diweddar'; +$lang['recent_days'] = 'Sawl newid diweddar i\'w cadw (diwrnodau)'; +$lang['breadcrumbs'] = 'Nifer y briwsion "trywydd". Gosodwch i 0 i analluogi.'; +$lang['youarehere'] = 'Defnyddiwch briwsion hierarchaidd (byddwch chi yn debygol o angen analluogi\'r opsiwn uchod wedyn)'; +$lang['fullpath'] = 'Datgelu llwybr llawn y tudalennau yn y troedyn'; +$lang['typography'] = 'Gwnewch amnewidiadau argraffyddol'; +$lang['dformat'] = 'Fformat dyddiad (gweler swyddogaeth strftime PHP)'; +$lang['signature'] = 'Yr hyn i\'w mewnosod gyda\'r botwm llofnod yn y golygydd'; +$lang['showuseras'] = 'Yr hyn i\'w harddangos wrth ddangos y defnyddiwr a wnaeth olygu\'r dudalen yn olaf'; +$lang['toptoclevel'] = 'Lefel uchaf ar gyfer tabl cynnwys'; +$lang['tocminheads'] = 'Isafswm y penawdau sy\'n penderfynu os ydy\'r tabl cynnwys yn cael ei adeiladu'; +$lang['maxtoclevel'] = 'Lefel uchaf ar gyfer y tabl cynnwys'; +$lang['maxseclevel'] = 'Lefel uchaf adran olygu'; +$lang['camelcase'] = 'Defnyddio CamelCase ar gyfer dolenni'; +$lang['deaccent'] = 'Sut i lanhau enwau tudalennau'; +$lang['useheading'] = 'Defnyddio\'r pennawd cyntaf ar gyfer enwau tudalennau'; +$lang['sneaky_index'] = 'Yn ddiofyn, bydd DokuWiki yn dangos pob namespace yn y map safle. Bydd galluogi yr opsiwn hwn yn cuddio\'r rheiny lle \'sdim hawliau darllen gan y defnyddiwr. Gall hwn achosi cuddio subnamespaces cyraeddadwy a fydd yn gallu peri\'r indecs i beidio â gweithio gyda gosodiadau ACL penodol.'; //namespace +$lang['hidepages'] = 'Cuddio tudalennau sy\'n cydweddu gyda\'r mynegiad rheolaidd o\'r chwiliad, y map safle ac indecsau awtomatig eraill'; + +/* Authentication Settings */ +$lang['useacl'] = 'Defnyddio rhestrau rheoli mynediad'; +$lang['autopasswd'] = 'Awtogeneradu cyfrineiriau'; +$lang['authtype'] = 'Ôl-brosesydd dilysu'; +$lang['passcrypt'] = 'Dull amgryptio cyfrineiriau'; +$lang['defaultgroup']= 'Grŵp diofyn, caiff pob defnyddiwr newydd ei osod yn y grŵp hwn'; +$lang['superuser'] = 'Uwchddefnyddiwr - grŵp, defnyddiwr neu restr gwahanwyd gan goma defnyddiwr1,@group1,defnyddiwr2 gyda mynediad llawn i bob tudalen beth bynnag y gosodiadau ACL'; +$lang['manager'] = 'Rheolwr - grŵp, defnyddiwr neu restr gwahanwyd gan goma defnyddiwr1,@group1,defnyddiwr2 gyda mynediad i swyddogaethau rheoli penodol'; +$lang['profileconfirm'] = 'Cadrnhau newidiadau proffil gyda chyfrinair'; +$lang['rememberme'] = 'Caniatáu cwcis mewngofnodi parhaol (cofio fi)'; +$lang['disableactions'] = 'Analluogi gweithredoedd DokuWiki'; +$lang['disableactions_check'] = 'Gwirio'; +$lang['disableactions_subscription'] = 'Tanysgrifio/Dad-tanysgrifio'; +$lang['disableactions_wikicode'] = 'Dangos ffynhonnell/Allforio Crai'; +$lang['disableactions_profile_delete'] = 'Dileu Cyfrif Eu Hunain'; +$lang['disableactions_other'] = 'Gweithredoedd eraill (gwahanu gan goma)'; +$lang['disableactions_rss'] = 'XML Syndication (RSS)'; //angen newid hwn +$lang['auth_security_timeout'] = 'Terfyn Amser Diogelwch Dilysiad (eiliadau)'; +$lang['securecookie'] = 'A ddylai cwcis sydd wedi cael eu gosod gan HTTPS gael eu hanfon trwy HTTPS yn unig gan y porwr? Analluogwch yr opsiwn hwn dim ond pan fydd yr unig mewngofnodiad i\'ch wici wedi\'i ddiogelu gydag SSL ond mae pori\'r wici yn cael ei wneud heb ddiogelu.'; +$lang['remote'] = 'Galluogi\'r system API pell. Mae hwn yn galluogi apps eraill i gael mynediad i\'r wici trwy XML-RPC neu fecanweithiau eraill.'; +$lang['remoteuser'] = 'Cyfyngu mynediad API pell i grwpiau neu ddefnydwyr wedi\'u gwahanu gan goma yma. Gadewch yn wag i roi mynediad i bawb.'; + +/* Anti-Spam Settings */ +$lang['usewordblock']= 'Blocio sbam wedi selio ar restr eiriau'; +$lang['relnofollow'] = 'Defnyddio rel="nofollow" ar ddolenni allanol'; +$lang['indexdelay'] = 'Oediad cyn indecsio (eil)'; +$lang['mailguard'] = 'Tywyllu cyfeiriadau ebost'; +$lang['iexssprotect']= 'Gwirio ffeiliau a lanlwythwyd am JavaScript neu god HTML sydd efallai\'n faleisis'; + +/* Editing Settings */ +$lang['usedraft'] = 'Cadw drafft yn awtomatig wrth olygu'; +$lang['htmlok'] = 'Caniatáu HTML wedi\'i fewnosod'; +$lang['phpok'] = 'Caniatáu PHP wedi\'i fewnosod'; +$lang['locktime'] = 'Oed mwyaf ar gyfer cloi ffeiliau (eil)'; +$lang['cachetime'] = 'Oed mwyaf ar gyfer y storfa (eil)'; + +/* Link settings */ +$lang['target____wiki'] = 'Ffenestr darged ar gyfer dolenni mewnol'; +$lang['target____interwiki'] = 'Ffenestr darged ar gyfer dolenni interwiki'; +$lang['target____extern'] = 'Ffenestr darged ar gyfer dolenni allanol'; +$lang['target____media'] = 'Ffenestr darged ar gyfer dolenni cyfrwng'; +$lang['target____windows'] = 'Ffenestr darged ar gyfer dolenni ffenestri'; + +/* Media Settings */ +$lang['mediarevisions'] = 'Galluogi Mediarevisions?'; +$lang['refcheck'] = 'Gwirio os ydy ffeil gyfrwng yn dal yn cael ei defnydio cyn ei dileu hi'; +$lang['gdlib'] = 'Fersiwn GD Lib'; +$lang['im_convert'] = 'Llwybr i declyn trosi ImageMagick'; +$lang['jpg_quality'] = 'Ansawdd cywasgu JPG (0-100)'; +$lang['fetchsize'] = 'Uchafswm maint (beit) gall fetch.php lawlwytho o URL allanol, ee. i storio ac ailfeintio delweddau allanol.'; + +/* Notification Settings */ +$lang['subscribers'] = 'Caniatáu defnyddwyr i danysgrifio i newidiadau tudalen gan ebost'; +$lang['subscribe_time'] = 'Yr amser cyn caiff rhestrau tanysgrifio a chrynoadau eu hanfon (eil); Dylai hwn fod yn llai na\'r amser wedi\'i gosod mewn recent_days.'; +$lang['notify'] = 'Wastad anfon hysbysiadau newidiadau i\'r cyfeiriad ebost hwn'; +$lang['registernotify'] = 'Wastad anfon gwybodaeth ar ddefnyddwyr newydd gofrestru i\'r cyfeiriad ebost hwn'; +$lang['mailfrom'] = 'Cyfeiriad anfon ebyst i\'w ddefnyddio ar gyfer pyst awtomatig'; +$lang['mailprefix'] = 'Rhagddodiad testun ebyst i\'w ddefnyddio ar gyfer pyst awtomatig. Gadewch yn wag i ddefnyddio teitl y wici'; +$lang['htmlmail'] = 'Anfonwch ebyst aml-ddarn HTML sydd yn edrych yn well, ond sy\'n fwy mewn maint. Analluogwch ar gyfer pyst testun plaen yn unig.'; + +/* Syndication Settings */ +$lang['sitemap'] = 'Generadu map safle Google mor aml â hyn (mewn diwrnodau). 0 i anallogi'; +$lang['rss_type'] = 'Math y ffrwd XML'; +$lang['rss_linkto'] = 'Ffrwd XML yn cysylltu â'; +$lang['rss_content'] = 'Beth i\'w ddangos mewn eitemau\'r ffrwd XML?'; +$lang['rss_update'] = 'Cyfnod diwedaru ffrwd XML (eil)'; +$lang['rss_show_summary'] = 'Dangos crynodeb mewn teitl y ffrwd XML'; +$lang['rss_media'] = 'Pa fath newidiadau a ddylai cael eu rhestru yn y ffrwd XML??'; + +/* Advanced Options */ +$lang['updatecheck'] = 'Gwirio am ddiweddariadau a rhybuddion diogelwch? Mae\'n rhaid i DokuWiki gysylltu ag update.dokuwiki.org ar gyfer y nodwedd hon.'; +$lang['userewrite'] = 'Defnyddio URLs pert'; +$lang['useslash'] = 'Defnyddio slaes fel gwahanydd namespace mewn URL'; +$lang['sepchar'] = 'Gwanahydd geiriau mewn enw tudalennau'; +$lang['canonical'] = 'Defnyddio URLs canonaidd llawn'; +$lang['fnencode'] = 'Dull amgodio enw ffeiliau \'non-ASCII\'.'; +$lang['autoplural'] = 'Gwirio am ffurfiau lluosog mewn dolenni'; +$lang['compression'] = 'Dull cywasgu ar gyfer ffeiliau llofft (hen adolygiadau)'; +$lang['gzip_output'] = 'Defnyddio gzip Content-Encoding ar gyfer xhtml'; //pwy a wyr +$lang['compress'] = 'Cywasgu allbwn CSS a javascript'; +$lang['cssdatauri'] = 'Uchafswm maint mewn beitiau ar gyfer delweddau i\'w cyfeirio atynt mewn ffeiliau CSS a ddylai cael eu mewnosod i\'r ddalen arddull i leihau gorbenion pennyn cais HTTP. Mae 400 i 600 beit yn werth da. Gosodwch i 0 i\'w analluogi.'; +$lang['send404'] = 'Anfon "HTTP 404/Page Not Found" ar gyfer tudalennau sy ddim yn bodoli'; +$lang['broken_iua'] = 'Ydy\'r swyddogaeth ignore_user_abort wedi torri ar eich system? Gall hwn achosi\'r indecs chwilio i beidio â gweithio. Rydym yn gwybod bod IIS+PHP/CGI wedi torri. Gweler Bug 852 am wybodaeth bellach.'; +$lang['xsendfile'] = 'Defnyddio\'r pennyn X-Sendfile i ganiatáu\'r gweinydd gwe i ddanfon ffeiliau statig? Mae\'n rhaid bod eich gweinydd gwe yn caniatáu hyn.'; +$lang['renderer_xhtml'] = 'Cyflwynydd i ddefnyddio ar gyfer prif allbwn (xhtml) y wici'; +$lang['renderer__core'] = '%s (craidd dokuwiki)'; +$lang['renderer__plugin'] = '%s (ategyn)'; + +/* Network Options */ +$lang['dnslookups'] = 'Bydd DokuWiki yn edrych i fyny enwau gwesteiwyr ar gyfer cyfeiriadau IP pell y defnyddwyr hynny sy\'n golygu tudalennau. Os oes gweinydd DNS sy\'n araf neu sy ddim yn gweithio \'da chi neu \'dych chi ddim am ddefnyddio\'r nodwedd hon, analluogwch yr opsiwn hwn.'; + +/* Proxy Options */ +$lang['proxy____host'] = 'Enw\'r gweinydd procsi'; +$lang['proxy____port'] = 'Porth procsi'; +$lang['proxy____user'] = 'Defnyddair procsi'; +$lang['proxy____pass'] = 'Cyfrinair procsi'; +$lang['proxy____ssl'] = 'Defnyddio SSL i gysylltu â\'r procsi'; +$lang['proxy____except'] = 'Mynegiad rheolaidd i gydweddu URL ar gyfer y procsi a ddylai cael eu hanwybyddu.'; + +/* Safemode Hack */ +$lang['safemodehack'] = 'Galluogi safemode hack'; +$lang['ftp____host'] = 'Gweinydd FTP safemode hack'; +$lang['ftp____port'] = 'Porth FTP safemode hack'; +$lang['ftp____user'] = 'Defnyddair FTP safemode hack'; +$lang['ftp____pass'] = 'Cyfrinair FTP safemode hack'; +$lang['ftp____root'] = 'Gwraiddffolder FTP safemode hack'; + +/* License Options */ +$lang['license_o_'] = 'Dim wedi\'i ddewis'; + +/* typography options */ +$lang['typography_o_0'] = 'dim'; +$lang['typography_o_1'] = 'eithrio dyfynodau sengl'; +$lang['typography_o_2'] = 'cynnwys dyfynodau sengl (efallai ddim yn gweithio pob tro)'; + +/* userewrite options */ +$lang['userewrite_o_0'] = 'dim'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'DokuWiki mewnol'; + +/* deaccent options */ +$lang['deaccent_o_0'] = 'bant'; +$lang['deaccent_o_1'] = 'tynnu acenion'; +$lang['deaccent_o_2'] = 'rhufeinio'; + +/* gdlib options */ +$lang['gdlib_o_0'] = 'GD Lib ddim ar gael'; +$lang['gdlib_o_1'] = 'Fersiwn 1.x'; +$lang['gdlib_o_2'] = 'Awtoddatgeliad'; + +/* rss_type options */ +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; +$lang['rss_type_o_atom'] = 'Atom 0.3'; +$lang['rss_type_o_atom1'] = 'Atom 1.0'; + +/* rss_content options */ +$lang['rss_content_o_abstract'] = 'Crynodeb'; +$lang['rss_content_o_diff'] = 'Gwahan. Unedig'; +$lang['rss_content_o_htmldiff'] = 'Gwahaniaethau ar ffurf tabl HTML'; +$lang['rss_content_o_html'] = 'Cynnwys tudalen HTML llawn'; + +/* rss_linkto options */ +$lang['rss_linkto_o_diff'] = 'golwg gwahaniaethau'; +$lang['rss_linkto_o_page'] = 'y dudalen a adolygwyd'; +$lang['rss_linkto_o_rev'] = 'rhestr adolygiadau'; +$lang['rss_linkto_o_current'] = 'y dudalen gyfredol'; + +/* compression options */ +$lang['compression_o_0'] = 'dim'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; + +/* xsendfile header */ +$lang['xsendfile_o_0'] = "peidio â defnyddio"; +$lang['xsendfile_o_1'] = 'Pennyn perchnogol lighttpd (cyn rhyddhad 1.5)'; +$lang['xsendfile_o_2'] = 'Pennyn safonol X-Sendfile'; +$lang['xsendfile_o_3'] = 'Pennyn perchnogol Nginx X-Accel-Redirect'; + +/* Display user info */ +$lang['showuseras_o_loginname'] = 'Enw mewngofnodi'; +$lang['showuseras_o_username'] = "Enw llawn y defnyddiwr"; +$lang['showuseras_o_username_link'] = "Enw llawn y defnyddiwr fel dolen defnyddiwr interwiki"; +$lang['showuseras_o_email'] = "Cyfeiriad e-bost y defnyddiwr (tywyllu yn ôl gosodiad mailguard)"; +$lang['showuseras_o_email_link'] = "Cyfeiriad e-bost y defnyddiwr fel dolen mailto:"; + +/* useheading options */ +$lang['useheading_o_0'] = 'Byth'; +$lang['useheading_o_navigation'] = 'Llywio yn Unig'; +$lang['useheading_o_content'] = 'Cynnwys Wici yn Unig'; +$lang['useheading_o_1'] = 'Wastad'; + +$lang['readdircache'] = 'Uchafswm amser ar gyfer storfa readdir (eil)'; diff --git a/sources/lib/plugins/config/lang/da/lang.php b/sources/lib/plugins/config/lang/da/lang.php index 59a602e..6935049 100644 --- a/sources/lib/plugins/config/lang/da/lang.php +++ b/sources/lib/plugins/config/lang/da/lang.php @@ -1,8 +1,8 @@ * @author Kalle Sommer Nielsen * @author Esben Laursen @@ -12,6 +12,7 @@ * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig + * @author Jacob Palm */ $lang['menu'] = 'Opsætningsindstillinger'; $lang['error'] = 'Indstillingerne blev ikke opdateret pÃ¥ grund af en ugyldig værdi, Gennemse venligst dine ændringer og gem dem igen. @@ -61,7 +62,7 @@ $lang['breadcrumbs'] = 'Stilængde'; $lang['youarehere'] = 'Hierarkisk sti'; $lang['fullpath'] = 'Vis den fulde sti til siderne i bundlinjen'; $lang['typography'] = 'Typografiske erstatninger'; -$lang['dformat'] = 'Datoformat (se PHP\'s strftime-funktion)'; +$lang['dformat'] = 'Datoformat (se PHP\'s strftime-funktion)'; $lang['signature'] = 'Underskrift'; $lang['showuseras'] = 'Hvad skal vises nÃ¥r den sidste bruger, der har ændret siden, fremstilles'; $lang['toptoclevel'] = 'Øverste niveau for indholdsfortegnelse'; diff --git a/sources/lib/plugins/config/lang/de-informal/lang.php b/sources/lib/plugins/config/lang/de-informal/lang.php index 7a17ace..b419c7b 100644 --- a/sources/lib/plugins/config/lang/de-informal/lang.php +++ b/sources/lib/plugins/config/lang/de-informal/lang.php @@ -60,7 +60,7 @@ $lang['breadcrumbs'] = 'Anzahl der Einträge im "Krümelpfad"'; $lang['youarehere'] = 'Hierarchische Pfadnavigation verwenden'; $lang['fullpath'] = 'Zeige vollen Pfad der Datei in Fußzeile an'; $lang['typography'] = 'Mach drucktechnische Ersetzungen'; -$lang['dformat'] = 'Datumsformat (siehe PHPs strftime Funktion)'; +$lang['dformat'] = 'Datumsformat (siehe PHPs strftime Funktion)'; $lang['signature'] = 'Signatur'; $lang['showuseras'] = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird'; $lang['toptoclevel'] = 'Inhaltsverzeichnis bei dieser Ãœberschriftengröße beginnen'; @@ -136,7 +136,7 @@ $lang['autoplural'] = 'Bei Links automatisch nach vorhandenen Pluralf $lang['compression'] = 'Komprimierungsmethode für alte Seitenrevisionen'; $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; -$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter! 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.'; +$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.'; $lang['send404'] = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten'; $lang['broken_iua'] = 'Falls die Funktion ignore_user_abort auf deinem System nicht funktioniert, könnte der Such-Index nicht funktionieren. IIS+PHP/CGI ist bekannt dafür. Siehe auch Bug 852.'; $lang['xsendfile'] = 'Den X-Sendfile-Header nutzen, um Dateien direkt vom Webserver ausliefern zu lassen? Dein Webserver muss dies unterstützen!'; diff --git a/sources/lib/plugins/config/lang/de/lang.php b/sources/lib/plugins/config/lang/de/lang.php index f3ddefd..7a8ecef 100644 --- a/sources/lib/plugins/config/lang/de/lang.php +++ b/sources/lib/plugins/config/lang/de/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Andreas Gohr * @author Michael Klier * @author Leo Moll @@ -67,7 +67,7 @@ $lang['breadcrumbs'] = 'Anzahl der Einträge im "Krümelpfad"'; $lang['youarehere'] = 'Hierarchische Pfadnavigation verwenden'; $lang['fullpath'] = 'Den kompletten Dateipfad im Footer anzeigen'; $lang['typography'] = 'Typographische Ersetzungen'; -$lang['dformat'] = 'Datumsformat (Siehe PHP strftime Funktion)'; +$lang['dformat'] = 'Datumsformat (Siehe PHP strftime Funktion)'; $lang['signature'] = 'Signatur'; $lang['showuseras'] = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird'; $lang['toptoclevel'] = 'Inhaltsverzeichnis bei dieser Ãœberschriftengröße beginnen'; @@ -144,7 +144,7 @@ $lang['autoplural'] = 'Bei Links automatisch nach vorhandenen Pluralf $lang['compression'] = 'Komprimierungsmethode für alte Seitenrevisionen'; $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; -$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in CSS-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter! Empfohlene Einstellung: 400 to 600 Bytes. Setzen Sie die Einstellung auf 0 um die Funktion zu deaktivieren.'; +$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in CSS-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Empfohlene Einstellung: 400 to 600 Bytes. Setzen Sie die Einstellung auf 0 um die Funktion zu deaktivieren.'; $lang['send404'] = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten'; $lang['broken_iua'] = 'Falls die Funktion ignore_user_abort auf Ihrem System nicht funktioniert, könnte der Such-Index nicht funktionieren. IIS+PHP/CGI ist bekannt dafür. Siehe auch Bug 852.'; $lang['xsendfile'] = 'Den X-Sendfile-Header nutzen, um Dateien direkt vom Webserver ausliefern zu lassen? Ihr Webserver muss dies unterstützen!'; diff --git a/sources/lib/plugins/config/lang/el/lang.php b/sources/lib/plugins/config/lang/el/lang.php index 4c24e06..a94bcc4 100644 --- a/sources/lib/plugins/config/lang/el/lang.php +++ b/sources/lib/plugins/config/lang/el/lang.php @@ -62,7 +62,7 @@ $lang['breadcrumbs'] = 'ΑÏιθμός συνδέσμων ιστοÏι $lang['youarehere'] = 'Εμφάνιση ιεÏαÏχικής Ï€Ïοβολής Ï„Ïέχουσας σελίδας'; $lang['fullpath'] = 'Εμφάνιση πλήÏους διαδÏομής σελίδας στην υποκεφαλίδα'; $lang['typography'] = 'ΜετατÏοπή ειδικών χαÏακτήÏων στο τυπογÏαφικό ισοδÏναμό τους'; -$lang['dformat'] = 'ΜοÏφή ημεÏομηνίας (βλέπε την strftime function της PHP)'; +$lang['dformat'] = 'ΜοÏφή ημεÏομηνίας (βλέπε την strftime function της PHP)'; $lang['signature'] = 'ΥπογÏαφή'; $lang['showuseras'] = 'Τι να εμφανίζεται όταν φαίνεται ο χÏήστης που Ï„Ïοποποίησε τελευταίος μία σελίδα'; $lang['toptoclevel'] = 'Ανώτατο επίπεδο πίνακα πεÏιεχομένων σελίδας'; diff --git a/sources/lib/plugins/config/lang/en/lang.php b/sources/lib/plugins/config/lang/en/lang.php index 5e5218a..c6a5664 100644 --- a/sources/lib/plugins/config/lang/en/lang.php +++ b/sources/lib/plugins/config/lang/en/lang.php @@ -72,7 +72,7 @@ $lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.'; $lang['youarehere'] = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)'; $lang['fullpath'] = 'Reveal full path of pages in the footer'; $lang['typography'] = 'Do typographical replacements'; -$lang['dformat'] = 'Date format (see PHP\'s strftime function)'; +$lang['dformat'] = 'Date format (see PHP\'s strftime function)'; $lang['signature'] = 'What to insert with the signature button in the editor'; $lang['showuseras'] = 'What to display when showing the user that last edited a page'; $lang['toptoclevel'] = 'Top level for table of contents'; @@ -165,7 +165,7 @@ $lang['autoplural'] = 'Check for plural forms in links'; $lang['compression'] = 'Compression method for attic files'; $lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml'; $lang['compress'] = 'Compact CSS and javascript output'; -$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! 400 to 600 bytes is a good value. Set 0 to disable.'; +$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. 400 to 600 bytes is a good value. Set 0 to disable.'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; $lang['broken_iua'] = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See Bug 852 for more info.'; $lang['xsendfile'] = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.'; diff --git a/sources/lib/plugins/config/lang/eo/lang.php b/sources/lib/plugins/config/lang/eo/lang.php index 566da0d..644ca79 100644 --- a/sources/lib/plugins/config/lang/eo/lang.php +++ b/sources/lib/plugins/config/lang/eo/lang.php @@ -59,7 +59,7 @@ $lang['breadcrumbs'] = 'Nombro da paderoj'; $lang['youarehere'] = 'Hierarkiaj paderoj'; $lang['fullpath'] = 'Montri la kompletan padon de la paÄoj en la piedlinio'; $lang['typography'] = 'Fari tipografiajn anstataÅ­igojn'; -$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion strftime)'; +$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion strftime)'; $lang['signature'] = 'Subskribo'; $lang['showuseras'] = 'Kiel indiki la lastan redaktinton'; $lang['toptoclevel'] = 'Supera nivelo por la enhavtabelo'; @@ -134,7 +134,7 @@ $lang['autoplural'] = 'Kontroli pluralajn formojn en ligiloj'; $lang['compression'] = 'Kompaktigmetodo por arkivaj dosieroj'; $lang['gzip_output'] = 'Uzi gzip-an enhav-enkodigon por XHTML'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; -$lang['cssdatauri'] = 'Grandeco en bitokoj, Äis kiom en CSS-dosieroj referencitaj bildoj enmetiÄu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aÅ­ pli frua! +$lang['cssdatauri'] = 'Grandeco en bitokoj, Äis kiom en CSS-dosieroj referencitaj bildoj enmetiÄu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. 400 Äis 600 bitokoj estas bona grandeco. Indiku 0 por malebligi enmeton.'; $lang['send404'] = 'Sendi la mesaÄon "HTTP 404/PaÄo ne trovita" por ne ekzistantaj paÄoj'; $lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuÅaĵo. Vidu Cimon 852 por pli da informoj.'; diff --git a/sources/lib/plugins/config/lang/es/lang.php b/sources/lib/plugins/config/lang/es/lang.php index 74946bd..412dba7 100644 --- a/sources/lib/plugins/config/lang/es/lang.php +++ b/sources/lib/plugins/config/lang/es/lang.php @@ -73,7 +73,7 @@ $lang['breadcrumbs'] = 'Número de pasos de traza'; $lang['youarehere'] = 'Traza jerárquica'; $lang['fullpath'] = 'Mostrar ruta completa en el pie de página'; $lang['typography'] = 'Realizar reemplazos tipográficos'; -$lang['dformat'] = 'Formato de fecha (ver la función de PHP strftime)'; +$lang['dformat'] = 'Formato de fecha (ver la función de PHP strftime)'; $lang['signature'] = 'Firma'; $lang['showuseras'] = 'Qué ver al mostrar el último usuario que editó una página'; $lang['toptoclevel'] = 'Nivel superior para la tabla de contenidos'; diff --git a/sources/lib/plugins/config/lang/eu/lang.php b/sources/lib/plugins/config/lang/eu/lang.php index 2b67a49..74b5079 100644 --- a/sources/lib/plugins/config/lang/eu/lang.php +++ b/sources/lib/plugins/config/lang/eu/lang.php @@ -50,7 +50,7 @@ $lang['breadcrumbs'] = 'Arrasto pauso kopurua'; $lang['youarehere'] = 'Arrasto pauso hierarkikoak'; $lang['fullpath'] = 'Orri oinean orrien bide osoa erakutsi'; $lang['typography'] = 'Ordezkapen tipografikoak egin'; -$lang['dformat'] = 'Data formatua (ikusi PHPren strftime funtzioa)'; +$lang['dformat'] = 'Data formatua (ikusi PHPren strftime funtzioa)'; $lang['signature'] = 'Sinadura'; $lang['showuseras'] = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan'; $lang['toptoclevel'] = 'Eduki taularen goiko maila'; diff --git a/sources/lib/plugins/config/lang/fa/lang.php b/sources/lib/plugins/config/lang/fa/lang.php index dd97f71..e89d473 100644 --- a/sources/lib/plugins/config/lang/fa/lang.php +++ b/sources/lib/plugins/config/lang/fa/lang.php @@ -1,6 +1,7 @@ @@ -9,6 +10,8 @@ * @author Mohammad Reza Shoaei * @author Milad DZand * @author AmirH Hassaneini + * @author Mohmmad Razavi + * @author Masoud Sadrnezhaad */ $lang['menu'] = 'تنظیمات پیکر‌بندی'; $lang['error'] = 'به دلیل ایراد در مقادیر وارد شده، تنظیمات اعمال نشد، خواهشمندیم تغییرات را مجددن کنترل نمایید Ùˆ دوباره ارسال کنید.
      مقادیر مشکل‌دار با کادر قرمز مشخص شده‌اند.'; @@ -57,7 +60,7 @@ $lang['breadcrumbs'] = 'تعداد ردپاها'; $lang['youarehere'] = 'ردپای درختی'; $lang['fullpath'] = 'نمایش دادن مسیر کامل صÙحات در پایین صÙحه'; $lang['typography'] = 'جای‌گزاری متن‌ها انجام شود'; -$lang['dformat'] = 'Ùرمت تاریخ (راهنمای تابع strftime را مشاهده کنید)'; +$lang['dformat'] = 'Ùرمت تاریخ (راهنمای تابع strftime را مشاهده کنید)'; $lang['signature'] = 'امضا'; $lang['showuseras'] = 'چگونه آخرین کاربر ویرایش کننده، یک صÙحه نمایش داده شود'; $lang['toptoclevel'] = 'بیشترین عمق برای «Ùهرست مطالب»'; @@ -82,7 +85,9 @@ $lang['disableactions'] = 'غیرÙعال کردن Ùعالیت‌های $lang['disableactions_check'] = 'بررسی'; $lang['disableactions_subscription'] = 'عضویت/عدم عضویت'; $lang['disableactions_wikicode'] = 'نمایش سورس/برون‌بری خام'; +$lang['disableactions_profile_delete'] = 'حذ٠حساب کاربری خود.'; $lang['disableactions_other'] = 'Ùعالیت‌های دیگر (با ویرگول انگلیسی «,» از هم جدا کنید)'; +$lang['disableactions_rss'] = 'خبرخوان (RSS)'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; $lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی Ú©Ù‡ Ùقط صÙحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرÙعال نمایید.'; $lang['remote'] = 'سیستم API راه دور را Ùعال کنید . این به سایر کاربردها اجازه Ù…ÛŒ دهد Ú©Ù‡ به ویکی از طریق XML-RPC یا سایر مکانیزم ها دسترسی داشته باشند.'; @@ -133,7 +138,7 @@ $lang['autoplural'] = 'بررسی جمع بودن در پیوندها $lang['compression'] = 'روش Ùشرده‌سازی برای Ùایل‌های Ø®Ùرد'; $lang['gzip_output'] = 'استÙاده از gzip برای xhtmlها'; $lang['compress'] = 'Ùشرده‌سازی کد‌های CSS Ùˆ JavaScript'; -$lang['cssdatauri'] = 'اندازه بایت هایی Ú©Ù‡ تصاویر ارجاع شده به Ùایل های CSS باید به درستی درون stylesheet جایگذاری شود تا سربار سرایند درخواست HTTP را کاهش دهد. این روش در IE 7 Ùˆ پایین تر کار نمی کند! مقادیر 400 تا 600 بایت مقدار خوبی است. برای غیر Ùعال کردن 0 قرار دهید.'; +$lang['cssdatauri'] = 'اندازه بایت هایی Ú©Ù‡ تصاویر ارجاع شده به Ùایل های CSS باید به درستی درون stylesheet جایگذاری شود تا سربار سرایند درخواست HTTP را کاهش دهد. مقادیر 400 تا 600 بایت مقدار خوبی است. برای غیر Ùعال کردن 0 قرار دهید.'; $lang['send404'] = 'ارسال «HTTP 404/Page Not Found» برای صÙحاتی Ú©Ù‡ وجود ندارند'; $lang['broken_iua'] = 'آیا تابع ignore_user_about در ویکی شما کار نمی‌کند؟ ممکن است Ùهرست جستجوی شما کار نکند. IIS به همراه PHP/CGI باعث خراب شدن این گزینه می‌شود. برای اطلاعات بیشتر باگ Û¸ÛµÛ² را مشاهده کنید.'; $lang['xsendfile'] = 'استÙاده از هدر X-SendfileØŒ تا به وب‌سرور توانایی ارسال Ùایل‌های ثابت را بدهد. وب‌سرور شما باید این مورد را پشتیبانی کند.'; @@ -188,6 +193,7 @@ $lang['xsendfile_o_2'] = 'هدر استاندارد X-Sendfile'; $lang['xsendfile_o_3'] = 'هدر اختصاصی X-Accel-Redirect در وب سرور Nginx'; $lang['showuseras_o_loginname'] = 'نام کاربری'; $lang['showuseras_o_username'] = 'نام کامل کاربران'; +$lang['showuseras_o_username_link'] = 'نام کامل کاربر به عنوان لینک داخلی ویکی'; $lang['showuseras_o_email'] = 'آدرس ایمیل کاربران (با تنظیمات «نگهبان ایمیل» مبهم می‌شود)'; $lang['showuseras_o_email_link'] = 'نمایش ایمیل کاربران با اÙزودن mailto'; $lang['useheading_o_0'] = 'هرگز'; diff --git a/sources/lib/plugins/config/lang/fi/lang.php b/sources/lib/plugins/config/lang/fi/lang.php index 9fd3fba..3389754 100644 --- a/sources/lib/plugins/config/lang/fi/lang.php +++ b/sources/lib/plugins/config/lang/fi/lang.php @@ -1,11 +1,13 @@ * @author Teemu Mattila * @author Sami Olmari + * @author Wiki Doku */ $lang['menu'] = 'Asetukset'; $lang['error'] = 'Asetuksia ei päivitetty väärän arvon vuoksi. Tarkista muutokset ja lähetä sivu uudestaan. @@ -56,7 +58,7 @@ $lang['breadcrumbs'] = 'Leivänmurujen määrä'; $lang['youarehere'] = 'Hierarkkiset leivänmurut'; $lang['fullpath'] = 'Näytä sivun koko polku sivun alareunassa'; $lang['typography'] = 'Tee typografiset korvaukset'; -$lang['dformat'] = 'Päivämäärän muoto (katso PHPn strftime funktiota)'; +$lang['dformat'] = 'Päivämäärän muoto (katso PHPn strftime funktiota)'; $lang['signature'] = 'Allekirjoitus'; $lang['showuseras'] = 'Mitä näytetään, kun kerrotaan viimeisen editoijan tiedot'; $lang['toptoclevel'] = 'Ylätason sisällysluettelo'; diff --git a/sources/lib/plugins/config/lang/fr/lang.php b/sources/lib/plugins/config/lang/fr/lang.php index 69e58f7..e7e7ff8 100644 --- a/sources/lib/plugins/config/lang/fr/lang.php +++ b/sources/lib/plugins/config/lang/fr/lang.php @@ -6,17 +6,16 @@ * @author Guy Brand * @author Delassaux Julien * @author Maurice A. LeBlanc - * @author stephane.gully@gmail.com + * @author * @author Guillaume Turri * @author Erik Pedersen * @author olivier duperray * @author Vincent Feltz * @author Philippe Bajoit * @author Florian Gaub - * @author Samuel Dorsaz samuel.dorsaz@novelion.net + * @author Samuel Dorsaz * @author Johan Guilbaud - * @author schplurtz@laposte.net - * @author skimpax@gmail.com + * @author * @author Yannick Aure * @author Olivier DUVAL * @author Anael Mobilia @@ -24,6 +23,8 @@ * @author Carbain Frédéric * @author Nicolas Friedli * @author Floriang + * @author Schplurtz le Déboulonné + * @author Simon DELAGE */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez.
      Les valeurs erronées sont entourées d\'une bordure rouge.'; @@ -36,7 +37,7 @@ $lang['security'] = 'Avertissement de sécurité : modifier cette o $lang['_configuration_manager'] = 'Gestionnaire de configuration'; $lang['_header_dokuwiki'] = 'Paramètres de DokuWiki'; $lang['_header_plugin'] = 'Paramètres des extensions'; -$lang['_header_template'] = 'Paramètres des modèles'; +$lang['_header_template'] = 'Paramètres du modèle'; $lang['_header_undefined'] = 'Paramètres indéfinis'; $lang['_basic'] = 'Paramètres de base'; $lang['_display'] = 'Paramètres d\'affichage'; @@ -72,7 +73,7 @@ $lang['breadcrumbs'] = 'Nombre de traces à afficher. 0 désactive cet $lang['youarehere'] = 'Utiliser des traces hiérarchiques (vous voulez probablement désactiver l\'option ci-dessus)'; $lang['fullpath'] = 'Afficher le chemin complet des pages dans le pied de page'; $lang['typography'] = 'Effectuer des améliorations typographiques'; -$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; +$lang['dformat'] = 'Format de date (cf. fonction strftime de PHP)'; $lang['signature'] = 'Données à insérer lors de l\'utilisation du bouton « signature » dans l\'éditeur'; $lang['showuseras'] = 'Données à afficher concernant le dernier utilisateur ayant modifié une page'; $lang['toptoclevel'] = 'Niveau le plus haut à afficher dans la table des matières'; diff --git a/sources/lib/plugins/config/lang/gl/lang.php b/sources/lib/plugins/config/lang/gl/lang.php index 44942cc..5513964 100644 --- a/sources/lib/plugins/config/lang/gl/lang.php +++ b/sources/lib/plugins/config/lang/gl/lang.php @@ -55,7 +55,7 @@ $lang['breadcrumbs'] = 'Número de niveis da estrutura de navegación' $lang['youarehere'] = 'Niveis xerárquicos da estrutura de navegación'; $lang['fullpath'] = 'Amosar a ruta completa das páxinas no pé das mesmas'; $lang['typography'] = 'Facer substitucións tipográficas'; -$lang['dformat'] = 'Formato de Data (bótalle un ollo á función strftime do PHP)'; +$lang['dformat'] = 'Formato de Data (bótalle un ollo á función strftime do PHP)'; $lang['signature'] = 'Sinatura'; $lang['showuseras'] = 'Que amosar cando se informe do usuario que fixo a última modificación dunha páxina'; $lang['toptoclevel'] = 'Nivel superior para a táboa de contidos'; @@ -130,7 +130,7 @@ $lang['autoplural'] = 'Comprobar formas plurais nas ligazóns'; $lang['compression'] = 'Método de compresión para arquivos attic'; $lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml'; $lang['compress'] = 'Saída compacta de CSS e Javascript'; -$lang['cssdatauri'] = 'Tamaño en bytes ata o cal as imaxes referenciadas nos CSS serán incrustadas na folla de estilos para disminuir o tamaño das cabeceiras das solicitudes HTTP. Esta técnica non funcionará en IE 7 ou anteriores! entre 400 e 600 bytes é un valor axeitado. Establecer a 0 para deshabilitar.'; +$lang['cssdatauri'] = 'Tamaño en bytes ata o cal as imaxes referenciadas nos CSS serán incrustadas na folla de estilos para disminuir o tamaño das cabeceiras das solicitudes HTTP. Entre 400 e 600 bytes é un valor axeitado. Establecer a 0 para deshabilitar.'; $lang['send404'] = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes'; $lang['broken_iua'] = 'Rachou a función ignore_user_abort no teu sistema? Isto podería causar que o índice de procura non funcione. Coñécese que o IIS+PHP/CGI ráchaa. Bótalle un ollo ao Bug 852 para obter máis información.'; $lang['xsendfile'] = 'Empregar a cabeceira X-Sendfile para que o servidor web envie arquivos estáticos? O teu servidor web precisa soportar isto.'; diff --git a/sources/lib/plugins/config/lang/he/lang.php b/sources/lib/plugins/config/lang/he/lang.php index bddfd90..dbc6a32 100644 --- a/sources/lib/plugins/config/lang/he/lang.php +++ b/sources/lib/plugins/config/lang/he/lang.php @@ -1,13 +1,14 @@ * @author Dotan Kamber * @author Moshe Kaplan * @author Yaron Yogev * @author Yaron Shahrabani + * @author sagi */ $lang['menu'] = 'הגדרות תצורה'; $lang['error'] = 'ההגדרות ×œ× ×¢×•×“×›× ×• בגלל ערך ×œ× ×ª×§×£, × × ×œ×¢×™×™×Ÿ ×‘×©×™× ×•×™×™× ×•×œ×©×œ×•×— שנית. @@ -33,23 +34,23 @@ $lang['_network'] = 'הגדרות רשת'; $lang['_msg_setting_undefined'] = '×ין מידע-על להגדרה.'; $lang['_msg_setting_no_class'] = '×ין קבוצה להגדרה.'; $lang['_msg_setting_no_default'] = '×ין ערך ברירת מחדל.'; -$lang['fmode'] = 'מצב יצירת קובץ'; -$lang['dmode'] = 'מצב יצירת ספריה'; +$lang['title'] = 'כותרת הויקי'; +$lang['start'] = '×©× ×“×£ הפתיחה'; $lang['lang'] = 'שפה'; +$lang['template'] = 'תבנית'; +$lang['savedir'] = 'ספריה לשמירת מידע'; $lang['basedir'] = 'ספרית בסיס'; $lang['baseurl'] = 'כתובת URL בסיסית'; -$lang['savedir'] = 'ספריה לשמירת מידע'; -$lang['start'] = '×©× ×“×£ הפתיחה'; -$lang['title'] = 'כותרת הויקי'; -$lang['template'] = 'תבנית'; -$lang['fullpath'] = 'הצגת נתיב ×ž×œ× ×œ×“×¤×™× ×‘×ª×—×ª×™×ª'; +$lang['dmode'] = 'מצב יצירת ספריה'; +$lang['fmode'] = 'מצב יצירת קובץ'; +$lang['allowdebug'] = '×פשר דיבוג יש לבטל ×× ×ין צורך!'; $lang['recent'] = '×©×™× ×•×™×™× ×חרוני×'; +$lang['recent_days'] = 'כמה ×©×™× ×•×™×™× ××—×¨×•× ×™× ×œ×©×ž×•×¨ (ימי×)'; $lang['breadcrumbs'] = 'מספר עקבות להיסטוריה'; $lang['youarehere'] = 'עקבות היררכיות להיסטוריה'; +$lang['fullpath'] = 'הצגת נתיב ×ž×œ× ×œ×“×¤×™× ×‘×ª×—×ª×™×ª'; $lang['typography'] = 'שימוש בחלופות טיפוגרפיות'; -$lang['htmlok'] = '×ישור שיבוץ HTML'; -$lang['phpok'] = '×ישור שיבוץ PHP'; -$lang['dformat'] = 'תסדיר ת×ריך (× × ×œ×¤× ×•×ª לפונקציה strftime של PHP)'; +$lang['dformat'] = 'תסדיר ת×ריך (× × ×œ×¤× ×•×ª לפונקציה strftime של PHP)'; $lang['signature'] = 'חתימה'; $lang['toptoclevel'] = 'רמה עליונה בתוכן ×”×¢× ×™× ×™×'; $lang['maxtoclevel'] = 'רמה מירבית בתוכן ×”×¢× ×™× ×™×'; @@ -57,13 +58,8 @@ $lang['maxseclevel'] = 'רמה מירבית בעריכת קטעי×'; $lang['camelcase'] = 'השתמש בר×שיות גדולות לקישורי×'; $lang['deaccent'] = 'נקה שמות דפי×'; $lang['useheading'] = 'השתמש בכותרת הר×שונה ×œ×©× ×”×“×£'; -$lang['refcheck'] = 'בדוק שיוך מדיה'; -$lang['allowdebug'] = '×פשר דיבוג יש לבטל ×× ×ין צורך!'; -$lang['usewordblock'] = 'חסימת דו×ר זבל לפי רשימת מילי×'; -$lang['indexdelay'] = 'השהיה ×‘×˜×¨× ×”×›× ×¡×” ל×ינדקס (שניות)'; -$lang['relnofollow'] = 'השתמש ב- rel="nofollow" ×œ×§×™×©×•×¨×™× ×—×™×¦×•× ×™×™×'; -$lang['mailguard'] = 'הגן על כתובות דו×"ל'; -$lang['iexssprotect'] = 'בדוק ×ת ×”×“×¤×™× ×”×ž×•×¢×œ×™× ×œ×—×©×“ ל-JavaScript ×ו קוד HTML זדוני'; +$lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג ×ת כל מרחבי השמות בתצוגת תוכן ×”×¢× ×™× ×™×. בחירה ב×פשרות ×–×ת תסתיר ×ת ×לו ×©×‘×”× ×œ×ž×©×ª×ž×© ×ין הרש×ות קרי××”. התוצ××” עלולה להיות הסתרת תת מרחבי שמות ××œ×™×”× ×™×© למשתמש גישה. ב×ופן ×–×” תוכן ×”×¢× ×™× ×™× ×¢×œ×•×œ להפוך לחסר תועלת ×¢× ×”×’×“×¨×•×ª ACL מסוימות'; +$lang['hidepages'] = 'הסתר ×“×¤×™× ×ª×•××ž×™× (×‘×™×˜×•×™×™× ×¨×’×•×œ×¨×™×™×)'; $lang['useacl'] = 'השתמש ברשימות בקרת גישה'; $lang['autopasswd'] = 'צור סיסמ×ות ב×ופן ×וטומטי'; $lang['authtype'] = 'מנוע הזדהות'; @@ -77,47 +73,52 @@ $lang['disableactions_check'] = 'בדיקה'; $lang['disableactions_subscription'] = 'הרשמה/הסרה מרשימה'; $lang['disableactions_wikicode'] = 'הצגת המקור/×™×¦×•× ×’×•×œ×ž×™'; $lang['disableactions_other'] = 'פעולות ×חרות (מופרדות בפסיק)'; -$lang['sneaky_index'] = 'כברירת מחדל, דוקוויקי יציג ×ת כל מרחבי השמות בתצוגת תוכן ×”×¢× ×™× ×™×. בחירה ב×פשרות ×–×ת תסתיר ×ת ×לו ×©×‘×”× ×œ×ž×©×ª×ž×© ×ין הרש×ות קרי××”. התוצ××” עלולה להיות הסתרת תת מרחבי שמות ××œ×™×”× ×™×© למשתמש גישה. ב×ופן ×–×” תוכן ×”×¢× ×™× ×™× ×¢×œ×•×œ להפוך לחסר תועלת ×¢× ×”×’×“×¨×•×ª ACL מסוימות'; $lang['auth_security_timeout'] = 'מגבלת ×בטח פסק הזמן להזדהות (שניות)'; -$lang['updatecheck'] = 'בדיקת עידכוני ×בטחה והתר×ות? על DokuWiki להתקשר ×ל update.dokuwiki.org לצורך כך.'; -$lang['userewrite'] = 'השתמש בכתובות URL יפות'; -$lang['useslash'] = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות'; +$lang['usewordblock'] = 'חסימת דו×ר זבל לפי רשימת מילי×'; +$lang['relnofollow'] = 'השתמש ב- rel="nofollow" ×œ×§×™×©×•×¨×™× ×—×™×¦×•× ×™×™×'; +$lang['indexdelay'] = 'השהיה ×‘×˜×¨× ×”×›× ×¡×” ל×ינדקס (שניות)'; +$lang['mailguard'] = 'הגן על כתובות דו×"ל'; +$lang['iexssprotect'] = 'בדוק ×ת ×”×“×¤×™× ×”×ž×•×¢×œ×™× ×œ×—×©×“ ל-JavaScript ×ו קוד HTML זדוני'; $lang['usedraft'] = 'שמור טיוטות ב×ופן ×וטומטי בעת עריכה'; -$lang['sepchar'] = 'מפריד בין מילות ש×-דף'; -$lang['canonical'] = 'השתמש בכתובות URL מל×ות'; -$lang['autoplural'] = 'בדוק לצורת ×¨×‘×™× ×‘×§×™×©×•×¨×™×'; -$lang['compression'] = '×ופן דחיסת ×§×‘×¦×™× ×‘-attic'; -$lang['cachetime'] = 'גיל מירבי לזכרון מטמון (שניות)'; +$lang['htmlok'] = '×ישור שיבוץ HTML'; +$lang['phpok'] = '×ישור שיבוץ PHP'; $lang['locktime'] = 'גיל מירבי לקבצי נעילה (שניות)'; -$lang['fetchsize'] = 'גודל הקובץ המירבי (bytes) ש-fetch.php יכול להוריד מבחוץ'; -$lang['notify'] = 'שלח התר×ות על ×©×™× ×•×™×™× ×œ×›×ª×•×‘×ª דו×"ל זו'; -$lang['registernotify'] = 'שלח מידע על ×ž×©×ª×ž×©×™× ×¨×©×•×ž×™× ×—×“×©×™× ×œ×›×ª×•×‘×ª דו×"ל זו'; -$lang['mailfrom'] = 'כתובת הדו×"ל לשימוש בדברי דו×"ל ×וטומטיי×'; -$lang['gzip_output'] = 'השתמש בקידוד תוכן של gzip עבור xhtml'; -$lang['gdlib'] = 'גרסת ספרית ×”-GD'; -$lang['im_convert'] = 'נתיב לכלי ×”-convert של ImageMagick'; -$lang['jpg_quality'] = '×יכות הדחיסה של JPG (0-100)'; -$lang['subscribers'] = 'התר תמיכה ×‘×¨×™×©×•× ×œ×“×¤×™×'; -$lang['compress'] = 'פלט קומפקטי של CSS ו-javascript'; -$lang['hidepages'] = 'הסתר ×“×¤×™× ×ª×•××ž×™× (×‘×™×˜×•×™×™× ×¨×’×•×œ×¨×™×™×)'; -$lang['send404'] = 'שלח "HTTP 404/Page Not Found" עבור ×“×¤×™× ×©××™× × ×§×™×™×ž×™×'; -$lang['sitemap'] = 'צור מפת ×תר של Google (ימי×)'; -$lang['broken_iua'] = '×”×× ×”×¤×¢×•×œ×” ignore_user_abort תקולה במערכת שלך? הדבר עלול ×œ×”×‘×™× ×œ×ª×•×›×Ÿ חיפוש ש×ינו תקין. IIS+PHP/CGI ידוע כתקול. ר××” ×ת ב××’ 852 למידע נוסף'; -$lang['xsendfile'] = 'להשתמש בכותר X-Sendfile כדי ל×פשר לשרת לספק ×§×‘×¦×™× ×¡×˜×˜×™×™×? על השרת שלך לתמוך ב×פשרות ×–×ת.'; -$lang['renderer_xhtml'] = 'מחולל לשימוש עבור פלט הויקי העיקרי (xhtml)'; -$lang['renderer__core'] = '%s (ליבת דוקוויקי)'; -$lang['renderer__plugin'] = '%s (הרחבות)'; -$lang['rss_type'] = 'סוג פלט XML'; -$lang['rss_linkto'] = 'פלט ×”-XML מקשר ×ל'; -$lang['rss_content'] = 'מה להציג בפרטי פלט ×”-XML'; -$lang['rss_update'] = 'פלט ×”-XML מתעדכן כל (שניות)'; -$lang['recent_days'] = 'כמה ×©×™× ×•×™×™× ××—×¨×•× ×™× ×œ×©×ž×•×¨ (ימי×)'; -$lang['rss_show_summary'] = 'פלט ×”-XML מציג תקציר בכותרת'; +$lang['cachetime'] = 'גיל מירבי לזכרון מטמון (שניות)'; $lang['target____wiki'] = 'חלון יעד ×œ×§×™×©×•×¨×™× ×¤× ×™×ž×™×™×'; $lang['target____interwiki'] = 'חלון יעד ×œ×§×™×©×•×¨×™× ×‘×™×Ÿ מערכות ויקי'; $lang['target____extern'] = 'חלון יעד ×œ×§×™×©×•×¨×™× ×—×™×¦×•× ×™×™×'; $lang['target____media'] = 'חלון יעד לקישור למדיה'; $lang['target____windows'] = 'חלון יעד לתיקיות משותפות'; +$lang['refcheck'] = 'בדוק שיוך מדיה'; +$lang['gdlib'] = 'גרסת ספרית ×”-GD'; +$lang['im_convert'] = 'נתיב לכלי ×”-convert של ImageMagick'; +$lang['jpg_quality'] = '×יכות הדחיסה של JPG (0-100)'; +$lang['fetchsize'] = 'גודל הקובץ המירבי (bytes) ש-fetch.php יכול להוריד מבחוץ'; +$lang['subscribers'] = 'התר תמיכה ×‘×¨×™×©×•× ×œ×“×¤×™×'; +$lang['notify'] = 'שלח התר×ות על ×©×™× ×•×™×™× ×œ×›×ª×•×‘×ª דו×"ל זו'; +$lang['registernotify'] = 'שלח מידע על ×ž×©×ª×ž×©×™× ×¨×©×•×ž×™× ×—×“×©×™× ×œ×›×ª×•×‘×ª דו×"ל זו'; +$lang['mailfrom'] = 'כתובת הדו×"ל לשימוש בדברי דו×"ל ×וטומטיי×'; +$lang['sitemap'] = 'צור מפת ×תר של Google (ימי×)'; +$lang['rss_type'] = 'סוג פלט XML'; +$lang['rss_linkto'] = 'פלט ×”-XML מקשר ×ל'; +$lang['rss_content'] = 'מה להציג בפרטי פלט ×”-XML'; +$lang['rss_update'] = 'פלט ×”-XML מתעדכן כל (שניות)'; +$lang['rss_show_summary'] = 'פלט ×”-XML מציג תקציר בכותרת'; +$lang['updatecheck'] = 'בדיקת עידכוני ×בטחה והתר×ות? על DokuWiki להתקשר ×ל update.dokuwiki.org לצורך כך.'; +$lang['userewrite'] = 'השתמש בכתובות URL יפות'; +$lang['useslash'] = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות'; +$lang['sepchar'] = 'מפריד בין מילות ש×-דף'; +$lang['canonical'] = 'השתמש בכתובות URL מל×ות'; +$lang['autoplural'] = 'בדוק לצורת ×¨×‘×™× ×‘×§×™×©×•×¨×™×'; +$lang['compression'] = '×ופן דחיסת ×§×‘×¦×™× ×‘-attic'; +$lang['gzip_output'] = 'השתמש בקידוד תוכן של gzip עבור xhtml'; +$lang['compress'] = 'פלט קומפקטי של CSS ו-javascript'; +$lang['send404'] = 'שלח "HTTP 404/Page Not Found" עבור ×“×¤×™× ×©××™× × ×§×™×™×ž×™×'; +$lang['broken_iua'] = '×”×× ×”×¤×¢×•×œ×” ignore_user_abort תקולה במערכת שלך? הדבר עלול ×œ×”×‘×™× ×œ×ª×•×›×Ÿ חיפוש ש×ינו תקין. IIS+PHP/CGI ידוע כתקול. ר××” ×ת ב××’ 852 למידע נוסף'; +$lang['xsendfile'] = 'להשתמש בכותר X-Sendfile כדי ל×פשר לשרת לספק ×§×‘×¦×™× ×¡×˜×˜×™×™×? על השרת שלך לתמוך ב×פשרות ×–×ת.'; +$lang['renderer_xhtml'] = 'מחולל לשימוש עבור פלט הויקי העיקרי (xhtml)'; +$lang['renderer__core'] = '%s (ליבת דוקוויקי)'; +$lang['renderer__plugin'] = '%s (הרחבות)'; $lang['proxy____host'] = '×©× ×”×©×¨×ª המתווך'; $lang['proxy____port'] = 'שער השרת המתווך'; $lang['proxy____user'] = '×©× ×”×ž×©×ª×ž×© בשרת המתווך'; diff --git a/sources/lib/plugins/config/lang/hr/intro.txt b/sources/lib/plugins/config/lang/hr/intro.txt new file mode 100644 index 0000000..c71a2ee --- /dev/null +++ b/sources/lib/plugins/config/lang/hr/intro.txt @@ -0,0 +1,7 @@ +====== Upravljanje postavkama ====== + +Koristite ovu stranicu za upravljanje postavkama VaÅ¡e DokuWiki instalacije. Za pomoć o pojedinim postavkama pogledajte [[doku>config|konfiguraciju]]. Za viÅ¡e detalja o ovom dodatku pogledajte [[doku>plugin:config]]. + +Postavke prikazane u svjetlo crvenoj pozadini su zaÅ¡tićene i ne mogu biti mijenjane pomoću ovog dodatka. Postavke s plavom pozadinom sadrže inicijalno podrazumijevane vrijednosti, dok postavke s bijelom pozadinom sadrže korisniÄki postavljene vrijednosti. I plave i bijele postavke se mogu mijenjati. + +Zapamtite da pritisnete **Snimi** gumb prije nego napustite ovu stranicu ili će izmjene biti izgubljene. diff --git a/sources/lib/plugins/config/lang/hr/lang.php b/sources/lib/plugins/config/lang/hr/lang.php new file mode 100644 index 0000000..706e9d4 --- /dev/null +++ b/sources/lib/plugins/config/lang/hr/lang.php @@ -0,0 +1,196 @@ + + */ +$lang['menu'] = 'Konfiguracijske postavke'; +$lang['error'] = 'Postavke nisu ažurirane zbog neispravnih vrijednosti, molim provjerite vaÅ¡e promjene i ponovo ih snimite. +
      Neispravne vrijednosti biti će oznaÄene crvenim rubom.'; +$lang['updated'] = 'Postavke uspjeÅ¡no izmijenjene.'; +$lang['nochoice'] = '(ne postoje druge mogućnosti odabira)'; +$lang['locked'] = 'Postavke ne mogu biti izmijenjene, ako je to nenamjerno,
      + osigurajte da su ime datoteke lokalnih postavki i dozvole ispravni.'; +$lang['danger'] = 'Opasnost: Promjena ove opcije može uÄiniti nedostupnim VaÅ¡ wiki i izbornik upravljanja postavkama.'; +$lang['warning'] = 'Upozorenje: Izmjena ove opcije može izazvati neželjeno ponaÅ¡anje.'; +$lang['security'] = 'Sigurnosno upozorenje: Izmjena ove opcije može izazvati sigurnosni rizik.'; +$lang['_configuration_manager'] = 'Upravljanje postavkama'; +$lang['_header_dokuwiki'] = 'DokuWiki'; +$lang['_header_plugin'] = 'Dodatak'; +$lang['_header_template'] = 'Predložak'; +$lang['_header_undefined'] = 'Nedefinirana postavka'; +$lang['_basic'] = 'Osnovno'; +$lang['_display'] = 'Prikaz'; +$lang['_authentication'] = 'Prijava'; +$lang['_anti_spam'] = 'Protu-Spam'; +$lang['_editing'] = 'Izmjena'; +$lang['_links'] = 'PreÄaci'; +$lang['_media'] = 'Mediji'; +$lang['_notifications'] = 'Obavijesti'; +$lang['_syndication'] = 'RSS izvori'; +$lang['_advanced'] = 'Napredno'; +$lang['_network'] = 'Mreža'; +$lang['_msg_setting_undefined'] = 'Nema postavke meta_podatka.'; +$lang['_msg_setting_no_class'] = 'Nema postavke klase.'; +$lang['_msg_setting_no_default'] = 'Nema podrazumijevane vrijednosti.'; +$lang['title'] = 'Wiki naslov, odnosno naziv VaÅ¡eg wikija'; +$lang['start'] = 'Naziv poÄetne stranice u svakom imenskom prostoru'; +$lang['lang'] = 'Jezik suÄelja'; +$lang['template'] = 'Predložak, odnosno izgled wikija.'; +$lang['tagline'] = 'Opisni redak Wiki naslova (ako ga predložak podržava)'; +$lang['sidebar'] = 'Naziv boÄne stranice (ako ga predložak podržava), prazno polje onemogućuje boÄnu stranicu'; +$lang['license'] = 'Pod kojom licencom će sadržaj biti objavljen?'; +$lang['savedir'] = 'Pod-direktoriji gdje se pohranjuju podatci'; +$lang['basedir'] = 'Staza poslužitelja (npr. /dokuwiki/). Ostavite prazno za auto-detekciju.'; +$lang['baseurl'] = 'URL poslužitelja (npr. http://www.yourserver.com). Ostavite prazno za auto-detekciju.'; +$lang['cookiedir'] = 'Staza za kolaÄiće. Ostavite prazno za bazni URL.'; +$lang['dmode'] = 'Mod kreiranja diretorija'; +$lang['fmode'] = 'Mod kreiranja datoteka'; +$lang['allowdebug'] = 'Omogući uklanjanje pogreÅ¡aka. Onemogiućiti ako nije potrebno!'; +$lang['recent'] = 'Broj unosa po stranici na nedavnim promjenama'; +$lang['recent_days'] = 'Koliko nedavnih promjena da se Äuva (dani)'; +$lang['breadcrumbs'] = 'Broj nedavnih stranica koji se prikazuje. Postavite na 0 da biste onemogućili.'; +$lang['youarehere'] = 'Prikaži hijerarhijsku stazu stranice (tada vjerojatno želite onemogućiti gornju opciju)'; +$lang['fullpath'] = 'Prikaži punu putanju u podnožju stranice'; +$lang['typography'] = 'Napravi tipografske zamjene'; +$lang['dformat'] = 'Format datuma (pogledajte PHP strftime funkciju)'; +$lang['signature'] = 'Å to ubacuje gumb potpisa u ureÄ‘ivaÄu'; +$lang['showuseras'] = 'Å to da prikažem za korisnika koji je napravio zadnju izmjenu'; +$lang['toptoclevel'] = 'NajviÅ¡i nivo za sadržaj stranice'; +$lang['tocminheads'] = 'Minimalni broj naslova koji odreÄ‘uje da li će biti prikazan sadržaj stranice'; +$lang['maxtoclevel'] = 'Maksimalni broj nivoa u sadržaju stranice'; +$lang['maxseclevel'] = 'Maksimalni nivo do kojeg se omogućuje izmjena dijela stranice'; +$lang['camelcase'] = 'Koristi CamelCase za poveznice (veliko poÄetno slovo svake rijeÄi)'; +$lang['deaccent'] = 'Kako se proÄišćuje naziv stranice'; +$lang['useheading'] = 'Koristi prvi naslov za naziv stranice'; +$lang['sneaky_index'] = 'Inicijalno DokuWiki će prikazati sve imenske prostore u site mapi. Omogućavanjem ove opcije biti će sakriveni oni za koje korisnik nema barem pravo Äitanja. Ovo može rezultirati skrivanjem podimenskih prostora koji su inaÄe pristupaÄni, Å¡to može indeks uÄiniti nekorisnim pod odreÄ‘enim postavkama ACL-a.'; +$lang['hidepages'] = 'Kod potrage mape stranica i drugih automatskih indeksa ne prikazuj stranice koje zadovoljavaju ovaj regularni izraz'; +$lang['useacl'] = 'Koristi kontrolnu listu pristupa'; +$lang['autopasswd'] = 'Auto-generiranje lozinki'; +$lang['authtype'] = 'Mehanizam za identificiranje korisnika'; +$lang['passcrypt'] = 'Metoda Å¡ifriranja lozinki'; +$lang['defaultgroup'] = 'Osnovna grupa'; +$lang['superuser'] = 'Superuser - grupa, korisnik ili zarezom odvojena lista (npr. korisnik1,@grupa1,korisnik2) s punim pravom pristupa svim stranicama i funkcionalnostima neovisno o ACL postavkama'; +$lang['manager'] = 'Manager - grupa, korisnik ili zarezom odvojena lista (npr. korisnik1,@grupa1,korisnik2) s pristupom odreÄ‘enim upravljaÄkim funkcijama'; +$lang['profileconfirm'] = 'Potvrdi promjene profila sa lozinkom'; +$lang['rememberme'] = 'Omogući trajne kolaÄiće za prijavu (zapamti me)'; +$lang['disableactions'] = 'Onemogući odreÄ‘ene DokuWiki aktivnosti'; +$lang['disableactions_check'] = 'Provjeri'; +$lang['disableactions_subscription'] = 'Pretplati/Odjavi'; +$lang['disableactions_wikicode'] = 'Vidi izvorni kod/Izvezi sirovi oblik'; +$lang['disableactions_profile_delete'] = 'ObriÅ¡i svog korisnika'; +$lang['disableactions_other'] = 'Ostale aktivnosti (odvojene zarezom)'; +$lang['disableactions_rss'] = 'XML Syndication (RSS)'; +$lang['auth_security_timeout'] = 'Vremenski limit za prijavu (sekunde)'; +$lang['securecookie'] = 'Da li će kolaÄići poslani HTTPS-om biti poslani HTTPS-om od strane preglednika? Onemogući ovu opciju kada je samo prijava osigurana SSL-om a ne i pristup stranicama.'; +$lang['remote'] = 'Omogući udaljeni API. Ovo omogućava drugim aplikacijama pristup wikiju koriÅ¡tenjem XML-RPC i drugih mehanizama.'; +$lang['remoteuser'] = 'OgraniÄi pristup udaljenom API-u samo korisnicima i grupama navedenim ovdje u listi odvojenoj zarezom. Ostavi prazno za pristup omogućen svima.'; +$lang['usewordblock'] = 'Zaustavi spam baziran na listi rijeÄi'; +$lang['relnofollow'] = 'Koristi rel="nofollow" na vanjskim poveznicama'; +$lang['indexdelay'] = 'ÄŒekanje prije indeksiranja (sek.)'; +$lang['mailguard'] = 'Prikrivanje e-mail adresa'; +$lang['iexssprotect'] = 'Provjeri uÄitane datoteke za potencijalno maliciozni JavaScript ili HTML kod'; +$lang['usedraft'] = 'Automatski snimi nacrte promjena tijekom ureÄ‘ivanja'; +$lang['htmlok'] = 'Omogući ugraÄ‘eni HTML'; +$lang['phpok'] = 'Omogući ugraÄ‘eni PHP'; +$lang['locktime'] = 'Maksimalna trajanje zakljuÄavanja (sek.)'; +$lang['cachetime'] = 'Maksimalno trajanje priruÄne pohrane (sek.)'; +$lang['target____wiki'] = 'OdrediÅ¡ni prozor za interne poveznice'; +$lang['target____interwiki'] = 'OdrediÅ¡ni prozor za interwiki poveznice'; +$lang['target____extern'] = 'OdrediÅ¡ni prozor za vanjske poveznice'; +$lang['target____media'] = 'OdrediÅ¡ni prozor za medijske poveznice'; +$lang['target____windows'] = 'OdrediÅ¡ni prozor za windows poveznice'; +$lang['mediarevisions'] = 'Omogućiti revizije medijskih datoteka?'; +$lang['refcheck'] = 'Provjeri prije brisanja da li se medijska datoteka joÅ¡ uvijek koristi'; +$lang['gdlib'] = 'InaÄica GD Lib'; +$lang['im_convert'] = 'Staza do ImageMagick\'s konverzijskog alata'; +$lang['jpg_quality'] = 'Kvaliteta kompresije JPG-a (0-100)'; +$lang['fetchsize'] = 'Maksimalna veliÄina (bajtovi) koju fetch.php može uÄitati iz vanjskih URL-ova. npr. za pohranu i promjenu veliÄine vanjskih slika.'; +$lang['subscribers'] = 'Omogući korisnicima preplatu na promjene preko e-poÅ¡te'; +$lang['subscribe_time'] = 'Vrijeme (sek.) nakon kojeg se Å¡alju pretplatne liste. Trebalo bi biti manje od od vremena navedenog u recent_days parametru.'; +$lang['notify'] = 'Uvijek Å¡alji obavijesti o promjenama na ovu adresu epoÅ¡te'; +$lang['registernotify'] = 'Uvijek Å¡alji obavijesti o novo-kreiranim korisnicima na ovu adresu epoÅ¡te'; +$lang['mailfrom'] = 'Adresa poÅ¡iljatelja epoÅ¡te koja se koristi pri slanju automatskih poruka'; +$lang['mailprefix'] = 'Prefiks predmeta poruke kod automatskih poruka. Ostaviti prazno za koriÅ¡tenje naslova wikija'; +$lang['htmlmail'] = 'Å alji ljepÅ¡e, ali i veće poruke u HTML obliku. Onemogući za slanje poruka kao obiÄan tekst.'; +$lang['sitemap'] = 'Generiraj Google mapu stranica svakih (dana). 0 za onemogućivanje'; +$lang['rss_type'] = 'tip XML feed-a'; +$lang['rss_linkto'] = 'XML feed povezuje na'; +$lang['rss_content'] = 'Å to da se prikazuje u stavkama XML feed-a?'; +$lang['rss_update'] = 'Interval obnavljanja XML feed-a (sek.)'; +$lang['rss_show_summary'] = 'Prikaz sažetka u naslovu XML feed-a'; +$lang['rss_media'] = 'Koje vrste promjena trebaju biti prikazane u XML feed-u?'; +$lang['updatecheck'] = 'Provjera za nadogradnje i sigurnosna upozorenja? DokuWiki treba imati pristup do dokuwiki.org za ovo.'; +$lang['userewrite'] = 'Koristi jednostavne URL-ove'; +$lang['useslash'] = 'Koristi kosu crtu kao separator imenskih prostora u URL-ovima'; +$lang['sepchar'] = 'Separator rijeÄi u nazivu stranice'; +$lang['canonical'] = 'Uvije koristi puni kanonski oblik URL-ova (puna apsolutna staza)'; +$lang['fnencode'] = 'Metoda kodiranja ne-ASCII imena datoteka.'; +$lang['autoplural'] = 'Provjera izraza u množini u poveznicama'; +$lang['compression'] = 'Vrsta kompresije za pohranu attic datoteka'; +$lang['gzip_output'] = 'Koristi gzip Content-Encoding za xhtml'; +$lang['compress'] = 'Sažmi CSS i javascript izlaz'; +$lang['cssdatauri'] = 'VeliÄina u bajtovima do koje slike navedene u CSS datotekama će biti ugraÄ‘ene u stylesheet kako bi se smanjilo prekoraÄenje zaglavlja HTTP zathjeva . 400 do 600 bajtova je dobra vrijednost. Postavi 0 za onemogućavanje.'; +$lang['send404'] = 'PoÅ¡alji "HTTP 404/Page Not Found" za nepostojeće stranice'; +$lang['broken_iua'] = 'Da li je ignore_user_abort funkcija neispravna na vaÅ¡em sustavu? Ovo može izazvati neispravan indeks pretrage. IIS+PHP/CGI je poznat po neispravnosti. Pogledaj Bug 852 za viÅ¡e informacija.'; +$lang['xsendfile'] = 'Koristi X-Sendfile zaglavlje da se dopusti web poslužitelj dostavu statiÄkih datoteka? VaÅ¡ web poslužitelj ovo mora podržavati.'; +$lang['renderer_xhtml'] = 'Mehanizam koji se koristi za slaganje osnovnog (xhtml) wiki izlaza'; +$lang['renderer__core'] = '%s (dokuwiki jezgra)'; +$lang['renderer__plugin'] = '%s (dodatak)'; +$lang['dnslookups'] = 'Da li da DokuWiki potraži ime raÄunala za udaljenu IP adresu korisnik koji je izmijenio stranicu. Ako imate spor ili neispravan DNS server, nemojte koristiti ovu funkcionalnost, onemogućite ovu opciju'; +$lang['proxy____host'] = 'Proxy poslužitelj - adresa'; +$lang['proxy____port'] = 'Proxy poslužitelj - port'; +$lang['proxy____user'] = 'Proxy poslužitelj - korisniÄko ime'; +$lang['proxy____pass'] = 'Proxy poslužitelj - lozinka'; +$lang['proxy____ssl'] = 'Koristi SSL za vezu prema proxy poslužitelju'; +$lang['proxy____except'] = 'PreskoÄi proxy za URL-ove koji odgovaraju ovom regularnom izrazu.'; +$lang['safemodehack'] = 'Omogući safemode hack'; +$lang['ftp____host'] = 'FTP poslužitelj za safemode hack'; +$lang['ftp____port'] = 'FTP port za safemode hack'; +$lang['ftp____user'] = 'FTP korisniÄko ime za safemode hack'; +$lang['ftp____pass'] = 'FTP lozinka za safemode hack'; +$lang['ftp____root'] = 'FTP root direktorij za safemode hack'; +$lang['license_o_'] = 'NiÅ¡ta odabrano'; +$lang['typography_o_0'] = 'niÅ¡ta'; +$lang['typography_o_1'] = 'iskljuÄivÅ¡i jednostruke navodnike'; +$lang['typography_o_2'] = 'ukljuÄivÅ¡i jednostruke navodnike (ne mora uvijek raditi)'; +$lang['userewrite_o_0'] = 'niÅ¡ta'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'DokuWiki interno'; +$lang['deaccent_o_0'] = 'iskljuÄeno'; +$lang['deaccent_o_1'] = 'ukloni akcente'; +$lang['deaccent_o_2'] = 'romanizacija'; +$lang['gdlib_o_0'] = 'GD Lib nije dostupna'; +$lang['gdlib_o_1'] = 'InaÄica 1.x'; +$lang['gdlib_o_2'] = 'Autodetekcija'; +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; +$lang['rss_type_o_atom'] = 'Atom 0.3'; +$lang['rss_type_o_atom1'] = 'Atom 1.0'; +$lang['rss_content_o_abstract'] = 'Sažetak'; +$lang['rss_content_o_diff'] = 'Unificirani Diff'; +$lang['rss_content_o_htmldiff'] = 'HTML formatirana diff tabela'; +$lang['rss_content_o_html'] = 'Puni HTML sadržaj stranice'; +$lang['rss_linkto_o_diff'] = 'pregled razlika'; +$lang['rss_linkto_o_page'] = 'izmijenjena stranica'; +$lang['rss_linkto_o_rev'] = 'lista izmjena'; +$lang['rss_linkto_o_current'] = 'tekuća stranica'; +$lang['compression_o_0'] = 'niÅ¡ta'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'ne koristi'; +$lang['xsendfile_o_1'] = 'Posebno lighttpd zaglavlje (prije inaÄice 1.5)'; +$lang['xsendfile_o_2'] = 'Standardno X-Sendfile zaglavlje'; +$lang['xsendfile_o_3'] = 'Posebno Nginx X-Accel-Redirect zaglavlje'; +$lang['showuseras_o_loginname'] = 'KorisniÄko ime'; +$lang['showuseras_o_username'] = 'Puno ime korisnika'; +$lang['showuseras_o_username_link'] = 'Puno ime korisnika kao interwiki poveznica'; +$lang['showuseras_o_email'] = 'Korisnikova adresa epoÅ¡te (prikrivanje prema mailguard postavci)'; +$lang['showuseras_o_email_link'] = 'Korisnikova adresa epoÅ¡te kao mailto: poveznica'; +$lang['useheading_o_0'] = 'Nikad'; +$lang['useheading_o_navigation'] = 'Samo navigacija'; +$lang['useheading_o_content'] = 'Samo wiki sadržaj'; +$lang['useheading_o_1'] = 'Uvijek'; +$lang['readdircache'] = 'Maksimalna starost za readdir meÄ‘uspremnik (sek.)'; diff --git a/sources/lib/plugins/config/lang/hu/lang.php b/sources/lib/plugins/config/lang/hu/lang.php index 59d7e9f..972a731 100644 --- a/sources/lib/plugins/config/lang/hu/lang.php +++ b/sources/lib/plugins/config/lang/hu/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Sandor TIHANYI * @author Siaynoq Mage * @author schilling.janos@gmail.com @@ -60,7 +60,7 @@ $lang['breadcrumbs'] = 'Nyomvonal elemszám'; $lang['youarehere'] = 'Hierarchikus nyomvonal'; $lang['fullpath'] = 'Az oldalak teljes útvonalának mutatása a láblécben'; $lang['typography'] = 'Legyen-e tipográfiai csere'; -$lang['dformat'] = 'Dátum formázás (lásd a PHP strftime függvényt)'; +$lang['dformat'] = 'Dátum formázás (lásd a PHP strftime függvényt)'; $lang['signature'] = 'Aláírás'; $lang['showuseras'] = 'A felhasználó melyik adatát mutassunk az utolsó változtatás adatainál?'; $lang['toptoclevel'] = 'A tartalomjegyzék felsÅ‘ szintje'; @@ -137,7 +137,7 @@ $lang['autoplural'] = 'Többes szám ellenÅ‘rzés a hivatkozásokban $lang['compression'] = 'Tömörítés használata a törölt lapokhoz'; $lang['gzip_output'] = 'gzip tömörítés használata xhtml-hez (Content-Encoding)'; $lang['compress'] = 'CSS és JavaScript fájlok tömörítése'; -$lang['cssdatauri'] = 'Mérethatár bájtokban, ami alatti CSS-ben hivatkozott fájlok közvetlenül beágyazódjanak a stíluslapba. Ez IE 7-ben és alatta nem fog működni! 400-600 bájt ideális érték. Ãllítsd 0-ra a beágyazás kikapcsolásához!'; +$lang['cssdatauri'] = 'Mérethatár bájtokban, ami alatti CSS-ben hivatkozott fájlok közvetlenül beágyazódjanak a stíluslapba. 400-600 bájt ideális érték. Ãllítsd 0-ra a beágyazás kikapcsolásához!'; $lang['send404'] = '"HTTP 404/Page Not Found" küldése nemlétezÅ‘ oldalak esetén'; $lang['broken_iua'] = 'Az ignore_user_abort függvény hibát dob a rendszereden? Ez nem működÅ‘ keresési indexet eredményezhet. Az IIS+PHP/CGI összeállításról tudjuk, hogy hibát dob. Lásd a Bug 852 oldalt a további infóért.'; $lang['xsendfile'] = 'Használjuk az X-Sendfile fejlécet, hogy a webszerver statikus állományokat tudjon küldeni? A webszervernek is támogatnia kell ezt a funkciót.'; diff --git a/sources/lib/plugins/config/lang/ia/lang.php b/sources/lib/plugins/config/lang/ia/lang.php index c343003..511d081 100644 --- a/sources/lib/plugins/config/lang/ia/lang.php +++ b/sources/lib/plugins/config/lang/ia/lang.php @@ -47,7 +47,7 @@ $lang['youarehere'] = 'Micas de pan hierarchic'; $lang['typography'] = 'Face substitutiones typographic'; $lang['htmlok'] = 'Permitter incorporation de HTML'; $lang['phpok'] = 'Permitter incorporation de PHP'; -$lang['dformat'] = 'Formato del datas (vide le function strftime de PHP)'; +$lang['dformat'] = 'Formato del datas (vide le function strftime de PHP)'; $lang['signature'] = 'Signatura'; $lang['toptoclevel'] = 'Nivello principal pro tabula de contento'; $lang['tocminheads'] = 'Numero minimal de titulos requirite pro inserer tabula de contento'; diff --git a/sources/lib/plugins/config/lang/is/lang.php b/sources/lib/plugins/config/lang/is/lang.php index a99b39c..4f49446 100644 --- a/sources/lib/plugins/config/lang/is/lang.php +++ b/sources/lib/plugins/config/lang/is/lang.php @@ -22,7 +22,7 @@ $lang['youarehere'] = 'Stigveldisá brauðmolar'; $lang['typography'] = 'Gera stað fyrir leturgerðir'; $lang['htmlok'] = 'Fella HTML inn'; $lang['phpok'] = 'Fella PHP inn'; -$lang['dformat'] = 'Dagsetningarsnið (sjá PHP-aðgerð strftime)'; +$lang['dformat'] = 'Dagsetningarsnið (sjá PHP-aðgerð strftime)'; $lang['signature'] = 'Undirskrift'; $lang['passcrypt'] = 'Dulritunaraðferð aðgangsorðs'; $lang['defaultgroup'] = 'Sjálfgefinn hópur'; diff --git a/sources/lib/plugins/config/lang/it/lang.php b/sources/lib/plugins/config/lang/it/lang.php index e97ddc4..8173551 100644 --- a/sources/lib/plugins/config/lang/it/lang.php +++ b/sources/lib/plugins/config/lang/it/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Christopher Smith * @author Silvia Sargentoni * @author Pietro Battiston toobaz@email.it @@ -66,7 +66,7 @@ $lang['breadcrumbs'] = 'Numero di breadcrumb'; $lang['youarehere'] = 'Breadcrumb gerarchici'; $lang['fullpath'] = 'Mostra il percorso completo delle pagine'; $lang['typography'] = 'Abilita la sostituzione tipografica'; -$lang['dformat'] = 'Formato delle date (vedi la funzione strftime di PHP)'; +$lang['dformat'] = 'Formato delle date (vedi la funzione strftime di PHP)'; $lang['signature'] = 'Firma'; $lang['showuseras'] = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina'; $lang['toptoclevel'] = 'Livello superiore per l\'indice'; @@ -91,7 +91,9 @@ $lang['disableactions'] = 'Disabilita azioni DokuWiki'; $lang['disableactions_check'] = 'Controlla'; $lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione'; $lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw'; +$lang['disableactions_profile_delete'] = 'Elimina il proprio account'; $lang['disableactions_other'] = 'Altre azioni (separate da virgola)'; +$lang['disableactions_rss'] = 'XML Syndication (RSS)'; $lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; $lang['remote'] = 'Abilita il sistema di API remoto. Questo permette ad altre applicazioni di accedere al wiki tramite XML-RPC o altri meccanismi.'; @@ -141,7 +143,7 @@ $lang['autoplural'] = 'Controlla il plurale nei collegamenti'; $lang['compression'] = 'Usa la compressione per i file dell\'archivio'; $lang['gzip_output'] = 'Usa il Content-Encoding gzip per xhtml'; $lang['compress'] = 'Comprimi i file CSS e javascript'; -$lang['cssdatauri'] = 'Dimensione massima in byte di un\'immagine che può essere integrata nel CSS per ridurre l\'overhead delle richieste HTTP. Questa tecnica non funziona con IE7 e precedenti! Da 400 a 600 bytes è un buon valore. Impostare a 0 per disabilitare.'; +$lang['cssdatauri'] = 'Dimensione massima in byte di un\'immagine che può essere integrata nel CSS per ridurre l\'overhead delle richieste HTTP. Da 400 a 600 bytes è un buon valore. Impostare a 0 per disabilitare.'; $lang['send404'] = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti'; $lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi ilBug 852 per maggiori informazioni.'; $lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.'; @@ -196,6 +198,7 @@ $lang['xsendfile_o_2'] = 'Header standard X-Sendfile'; $lang['xsendfile_o_3'] = 'Header proprietario Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Nome utente'; $lang['showuseras_o_username'] = 'Nome completo dell\'utente'; +$lang['showuseras_o_username_link'] = 'Nome completo dell\'utente come link interwiki'; $lang['showuseras_o_email'] = 'Indirizzo email dell\'utente (offuscato in base alle impostazioni di sicurezza posta)'; $lang['showuseras_o_email_link'] = 'Indirizzo email dell\'utente come collegamento mailto:'; $lang['useheading_o_0'] = 'Mai'; diff --git a/sources/lib/plugins/config/lang/ja/lang.php b/sources/lib/plugins/config/lang/ja/lang.php index 83445e6..6432b13 100644 --- a/sources/lib/plugins/config/lang/ja/lang.php +++ b/sources/lib/plugins/config/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuji Takenaka * @author Christopher Smith * @author Ikuo Obataya @@ -61,7 +61,7 @@ $lang['breadcrumbs'] = 'トレース（パンããšï¼‰è¡¨ç¤ºæ•°'; $lang['youarehere'] = 'ç¾åœ¨ä½ç½®ã‚’表示'; $lang['fullpath'] = 'ページã®ãƒ•ãƒƒã‚¿ãƒ¼ã«çµ¶å¯¾ãƒ‘スを表示'; $lang['typography'] = 'タイãƒã‚°ãƒ©ãƒ•ã‚£ãƒ¼å¤‰æ›'; -$lang['dformat'] = '日付フォーマット（PHPã®strftime関数をå‚照）'; +$lang['dformat'] = '日付フォーマット（PHPã®strftime関数をå‚照）'; $lang['signature'] = 'ç½²å'; $lang['showuseras'] = '最終編集者ã®æƒ…å ±ã¨ã—ã¦è¡¨ç¤ºã™ã‚‹å†…容'; $lang['toptoclevel'] = '目次 トップレベル見出ã—'; @@ -138,7 +138,7 @@ $lang['autoplural'] = '自動複数形処ç†'; $lang['compression'] = 'アーカイブファイルã®åœ§ç¸®æ–¹æ³•'; $lang['gzip_output'] = 'xhtmlã«å¯¾ã™ã‚‹ã‚³ãƒ³ãƒ†ãƒ³ãƒ„圧縮（gzip）を使用'; $lang['compress'] = 'CSSã¨JavaScriptを圧縮'; -$lang['cssdatauri'] = 'HTTP リクエスト数ã«ã‚ˆã‚‹ã‚ªãƒ¼ãƒãƒ¼ãƒ˜ãƒƒãƒ‰ã‚’減らã™ãŸã‚ã€CSS ファイルã‹ã‚‰å‚ç…§ã•ã‚Œã‚‹ç”»åƒãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚µã‚¤ã‚ºãŒã“ã“ã§æŒ‡å®šã™ã‚‹ãƒã‚¤ãƒˆæ•°ä»¥å†…ã®å ´åˆã¯ CSS ファイル内㫠Data URI ã¨ã—ã¦åŸ‹ã‚è¾¼ã¿ã¾ã™ã€‚ã“ã®ãƒ†ã‚¯ãƒ‹ãƒƒã‚¯ã¯ IE7 以下ã§ã¯å‹•ä½œã—ã¾ã›ã‚“! 400 ã‹ã‚‰ 600 ãƒã‚¤ãƒˆãŒã¡ã‚‡ã†ã©ã‚ˆã„値ã§ã™ã€‚0 を指定ã™ã‚‹ã¨åŸ‹ã‚è¾¼ã¿å‡¦ç†ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。'; +$lang['cssdatauri'] = 'HTTP リクエスト数ã«ã‚ˆã‚‹ã‚ªãƒ¼ãƒãƒ¼ãƒ˜ãƒƒãƒ‰ã‚’減らã™ãŸã‚ã€CSS ファイルã‹ã‚‰å‚ç…§ã•ã‚Œã‚‹ç”»åƒãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚µã‚¤ã‚ºãŒã“ã“ã§æŒ‡å®šã™ã‚‹ãƒã‚¤ãƒˆæ•°ä»¥å†…ã®å ´åˆã¯ CSS ファイル内㫠Data URI ã¨ã—ã¦åŸ‹ã‚è¾¼ã¿ã¾ã™ã€‚ 400 ã‹ã‚‰ 600 ãƒã‚¤ãƒˆãŒã¡ã‚‡ã†ã©ã‚ˆã„値ã§ã™ã€‚0 を指定ã™ã‚‹ã¨åŸ‹ã‚è¾¼ã¿å‡¦ç†ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。'; $lang['send404'] = '文書ãŒå­˜åœ¨ã—ãªã„ページã«"HTTP404/Page Not Found"を使用'; $lang['broken_iua'] = 'ignore_user_abort関数ãŒç ´æã—ã¦ã„ã‚‹æã‚ŒãŒã‚ã‚Šã¾ã™ã€‚ãã®ãŸã‚ã€æ¤œç´¢ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãŒå‹•ä½œã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚IIS+PHP/CGIã®çµ„ã¿åˆã‚ã›ã§ç ´æã™ã‚‹ã“ã¨ãŒåˆ¤æ˜Žã—ã¦ã„ã¾ã™ã€‚詳ã—ãã¯Bug 852ã‚’å‚ç…§ã—ã¦ãã ã•ã„。'; $lang['xsendfile'] = 'ウェブサーãƒãƒ¼ãŒé™çš„ファイルを生æˆã™ã‚‹ãŸã‚ã« X-Sendfile ヘッダーを使用ã—ã¾ã™ã‹ï¼ŸãªãŠã€ã“ã®æ©Ÿèƒ½ã‚’ウェブサーãƒãƒ¼ãŒã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚'; diff --git a/sources/lib/plugins/config/lang/ko/lang.php b/sources/lib/plugins/config/lang/ko/lang.php index 420946f..94b1fa6 100644 --- a/sources/lib/plugins/config/lang/ko/lang.php +++ b/sources/lib/plugins/config/lang/ko/lang.php @@ -2,13 +2,14 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author jk Lee * @author dongnak@gmail.com * @author Song Younghwan * @author Seung-Chul Yoo * @author erial2@gmail.com * @author Myeongjin + * @author Erial */ $lang['menu'] = '환경 설정'; $lang['error'] = 'ìž˜ëª»ëœ ê°’ ë•Œë¬¸ì— ì„¤ì •ì„ ë°”ê¿€ 수 없습니다, ë°”ë€œì„ ê²€í† í•˜ê³  다시 제출하세요. @@ -59,7 +60,7 @@ $lang['breadcrumbs'] = 'ì´ë™ 경로 "추ì " 수. 비활성화하려 $lang['youarehere'] = 'ê³„ì¸µì  ì´ë™ 경로 사용 (다ìŒì— 위 ì˜µì…˜ì„ ë¹„í™œì„±í™”í•˜ê¸°ë¥¼ ì›í•  ê²ë‹ˆë‹¤)'; $lang['fullpath'] = 'ë°”ë‹¥ê¸€ì— ë¬¸ì„œì˜ ì „ì²´ 경로 ë°ížˆê¸°'; $lang['typography'] = '타ì´í¬ê·¸ëž˜í”¼ 대체'; -$lang['dformat'] = '날짜 í˜•ì‹ (PHPì˜ strftime 함수 참고)'; +$lang['dformat'] = '날짜 í˜•ì‹ (PHPì˜ strftime 함수 참고)'; $lang['signature'] = '편집기ì—ì„œ 서명 ë²„íŠ¼ì„ ëˆ„ë¥¼ ë•Œ ë„£ì„ ë‚´ìš©'; $lang['showuseras'] = '문서를 마지막으로 편집한 사용ìžë¥¼ 보여줄지 여부'; $lang['toptoclevel'] = 'ëª©ì°¨ì˜ ìµœìƒìœ„ 단계'; @@ -112,7 +113,7 @@ $lang['gdlib'] = 'GD ë¼ì´ë¸ŒëŸ¬ë¦¬ 버전'; $lang['im_convert'] = 'ImageMagickì˜ ë³€í™˜ ë„êµ¬ì˜ ê²½ë¡œ'; $lang['jpg_quality'] = 'JPG 압축 품질 (0-100)'; $lang['fetchsize'] = 'fetch.phpê°€ 바깥 URLì—ì„œ 다운로드할 수 있는 최대 í¬ê¸° (ë°”ì´íŠ¸), 예를 들어 바깥 ê·¸ë¦¼ì„ ìºì‹œí•˜ê³  í¬ê¸° 조절할 ë•Œ.'; -$lang['subscribers'] = '사용ìžê°€ ì´ë©”ì¼ë¡œ 문서 ë°”ë€œì„ êµ¬ë…하는 ê²ƒì„ í—ˆìš©'; +$lang['subscribers'] = '사용ìžê°€ ì´ë©”ì¼ë¡œ 문서 ë°”ë€œì„ êµ¬ë…í•  수 있ë„ë¡ í•˜ê¸°'; $lang['subscribe_time'] = 'êµ¬ë… ëª©ë¡ê³¼ ìš”ì•½ì´ ë³´ë‚´ì§ˆ 경과 시간 (ì´ˆ); recent_daysì— ì§€ì •ëœ ì‹œê°„ë³´ë‹¤ 작아야 합니다.'; $lang['notify'] = 'í•­ìƒ ì´ ì´ë©”ì¼ ì£¼ì†Œë¡œ 바뀜 ì•Œë¦¼ì„ ë³´ëƒ„'; $lang['registernotify'] = 'í•­ìƒ ì´ ì´ë©”ì¼ ì£¼ì†Œë¡œ 새로 등ë¡í•œ 사용ìžì˜ 정보를 보냄'; @@ -126,7 +127,7 @@ $lang['rss_content'] = 'XML 피드 í•­ëª©ì— ë³´ì—¬ì£¼ëŠ” ë‚´ìš©ì€ $lang['rss_update'] = 'XML 피드 ì—…ë°ì´íŠ¸ 간격 (ì´ˆ)'; $lang['rss_show_summary'] = 'XML í”¼ë“œì˜ ì œëª©ì—ì„œ 요악 보여주기'; $lang['rss_media'] = 'ì–´ë–¤ 규격으로 XML í”¼ë“œì— ë°”ë€œì„ ë‚˜ì—´í•´ì•¼ 합니까?'; -$lang['updatecheck'] = 'ë°ì´íŠ¸ì™€ 보안 경고를 검사할까요? ë„쿠위키는 ì´ ê¸°ëŠ¥ì„ ìœ„í•´ update.dokuwiki.orgì— ì—°ê²°ì´ í•„ìš”í•©ë‹ˆë‹¤.'; +$lang['updatecheck'] = 'ì—…ë°ì´íŠ¸ì™€ 보안 경고를 검사할까요? ë„쿠위키는 ì´ ê¸°ëŠ¥ì„ ìœ„í•´ update.dokuwiki.orgì— ì—°ê²°ì´ í•„ìš”í•©ë‹ˆë‹¤.'; $lang['userewrite'] = '멋진 URL 사용'; $lang['useslash'] = 'URLì—ì„œ ì´ë¦„공간 구분ìžë¡œ 슬래시 사용'; $lang['sepchar'] = '문서 ì´ë¦„ ë‚±ë§ êµ¬ë¶„ìž'; @@ -136,7 +137,7 @@ $lang['autoplural'] = 'ë§í¬ì—ì„œ 복수형 검사'; $lang['compression'] = '첨부 파ì¼ì˜ 압축 방법'; $lang['gzip_output'] = 'xhtmlì— ëŒ€í•´ gzip ë‚´ìš© ì¸ì½”딩 사용'; $lang['compress'] = 'CSS ë° ìžë°”스í¬ë¦½íŠ¸ë¥¼ 압축하여 출력'; -$lang['cssdatauri'] = 'CSS 파ì¼ì—ì„œ ê·¸ë¦¼ì´ ì°¸ì¡°ë˜ëŠ” 최대 ë°”ì´íŠ¸ í¬ê¸°ë¥¼ 스타ì¼ì‹œíŠ¸ì— 규정해야 HTTP 요청 í—¤ë” ì˜¤ë²„í—¤ë“œ í¬ê¸°ë¥¼ ì¤„ì¼ ìˆ˜ 있습니다. ì´ ê¸°ìˆ ì€ IE 7 ì´í•˜ì—서는 ìž‘ë™í•˜ì§€ 않습니다! 400ì—ì„œ 600 ë°”ì´íŠ¸ ì •ë„ë©´ ì¢‹ì€ íš¨ìœ¨ì„ ê°€ì ¸ì˜µë‹ˆë‹¤. 비활성화하려면 0으로 설정하세요.'; +$lang['cssdatauri'] = 'CSS 파ì¼ì—ì„œ ê·¸ë¦¼ì´ ì°¸ì¡°ë˜ëŠ” 최대 ë°”ì´íŠ¸ í¬ê¸°ë¥¼ 스타ì¼ì‹œíŠ¸ì— 규정해야 HTTP 요청 í—¤ë” ì˜¤ë²„í—¤ë“œ í¬ê¸°ë¥¼ ì¤„ì¼ ìˆ˜ 있습니다. 400ì—ì„œ 600 ë°”ì´íŠ¸ ì •ë„ë©´ ì¢‹ì€ íš¨ìœ¨ì„ ê°€ì ¸ì˜µë‹ˆë‹¤. 비활성화하려면 0으로 설정하세요.'; $lang['send404'] = '존재하지 않는 ë¬¸ì„œì— "HTTP 404/페ì´ì§€ë¥¼ ì°¾ì„ ìˆ˜ 없습니다" 보내기'; $lang['broken_iua'] = '시스템ì—ì„œ ignore_user_abort í•¨ìˆ˜ì— ë¬¸ì œê°€ 있습니까? 문제가 있다면 검색 색ì¸ì´ ë™ìž‘하지 않는 ì›ì¸ì´ ë©ë‹ˆë‹¤. ì´ í•¨ìˆ˜ê°€ IIS+PHP/CGIì—ì„œ 문제가 있는 것으로 알려져 있습니다. ìžì„¸í•œ 정보는 버그 852를 참조하시기 ë°”ëžë‹ˆë‹¤.'; $lang['xsendfile'] = '웹 서버가 ì •ì  íŒŒì¼ì„ 제공할 수 있ë„ë¡ X-Sendfile í—¤ë”를 사용하겠습니까? 웹 서버가 ì´ ê¸°ëŠ¥ì„ ì§€ì›í•´ì•¼ 합니다.'; diff --git a/sources/lib/plugins/config/lang/la/lang.php b/sources/lib/plugins/config/lang/la/lang.php index 100f064..515aa95 100644 --- a/sources/lib/plugins/config/lang/la/lang.php +++ b/sources/lib/plugins/config/lang/la/lang.php @@ -46,7 +46,7 @@ $lang['youarehere'] = 'Ordo uestigiorum'; $lang['typography'] = 'Signa supponentes'; $lang['htmlok'] = 'HTML aptum facere'; $lang['phpok'] = 'PHP aptum facere'; -$lang['dformat'] = 'Forma diei (uide paginam de diebus)'; +$lang['dformat'] = 'Forma diei (uide paginam de diebus)'; $lang['signature'] = 'Subscriptio'; $lang['toptoclevel'] = 'Gradus maior tabularum argumentorum'; $lang['tocminheads'] = 'Minimus numerus capitum'; diff --git a/sources/lib/plugins/config/lang/lv/lang.php b/sources/lib/plugins/config/lang/lv/lang.php index aa692c1..533b008 100644 --- a/sources/lib/plugins/config/lang/lv/lang.php +++ b/sources/lib/plugins/config/lang/lv/lang.php @@ -49,7 +49,7 @@ $lang['breadcrumbs'] = 'ApmeklÄ“jumu vÄ“stures garums'; $lang['youarehere'] = 'RÄdÄ«t "tu atrodies Å¡eit"'; $lang['fullpath'] = 'NorÄdÄ«t kÄjenÄ“ pilnu lapas ceļu'; $lang['typography'] = 'Veikt tipogrÄfijas aizvietoÅ¡anu'; -$lang['dformat'] = 'Datuma formÄts (sk. PHP strftime funkciju)'; +$lang['dformat'] = 'Datuma formÄts (sk. PHP strftime funkciju)'; $lang['signature'] = 'Paraksts'; $lang['showuseras'] = 'KÄ rÄdÄ«t pÄ“dÄ“jo lietotÄju, ka labojis lapu'; $lang['toptoclevel'] = 'Satura rÄdÄ«tÄja pirmais lÄ«menis'; diff --git a/sources/lib/plugins/config/lang/mr/lang.php b/sources/lib/plugins/config/lang/mr/lang.php index 172c47e..5dbb8ec 100644 --- a/sources/lib/plugins/config/lang/mr/lang.php +++ b/sources/lib/plugins/config/lang/mr/lang.php @@ -50,7 +50,7 @@ $lang['youarehere'] = 'पà¥à¤°à¤¤à¤µà¤¾à¤° बà¥à¤°à¥‡à¤¡à¤•à¥à¤° $lang['typography'] = 'अनवधानाने à¤à¤¾à¤²à¥‡à¤²à¥à¤¯à¤¾ चà¥à¤•à¤¾ बदला'; $lang['htmlok'] = 'अंतरà¥à¤—त HTML टाकायची परवानगी असू दे'; $lang['phpok'] = 'अंतरà¥à¤—त PHP टाकायची परवानगी असू दे'; -$lang['dformat'] = 'दिनांकाची पदà¥à¤§à¤¤ ( PHP चं strftime हे फंकà¥à¤¶à¤¨ पाहा )'; +$lang['dformat'] = 'दिनांकाची पदà¥à¤§à¤¤ ( PHP चं strftime हे फंकà¥à¤¶à¤¨ पाहा )'; $lang['signature'] = 'हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°'; $lang['toptoclevel'] = 'अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¥‡à¤šà¥€ सरà¥à¤µà¥‹à¤šà¥à¤š पातळी'; $lang['tocminheads'] = 'कमीत कमी किती शीरà¥à¤·à¤•à¥‡ असलà¥à¤¯à¤¾à¤¸ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ बनवावी'; diff --git a/sources/lib/plugins/config/lang/nl/lang.php b/sources/lib/plugins/config/lang/nl/lang.php index a9791b7..d173ea6 100644 --- a/sources/lib/plugins/config/lang/nl/lang.php +++ b/sources/lib/plugins/config/lang/nl/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Pieter van der Meulen * @author Wouter Schoot * @author John de Graaff @@ -66,7 +66,7 @@ $lang['breadcrumbs'] = 'Aantal broodkruimels. Zet dit op 0 om uit te s $lang['youarehere'] = 'Gebruik hiërarchische broodkruimels (waarschijnlijk wil je dan de optie hierboven uitschakelen)'; $lang['fullpath'] = 'Volledig pad van pagina\'s in de footer weergeven'; $lang['typography'] = 'Breng typografische wijzigingen aan'; -$lang['dformat'] = 'Datum formaat (zie de PHP strftime functie)'; +$lang['dformat'] = 'Datum formaat (zie de PHP strftime functie)'; $lang['signature'] = 'Tekst die ingevoegd wordt met de Handtekening-knop in het bewerkvenster.'; $lang['showuseras'] = 'Hoe de gebruiker die de pagina het laatst wijzigde weergeven'; $lang['toptoclevel'] = 'Bovenste niveau voor inhoudsopgave'; @@ -143,7 +143,7 @@ $lang['autoplural'] = 'Controleer op meervoudsvormen in links'; $lang['compression'] = 'Compressiemethode voor attic-bestanden'; $lang['gzip_output'] = 'Gebruik gzip Content-Encoding voor xhtml'; $lang['compress'] = 'Compacte CSS en javascript output'; -$lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! 400 tot 600 is een geschikte omvang. Stel de omvang in op 0 om deze functionaliteit uit te schakelen.'; +$lang['cssdatauri'] = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. 400 tot 600 is een geschikte omvang. Stel de omvang in op 0 om deze functionaliteit uit te schakelen.'; $lang['send404'] = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s'; $lang['broken_iua'] = 'Is de ignore_user_abort functie onbruikbaar op uw systeem? Dit kan een onbruikbare zoekindex tot gevolg hebben. IIS+PHP/CGI staat hier bekend om. Zie Bug 852 voor meer informatie.'; $lang['xsendfile'] = 'Gebruik de X-Sendfile header om de webserver statische content te laten versturen? De webserver moet dit wel ondersteunen.'; diff --git a/sources/lib/plugins/config/lang/no/lang.php b/sources/lib/plugins/config/lang/no/lang.php index f048a0f..aa2a307 100644 --- a/sources/lib/plugins/config/lang/no/lang.php +++ b/sources/lib/plugins/config/lang/no/lang.php @@ -64,7 +64,7 @@ $lang['youarehere'] = 'Vis hvor i hvilke(t) navnerom siden er'; $lang['typography'] = 'Gjør typografiske erstatninger'; $lang['htmlok'] = 'Tillat HTML'; $lang['phpok'] = 'Tillat PHP'; -$lang['dformat'] = 'Datoformat (se PHPs datofunksjon)'; +$lang['dformat'] = 'Datoformat (se PHPs datofunksjon)'; $lang['signature'] = 'Signatur'; $lang['toptoclevel'] = 'ToppnivÃ¥ for innholdsfortegnelse'; $lang['tocminheads'] = 'Minimum antall overskrifter som bestemmer om innholdsbetegnelse skal bygges.'; diff --git a/sources/lib/plugins/config/lang/pl/lang.php b/sources/lib/plugins/config/lang/pl/lang.php index 9a7cc49..4851481 100644 --- a/sources/lib/plugins/config/lang/pl/lang.php +++ b/sources/lib/plugins/config/lang/pl/lang.php @@ -138,7 +138,7 @@ $lang['autoplural'] = 'Automatyczne tworzenie liczby mnogiej'; $lang['compression'] = 'Metoda kompresji dla usuniÄ™tych plików'; $lang['gzip_output'] = 'Używaj kodowania GZIP dla zawartoÅ›ci XHTML'; $lang['compress'] = 'Kompresja arkuszy CSS i plików JavaScript'; -$lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwoÅ‚ania do obrazów w plikach CSS powinny być osadzone bezpoÅ›rednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie dziaÅ‚a w IE 7 i poniżej! 400 do 600 bajtów jest dobrÄ… wartoÅ›ciÄ…. Ustaw 0 aby wyÅ‚Ä…czyć.'; +$lang['cssdatauri'] = 'Rozmiar w bajtach, poniżej którego odwoÅ‚ania do obrazów w plikach CSS powinny być osadzone bezpoÅ›rednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. 400 do 600 bajtów jest dobrÄ… wartoÅ›ciÄ…. Ustaw 0 aby wyÅ‚Ä…czyć.'; $lang['send404'] = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejÄ…cych stron'; $lang['broken_iua'] = 'Czy funkcja "ignore_user_abort" dziaÅ‚a? JeÅ›li nie, może to powodować problemy z indeksem przeszukiwania. Funkcja nie dziaÅ‚a przy konfiguracji oprogramowania IIS+PHP/CGI. Szczegółowe informacje: Bug 852.'; $lang['xsendfile'] = 'Użyj nagłówka HTTP X-Sendfile w celu przesyÅ‚ania statycznych plików. Serwer HTTP musi obsÅ‚ugiwać ten nagłówek.'; diff --git a/sources/lib/plugins/config/lang/pt-br/lang.php b/sources/lib/plugins/config/lang/pt-br/lang.php index 625dc6a..24c133a 100644 --- a/sources/lib/plugins/config/lang/pt-br/lang.php +++ b/sources/lib/plugins/config/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães * @author Felipe Castro * @author Lucien Raven @@ -18,6 +18,8 @@ * @author Isaias Masiero Filho * @author Balaco Baco * @author Victor Westmann + * @author Guilherme Cardoso + * @author Viliam Dias */ $lang['menu'] = 'Configurações do DokuWiki'; $lang['error'] = 'As configurações não foram atualizadas devido a um valor inválido. Por favor, reveja suas alterações e reenvie-as.
      O(s) valor(es) incorreto(s) serão exibidos contornados por uma borda vermelha.'; @@ -68,7 +70,7 @@ $lang['breadcrumbs'] = 'Número de elementos na trilha de páginas vis $lang['youarehere'] = 'Trilha hierárquica'; $lang['fullpath'] = 'Indica o caminho completo das páginas no rodapé'; $lang['typography'] = 'Efetuar modificações tipográficas'; -$lang['dformat'] = 'Formato da data (veja a função strftime do PHP)'; +$lang['dformat'] = 'Formato da data (veja a função strftime do PHP)'; $lang['signature'] = 'Assinatura'; $lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; $lang['toptoclevel'] = 'Nível mais alto para a tabela de conteúdos'; diff --git a/sources/lib/plugins/config/lang/pt/lang.php b/sources/lib/plugins/config/lang/pt/lang.php index c953492..312f45d 100644 --- a/sources/lib/plugins/config/lang/pt/lang.php +++ b/sources/lib/plugins/config/lang/pt/lang.php @@ -2,13 +2,14 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author José Monteiro * @author Enrico Nicoletto * @author Fil * @author André Neves * @author José Campos zecarlosdecampos@gmail.com * @author Paulo Carmino + * @author Alfredo Silva */ $lang['menu'] = 'Configuração'; $lang['error'] = 'Parâmetros de Configuração não actualizados devido a valores inválidos. Por favor, reveja as modificações que pretende efectuar antes de re-submetê-las.
      Os valores incorrectos serão mostrados dentro de uma "moldura" vermelha.'; @@ -32,6 +33,7 @@ $lang['_editing'] = 'Configuração de Edição'; $lang['_links'] = 'Configuração de Ligações'; $lang['_media'] = 'Configuração de Media'; $lang['_notifications'] = 'Notificação'; +$lang['_syndication'] = 'Sindicação (RSS)'; $lang['_advanced'] = 'Configurações Avançadas'; $lang['_network'] = 'Configuração de Rede'; $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.'; @@ -54,7 +56,7 @@ $lang['breadcrumbs'] = 'Número máximo de breadcrumbs'; $lang['youarehere'] = 'Breadcrumbs hierárquicas'; $lang['fullpath'] = 'Revelar caminho completo no rodapé'; $lang['typography'] = 'Executar substituições tipográficas'; -$lang['dformat'] = 'Formato de Data (ver função PHP\'s strftime)'; +$lang['dformat'] = 'Formato de Data (ver função PHP\'s strftime)'; $lang['signature'] = 'Assinatura'; $lang['showuseras'] = 'O que exibir quando mostrar o utilizador que editou a página pela última vez'; $lang['toptoclevel'] = 'Nível de topo para a tabela de conteúdo'; @@ -81,6 +83,7 @@ $lang['disableactions_subscription'] = 'Subscrever/Não Subscrver'; $lang['disableactions_wikicode'] = 'Ver fonte/Exportar em bruto'; $lang['disableactions_profile_delete'] = 'Deletar Sua Conta.'; $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; +$lang['disableactions_rss'] = 'Sindicação XML (RSS)'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; $lang['securecookie'] = 'Os cookies definidos via HTTPS deverão ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação de maneira insegura.'; $lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras (wordlist)'; @@ -98,6 +101,7 @@ $lang['target____interwiki'] = 'Parâmetro "target" para links entre wikis'; $lang['target____extern'] = 'Parâmetro "target" para links externos'; $lang['target____media'] = 'Parâmetro "target" para links de media'; $lang['target____windows'] = 'Parâmetro "target" para links do Windows'; +$lang['mediarevisions'] = 'Ativar Mediarevisions?'; $lang['refcheck'] = 'Verificação de referência da media'; $lang['gdlib'] = 'Versão GD Lib'; $lang['im_convert'] = 'Caminho para a ferramenta "convert" do ImageMagick'; @@ -125,7 +129,7 @@ $lang['autoplural'] = 'Verificar formas plurais nos links'; $lang['compression'] = 'Método de compressão para histórico'; $lang['gzip_output'] = 'Usar "Content-Encoding" do gzip para o código xhtml'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; -$lang['cssdatauri'] = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. Esta técnica não funciona em IE 7 e abaixo! 400 a 600 bytes é um bom valor. Escolher 0 para desativar.'; +$lang['cssdatauri'] = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. 400 a 600 bytes é um bom valor. Escolher 0 para desativar.'; $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; $lang['broken_iua'] = 'A função "ignore_user_abort" não está a funcionar no seu sistema? Isso pode causar um índice de busca defeituoso. Sistemas com IIS+PHP/CGI são conhecidos por possuírem este problema. Veja o bug 852 para mais informações.'; $lang['xsendfile'] = 'Usar o cabeçalho "X-Sendfile" para permitir o servidor de internet encaminhar ficheiros estáticos? O seu servidor de internet precisa ter suporte a isso.'; diff --git a/sources/lib/plugins/config/lang/ro/lang.php b/sources/lib/plugins/config/lang/ro/lang.php index e95c551..1946502 100644 --- a/sources/lib/plugins/config/lang/ro/lang.php +++ b/sources/lib/plugins/config/lang/ro/lang.php @@ -1,7 +1,8 @@ * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi @@ -37,28 +38,29 @@ $lang['_network'] = 'Setări ReÅ£ea'; $lang['_msg_setting_undefined'] = 'Nesetat metadata'; $lang['_msg_setting_no_class'] = 'Nesetat class'; $lang['_msg_setting_no_default'] = 'Nici o valoare implicită'; -$lang['fmode'] = 'Mod creare fiÅŸier'; -$lang['dmode'] = 'Mod creare director'; -$lang['lang'] = 'Limbă'; -$lang['basedir'] = 'Director bază'; -$lang['baseurl'] = 'URL bază '; -$lang['savedir'] = 'Director pentru salvarea datelor'; -$lang['cookiedir'] = 'Cale Cookie. LăsaÈ›i gol pentru a utiliza baseurl.'; -$lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; +$lang['start'] = 'Numele paginii de start'; +$lang['lang'] = 'Limbă'; $lang['template'] = 'Åžablon'; $lang['tagline'] = 'Slogan (dacă templateul suportă opÈ›iunea)'; $lang['sidebar'] = 'Numele paginii barei laterale (dacă templateul suportă opÈ›iunea), câmpul lăsat gol dezactivează bara laterală'; $lang['license'] = 'Sub ce licenţă va fi publicat conÅ£inutul?'; -$lang['fullpath'] = 'Arată calea completă a paginii în subsol'; +$lang['savedir'] = 'Director pentru salvarea datelor'; +$lang['basedir'] = 'Director bază'; +$lang['baseurl'] = 'URL bază '; +$lang['cookiedir'] = 'Cale Cookie. LăsaÈ›i gol pentru a utiliza baseurl.'; +$lang['dmode'] = 'Mod creare director'; +$lang['fmode'] = 'Mod creare fiÅŸier'; +$lang['allowdebug'] = 'Permite depanarea dezactivaÅ£i dacă cu e necesar!'; $lang['recent'] = 'Modificări recente'; +$lang['recent_days'] = 'Câte modificări recente să se păstreze?'; $lang['breadcrumbs'] = 'Numărul de "urme" lăsate'; $lang['youarehere'] = 'Structura ierarhică a "urmelor" lăsate'; +$lang['fullpath'] = 'Arată calea completă a paginii în subsol'; $lang['typography'] = 'Fă înlocuiri topografice'; -$lang['htmlok'] = 'Permite intercalare cod HTML'; -$lang['phpok'] = 'Permite intercalare cod PHP'; -$lang['dformat'] = 'Format dată (vezi funcÅ£ia PHP strftime)'; +$lang['dformat'] = 'Format dată (vezi funcÅ£ia PHP strftime)'; $lang['signature'] = 'Semnătura'; +$lang['showuseras'] = 'Ce se afiÅŸează la indicarea utilizatorului care a editat ultimul o pagină'; $lang['toptoclevel'] = 'Primul nivel pentru cuprins'; $lang['tocminheads'] = 'Numărul minim de titluri ce determină dacă se alcătuieÅŸte Tabelul de Cuprins (TOC)'; $lang['maxtoclevel'] = 'Nivelul maxim pentru cuprins'; @@ -66,15 +68,8 @@ $lang['maxseclevel'] = 'Nivelul maxim de editare al secÅ£iunii'; $lang['camelcase'] = 'FoloseÅŸte CamelCase pentru legături'; $lang['deaccent'] = 'numedepagină curate'; $lang['useheading'] = 'FoloseÅŸte primul titlu pentru numele paginii'; -$lang['refcheck'] = 'Verificare referinţă media'; -$lang['allowdebug'] = 'Permite depanarea dezactivaÅ£i dacă cu e necesar!'; -$lang['mediarevisions'] = 'Activare Revizii Media?'; -$lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; -$lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; -$lang['relnofollow'] = 'FolosiÅ£i rel="nofollow" pentru legăturile externe'; -$lang['mailguard'] = 'Adrese de email acoperite'; -$lang['iexssprotect'] = 'Verifică fiÅŸierele încărcate pentru posibil cod periculos JavaScript sau HTML'; -$lang['showuseras'] = 'Ce se afiÅŸează la indicarea utilizatorului care a editat ultimul o pagină'; +$lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaÅ£ii la vizualizarea indexului. Activând această opÅ£iune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaÅ£ii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; +$lang['hidepages'] = 'Ascunde paginile pereche (expresii regulate)'; $lang['useacl'] = 'Utilizează liste de control al accesului'; $lang['autopasswd'] = 'Parole autogenerate'; $lang['authtype'] = 'Autentificare backend'; @@ -83,61 +78,67 @@ $lang['defaultgroup'] = 'Grup implicit'; $lang['superuser'] = 'Superuser - un grup sau un utilizator cu acces complet la toate paginile ÅŸi funcÅ£iile indiferent de setările ACL'; $lang['manager'] = 'Manager - un grup sau un utilizator cu acces la anumite funcÅ£ii de management'; $lang['profileconfirm'] = 'Confirmă schimbarea profilului cu parola'; +$lang['rememberme'] = 'PermiteÅ£i cookies permanente la login (Å£ine-mă minte)'; $lang['disableactions'] = 'Dezactivează acÅ£iunile DokuWiki'; $lang['disableactions_check'] = 'Verifică'; $lang['disableactions_subscription'] = 'Subscrie/Anulează subscrierea'; $lang['disableactions_wikicode'] = 'Vizualizează sursa/Export Raw'; $lang['disableactions_other'] = 'Alte acÅ£iuni (separate prin virgulă)'; -$lang['sneaky_index'] = 'Implicit, DokuWiki va arăta toate numele de spaÅ£ii la vizualizarea indexului. Activând această opÅ£iune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaÅ£ii accesibile. Aceasta poate face index-ul inutilizabil cu anumite setări ale ACL'; $lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)'; $lang['securecookie'] = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? DezactivaÅ£i această opÅ£iune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.'; $lang['remote'] = 'Activează sistemul remote API. Acesta permite altor aplicaÈ›ii să acceseze wiki-ul via XML-RPC sau alte mecanisme.'; $lang['remoteuser'] = 'RestricÈ›ionează accesul sistemului remote API la grupurile sau utilizatorii următori (separaÈ›i prin virgulă). LăsaÈ›i câmpul gol pentru a da acces către toÈ›i.'; -$lang['updatecheck'] = 'Verificare actualizări ÅŸi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; -$lang['userewrite'] = 'Folosire URL-uri "nice"'; -$lang['useslash'] = 'FoloseÅŸte slash-ul ca separator de spaÅ£ii de nume în URL-uri'; +$lang['usewordblock'] = 'Blochează spam-ul pe baza listei de cuvinte'; +$lang['relnofollow'] = 'FolosiÅ£i rel="nofollow" pentru legăturile externe'; +$lang['indexdelay'] = 'Timpul de întârziere înainte de indexare (sec)'; +$lang['mailguard'] = 'Adrese de email acoperite'; +$lang['iexssprotect'] = 'Verifică fiÅŸierele încărcate pentru posibil cod periculos JavaScript sau HTML'; $lang['usedraft'] = 'Salvează automat o schiţă în timpul editării'; -$lang['sepchar'] = 'Separator cuvinte în numele paginii'; -$lang['canonical'] = 'FoloseÅŸte URL-uri canonice'; -$lang['fnencode'] = 'Metoda de encodare a numelor fiÅŸierelor non-ASCII.'; -$lang['autoplural'] = 'Verifică formele de plural în legături'; -$lang['compression'] = 'Metoda de criptare a fiÅŸierelor pod'; -$lang['cachetime'] = 'Durata maximă pentru cache (secunde)'; +$lang['htmlok'] = 'Permite intercalare cod HTML'; +$lang['phpok'] = 'Permite intercalare cod PHP'; $lang['locktime'] = 'Durata maximă pentru blocarea fiÅŸierelor (secunde)'; -$lang['fetchsize'] = 'Dimensiunea maximă (byte) pe care fetch.php poate să descarce din exterior'; -$lang['notify'] = 'Trimite notificări privind modificările pe această adresă de email'; -$lang['registernotify'] = 'Trimite informare noilor utilizatori înregistraÅ£i pe această adresă de email'; -$lang['mailfrom'] = 'Adresa de email utilizată pentru mailuri automate'; -$lang['mailprefix'] = 'Prefix subiect e-mail de folosit pentru mail-uri automate'; -$lang['gzip_output'] = 'FoloseÅŸte gzip pentru codarea conÅ£inutului xhtml'; -$lang['gdlib'] = 'Versiunea GD Lib'; -$lang['im_convert'] = 'Calea către instrumentul de conversie ImageMagick'; -$lang['jpg_quality'] = 'Calitatea compresiei JPG (0-100)'; -$lang['subscribers'] = 'Activează suportul pentru subscrierea paginii'; -$lang['subscribe_time'] = 'Timpul după care lista de abonare ÅŸi digestie sunt trimise (sec); Aceasta ar trebui să fie mai mic decât timpul specificat în recent_days.'; -$lang['compress'] = 'Compactează codul CSS ÅŸi javascript produs'; -$lang['cssdatauri'] = 'Dimensiunea în octeÈ›i până la care imaginile regasite în fiÈ™ierele CSS ar trebui să fie incluse direct în stylesheet pentru a reduce supraîncărcarea antetului cererii HTTP. Această tehnică nu va funcÈ›iona în IE < 8! 400 până la 600 octeÈ›i sunt suficienÈ›i. IntroduceÈ›i 0 pentru a dezactiva această opÈ›iune.'; -$lang['hidepages'] = 'Ascunde paginile pereche (expresii regulate)'; -$lang['send404'] = 'Trimite mesajul "HTTP 404/Page Not Found" pentru paginile inexistente'; -$lang['sitemap'] = 'Generează Google sitemap (zile)'; -$lang['broken_iua'] = 'FuncÅ£ia ignore_user_abort nu funcÅ£ionează pe sistemul dumneavoastră? Aceasta poate determina nefuncÅ£ionarea indexului de căutare. IIS+PHP/CGI sunt cunoscute ca fiind nefuncÅ£ionale. Mai multe detalii găsiÅ£i la Bug 852'; -$lang['xsendfile'] = 'FolosiÅ£i header-ul X-Send pentru a-i permite serverului web să trimită fiÅŸiere statice? Serverul web trebuie să permită aceasta.'; -$lang['renderer_xhtml'] = 'Motorul de randare principal folosit pentru afiÅŸarea wiki în format xhtml'; -$lang['renderer__core'] = '%s (nucleu dokuwiki)'; -$lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'PermiteÅ£i cookies permanente la login (Å£ine-mă minte)'; -$lang['rss_type'] = 'Tip flux XML'; -$lang['rss_linkto'] = 'Fluxul XML se leagă la'; -$lang['rss_content'] = 'Ce să afiÅŸez în obiectele fluxurilor XML'; -$lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; -$lang['recent_days'] = 'Câte modificări recente să se păstreze?'; -$lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; -$lang['rss_media'] = 'Ce fel de modificări ar trebui afiÈ™ate în fluxul XML?'; +$lang['cachetime'] = 'Durata maximă pentru cache (secunde)'; $lang['target____wiki'] = 'Fereastra Å£intă pentru legăturile interne'; $lang['target____interwiki'] = 'Fereastra Å£intă pentru legăturile interwiki'; $lang['target____extern'] = 'Fereastra Å£intă pentru legăturile externe'; $lang['target____media'] = 'Fereastra Å£intă pentru legăturile media'; $lang['target____windows'] = 'Fereastra Å£intă pentru legăturile windows'; +$lang['mediarevisions'] = 'Activare Revizii Media?'; +$lang['refcheck'] = 'Verificare referinţă media'; +$lang['gdlib'] = 'Versiunea GD Lib'; +$lang['im_convert'] = 'Calea către instrumentul de conversie ImageMagick'; +$lang['jpg_quality'] = 'Calitatea compresiei JPG (0-100)'; +$lang['fetchsize'] = 'Dimensiunea maximă (byte) pe care fetch.php poate să descarce din exterior'; +$lang['subscribers'] = 'Activează suportul pentru subscrierea paginii'; +$lang['subscribe_time'] = 'Timpul după care lista de abonare ÅŸi digestie sunt trimise (sec); Aceasta ar trebui să fie mai mic decât timpul specificat în recent_days.'; +$lang['notify'] = 'Trimite notificări privind modificările pe această adresă de email'; +$lang['registernotify'] = 'Trimite informare noilor utilizatori înregistraÅ£i pe această adresă de email'; +$lang['mailfrom'] = 'Adresa de email utilizată pentru mailuri automate'; +$lang['mailprefix'] = 'Prefix subiect e-mail de folosit pentru mail-uri automate'; +$lang['sitemap'] = 'Generează Google sitemap (zile)'; +$lang['rss_type'] = 'Tip flux XML'; +$lang['rss_linkto'] = 'Fluxul XML se leagă la'; +$lang['rss_content'] = 'Ce să afiÅŸez în obiectele fluxurilor XML'; +$lang['rss_update'] = 'Intervalul de actualizare a fluxului XML (sec)'; +$lang['rss_show_summary'] = 'Fluxul XML arată rezumat în titlu'; +$lang['rss_media'] = 'Ce fel de modificări ar trebui afiÈ™ate în fluxul XML?'; +$lang['updatecheck'] = 'Verificare actualizări ÅŸi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.'; +$lang['userewrite'] = 'Folosire URL-uri "nice"'; +$lang['useslash'] = 'FoloseÅŸte slash-ul ca separator de spaÅ£ii de nume în URL-uri'; +$lang['sepchar'] = 'Separator cuvinte în numele paginii'; +$lang['canonical'] = 'FoloseÅŸte URL-uri canonice'; +$lang['fnencode'] = 'Metoda de encodare a numelor fiÅŸierelor non-ASCII.'; +$lang['autoplural'] = 'Verifică formele de plural în legături'; +$lang['compression'] = 'Metoda de criptare a fiÅŸierelor pod'; +$lang['gzip_output'] = 'FoloseÅŸte gzip pentru codarea conÅ£inutului xhtml'; +$lang['compress'] = 'Compactează codul CSS ÅŸi javascript produs'; +$lang['cssdatauri'] = 'Dimensiunea în octeÈ›i până la care imaginile regasite în fiÈ™ierele CSS ar trebui să fie incluse direct în stylesheet pentru a reduce supraîncărcarea antetului cererii HTTP. Această tehnică nu va funcÈ›iona în IE < 8! 400 până la 600 octeÈ›i sunt suficienÈ›i. IntroduceÈ›i 0 pentru a dezactiva această opÈ›iune.'; +$lang['send404'] = 'Trimite mesajul "HTTP 404/Page Not Found" pentru paginile inexistente'; +$lang['broken_iua'] = 'FuncÅ£ia ignore_user_abort nu funcÅ£ionează pe sistemul dumneavoastră? Aceasta poate determina nefuncÅ£ionarea indexului de căutare. IIS+PHP/CGI sunt cunoscute ca fiind nefuncÅ£ionale. Mai multe detalii găsiÅ£i la Bug 852'; +$lang['xsendfile'] = 'FolosiÅ£i header-ul X-Send pentru a-i permite serverului web să trimită fiÅŸiere statice? Serverul web trebuie să permită aceasta.'; +$lang['renderer_xhtml'] = 'Motorul de randare principal folosit pentru afiÅŸarea wiki în format xhtml'; +$lang['renderer__core'] = '%s (nucleu dokuwiki)'; +$lang['renderer__plugin'] = '%s (plugin)'; $lang['proxy____host'] = 'Nume server Proxy'; $lang['proxy____port'] = 'Port Proxy'; $lang['proxy____user'] = 'Nume utilizator Proxy'; diff --git a/sources/lib/plugins/config/lang/ru/intro.txt b/sources/lib/plugins/config/lang/ru/intro.txt index f30d4c7..01cf190 100644 --- a/sources/lib/plugins/config/lang/ru/intro.txt +++ b/sources/lib/plugins/config/lang/ru/intro.txt @@ -1,7 +1,7 @@ ====== ÐаÑтройки вики ====== -ЗдеÑÑŒ вы можете изменить наÑтройки Ñвоей «ДокуВики». Ð”Ð»Ñ Ñправки по поводу конкретных опций Ñмотрите [[doku>config]]. Дополнительные детали об Ñтом плагине доÑтупны здеÑÑŒ: [[doku>plugin:config]]. +ЗдеÑÑŒ вы можете изменить наÑтройки Ñвоей «Докувики». Ð”Ð»Ñ Ñправки по поводу конкретных опций Ñмотрите [[doku>config|Конфигурирование «Докувики»]]. Дополнительные детали об Ñтом плагине доÑтупны здеÑÑŒ: [[doku>plugin:config]]. -ÐаÑтройки, отображаемые на Ñветло-краÑном фоне, защищены от изменений и не могут быть отредактированы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтого плагина. Голубым фоном отмечены наÑтройки Ñо значениÑми по умолчанию, а белым фоном — наÑтройки, которые были локально изменены Ð´Ð»Ñ Ñтой конкретной «ДокуВики». Как голубые, так и белые наÑтройки доÑтупны Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. +ÐаÑтройки, отображаемые на Ñветло-краÑном фоне, защищены от изменений и не могут быть отредактированы Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтого плагина. Голубым фоном отмечены наÑтройки Ñо значениÑми по умолчанию, а белым фоном — наÑтройки, которые были локально изменены Ð´Ð»Ñ Ñтой конкретной «Докувики». Как голубые, так и белые наÑтройки доÑтупны Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. Ðе забудьте нажать кнопку «**Сохранить**» перед тем, как покинуть Ñту Ñтраницу, иначе вÑе ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ потерÑны. diff --git a/sources/lib/plugins/config/lang/ru/lang.php b/sources/lib/plugins/config/lang/ru/lang.php index 57e0602..fc1cb32 100644 --- a/sources/lib/plugins/config/lang/ru/lang.php +++ b/sources/lib/plugins/config/lang/ru/lang.php @@ -19,6 +19,7 @@ * @author Johnny Utah * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua) * @author RainbowSpike <1@2.ru> + * @author Aleksandr Selivanov */ $lang['menu'] = 'ÐаÑтройки вики'; $lang['error'] = 'ÐаÑтройки не были Ñохранены из-за ошибки в одном из значений. ПожалуйÑта, проверьте Ñвои Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ попробуйте ещё раз.
      Ðеправильные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ обведены краÑной рамкой.'; @@ -29,7 +30,7 @@ $lang['danger'] = 'Внимание: изменение Ñтой $lang['warning'] = 'ПредоÑтережение: изменение Ñтой опции может вызвать непредÑказуемое поведение.'; $lang['security'] = 'ПредоÑтережение по безопаÑноÑти: изменение Ñтой опции может вызвать риÑк, ÑвÑзанный Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑтью.'; $lang['_configuration_manager'] = 'ÐаÑтройки вики'; -$lang['_header_dokuwiki'] = 'Параметры «ДокуВики»'; +$lang['_header_dokuwiki'] = 'Параметры «Докувики»'; $lang['_header_plugin'] = 'Параметры плагинов'; $lang['_header_template'] = 'Параметры шаблонов'; $lang['_header_undefined'] = 'Прочие параметры'; @@ -52,7 +53,7 @@ $lang['start'] = 'Ð˜Ð¼Ñ Ñтартовой Ñтраницы'; $lang['lang'] = 'Язык'; $lang['template'] = 'Шаблон'; $lang['tagline'] = 'Слоган (еÑли поддерживаетÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð¼)'; -$lang['sidebar'] = 'Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ, пуÑтое поле отключает боковую панель.'; +$lang['sidebar'] = 'Ð‘Ð¾ÐºÐ¾Ð²Ð°Ñ Ð¿Ð°Ð½ÐµÐ»ÑŒ; пуÑтое поле отключает боковую панель.'; $lang['license'] = 'Ðа уÑловиÑÑ… какой лицензии будет предоÑтавлÑÑ‚ÑŒÑÑ Ñодержимое вики?'; $lang['savedir'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…'; $lang['basedir'] = 'ÐšÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ (например, /dokuwiki/). ОÑтавьте пуÑтым Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ.'; @@ -60,14 +61,14 @@ $lang['baseurl'] = 'Корневой Ð°Ð´Ñ€ÐµÑ (URL) (напри $lang['cookiedir'] = 'Cookie директориÑ. ОÑтавьте пуÑтым Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ.'; $lang['dmode'] = 'Права Ð´Ð»Ñ Ñоздаваемых директорий'; $lang['fmode'] = 'Права Ð´Ð»Ñ Ñоздаваемых файлов'; -$lang['allowdebug'] = 'Включить отладку (отключите!)'; +$lang['allowdebug'] = 'Включить отладку. Отключите, еÑли она вам не нужна!'; $lang['recent'] = 'Ðедавние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ (кол-во)'; $lang['recent_days'] = 'Ðа Ñколько дней назад ÑохранÑÑ‚ÑŒ недавние изменениÑ'; -$lang['breadcrumbs'] = 'Ð’Ñ‹ поÑетили (кол-во)'; +$lang['breadcrumbs'] = 'Ð’Ñ‹ поÑетили (кол-во). ПоÑтавьте 0 (ноль) Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.'; $lang['youarehere'] = 'Показывать «Вы находитеÑÑŒ здеÑь»'; $lang['fullpath'] = 'Полный путь к документу'; $lang['typography'] = 'ТипографÑкие Ñимволы'; -$lang['dformat'] = 'Формат даты и времени'; +$lang['dformat'] = 'Формат даты и времени (Ñм. функцию PHP strftime)'; $lang['signature'] = 'Шаблон подпиÑи'; $lang['showuseras'] = 'Что отображать при показе пользователÑ, редактировавшего Ñтраницу поÑледним'; $lang['toptoclevel'] = 'Мин. уровень в Ñодержании'; @@ -76,32 +77,32 @@ $lang['maxtoclevel'] = 'МакÑ. уровень в Ñодержани $lang['maxseclevel'] = 'МакÑ. уровень Ð´Ð»Ñ Ð¿Ñ€Ð°Ð²ÐºÐ¸'; $lang['camelcase'] = 'ИÑпользовать ВикиРегиÑÑ‚Ñ€ Ð´Ð»Ñ ÑÑылок'; $lang['deaccent'] = 'ТранÑÐ»Ð¸Ñ‚ÐµÑ€Ð°Ñ†Ð¸Ñ Ð² именах Ñтраниц'; -$lang['useheading'] = 'Первый заголовок вмеÑто имени'; -$lang['sneaky_index'] = 'По умолчанию, «ДокуВики» показывает в индекÑе Ñтраниц вÑе проÑтранÑтва имён. Включение Ñтой опции Ñкроет проÑтранÑтва имён, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… пользователь не имеет прав чтениÑ. Это может привеÑти к Ñкрытию доÑтупных вложенных проÑтранÑтв имён и потере функциональноÑти индекÑа Ñтраниц при некоторых конфигурациÑÑ… прав доÑтупа.'; -$lang['hidepages'] = 'Скрыть Ñтраницы (рег. выражение)'; +$lang['useheading'] = 'Первый заголовок вмеÑто имени Ñтраницы'; +$lang['sneaky_index'] = 'По умолчанию, «Докувики» показывает в индекÑе Ñтраниц вÑе проÑтранÑтва имён. Включение Ñтой опции Ñкроет проÑтранÑтва имён, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… пользователь не имеет прав чтениÑ. Это может привеÑти к Ñкрытию доÑтупных вложенных проÑтранÑтв имён и потере функциональноÑти индекÑа Ñтраниц при некоторых конфигурациÑÑ… прав доÑтупа.'; +$lang['hidepages'] = 'Скрыть Ñтраницы (регулÑрное выражение)'; $lang['useacl'] = 'ИÑпользовать ÑпиÑки прав доÑтупа'; $lang['autopasswd'] = 'ÐÐ²Ñ‚Ð¾Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹'; $lang['authtype'] = 'Механизм аутентификации'; $lang['passcrypt'] = 'Метод ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ'; -$lang['defaultgroup'] = 'Группа по умолчанию'; -$lang['superuser'] = 'Суперпользователь — группа или пользователь Ñ Ð¿Ð¾Ð»Ð½Ñ‹Ð¼ доÑтупом ко вÑем Ñтраницам и функциÑм админиÑтрированиÑ, незавиÑимо от уÑтановок ACL. Перечень разделÑйте запÑтыми: user1,@group1,user2'; +$lang['defaultgroup'] = 'Группа по умолчанию. Ð’Ñе новые пользователю будут добавлÑÑ‚ÑŒÑÑ Ð²Â Ñту группу.'; +$lang['superuser'] = 'Суперпользователь — группа или пользователь Ñ Ð¿Ð¾Ð»Ð½Ñ‹Ð¼ доÑтупом ко вÑем Ñтраницам и функциÑм админиÑтрированиÑ, незавиÑимо от уÑтановок ÑпиÑков прав доÑтупа. Перечень разделÑйте запÑтыми: user1,@group1,user2'; $lang['manager'] = 'Менеджер — группа или пользователь Ñ Ð´Ð¾Ñтупом к определённым функциÑм управлениÑ. Перечень разделÑйте запÑтыми: user1,@group1,user2'; $lang['profileconfirm'] = 'Пароль Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ'; $lang['rememberme'] = 'Разрешить перманентные куки (cookies) Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° («запомнить менÑ»)'; -$lang['disableactions'] = 'Заблокировать операции «ДокуВики»'; +$lang['disableactions'] = 'Заблокировать операции «Докувики»'; $lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'ПодпиÑка/Отмена подпиÑки'; $lang['disableactions_wikicode'] = 'Показ/ÑкÑпорт иÑходного текÑта'; $lang['disableactions_profile_delete'] = 'Удалить Ñвой аккаунт'; $lang['disableactions_other'] = 'Другие операции (через запÑтую)'; -$lang['disableactions_rss'] = 'XML ÑÐ¸Ð½Ð´Ð¸ÐºÐ°Ñ†Ð¸Ñ (RSS)'; +$lang['disableactions_rss'] = 'XML-ÑÐ¸Ð½Ð´Ð¸ÐºÐ°Ñ†Ð¸Ñ (RSS)'; $lang['auth_security_timeout'] = 'Интервал Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти авторизации (Ñек.)'; $lang['securecookie'] = 'Должны ли куки (cookies), выÑтавленные через HTTPS, отправлÑÑ‚ÑŒÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð¾Ð¼ только через HTTPS. Отключите Ñту опцию в Ñлучае, когда только логин вашей вики передаётÑÑ Ñ‡ÐµÑ€ÐµÐ· SSL, а обычный проÑмотр оÑущеÑтвлÑетÑÑ Ð² небезопаÑном режиме.'; $lang['remote'] = 'Включить ÑиÑтему API Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹. Это позволит другим приложениÑм получить доÑтуп к вики через XML-RPC или другие механизмы.'; -$lang['remoteuser'] = 'Дать права Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ API доÑтупа пользователÑм указанным тут (разделÑÑ‚ÑŒ запÑтыми). ОÑтавьте Ñто поле пуÑтым что бы открыть доÑтуп вÑем.'; +$lang['remoteuser'] = 'Дать права Ð´Ð»Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ð¾Ð³Ð¾ API-доÑтупа пользователÑм, указанным здеÑÑŒ (разделÑйте запÑтыми). ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа вÑем.'; $lang['usewordblock'] = 'Блокировать Ñпам по ключевым Ñловам'; -$lang['relnofollow'] = 'rel="nofollow" Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… ÑÑылок'; -$lang['indexdelay'] = 'Задержка перед индекÑированием'; +$lang['relnofollow'] = 'ИÑпользовать rel="nofollow" Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… ÑÑылок'; +$lang['indexdelay'] = 'Задержка перед индекÑированием (Ñек.)'; $lang['mailguard'] = 'Кодировать адреÑа Ñлектронной почты'; $lang['iexssprotect'] = 'ПроверÑÑ‚ÑŒ закачанные файлы на наличие потенциально опаÑного кода JavaScript или HTML'; $lang['usedraft'] = 'ÐвтоматичеÑки ÑохранÑÑ‚ÑŒ черновик во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ñ€Ð°Ð²ÐºÐ¸'; @@ -122,36 +123,36 @@ $lang['jpg_quality'] = 'КачеÑтво ÑÐ¶Ð°Ñ‚Ð¸Ñ JPG (0–100). $lang['fetchsize'] = 'МакÑимальный размер файла (в байтах), который fetch.php может Ñкачивать Ñ Ð²Ð½ÐµÑˆÐ½ÐµÐ³Ð¾ иÑточника'; $lang['subscribers'] = 'Разрешить подпиÑку на изменениÑ'; $lang['subscribe_time'] = 'Интервал раÑÑылки подпиÑок и Ñводок (Ñек.). Должен быть меньше, чем значение, указанное в recent_days.'; -$lang['notify'] = 'Электронный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¸Ð·Ð²ÐµÑ‰ÐµÐ½Ð¸Ð¹'; -$lang['registernotify'] = 'ПоÑылать информацию о новых зарегиÑтрированных пользователÑÑ… на Ñтот Ñлектронный адреÑ'; +$lang['notify'] = 'Ð’Ñегда отправлÑÑ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð±Â Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÑÑ… на Ñтот Ñлектронный адреÑ'; +$lang['registernotify'] = 'Ð’Ñегода отправлÑÑ‚ÑŒ информацию о новых зарегиÑтрированных пользователÑÑ… на Ñтот Ñлектронный адреÑ'; $lang['mailfrom'] = 'Электронный Ð°Ð´Ñ€ÐµÑ Ð²Ð¸ÐºÐ¸ (От:)'; -$lang['mailprefix'] = 'ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ð¸Ñпользуемый Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого пиÑьма Ñтанет темой Ñообщений'; +$lang['mailprefix'] = 'ПрефикÑ, иÑпользуемый Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкого пиÑьма, Ñтанет темой ÑообщениÑ. ОÑтавьте поле пуÑтым Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð²Ð¸ÐºÐ¸.'; $lang['htmlmail'] = 'ОтправлÑÑ‚ÑŒ краÑивые, но крупные HTML-многочаÑтные пиÑьма. Ð”Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ проÑÑ‚Ñ‹Ñ… текÑтовых пиÑем - отключить'; -$lang['sitemap'] = 'ЧиÑло дней, через которое нужно Ñоздавать (обновлÑÑ‚ÑŒ) карту Ñайта Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñковиков (Гугл, Ð¯Ð½Ð´ÐµÐºÑ Ð¸ др.)'; -$lang['rss_type'] = 'Тип RSS'; -$lang['rss_linkto'] = 'СÑылки в RSS'; -$lang['rss_content'] = 'Что отображать в Ñтроках XML-ленты?'; +$lang['sitemap'] = 'ЧиÑло дней, через которое нужно Ñоздавать (обновлÑÑ‚ÑŒ) карту Ñайта Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñковиков (Гугл, Ð¯Ð½Ð´ÐµÐºÑ Ð¸ др.). Укажите 0 (ноль) Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ.'; +$lang['rss_type'] = 'Тип XML-ленты'; +$lang['rss_linkto'] = 'СÑылки в XML-ленте указывают на'; +$lang['rss_content'] = 'Что показывать в XML-ленте?'; $lang['rss_update'] = 'Интервал Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ XML-ленты (Ñек.)'; $lang['rss_show_summary'] = 'Показывать краткую выдержку в заголовках XML-ленты'; -$lang['rss_media'] = 'Какие Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть отображены в XML?'; -$lang['updatecheck'] = 'ПроверÑÑ‚ÑŒ наличие обновлений и предупреждений о безопаÑноÑти? Ð”Ð»Ñ Ñтого «ДокуВики» потребуетÑÑ ÑвÑзыватьÑÑ Ñ Ñайтом splitbrain.org.'; +$lang['rss_media'] = 'Какие Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ быть отображены в XML-ленте?'; +$lang['updatecheck'] = 'ПроверÑÑ‚ÑŒ наличие обновлений и предупреждений о безопаÑноÑти? Ð”Ð»Ñ Ñтого «Докувики» потребуетÑÑ ÑвÑзыватьÑÑ Ñ update.dokuwiki.org.'; $lang['userewrite'] = 'Удобочитаемые адреÑа (URL)'; -$lang['useslash'] = 'ИÑпользовать ÑлÑш'; +$lang['useslash'] = 'ИÑпользовать ÑлÑш в URL'; $lang['sepchar'] = 'Разделитель Ñлов в имени Ñтраницы'; $lang['canonical'] = 'Полные каноничеÑкие адреÑа (URL)'; $lang['fnencode'] = 'Метод ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼Ñ‘Ð½ файлов, запиÑанных не ASCII-Ñимволами.'; -$lang['autoplural'] = 'ÐвтоматичеÑкое мн. чиÑло'; +$lang['autoplural'] = 'ПроверÑÑ‚ÑŒ можеÑтвенную форму имени Ñтраницы в ÑÑылках'; $lang['compression'] = 'Метод ÑÐ¶Ð°Ñ‚Ð¸Ñ Ð´Ð»Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ñ‹Ñ… файлов'; $lang['gzip_output'] = 'ИÑпользовать gzip-Ñжатие Ð´Ð»Ñ xhtml'; $lang['compress'] = 'Сжимать файлы CSS и javascript'; $lang['cssdatauri'] = 'Размер в байтах до которого изображениÑ, указанные в CSS-файлах, должны быть вÑтроены прÑмо в таблицу Ñтилей, Ð´Ð»Ñ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¸Ñ Ð¸Ð·Ð±Ñ‹Ñ‡Ñ‚Ð¾Ð½Ñ‹Ñ… HTTP-запроÑов. Этот метод не будет работать в IE верÑии 7 и ниже! УÑтановка от 400 до 600 байт ÑвлÑетÑÑ Ñ…Ð¾Ñ€Ð¾ÑˆÐ¸Ð¼ показателем. УÑтановите 0, чтобы отключить.'; -$lang['send404'] = 'ПоÑылать «HTTP404/Page Not Found»'; +$lang['send404'] = 'ПоÑылать «HTTP 404/Страница не найдена» Ð´Ð»Ñ Ð½ÐµÑущеÑтвующих Ñтраниц'; $lang['broken_iua'] = 'Возможно, Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ ignore_user_abort не работает в вашей ÑиÑтеме? Это может привеÑти к потере функциональноÑти индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð¸Ñка. Эта проблема приÑутÑтвует, например, в IIS+PHP/CGI. Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите баг 852.'; $lang['xsendfile'] = 'ИÑпользуете заголовок X-Sendfile Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файлов на веб-Ñервер? Ваш веб-Ñервер должен поддерживать Ñто.'; $lang['renderer_xhtml'] = 'Обработчик оÑновного (xhtml) вывода вики'; -$lang['renderer__core'] = '%s (Ñдро dokuwiki)'; +$lang['renderer__core'] = '%s (Ñдро «Докувики»)'; $lang['renderer__plugin'] = '%s (плагин)'; -$lang['dnslookups'] = 'DokuWiki ищет DNS имена пользователей редактирующих Ñтраницы. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ DNS Ñервера или он работает медленно, рекомендуем отключить Ñту опцию.'; +$lang['dnslookups'] = '«Докувики» ищет DNS-имена пользователей, редактирующих Ñтраницы. ЕÑли у Ð²Ð°Ñ Ð½ÐµÑ‚ DNS-Ñервера или он работает медленно, рекомендуем отключить Ñту опцию.'; $lang['proxy____host'] = 'proxy-адреÑ'; $lang['proxy____port'] = 'proxy-порт'; $lang['proxy____user'] = 'proxy-Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ'; @@ -166,15 +167,15 @@ $lang['ftp____pass'] = 'ftp-пароль'; $lang['ftp____root'] = 'ftp-ÐºÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ'; $lang['license_o_'] = 'Ðе выбрано'; $lang['typography_o_0'] = 'нет'; -$lang['typography_o_1'] = 'Только двойные кавычки'; -$lang['typography_o_2'] = 'Ð’Ñе кавычки (может не вÑегда работать)'; +$lang['typography_o_1'] = 'только двойные кавычки'; +$lang['typography_o_2'] = 'вÑе кавычки (может не вÑегда работать)'; $lang['userewrite_o_0'] = '(нет)'; $lang['userewrite_o_1'] = '.htaccess'; -$lang['userewrite_o_2'] = 'ÑредÑтвами «ДокуВики»'; +$lang['userewrite_o_2'] = 'ÑредÑтвами «Докувики»'; $lang['deaccent_o_0'] = 'отключить'; $lang['deaccent_o_1'] = 'убирать только диакр. знаки'; $lang['deaccent_o_2'] = 'Ð¿Ð¾Ð»Ð½Ð°Ñ Ñ‚Ñ€Ð°Ð½ÑлитерациÑ'; -$lang['gdlib_o_0'] = 'LibGD недоÑтупна'; +$lang['gdlib_o_0'] = 'GD Lib недоÑтупна'; $lang['gdlib_o_1'] = 'верÑÐ¸Ñ 1.x'; $lang['gdlib_o_2'] = 'автоопределение'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -182,10 +183,10 @@ $lang['rss_type_o_rss1'] = 'RSS 1.0'; $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; -$lang['rss_content_o_abstract'] = 'ÐбÑтрактный'; -$lang['rss_content_o_diff'] = 'Объединённый diff'; +$lang['rss_content_o_abstract'] = 'абÑтрактный'; +$lang['rss_content_o_diff'] = 'объединённый diff'; $lang['rss_content_o_htmldiff'] = 'HTML-Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ð° diff'; -$lang['rss_content_o_html'] = 'Полное Ñодержимое HTML-Ñтраницы'; +$lang['rss_content_o_html'] = 'полное Ñодержимое HTML-Ñтраницы'; $lang['rss_linkto_o_diff'] = 'Ð¾Ñ‚Ð»Ð¸Ñ‡Ð¸Ñ Ð¾Ñ‚ текущей'; $lang['rss_linkto_o_page'] = 'текÑÑ‚ Ñтраницы'; $lang['rss_linkto_o_rev'] = 'иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð°Ð²Ð¾Ðº'; @@ -194,16 +195,16 @@ $lang['compression_o_0'] = 'без ÑжатиÑ'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'не иÑпользуетÑÑ'; -$lang['xsendfile_o_1'] = 'Проприетарный lighttpd-заголовок (перед релизом 1.5)'; +$lang['xsendfile_o_1'] = 'Проприетарный lighttpd-заголовок (до релиза 1.5)'; $lang['xsendfile_o_2'] = 'Стандартный заголовок X-Sendfile'; $lang['xsendfile_o_3'] = 'Проприетарный заголовок Nginx X-Accel-Redirect'; -$lang['showuseras_o_loginname'] = 'Логин'; -$lang['showuseras_o_username'] = 'Полное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ'; -$lang['showuseras_o_username_link'] = 'Полное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÐºÐ°Ðº интервики-ÑÑылка'; -$lang['showuseras_o_email'] = 'ÐÐ´Ñ€ÐµÑ Ñлектропочты в шифрованном виде (Ñм. mailguard)'; -$lang['showuseras_o_email_link'] = 'ÐÐ´Ñ€ÐµÑ Ñлектропочты в виде ÑÑылки mailto:'; -$lang['useheading_o_0'] = 'Ðикогда'; -$lang['useheading_o_navigation'] = 'Только навигациÑ'; -$lang['useheading_o_content'] = 'Только Ñодержимое вики'; -$lang['useheading_o_1'] = 'Ð’Ñегда'; +$lang['showuseras_o_loginname'] = 'логин'; +$lang['showuseras_o_username'] = 'полное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ'; +$lang['showuseras_o_username_link'] = 'полное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ÐºÐ°Ðº интервики-ÑÑылка'; +$lang['showuseras_o_email'] = 'Ð°Ð´Ñ€ÐµÑ Ñлектропочты в шифрованном виде (Ñм. mailguard)'; +$lang['showuseras_o_email_link'] = 'Ð°Ð´Ñ€ÐµÑ Ñлектропочты в виде ÑÑылки mailto:'; +$lang['useheading_o_0'] = 'никогда'; +$lang['useheading_o_navigation'] = 'только в навигации'; +$lang['useheading_o_content'] = 'только в Ñодержимом вики'; +$lang['useheading_o_1'] = 'вÑегда'; $lang['readdircache'] = 'МакÑимальное Ð²Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸ кÑша readdir (Ñек.)'; diff --git a/sources/lib/plugins/config/lang/sk/lang.php b/sources/lib/plugins/config/lang/sk/lang.php index 46e4081..dfa5ca7 100644 --- a/sources/lib/plugins/config/lang/sk/lang.php +++ b/sources/lib/plugins/config/lang/sk/lang.php @@ -1,10 +1,12 @@ * @author exusik@gmail.com * @author Martin Michalek + * @author Michalek */ $lang['menu'] = 'Nastavenia konfigurácie'; $lang['error'] = 'Nastavenia neboli aktualizované kvôli neplatnej hodnote, prosím skontrolujte vaÅ¡e zmeny a znovu ich poÅ¡lite.
      Nesprávna hodnota(y) bude ohraniÄená Äerveným okrajom.'; @@ -54,7 +56,7 @@ $lang['breadcrumbs'] = 'PoÄet záznamov histórie'; $lang['youarehere'] = 'Nachádzate sa'; $lang['fullpath'] = 'ZobrazovaÅ¥ plnú cestu k stránkam v pätiÄke'; $lang['typography'] = 'VykonaÅ¥ typografické zmeny'; -$lang['dformat'] = 'Formát dátumu (pozri funkciu PHP strftime)'; +$lang['dformat'] = 'Formát dátumu (pozri funkciu PHP strftime)'; $lang['signature'] = 'Podpis'; $lang['showuseras'] = 'ÄŒo použiÅ¥ pri zobrazení používateľa, ktorý posledný upravoval stránku'; $lang['toptoclevel'] = 'NajvyÅ¡Å¡ia úroveň pre generovanie obsahu.'; @@ -129,7 +131,7 @@ $lang['autoplural'] = 'KontrolovaÅ¥ množné Äíslo v odkazoch'; $lang['compression'] = 'Metóda kompresie pre staré verzie stránok'; $lang['gzip_output'] = 'PoužívaÅ¥ gzip Content-Encoding pre xhtml'; $lang['compress'] = 'KomprimovaÅ¥ CSS a javascript výstup'; -$lang['cssdatauri'] = 'VeľkosÅ¥ v bytoch, do ktorej by mali byÅ¥ obrázky s odkazom v CSS vložené priamo do Å¡týlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE verzie 7 a nižšie! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; +$lang['cssdatauri'] = 'VeľkosÅ¥ v bytoch, do ktorej by mali byÅ¥ obrázky s odkazom v CSS vložené priamo do Å¡týlu z dôvodu obmedzenia HTTP požiadaviek. Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; $lang['send404'] = 'PoslaÅ¥ "HTTP 404/Page Not Found" pre neexistujúce stránky'; $lang['broken_iua'] = 'Je vo VaÅ¡om systéme funkcia ignore_user_abort poÅ¡kodená? Môže to maÅ¥ za následok nefunkÄnosÅ¥ vyhľadávania v indexe. IIS+PHP/CGI je známy tým, že nefunguje správne. Pozrite Bug 852 pre dalÅ¡ie informácie.'; $lang['xsendfile'] = 'PoužívaÅ¥ X-Sendfile hlaviÄku pre doruÄenie statických súborov webserverom? Webserver musí túto funkcionalitu podporovaÅ¥.'; @@ -139,7 +141,7 @@ $lang['renderer__plugin'] = '%s (plugin)'; $lang['dnslookups'] = 'DokuWiki hľadá mená vzdialených IP adries používateľov editujúcich stránky. Ak máte pomalý alebo nefunkÄný DNS server alebo nechcete túto možnosÅ¥, deaktivujte túto voľbu'; $lang['proxy____host'] = 'Proxy server - názov'; $lang['proxy____port'] = 'Proxy server - port'; -$lang['proxy____user'] = 'Proxy server - užívateľské meno'; +$lang['proxy____user'] = 'Proxy server - používateľské meno'; $lang['proxy____pass'] = 'Proxy server - heslo'; $lang['proxy____ssl'] = 'Proxy server - použiÅ¥ SSL'; $lang['proxy____except'] = 'Regulárny výraz popisujúci URL odkazy, pre ktoré by proxy nemala byÅ¥ použitá.'; diff --git a/sources/lib/plugins/config/lang/sl/lang.php b/sources/lib/plugins/config/lang/sl/lang.php index fe334db..dcf8c0a 100644 --- a/sources/lib/plugins/config/lang/sl/lang.php +++ b/sources/lib/plugins/config/lang/sl/lang.php @@ -52,7 +52,7 @@ $lang['youarehere'] = 'HierarhiÄne drobtinice poti'; $lang['typography'] = 'OmogoÄi tipografske zamenjave'; $lang['htmlok'] = 'Dovoli vstavljeno kodo HTML'; $lang['phpok'] = 'Dovoli vstavljeno kodo PHP'; -$lang['dformat'] = 'Oblika zapisa Äasa (funkcija PHP strftime)'; +$lang['dformat'] = 'Oblika zapisa Äasa (funkcija PHP strftime)'; $lang['signature'] = 'Podpis'; $lang['toptoclevel'] = 'Vrhnja raven kazala'; $lang['tocminheads'] = 'NajmanjÅ¡e Å¡tevilo naslovov za izgradnjo kazala'; @@ -109,7 +109,7 @@ $lang['jpg_quality'] = 'Kakovost stiskanja datotek JPG (0-100)'; $lang['subscribers'] = 'OmogoÄi podporo naroÄanju na strani'; $lang['subscribe_time'] = 'ÄŒas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajÅ¡a od Äasa, ki je doloÄen z nedavno_dni.'; $lang['compress'] = 'Združi odvod CSS in JavaScript v brskalniku'; -$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjÅ¡anje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih razliÄicah! Ustrezne vrednosti so 400 do 600 bajtov. Vrednost 0 onemogoÄi možnost.'; +$lang['cssdatauri'] = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjÅ¡anje zahtev osveževanja strežnika HTTP. Ustrezne vrednosti so 400 do 600 bajtov. Vrednost 0 onemogoÄi možnost.'; $lang['hidepages'] = 'Skrij skladne strani (logiÄni izraz)'; $lang['send404'] = 'PoÅ¡lji "HTTP 404/Strani ni mogoÄe najti" pri dostopu do neobstojeÄih strani'; $lang['sitemap'] = 'Ustvari Google kazalo strani (v dnevih)'; diff --git a/sources/lib/plugins/config/lang/sq/lang.php b/sources/lib/plugins/config/lang/sq/lang.php index a6f3087..72c500a 100644 --- a/sources/lib/plugins/config/lang/sq/lang.php +++ b/sources/lib/plugins/config/lang/sq/lang.php @@ -47,7 +47,7 @@ $lang['youarehere'] = 'Gjurmë hierarkike'; $lang['typography'] = 'Bëj zëvendësime tipografike'; $lang['htmlok'] = 'Lejo HTML të ngulitura'; $lang['phpok'] = 'Lejo PHP të ngulitura'; -$lang['dformat'] = 'Formati i Datës (shiko funksionin strftime e PHP-së)'; +$lang['dformat'] = 'Formati i Datës (shiko funksionin strftime e PHP-së)'; $lang['signature'] = 'Firma'; $lang['toptoclevel'] = 'Niveli i Kreut për tabelën e përmbajtjes'; $lang['tocminheads'] = 'Sasia minimum e titrave që përcaktojnë nëse TOC ndërtohet ose jo'; diff --git a/sources/lib/plugins/config/lang/sr/lang.php b/sources/lib/plugins/config/lang/sr/lang.php index 1c3250e..6e28273 100644 --- a/sources/lib/plugins/config/lang/sr/lang.php +++ b/sources/lib/plugins/config/lang/sr/lang.php @@ -48,7 +48,7 @@ $lang['youarehere'] = 'ХиерархијÑке кораке (ÑÑ‚Ñ€ $lang['typography'] = 'Уради типографÑке замене'; $lang['htmlok'] = 'Дозволи угњежђени ХТМЛ'; $lang['phpok'] = 'Дозволи угњежђени ПХП'; -$lang['dformat'] = 'Облик датума (погледајте ПХПову strftime функцију)'; +$lang['dformat'] = 'Облик датума (погледајте ПХПову strftime функцију)'; $lang['signature'] = 'ПотпиÑ'; $lang['toptoclevel'] = 'Ðајвиши ниво за Ñадржај'; $lang['tocminheads'] = 'Минималан број наÑлова који одређују да ли ће Садржај бити направљен'; diff --git a/sources/lib/plugins/config/lang/sv/lang.php b/sources/lib/plugins/config/lang/sv/lang.php index 74f5950..7b7d08d 100644 --- a/sources/lib/plugins/config/lang/sv/lang.php +++ b/sources/lib/plugins/config/lang/sv/lang.php @@ -65,7 +65,7 @@ $lang['breadcrumbs'] = 'Antal spÃ¥r'; $lang['youarehere'] = 'Hierarkiska spÃ¥r'; $lang['fullpath'] = 'Visa fullständig sökväg i sidfoten'; $lang['typography'] = 'Aktivera typografiska ersättningar'; -$lang['dformat'] = 'Datumformat (se PHP:s strftime-funktion)'; +$lang['dformat'] = 'Datumformat (se PHP:s strftime-funktion)'; $lang['signature'] = 'Signatur'; $lang['showuseras'] = 'Vad som skall visas när man visar den användare som senast redigerade en sida'; $lang['toptoclevel'] = 'ToppnivÃ¥ för innehÃ¥llsförteckning'; diff --git a/sources/lib/plugins/config/lang/th/lang.php b/sources/lib/plugins/config/lang/th/lang.php index 68ee8b8..ce1d30d 100644 --- a/sources/lib/plugins/config/lang/th/lang.php +++ b/sources/lib/plugins/config/lang/th/lang.php @@ -1,7 +1,8 @@ * @author Kittithat Arnontavilas mrtomyum@gmail.com * @author Arthit Suriyawongkul @@ -23,48 +24,48 @@ $lang['_links'] = 'à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าลิงà¸à¹Œ' $lang['_media'] = 'à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าภาพ-เสียง'; $lang['_advanced'] = 'à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าขั้นสูง'; $lang['_network'] = 'à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเครือข่าย'; +$lang['start'] = 'ชื่อหน้าเริ่มต้น'; $lang['lang'] = 'ภาษา'; +$lang['savedir'] = 'ไดเรคทอรีที่บันทึà¸à¸‚้อมูล'; $lang['basedir'] = 'ไดเรคทอรีพื้นà¸à¸²à¸™'; $lang['baseurl'] = 'URL พื้นà¸à¸²à¸™'; -$lang['savedir'] = 'ไดเรคทอรีที่บันทึà¸à¸‚้อมูล'; -$lang['start'] = 'ชื่อหน้าเริ่มต้น'; $lang['recent'] = 'à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸¥à¹ˆà¸²à¸ªà¸¸à¸”'; -$lang['htmlok'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰ HTML'; -$lang['phpok'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰ PHP'; +$lang['recent_days'] = 'จำนวนวันที่เà¸à¹‡à¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸—ี่ถูà¸à¹à¸à¹‰à¹„ขล่าสุด'; $lang['signature'] = 'ลายเซนต์'; -$lang['usewordblock'] = 'คำที่จะถือว่าเป็นสà¹à¸›à¸¡'; -$lang['relnofollow'] = 'ใช้ rel="nofollow" สำหรับลิงà¸à¹Œà¸ à¸²à¸¢à¸™à¸­à¸'; +$lang['hidepages'] = 'ซ่อนหน้าที่เข้าà¸à¸±à¸™à¹„ด้ (regular expressions)'; $lang['autopasswd'] = 'สร้างรหัสผ่านให้อัตโนมัติ'; $lang['passcrypt'] = 'à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¹€à¸‚้ารหัส สำหรับเà¸à¹‡à¸šà¸šà¸±à¸™à¸—ึà¸à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™'; $lang['defaultgroup'] = 'à¸à¸¥à¸¸à¹ˆà¸¡à¸¡à¸²à¸•à¸£à¸à¸²à¸™'; $lang['profileconfirm'] = 'ใส่รหัสผ่านเพื่อยืนยันà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸‚้อมูล'; +$lang['rememberme'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¸ˆà¸”จำà¸à¸²à¸£ login à¹à¸šà¸šà¸–าวร'; $lang['disableactions_check'] = 'ตรวจสอบ'; $lang['auth_security_timeout'] = 'ระยะเวลาที่จะตัดà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­à¹à¸šà¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸”้วยสิทธิ์ผู้ใช้ (วินาที)'; -$lang['userewrite'] = 'à¹à¸ªà¸”งที่อยู่เว็บ (URL) à¹à¸šà¸šà¸­à¹ˆà¸²à¸™à¹€à¸‚้าใจง่าย'; -$lang['cachetime'] = 'ระยะเวลาสำหรับà¸à¸²à¸£à¹€à¸à¹‡à¸šà¹à¸„ช (วินาที)'; +$lang['usewordblock'] = 'คำที่จะถือว่าเป็นสà¹à¸›à¸¡'; +$lang['relnofollow'] = 'ใช้ rel="nofollow" สำหรับลิงà¸à¹Œà¸ à¸²à¸¢à¸™à¸­à¸'; +$lang['htmlok'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰ HTML'; +$lang['phpok'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰ PHP'; $lang['locktime'] = 'ระยะเวลานานสุด ที่จะล็อคไม่ให้à¹à¸à¹‰à¹„ขไฟล์ (วินาที)'; -$lang['fetchsize'] = 'ขนาดไฟล์ใหà¸à¹ˆà¸ªà¸¸à¸” (bytes) fetch.php ที่จะดาวน์โหลดจาà¸à¸ à¸²à¸¢à¸™à¸­à¸'; -$lang['notify'] = 'ส่งà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¹„ปยังที่อยู่อีเมลนี้'; -$lang['gzip_output'] = 'ใช้ gzip Content-Encoding สำหรับ xhtml'; -$lang['gdlib'] = 'เลขรุ่นของ GD Library'; -$lang['compress'] = 'บีบย่อ CSS à¹à¸¥à¸° javascript (เพื่อให้à¹à¸ªà¸”งหน้าเว็บเร็วขึ้น)'; -$lang['hidepages'] = 'ซ่อนหน้าที่เข้าà¸à¸±à¸™à¹„ด้ (regular expressions)'; -$lang['send404'] = 'ให้à¹à¸ªà¸”ง "HTTP 404/Page Not Found" เมื่อไม่พบข้อมูลหน้านั้น'; -$lang['sitemap'] = 'สร้าง à¸à¸¹à¹€à¸à¸´à¹‰à¸¥ ไซต์à¹à¸¡à¸ž (จำนวนวัน)'; -$lang['renderer__core'] = '%s (à¹à¸à¸™à¸«à¸¥à¸±à¸à¸‚อง dokuwiki)'; -$lang['renderer__plugin'] = '%s (โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ - plugin)'; -$lang['rememberme'] = 'อนุà¸à¸²à¸•à¹ƒà¸«à¹‰à¸ˆà¸”จำà¸à¸²à¸£ login à¹à¸šà¸šà¸–าวร'; -$lang['rss_type'] = 'ชนิดของ XML feed'; -$lang['rss_linkto'] = 'ลิงà¸à¹Œà¹€à¸Šà¸·à¹ˆà¸­à¸¡à¹‚ยงไปยัง XML feed'; -$lang['rss_content'] = 'ต้องà¸à¸²à¸£à¹ƒà¸«à¹‰à¸¡à¸µà¸­à¸°à¹„รà¹à¸ªà¸”งอยู่ใน XML feed บ้าง?'; -$lang['rss_update'] = 'ความถี่ในà¸à¸²à¸£à¸­à¸±à¸žà¹€à¸”ท XML feed (เป็นวินาที)'; -$lang['recent_days'] = 'จำนวนวันที่เà¸à¹‡à¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸—ี่ถูà¸à¹à¸à¹‰à¹„ขล่าสุด'; -$lang['rss_show_summary'] = 'ไตเติ้ลของบทสรุปย่อของ XML feed'; +$lang['cachetime'] = 'ระยะเวลาสำหรับà¸à¸²à¸£à¹€à¸à¹‡à¸šà¹à¸„ช (วินาที)'; $lang['target____wiki'] = 'เปิดà¹à¸ªà¸”งลิงà¸à¹Œà¸ à¸²à¸¢à¹ƒà¸™ ในหน้าเว็บà¹à¸šà¸šà¹ƒà¸”'; $lang['target____interwiki'] = 'เปิดà¹à¸ªà¸”งลิงà¸à¹Œ interwiki ในหน้าเว็บà¹à¸šà¸šà¹ƒà¸”'; $lang['target____extern'] = 'เปิดà¹à¸ªà¸”งลิงà¸à¹Œà¸ à¸²à¸¢à¸™à¸­à¸ ในหน้าเว็บà¹à¸šà¸šà¹ƒà¸”'; $lang['target____media'] = 'เปิดà¹à¸ªà¸”งลิงà¸à¹Œà¸‚องมีเดีย ในหน้าเว็บà¹à¸šà¸šà¹ƒà¸”'; $lang['target____windows'] = 'เปิดà¹à¸ªà¸”งลิงà¸à¹Œà¸‚องวินโดวส์ ในหน้าเว็บà¹à¸šà¸šà¹ƒà¸”'; +$lang['gdlib'] = 'เลขรุ่นของ GD Library'; +$lang['fetchsize'] = 'ขนาดไฟล์ใหà¸à¹ˆà¸ªà¸¸à¸” (bytes) fetch.php ที่จะดาวน์โหลดจาà¸à¸ à¸²à¸¢à¸™à¸­à¸'; +$lang['notify'] = 'ส่งà¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¹„ปยังที่อยู่อีเมลนี้'; +$lang['sitemap'] = 'สร้าง à¸à¸¹à¹€à¸à¸´à¹‰à¸¥ ไซต์à¹à¸¡à¸ž (จำนวนวัน)'; +$lang['rss_type'] = 'ชนิดของ XML feed'; +$lang['rss_linkto'] = 'ลิงà¸à¹Œà¹€à¸Šà¸·à¹ˆà¸­à¸¡à¹‚ยงไปยัง XML feed'; +$lang['rss_content'] = 'ต้องà¸à¸²à¸£à¹ƒà¸«à¹‰à¸¡à¸µà¸­à¸°à¹„รà¹à¸ªà¸”งอยู่ใน XML feed บ้าง?'; +$lang['rss_update'] = 'ความถี่ในà¸à¸²à¸£à¸­à¸±à¸žà¹€à¸”ท XML feed (เป็นวินาที)'; +$lang['rss_show_summary'] = 'ไตเติ้ลของบทสรุปย่อของ XML feed'; +$lang['userewrite'] = 'à¹à¸ªà¸”งที่อยู่เว็บ (URL) à¹à¸šà¸šà¸­à¹ˆà¸²à¸™à¹€à¸‚้าใจง่าย'; +$lang['gzip_output'] = 'ใช้ gzip Content-Encoding สำหรับ xhtml'; +$lang['compress'] = 'บีบย่อ CSS à¹à¸¥à¸° javascript (เพื่อให้à¹à¸ªà¸”งหน้าเว็บเร็วขึ้น)'; +$lang['send404'] = 'ให้à¹à¸ªà¸”ง "HTTP 404/Page Not Found" เมื่อไม่พบข้อมูลหน้านั้น'; +$lang['renderer__core'] = '%s (à¹à¸à¸™à¸«à¸¥à¸±à¸à¸‚อง dokuwiki)'; +$lang['renderer__plugin'] = '%s (โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ - plugin)'; $lang['proxy____host'] = 'ชื่อ server ของ proxy'; $lang['proxy____port'] = 'port ของ proxy'; $lang['proxy____user'] = 'user name ของ proxy'; diff --git a/sources/lib/plugins/config/lang/tr/lang.php b/sources/lib/plugins/config/lang/tr/lang.php index 344f22d..3e83d45 100644 --- a/sources/lib/plugins/config/lang/tr/lang.php +++ b/sources/lib/plugins/config/lang/tr/lang.php @@ -53,7 +53,7 @@ $lang['breadcrumbs'] = 'Ekmek kırıntıların sayısı'; $lang['youarehere'] = 'hiyerarÅŸik ekmek kırıntıları'; $lang['fullpath'] = 'sayfaların tüm patikasını (full path) göster'; $lang['typography'] = 'Tipografik deÄŸiÅŸtirmeleri yap'; -$lang['dformat'] = 'Tarih biçimi (PHP\'nin strftime fonksiyonuna bakın)'; +$lang['dformat'] = 'Tarih biçimi (PHP\'nin strftime fonksiyonuna bakın)'; $lang['signature'] = 'Ä°mza'; $lang['showuseras'] = 'Bir sayfayı en son düzenleyen kullanıcıya ne gösterilsin'; $lang['toptoclevel'] = 'İçindekiler için en üst seviye'; diff --git a/sources/lib/plugins/config/lang/uk/lang.php b/sources/lib/plugins/config/lang/uk/lang.php index dea9203..fe70019 100644 --- a/sources/lib/plugins/config/lang/uk/lang.php +++ b/sources/lib/plugins/config/lang/uk/lang.php @@ -1,8 +1,8 @@ * @author serg_stetsuk@ukr.net * @author okunia@gmail.com @@ -10,6 +10,7 @@ * @author Uko uko@uar.net * @author Ulrikhe Lukoie .com * @author Kate Arzamastseva pshns@ukr.net + * @author Maksim */ $lang['menu'] = 'ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð’Ñ–ÐºÑ–'; $lang['error'] = 'Параметри не збережено через помилкові значеннÑ. Будь лаÑка, переглÑньте ваші зміни та Ñпробуйте ще раз @@ -56,7 +57,7 @@ $lang['breadcrumbs'] = 'Ви відвідали (кількіÑÑ‚ÑŒ Ñ $lang['youarehere'] = 'Показувати "Ви тут"'; $lang['fullpath'] = 'Повний шлÑÑ… до документу'; $lang['typography'] = 'Замінювати типографÑькі Ñимволи'; -$lang['dformat'] = 'Формат дати (дивітьÑÑ Ñ„ÑƒÐ½ÐºÑ†Ñ–ÑŽ strftime PHP)'; +$lang['dformat'] = 'Формат дати (дивітьÑÑ Ñ„ÑƒÐ½ÐºÑ†Ñ–ÑŽ strftime PHP)'; $lang['signature'] = 'ПідпиÑ'; $lang['showuseras'] = 'Що вказувати при відображенні кориÑтувача, Ñкий воÑтаннє редагував Ñторінку'; $lang['toptoclevel'] = 'Мінімальний рівень Ð´Ð»Ñ Ð·Ð¼Ñ–Ñту'; diff --git a/sources/lib/plugins/config/lang/zh-tw/lang.php b/sources/lib/plugins/config/lang/zh-tw/lang.php index c586a0d..6723fe4 100644 --- a/sources/lib/plugins/config/lang/zh-tw/lang.php +++ b/sources/lib/plugins/config/lang/zh-tw/lang.php @@ -1,6 +1,7 @@ * @author http://www.chinese-tools.com/tools/converter-simptrad.html @@ -11,6 +12,7 @@ * @author Shuo-Ting Jian * @author syaoranhinata@gmail.com * @author Ichirou Uchiki + * @author Liou, Jhe-Yu */ $lang['menu'] = '系統設定'; $lang['error'] = '因為å«æœ‰ä¸åˆè¦æ ¼çš„設定值，故未能更新設定。請檢查您的更改並é‡æ–°é€å‡ºã€‚ @@ -60,7 +62,7 @@ $lang['breadcrumbs'] = '導覽路徑數é‡ã€‚輸入0表示åœç”¨ã€‚'; $lang['youarehere'] = '顯示階層å¼å°Žè¦½è·¯å¾‘ (è‹¥è¦ç”¨æ­¤åŠŸèƒ½ï¼Œå»ºè­°åœç”¨ä¸Šæ–¹çš„é¸é …)'; $lang['fullpath'] = '顯示完整的路徑於é é¢åº•éƒ¨'; $lang['typography'] = '進行字元替æ›'; -$lang['dformat'] = 'æ—¥æœŸæ ¼å¼ (åƒè¦‹ PHP çš„ strftime 函數)'; +$lang['dformat'] = 'æ—¥æœŸæ ¼å¼ (åƒè¦‹ PHP çš„ strftime 函數)'; $lang['signature'] = 'ç°½å'; $lang['showuseras'] = '將最後編輯é é¢çš„使用者顯示為：'; $lang['toptoclevel'] = '目錄表的最上層級'; @@ -135,7 +137,7 @@ $lang['autoplural'] = '檢查複數形å¼çš„é€£çµ (英文)'; $lang['compression'] = 'attic 文件的壓縮方å¼'; $lang['gzip_output'] = 'å° xhtml 使用 gzip 內容編碼'; $lang['compress'] = '壓縮 CSS 與 JavaScript 的輸出'; -$lang['cssdatauri'] = 'å‡å¦‚ CSS 中所引用的圖片å°æ–¼è©²æ•¸å­—大å°(bytes)，圖片將被直接嵌入 CSS 中，以減少 HTTP Request 的發é€ã€‚ IE 7 åŠä»¥ä¸‹çš„版本並ä¸æ”¯æ´æ­¤åŠŸèƒ½ã€‚æŽ¨è–¦æŠŠæ­¤æ•¸å€¼è¨­å®šæˆ 400 至 600 bytes 之間。若輸入 0 則åœç”¨æ­¤åŠŸèƒ½ã€‚'; +$lang['cssdatauri'] = 'å‡å¦‚ CSS 中所引用的圖片å°æ–¼è©²æ•¸å­—大å°(bytes)，圖片將被直接嵌入 CSS 中，以減少 HTTP Request 的發é€ã€‚ æŽ¨è–¦æŠŠæ­¤æ•¸å€¼è¨­å®šæˆ 400 至 600 bytes 之間。若輸入 0 則åœç”¨æ­¤åŠŸèƒ½ã€‚'; $lang['send404'] = 'å­˜å–ä¸å­˜åœ¨çš„é é¢æ™‚é€å‡º "HTTP 404/Page Not Found"'; $lang['broken_iua'] = 'ignore_user_abort 功能失效了？這有å¯èƒ½å°Žè‡´æœç´¢ç´¢å¼•ä¸å¯ç”¨ã€‚IIS+PHP/CGI å·²æ壞。請åƒé–± Bug 852 ç²å–更多訊æ¯ã€‚'; $lang['xsendfile'] = '使用 X-Sendfile 頭讓網é ä¼ºæœå™¨ç™¼é€ç‹€æ…‹æ–‡ä»¶ï¼Ÿæ‚¨çš„網é ä¼ºæœå™¨éœ€è¦æ”¯æŒè©²åŠŸèƒ½ã€‚'; diff --git a/sources/lib/plugins/config/lang/zh/lang.php b/sources/lib/plugins/config/lang/zh/lang.php index 5de2469..e29d7ec 100644 --- a/sources/lib/plugins/config/lang/zh/lang.php +++ b/sources/lib/plugins/config/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com @@ -15,6 +15,8 @@ * @author caii, patent agent in China * @author lainme993@gmail.com * @author Shuo-Ting Jian + * @author Garfield + * @author JellyChen <451453325@qq.com> */ $lang['menu'] = 'é…置设置'; $lang['error'] = '由于éžæ³•å‚数，设置没有更新。请检查您åšçš„改动并é‡æ–°æ交。 @@ -65,7 +67,7 @@ $lang['breadcrumbs'] = '显示“足迹â€çš„æ•°é‡'; $lang['youarehere'] = '显示“您在这里â€'; $lang['fullpath'] = '在页é¢åº•éƒ¨æ˜¾ç¤ºå®Œæ•´è·¯å¾„'; $lang['typography'] = '进行字符替æ¢'; -$lang['dformat'] = '日期格å¼ï¼ˆå‚è§ PHP çš„ strftime 功能）'; +$lang['dformat'] = '日期格å¼ï¼ˆå‚è§ PHP çš„ strftime 功能）'; $lang['signature'] = 'ç­¾åæ ·å¼'; $lang['showuseras'] = '显示用户为'; $lang['toptoclevel'] = '目录的最顶层'; diff --git a/sources/lib/plugins/config/settings/config.class.php b/sources/lib/plugins/config/settings/config.class.php index 9d0ad2c..102fc85 100644 --- a/sources/lib/plugins/config/settings/config.class.php +++ b/sources/lib/plugins/config/settings/config.class.php @@ -101,7 +101,12 @@ if (!class_exists('configuration')) { } $this->setting[$key] = new $class($key,$param); - $this->setting[$key]->initialize($default[$key],$local[$key],$protected[$key]); + + $d = array_key_exists($key, $default) ? $default[$key] : null; + $l = array_key_exists($key, $local) ? $local[$key] : null; + $p = array_key_exists($key, $protected) ? $protected[$key] : null; + + $this->setting[$key]->initialize($d,$l,$p); } $this->_loaded = true; @@ -215,15 +220,12 @@ if (!class_exists('configuration')) { $len = count($arr); for($j=0; $j<$len; $j++){ $arr[$j] = trim($arr[$j]); - $arr[$j] = preg_replace('/^(\'|")(.*)(?'\\','\\\''=>'\'','\\"'=>'"')); + $arr[$j] = $this->_readValue($arr[$j]); } $value = $arr; }else{ - // remove quotes from quoted strings & unescape escaped data - $value = preg_replace('/^(\'|")(.*)(?'\\','\\\''=>'\'','\\"'=>'"')); + $value = $this->_readValue($value); } $config[$key] = $value; @@ -233,6 +235,32 @@ if (!class_exists('configuration')) { return $config; } + /** + * Convert php string into value + * + * @param string $value + * @return bool|string + */ + protected function _readValue($value) { + $removequotes_pattern = '/^(\'|")(.*)(? '\\', + '\\\'' => '\'', + '\\"' => '"' + ); + + if($value == 'true') { + $value = true; + } elseif($value == 'false') { + $value = false; + } else { + // remove quotes from quoted strings & unescape escaped data + $value = preg_replace($removequotes_pattern,'$2',$value); + $value = strtr($value, $unescape_pairs); + } + return $value; + } + /** * Returns header of rewritten settings file * @@ -1186,6 +1214,7 @@ if (!class_exists('setting_multicheckbox')) { var $_choices = array(); var $_combine = array(); + var $_other = 'always'; /** * update changed setting with user provided value $input @@ -1219,7 +1248,7 @@ if (!class_exists('setting_multicheckbox')) { * Build html for label and input of setting * * @param DokuWiki_Plugin $plugin object of config plugin - * @param bool $echo true: show inputted value, when error occurred, otherwise the stored setting + * @param bool $echo true: show input value, when error occurred, otherwise the stored setting * @return string[] with content array(string $label_html, string $input_html) */ function html(&$plugin, $echo=false) { @@ -1250,9 +1279,7 @@ if (!class_exists('setting_multicheckbox')) { $checked = ($idx !== false) ? 'checked="checked"' : ''; - // ideally this would be handled using a second class of "default", however IE6 does not - // correctly support CSS selectors referencing multiple class names on the same element - // (e.g. .default.selection). + // @todo ideally this would be handled using a second class of "default" $class = (($idx !== false) == (false !== $idx_default)) ? " selectiondefault" : ""; $prompt = ($plugin->getLang($this->_key.'_'.$choice) ? @@ -1269,16 +1296,21 @@ if (!class_exists('setting_multicheckbox')) { } // handle any remaining values - $other = join(',',$value); + if ($this->_other != 'never'){ + $other = join(',',$value); + // test equivalent to ($this->_other == 'always' || ($other && $this->_other == 'exists') + // use != 'exists' rather than == 'always' to ensure invalid values default to 'always' + if ($this->_other != 'exists' || $other) { - $class = ((count($default) == count($value)) && (count($value) == count(array_intersect($value,$default)))) ? - " selectiondefault" : ""; - - $input .= '
      '."\n"; - $input .= '\n"; - $input .= '\n"; - $input .= "
      \n"; + $class = ((count($default) == count($value)) && (count($value) == count(array_intersect($value,$default)))) ? + " selectiondefault" : ""; + $input .= '
      '."\n"; + $input .= '\n"; + $input .= '\n"; + $input .= "
      \n"; + } + } $label = ''; return array($label,$input); } diff --git a/sources/lib/plugins/config/settings/config.metadata.php b/sources/lib/plugins/config/settings/config.metadata.php index aaa32cd..5115cbc 100644 --- a/sources/lib/plugins/config/settings/config.metadata.php +++ b/sources/lib/plugins/config/settings/config.metadata.php @@ -68,8 +68,14 @@ * '_max' - maximum numeric value, optional for 'numeric' and 'numericopt', ignored by others * '_delimiter' - string, default '/', a single character used as a delimiter for testing regex input values * '_pregflags' - string, default 'ui', valid preg pattern modifiers used when testing regex input values, for more - * information see http://uk1.php.net/manual/en/reference.pcre.pattern.modifiers.php + * information see http://php.net/manual/en/reference.pcre.pattern.modifiers.php * '_multiple' - bool, allow multiple comma separated email values; optional for 'email', ignored by others + * '_other' - how to handle other values (not listed in _choices). accepted values: 'always','exists','never' + * default value 'always'. 'exists' only shows 'other' input field when the setting contains value(s) + * not listed in choices (e.g. due to manual editing or update changing _choices). This is safer than + * 'never' as it will not discard unknown/other values. + * optional for 'multicheckbox', ignored by others + * * * @author Chris Smith */ @@ -131,7 +137,10 @@ $meta['_authentication'] = array('fieldset'); $meta['useacl'] = array('onoff','_caution' => 'danger'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype','_caution' => 'danger'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','djangomd5','djangosha1','sha512')); +$meta['passcrypt'] = array('multichoice','_choices' => array( + 'smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5', + 'mediawiki','bcrypt','djangomd5','djangosha1','djangopbkdf2_sha1','djangopbkdf2_sha256','sha512' +)); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string','_caution' => 'danger'); $meta['manager'] = array('string'); diff --git a/sources/lib/plugins/extension/helper/extension.php b/sources/lib/plugins/extension/helper/extension.php index 2f44f55..1f2c1af 100644 --- a/sources/lib/plugins/extension/helper/extension.php +++ b/sources/lib/plugins/extension/helper/extension.php @@ -107,7 +107,7 @@ class helper_plugin_extension_extension extends DokuWiki_Plugin { if (!empty($this->remoteInfo['bundled'])) return $this->remoteInfo['bundled']; return in_array($this->id, array( - 'authad', 'authldap', 'authmysql', 'authpgsql', 'authplain', 'acl', 'info', 'extension', + 'authad', 'authldap', 'authmysql', 'authpdo', 'authpgsql', 'authplain', 'acl', 'info', 'extension', 'revert', 'popularity', 'config', 'safefnrecode', 'styling', 'testing', 'template:dokuwiki' ) ); diff --git a/sources/lib/plugins/extension/lang/bg/intro_install.txt b/sources/lib/plugins/extension/lang/bg/intro_install.txt new file mode 100644 index 0000000..34b9248 --- /dev/null +++ b/sources/lib/plugins/extension/lang/bg/intro_install.txt @@ -0,0 +1 @@ +От тук можете да инÑталирате ръчно приÑтавки и шаблони като качите архив или поÑочите URL за ÑвалÑне на архива. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/bg/intro_plugins.txt b/sources/lib/plugins/extension/lang/bg/intro_plugins.txt new file mode 100644 index 0000000..927f617 --- /dev/null +++ b/sources/lib/plugins/extension/lang/bg/intro_plugins.txt @@ -0,0 +1 @@ +Това Ñа инÑталираните приÑтавки. От тук можете да ги включвате и изключвате както и да ги деинÑталирате. Тук ще виждате и наличните актуализации, като преди вÑÑка такава прочетете документациÑта на Ñъответната приÑтавка. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/bg/intro_search.txt b/sources/lib/plugins/extension/lang/bg/intro_search.txt new file mode 100644 index 0000000..cec4cd2 --- /dev/null +++ b/sources/lib/plugins/extension/lang/bg/intro_search.txt @@ -0,0 +1 @@ +От тук имате доÑтъп до вÑички налични приÑтавки и шаблони за DokuWiki, които Ñа дело на трети лица. Имайте предвид, че кодът им е потенциален **риÑк за ÑигурноÑтта на Ñървъра**! Повече по темата можете да прочетете в [[doku>security#plugin_security|plugin security]] first. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/bg/intro_templates.txt b/sources/lib/plugins/extension/lang/bg/intro_templates.txt new file mode 100644 index 0000000..8824b4d --- /dev/null +++ b/sources/lib/plugins/extension/lang/bg/intro_templates.txt @@ -0,0 +1 @@ +Това Ñа инÑталираните шаблони. Можете да определите кой шаблон да Ñе ползва от [[?do=admin&page=config|ÐаÑтройки]]. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/bg/lang.php b/sources/lib/plugins/extension/lang/bg/lang.php index b14442c..dda69a4 100644 --- a/sources/lib/plugins/extension/lang/bg/lang.php +++ b/sources/lib/plugins/extension/lang/bg/lang.php @@ -36,15 +36,19 @@ $lang['popularity'] = 'ПопулÑрноÑÑ‚: %s%%'; $lang['homepage_link'] = 'Документи'; $lang['tags'] = 'Етикети:'; $lang['author_hint'] = 'ТърÑене за други приÑтавки от този автор'; +$lang['installed'] = 'ИнÑталирано:'; $lang['downloadurl'] = 'СвалÑне от URL:'; $lang['repository'] = 'Хранилище:'; +$lang['unknown'] = 'неизвеÑтно'; $lang['installed_version'] = 'ИнÑталирана верÑиÑ:'; -$lang['install_date'] = 'ПоÑледна актуализирана на:'; +$lang['install_date'] = 'ПоÑл. актуализиране:'; $lang['available_version'] = 'Ðалична верÑиÑ:'; $lang['compatible'] = 'СъвмеÑтимоÑÑ‚ Ñ:'; $lang['depends'] = 'ИзиÑква:'; $lang['similar'] = 'ÐаподобÑва:'; $lang['conflicts'] = 'Ð’ кофликт Ñ:'; +$lang['donate'] = 'ХареÑва ли ви?'; +$lang['donate_action'] = 'Купете на автора кафе!'; $lang['repo_retry'] = 'Повторен опит'; $lang['provides'] = 'ОÑигурÑва:'; $lang['status'] = 'СъÑтоÑние:'; @@ -65,9 +69,16 @@ $lang['msg_plugin_install_success'] = 'ПриÑтавката "%s" е инÑта $lang['msg_plugin_update_success'] = 'ПриÑтавката "%s" е актуализирана уÑпешно'; $lang['msg_upload_failed'] = 'Качването на файлът Ñе провали'; $lang['missing_dependency'] = 'ИзиÑкван компонент липÑва или е изключен: %s'; +$lang['security_issue'] = 'Проблем ÑÑŠÑ ÑигурноÑтта: %s'; +$lang['security_warning'] = 'Предупреждние за ÑигурноÑтта: %s'; $lang['update_available'] = 'ÐктуализациÑ: Ðалична е нова верÑÐ¸Ñ - %s'; $lang['wrong_folder'] = 'Ðекоректно инÑталирана приÑтавка: Преименувайте директориÑта "%s" на "%s".'; $lang['error_badurl'] = 'URL адреÑите Ñ‚Ñ€Ñбва да започват Ñ http или https'; $lang['error_dircreate'] = 'Създаването на временна поапка за получаване на файла не е възможно'; $lang['error_download'] = 'ÐевъзможноÑÑ‚ за ÑвалÑне на файл: %s'; +$lang['noperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° разширението не е доÑтъпна за пиÑане'; +$lang['notplperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° шаблона не е доÑтъпна за пиÑане'; +$lang['nopluginperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° приÑтавката не е доÑтъпна за пиÑане'; $lang['install_url'] = 'ИнÑталиране от URL:'; +$lang['install_upload'] = 'Качване:'; +$lang['repo_error'] = 'ÐÑма връзка Ñ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰ÐµÑ‚Ð¾ на добавката. Проверете възможна ли е комуникациÑта www.dokuwiki.org и прокÑи наÑтройките.'; diff --git a/sources/lib/plugins/extension/lang/cy/intro_install.txt b/sources/lib/plugins/extension/lang/cy/intro_install.txt new file mode 100644 index 0000000..2bc933e --- /dev/null +++ b/sources/lib/plugins/extension/lang/cy/intro_install.txt @@ -0,0 +1 @@ +Gallwch chi arsefydlu ategion a thempledau gan law yma, naill ai gan eu lanlwytho neu gan gyflwyno URL lawrlwytho uniongyrchol. diff --git a/sources/lib/plugins/extension/lang/cy/intro_plugins.txt b/sources/lib/plugins/extension/lang/cy/intro_plugins.txt new file mode 100644 index 0000000..dd49a7a --- /dev/null +++ b/sources/lib/plugins/extension/lang/cy/intro_plugins.txt @@ -0,0 +1 @@ +Dyma'r ategion sydd wedi\'u harsefydlu yn eich DokuWiki yn bresennol. Gallwch chi eu galluogi neu eu hanalluogi nhw neu hyd yn oed eu dad-arsefydlu yn llwyr yma. Caiff diweddariadau'r ategion eu dangos yma hefyd, sicrhewch eich bod chi'n darllen dogfennaeth yr ategyn cyn diweddaru. diff --git a/sources/lib/plugins/extension/lang/cy/intro_search.txt b/sources/lib/plugins/extension/lang/cy/intro_search.txt new file mode 100644 index 0000000..8aef960 --- /dev/null +++ b/sources/lib/plugins/extension/lang/cy/intro_search.txt @@ -0,0 +1 @@ +Mae'r tab hwn yn rhoi mynediad i bob ategyn a thempled 3ydd parti ar gael ar gyfer DokuWiki. Sylwch fod arsefydlu cod 3ydd parti yn achosi **risg diogelwch**. Efallai hoffech chi ddarllen mwy ar [[doku>security#plugin_security|ddiogelwch ategion]] yn gyntaf. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/cy/intro_templates.txt b/sources/lib/plugins/extension/lang/cy/intro_templates.txt new file mode 100644 index 0000000..4947145 --- /dev/null +++ b/sources/lib/plugins/extension/lang/cy/intro_templates.txt @@ -0,0 +1 @@ +Dyma'r templedau sydd wedi'u harsefydlu yn eich DokuWiki yn bresennol. Gallwch chi ddewis y templed i'w ddefnyddio yn y [[?do=admin&page=config|Rheolwr Ffurfwedd]]. diff --git a/sources/lib/plugins/extension/lang/cy/lang.php b/sources/lib/plugins/extension/lang/cy/lang.php new file mode 100644 index 0000000..2a2a8c8 --- /dev/null +++ b/sources/lib/plugins/extension/lang/cy/lang.php @@ -0,0 +1,111 @@ + + * @author Christopher Smith + * @author Alan Davies + */ + +$lang['menu'] = 'Rheolwr Estyniadau'; + +$lang['tab_plugins'] = 'Ategion a Arsefydlwyd'; +$lang['tab_templates'] = 'Templedau a Arsefydlwyd'; +$lang['tab_search'] = 'Chwilio ac Arsefydlu'; +$lang['tab_install'] = 'Arsefydlu gan Law'; + +$lang['notimplemented'] = '\'Dyw\'r nodwedd hon heb ei rhoi ar waith eto'; +$lang['notinstalled'] = '\'Dyw\'r estyniad hwn heb ei arsefydlu'; +$lang['alreadyenabled'] = 'Cafodd yr estyniad hwn ei alluogi'; +$lang['alreadydisabled'] = 'Cafodd yr estyniad hwn ei analluogi'; +$lang['pluginlistsaveerror'] = 'Roedd gwall wrth gadw\'r rhestr ategion'; +$lang['unknownauthor'] = 'Awdur anhysbys'; +$lang['unknownversion'] = 'Fersiwn anhysbys'; + +$lang['btn_info'] = 'Dangos wybodaeth bellach'; +$lang['btn_update'] = 'Diweddaru'; +$lang['btn_uninstall'] = 'Dad-arsefydlu'; +$lang['btn_enable'] = 'Galluogi'; +$lang['btn_disable'] = 'Analluogi'; +$lang['btn_install'] = 'Arsyfydlu'; +$lang['btn_reinstall'] = 'Ail-arsefydlu'; + +$lang['js']['reallydel'] = 'Ydych chi wir am ddad-arsefydlu\'r estyniad hwn?'; + +$lang['search_for'] = 'Chwilio Estyniadau:'; +$lang['search'] = 'Chwilio'; + +$lang['extensionby'] = '%s gan %s'; +$lang['screenshot'] = 'Sgrinlun %s'; +$lang['popularity'] = 'Poblogrwydd: %s%%'; +$lang['homepage_link'] = 'Dogfennau'; +$lang['bugs_features'] = 'Bygiau'; +$lang['tags'] = 'Tagiau:'; +$lang['author_hint'] = 'Chwilio estyniadau gan awdur'; +$lang['installed'] = 'Arsefydlwyd:'; +$lang['downloadurl'] = 'URL Lawlwytho:'; +$lang['repository'] = 'Ystorfa:'; +$lang['unknown'] = 'anhysbys'; +$lang['installed_version'] = 'Fersiwn a arsefydlwyd:'; +$lang['install_date'] = 'Eich diweddariad diwethaf:'; +$lang['available_version'] = 'Fersiwn ar gael:'; +$lang['compatible'] = 'Yn gydnaws â:'; +$lang['depends'] = 'Yn dibynnu ar:'; +$lang['similar'] = 'Yn debyg i:'; +$lang['conflicts'] = 'Y gwrthdaro â:'; +$lang['donate'] = 'Fel hwn?'; +$lang['donate_action'] = 'Prynwch goffi i\'r awdur!'; +$lang['repo_retry'] = 'Ailgeisio'; +$lang['provides'] = 'Darparu:'; +$lang['status'] = 'Statws:'; +$lang['status_installed'] = 'arsefydlwyd'; +$lang['status_not_installed'] = 'heb ei arsefydlu'; +$lang['status_protected'] = 'amddiffynwyd'; +$lang['status_enabled'] = 'galluogwyd'; +$lang['status_disabled'] = 'analluogwyd'; +$lang['status_unmodifiable'] = 'methu addasu'; +$lang['status_plugin'] = 'ategyn'; +$lang['status_template'] = 'templed'; +$lang['status_bundled'] = 'bwndlwyd'; + +$lang['msg_enabled'] = 'Galluogwyd ategyn %s'; +$lang['msg_disabled'] = 'Analluogwyd ategyn %s'; +$lang['msg_delete_success'] = 'Dad-arsefydlwyd estyniad %s'; +$lang['msg_delete_failed'] = 'Methodd dad-arsefydlu estyniad %s'; +$lang['msg_template_install_success'] = 'Arsefydlwyd templed %s yn llwyddiannus'; +$lang['msg_template_update_success'] = 'Diweddarwyd templed %s yn llwyddiannus'; +$lang['msg_plugin_install_success'] = 'Arsefydlwyd ategyn %s yn llwyddiannus'; +$lang['msg_plugin_update_success'] = 'Diweddarwyd ategyn %s yn llwyddiannus'; +$lang['msg_upload_failed'] = 'Methodd lanlwytho\'r ffeil'; + +$lang['missing_dependency'] = 'Missing or disabled dependency: %s'; +$lang['security_issue'] = 'Mater Diogelwch: %s'; +$lang['security_warning'] = 'Rhybudd Diogelwch: %s'; +$lang['update_available'] = 'Diweddariad: Mae fersiwn newydd %s ar gael.'; +$lang['wrong_folder'] = 'Ategyn wedi\'i arsefydlu\'n anghywir: Ailenwch ffolder yr ategyn o "%s" i "%s".'; +$lang['url_change'] = 'Newid i\'r URL: Newidiodd yr URL lawlwytho ers y diweddariad diwethaf. Gwiriwch i weld os yw\'r URL newydd yn ddilys cyn diweddaru\'r estyniad.
      Newydd: %s
      Hen: %s'; + +$lang['error_badurl'] = 'Dylai URL ddechrau gyda http neu https'; +$lang['error_dircreate'] = 'Methu â chreu ffolder dros dro er mwyn derbyn y lawrlwythiad'; +$lang['error_download'] = 'Methu lawrlwytho\'r ffeil: %s'; +$lang['error_decompress'] = 'Methu datgywasgu\'r ffeil a lawrlwythwyd. Gall hwn fod o ganlyniad i lawrlwythiad gwael, felly ceisiwch eto; neu gall fod fformat y cywasgiad fod yn anhysbys, felly bydd yn rhaid i chi lawlwytho ac arsefydlu gan law.'; +$lang['error_findfolder'] = 'Methu ag adnabod ffolder yr estyniad, bydd angen lawrlwytho ac arsefydlu gan law'; +$lang['error_copy'] = 'Roedd gwall copïo ffeil wrth geisio arsefydlu ffeiliau i\'r ffolder %s: gall fod y ddisgen yn llawn neu gall hawliau mynediad i ffeiliau fod yn anghywir. Gall hwn fod wedi achosi ategyn sydd wedi arsefydlu\'n rhannol ac sydd wedi ansefydlogi\'ch arsefydliad wici'; + +$lang['noperms'] = '\'Sdim modd ysgrifennu i\'r ffolder estyniadau'; +$lang['notplperms'] = '\'Sdim modd ysgrifennu i\'r ffolder templedau'; + +$lang['nopluginperms'] = '\'Sdim modd ysgrifennu i\'r ffolder ategion'; +$lang['git'] = 'Cafodd yr estyniad hwn ei arsefydlu gan git, mae\'n bosib na fyddwch chi am ei ddiweddaru yma.'; +$lang['auth'] = '\'Dyw\'r ategyn dilysu hwn heb ei alluogi yn y ffurfwedd, ystyriwch ei analluogi.'; + +$lang['install_url'] = 'Arsefydlu o URL:'; +$lang['install_upload'] = 'Lanlwytho Estyniad:'; + +$lang['repo_error'] = 'Doedd dim modd cysylltu â\'r ystorfa ategion. Sicrhewch fod hawl gan eich gweinydd i gysylltu â www.dokuwiki.org a gwiriwch eich gosodiadau procsi.'; +$lang['nossl'] = 'Mae\'n debyg \'dyw eich PHP ddim yn cynnal SSL. Na fydd lawrlwytho yn gweithio ar gyfer nifer o estyniadau DokuWiki.'; + +$lang['js']['display_viewoptions'] = 'Opsiynau Golwg:'; +$lang['js']['display_enabled'] = 'galluogwyd'; +$lang['js']['display_disabled'] = 'analluogwyd'; +$lang['js']['display_updatable'] = 'gallu diweddaru'; diff --git a/sources/lib/plugins/extension/lang/da/lang.php b/sources/lib/plugins/extension/lang/da/lang.php index 17cb3b5..5d31357 100644 --- a/sources/lib/plugins/extension/lang/da/lang.php +++ b/sources/lib/plugins/extension/lang/da/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Søren Birk * @author Jacob Palm */ diff --git a/sources/lib/plugins/extension/lang/fa/intro_install.txt b/sources/lib/plugins/extension/lang/fa/intro_install.txt new file mode 100644 index 0000000..93c2b97 --- /dev/null +++ b/sources/lib/plugins/extension/lang/fa/intro_install.txt @@ -0,0 +1 @@ +در اینجا می‌توانید اÙزونه‌ها Ùˆ قالب‌ها را به صورت دستی از طریق آپلودشان یا با ارائهٔ لینک مستقیم دانلود نصب کنید. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/fa/intro_plugins.txt b/sources/lib/plugins/extension/lang/fa/intro_plugins.txt new file mode 100644 index 0000000..7d7d331 --- /dev/null +++ b/sources/lib/plugins/extension/lang/fa/intro_plugins.txt @@ -0,0 +1 @@ +این‌ها اÙزونه‌هایی است Ú©Ù‡ اکنون روی داکو ویکی شما نصب می‌باشند. از اینجا می‌توانید آن‌ها را غیرÙعال، Ùعال یا به طور کامل حذ٠نمایید. به‌روزرسانی اÙزونه‌ها نیز در اینجا نمایش داده می‌شود. پیش از به‌روزرسانی مطمئن شوید Ú©Ù‡ مستندات اÙزونه را مطالعه نموده‌اید. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/fa/intro_search.txt b/sources/lib/plugins/extension/lang/fa/intro_search.txt new file mode 100644 index 0000000..07fde76 --- /dev/null +++ b/sources/lib/plugins/extension/lang/fa/intro_search.txt @@ -0,0 +1 @@ +این شاخه به تمام اÙزونه‌ها Ùˆ قالب‌های نسل سوم داکو ویکی دسترسی می‌دهد. لطÙا دقت کنید Ú©Ù‡ نصب کد نسل سوم یک **ریسک امنیتی** است برای همین بهتر است Ú©Ù‡ ابتدا [[doku>security#plugin_security|امنیت اÙزونه]] را مطالعه نمایید. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/fa/intro_templates.txt b/sources/lib/plugins/extension/lang/fa/intro_templates.txt new file mode 100644 index 0000000..1a127c0 --- /dev/null +++ b/sources/lib/plugins/extension/lang/fa/intro_templates.txt @@ -0,0 +1 @@ +این‌ها قالب‌هاییست Ú©Ù‡ اکنون در داکو ویکی شما نصب می‌باشد. شما می‌توانید قالبی Ú©Ù‡ می‌خواهید استÙاده شود را در [[?do=admin&page=config|تنظیمات پیکربندی]] انتخاب نمایید. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/fa/lang.php b/sources/lib/plugins/extension/lang/fa/lang.php index 95c3e96..aa0613f 100644 --- a/sources/lib/plugins/extension/lang/fa/lang.php +++ b/sources/lib/plugins/extension/lang/fa/lang.php @@ -4,37 +4,93 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * * @author Mohamad Mehdi Habibi + * @author Masoud Sadrnezhaad */ $lang['menu'] = 'مدیریت اÙزونه ها'; $lang['tab_plugins'] = 'پلاگین های نصب شده'; $lang['tab_templates'] = 'قالب های نصب شده'; $lang['tab_search'] = 'جستجو Ùˆ نصب'; $lang['tab_install'] = 'نصب دستی'; +$lang['notimplemented'] = 'این قابلیت هنوز پیاده‌سازی نشده'; $lang['notinstalled'] = 'این اÙزونه نصب نشده است'; $lang['alreadyenabled'] = 'این اÙزونه Ùعال شده است'; $lang['alreadydisabled'] = 'این اÙزونه غیرÙعال شده است'; +$lang['pluginlistsaveerror'] = 'یک خطا هنگام ذخیره‌سازی این اÙزونه رخ داده'; +$lang['unknownauthor'] = 'نویسنده نامشخص'; $lang['unknownversion'] = 'نسخه ناشناخته'; $lang['btn_info'] = 'نمایش اطلاعات بیشتر'; $lang['btn_update'] = 'به روز رسانی'; +$lang['btn_uninstall'] = 'حذÙ'; $lang['btn_enable'] = 'Ùعال'; $lang['btn_disable'] = 'غیرÙعال'; $lang['btn_install'] = 'نصب'; $lang['btn_reinstall'] = 'نصب مجدد'; +$lang['js']['reallydel'] = 'واقعا می‌خواهید این اÙزونه را حذ٠کنید؟'; +$lang['js']['display_viewoptions'] = 'نمایش گزینه‌ها:'; +$lang['js']['display_enabled'] = 'Ùعال'; +$lang['js']['display_disabled'] = 'غیرÙعال'; +$lang['js']['display_updatable'] = 'قابل به‌روزرسانی'; $lang['search_for'] = 'جستجوی اÙزونه:'; $lang['search'] = 'جستجو'; +$lang['extensionby'] = '%s به وسیلهٔ %s'; +$lang['screenshot'] = 'اسکرینشات %s'; +$lang['popularity'] = 'محبوبیت: %s%%'; +$lang['homepage_link'] = 'مستندات'; +$lang['bugs_features'] = 'اشکالات'; $lang['tags'] = 'برچسب ها:'; +$lang['author_hint'] = 'جستجوی اÙزونه‌های این نویسنده'; +$lang['installed'] = 'نصب شده:'; +$lang['downloadurl'] = 'لینک دانلود:'; +$lang['repository'] = 'مخزن:'; +$lang['unknown'] = 'ناشناخته'; $lang['installed_version'] = 'نسخه نصب شده:'; +$lang['install_date'] = 'آخرین به‌روزرسانی شما:'; $lang['available_version'] = 'نسخه در دسترس:'; +$lang['compatible'] = 'سازگار با:'; +$lang['depends'] = 'وابسته به:'; +$lang['similar'] = 'شبیه به:'; +$lang['conflicts'] = 'تداخل دارد با:'; +$lang['donate'] = 'به این علاقه‌مندید؟'; +$lang['donate_action'] = 'برای نویسنده یک Ùنجان قهوه بخرید!'; $lang['repo_retry'] = 'دوباره'; +$lang['provides'] = 'شامل می‌شود:'; $lang['status'] = 'وضعیت'; $lang['status_installed'] = 'نصب شده'; $lang['status_not_installed'] = 'نصب نشده'; +$lang['status_protected'] = 'محاÙظت شده'; $lang['status_enabled'] = 'Ùعال'; $lang['status_disabled'] = 'غیرÙعال'; +$lang['status_unmodifiable'] = 'غیرقابل تغییر'; $lang['status_plugin'] = 'پلاگین'; $lang['status_template'] = 'قالب'; +$lang['status_bundled'] = 'باندل شده'; +$lang['msg_enabled'] = 'اÙزونه %s Ùعال شده'; +$lang['msg_disabled'] = 'اÙزونه %s غیرÙعال شده'; +$lang['msg_delete_success'] = 'اÙزونه %s حذ٠شده'; +$lang['msg_delete_failed'] = 'حذ٠اÙزونه %s ناموÙÙ‚ بود'; +$lang['msg_template_install_success'] = 'قالب %s با موÙقیت نصب شد'; +$lang['msg_template_update_success'] = 'قالب %s با موÙقیت به‌روزرسانی شد'; +$lang['msg_plugin_install_success'] = 'اÙزونهٔ %s با موÙقیت نصب شد'; +$lang['msg_plugin_update_success'] = 'اÙزونهٔ %s با موÙقیت نصب شد'; +$lang['msg_upload_failed'] = 'بارگذاری Ùایل ناموÙÙ‚ بود'; +$lang['missing_dependency'] = 'نیازمندی وجود ندارد یا غیرÙعال است: %s'; +$lang['security_issue'] = 'اشکال امنیتی: %s'; +$lang['security_warning'] = 'اخطار امنیتی: %s'; +$lang['update_available'] = 'به‌روزرسانی نسخهٔ جدید %s موجود است.'; +$lang['wrong_folder'] = 'اÙزونه اشتباه نصب شده: نام پوشهٔ اÙزونه را از "%s" به "%s" تغییر دهید.'; +$lang['url_change'] = 'لینک تغییر کرد: لینک دانلود از آخرین دانلود تغییر کرد. پیش از به‌روزرسانی اÙزونه، Ú†Ú© کنید Ú©Ù‡ لینک جدید درست باشد.
      جدید: %s
      قدیمی: %s'; +$lang['error_badurl'] = 'لینک‌ها باید با http یا https شروع شوند'; +$lang['error_dircreate'] = 'امکان ایجاد پوشهٔ موقت برای دریاÙت دانلود وجود ندارد'; +$lang['error_download'] = 'امکان دانلود Ùایل وجود ندارد: %s'; +$lang['error_decompress'] = 'امکان خارج کردن Ùایل دانلود شده از حالت Ùشرده وجود ندارد. این می‌توانید در اثر دانلود ناقص باشد Ú©Ù‡ در اینصورت باید دوباره تلاش کنید؛ یا اینکه Ùرمت Ùشرده‌سازی نامعلوم است Ú©Ù‡ در اینصورت باید به صورت دستی دانلود Ùˆ نصب نمایید.'; +$lang['error_findfolder'] = 'امکان تشخیص پوشهٔ اÙزونه وجود ندارد. باید به صورت دستی دانلود Ùˆ نصب کنید.'; +$lang['error_copy'] = 'هنگام تلاش برای نصب Ùایل‌ها برای پوشهٔ %s خطای Ú©Ù¾ÛŒ Ùایل وجود دارد: رسانه ذخیره‌سازی می‌تواند پر باشد یا پرمیشن‌های Ùایل نادرست است. این می‌تواند باعث نصب بخشی از اÙزونه شده باشد Ùˆ ویکی را ناپایدار نماید.'; $lang['noperms'] = 'پوشه اÙزونه ها قابل نوشتن نیست'; $lang['notplperms'] = 'پوشه قالب ها قابل نوشتن نیست'; $lang['nopluginperms'] = 'پوشه پلاگین ها قابل نوشتن نیست'; +$lang['git'] = 'این اÙزونه از طریق گیت نصب شده، شما نباید آن را از اینجا به‌روزرسانی کنید.'; +$lang['auth'] = 'این اÙزونهٔ auth در بخش تنظیمات Ùعال نشده، غیرÙعالش کنید.'; $lang['install_url'] = 'نصب از آدرس:'; $lang['install_upload'] = 'بارگذاری اÙزونه:'; +$lang['repo_error'] = 'امکان ارتباط با مخزن اÙزونه‌ها وجود ندارد. مطمئن شوید Ú©Ù‡ سرور شما اجازهٔ ارتباط با www.dokuwiki.org را دارد Ùˆ تنظیمات پراکسی را Ú†Ú© کنید.'; +$lang['nossl'] = 'به نظر می‌آید Ú©Ù‡ PHP شما از SSL پشتیبانی نمی‌کند. دانلود کردن برای بسیاری از اÙزونه‌های داکو ویکی کار نمی‌کند.'; diff --git a/sources/lib/plugins/extension/lang/fr/lang.php b/sources/lib/plugins/extension/lang/fr/lang.php index 4cb6f0d..e3dff49 100644 --- a/sources/lib/plugins/extension/lang/fr/lang.php +++ b/sources/lib/plugins/extension/lang/fr/lang.php @@ -38,12 +38,12 @@ $lang['extensionby'] = '%s de %s'; $lang['screenshot'] = 'Aperçu de %s'; $lang['popularity'] = 'Popularité : %s%%'; $lang['homepage_link'] = 'Documents'; -$lang['bugs_features'] = 'Bugs'; +$lang['bugs_features'] = 'Bogues'; $lang['tags'] = 'Étiquettes :'; $lang['author_hint'] = 'Chercher les extensions de cet auteur'; $lang['installed'] = 'Installés :'; $lang['downloadurl'] = 'URL de téléchargement :'; -$lang['repository'] = 'Entrepôt : '; +$lang['repository'] = 'Dépôt : '; $lang['unknown'] = 'inconnu'; $lang['installed_version'] = 'Version installée :'; $lang['install_date'] = 'Votre dernière mise à jour :'; @@ -69,7 +69,7 @@ $lang['status_bundled'] = 'fourni'; $lang['msg_enabled'] = 'Greffon %s activé'; $lang['msg_disabled'] = 'Greffon %s désactivé'; $lang['msg_delete_success'] = 'Extension %s désinstallée.'; -$lang['msg_delete_failed'] = 'Echec de la désinstallation de l\'extension %s'; +$lang['msg_delete_failed'] = 'Échec de la désinstallation de l\'extension %s'; $lang['msg_template_install_success'] = 'Thème %s installé avec succès'; $lang['msg_template_update_success'] = 'Thème %s mis à jour avec succès'; $lang['msg_plugin_install_success'] = 'Greffon %s installé avec succès'; @@ -77,16 +77,16 @@ $lang['msg_plugin_update_success'] = 'Greffon %s mis à jour avec succès'; $lang['msg_upload_failed'] = 'Téléversement échoué'; $lang['missing_dependency'] = 'Dépendance absente ou désactivée : %s'; $lang['security_issue'] = 'Problème de sécurité : %s'; -$lang['security_warning'] = 'Avertissement deSécurité : %s'; -$lang['update_available'] = 'Mise à jour : La version %s est disponible.'; -$lang['wrong_folder'] = 'Greffon installé incorrectement : Renomer le dossier du greffon "%s" en "%s".'; +$lang['security_warning'] = 'Avertissement de sécurité : %s'; +$lang['update_available'] = 'Mise à jour : la version %s est disponible.'; +$lang['wrong_folder'] = 'Greffon installé incorrectement : renommer le dossier du greffon "%s" en "%s".'; $lang['url_change'] = 'URL modifié : L\'URL de téléchargement a changé depuis le dernier téléchargement. Vérifiez si l\'URL est valide avant de mettre à jour l\'extension.
      Nouvel URL : %s
      Ancien : %s'; $lang['error_badurl'] = 'Les URL doivent commencer par http ou https'; $lang['error_dircreate'] = 'Impossible de créer le dossier temporaire pour le téléchargement.'; $lang['error_download'] = 'Impossible de télécharger le fichier : %s'; $lang['error_decompress'] = 'Impossible de décompresser le fichier téléchargé. C\'est peut être le résultat d\'une erreur de téléchargement, auquel cas vous devriez réessayer. Le format de compression est peut-être inconnu. Dans ce cas il vous faudra procéder à une installation manuelle.'; -$lang['error_findfolder'] = 'Impossible d\'identifier le dossier de l\'extension. vous devez procéder à une installation manuelle.'; -$lang['error_copy'] = 'Une erreur de copie de fichier s\'est produite lors de l\'installation des fichiers dans le dossier %s. Il se peut que le disque soit plein, ou que les permissions d\'accès aux fichiers soient incorrectes. Il est possible que le greffon soit partiellement installé et que cela laisse votre installation de DoluWiki instable.'; +$lang['error_findfolder'] = 'Impossible d\'identifier le dossier de l\'extension. Vous devez procéder à une installation manuelle.'; +$lang['error_copy'] = 'Une erreur de copie de fichier s\'est produite lors de l\'installation des fichiers dans le dossier %s. Il se peut que le disque soit plein, ou que les permissions d\'accès aux fichiers soient incorrectes. Il est possible que le greffon soit partiellement installé et que cela laisse votre installation de DokuWiki instable.'; $lang['noperms'] = 'Impossible d\'écrire dans le dossier des extensions.'; $lang['notplperms'] = 'Impossible d\'écrire dans le dossier des thèmes.'; $lang['nopluginperms'] = 'Impossible d\'écrire dans le dossier des greffons.'; @@ -94,5 +94,5 @@ $lang['git'] = 'Cette extension a été installé via git, vou $lang['auth'] = 'Votre configuration n\'utilise pas ce greffon d\'authentification. Vous devriez songer à le désactiver.'; $lang['install_url'] = 'Installez depuis l\'URL :'; $lang['install_upload'] = 'Téléversez l\'extension :'; -$lang['repo_error'] = 'L\'entrepôt d\'extensions est injoignable. Veuillez vous assurer que le server web est autorisé à contacter www.dokuwiki.org et vérifier les réglages de proxy.'; +$lang['repo_error'] = 'Le dépôt d\'extensions est injoignable. Veuillez vous assurer que le server web est autorisé à contacter www.dokuwiki.org et vérifier les réglages de proxy.'; $lang['nossl'] = 'Votre version de PHP semble ne pas prendre en charge SSL. Le téléchargement de nombreuses extensions va échouer.'; diff --git a/sources/lib/plugins/extension/lang/hr/lang.php b/sources/lib/plugins/extension/lang/hr/lang.php index e51d8cb..e395333 100644 --- a/sources/lib/plugins/extension/lang/hr/lang.php +++ b/sources/lib/plugins/extension/lang/hr/lang.php @@ -25,6 +25,10 @@ $lang['btn_disable'] = 'Onemogući'; $lang['btn_install'] = 'Ugradi'; $lang['btn_reinstall'] = 'Ponovno ugradi'; $lang['js']['reallydel'] = 'Zaista ukloniti ovo proširenje?'; +$lang['js']['display_viewoptions'] = 'Opcije pregleda:'; +$lang['js']['display_enabled'] = 'omogućen'; +$lang['js']['display_disabled'] = 'onemogućen'; +$lang['js']['display_updatable'] = 'izmjenjiv'; $lang['search_for'] = 'Pretraži proširenja'; $lang['search'] = 'Pretraži'; $lang['extensionby'] = '%s po %s'; diff --git a/sources/lib/plugins/extension/lang/it/intro_search.txt b/sources/lib/plugins/extension/lang/it/intro_search.txt new file mode 100644 index 0000000..fb77d36 --- /dev/null +++ b/sources/lib/plugins/extension/lang/it/intro_search.txt @@ -0,0 +1 @@ +Questa sezione ti da accesso a tutti i plugin e temi di terze parti disponibili per DokuWiki. Sappi che l'installazione di codice di terze parti potrebbe rappresentare un **rischio di sicurezza**, quindi, forse, prima vorresti informarti a proposito della [[doku>security#plugin_security|sicurezza dei plugin]]. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/it/intro_templates.txt b/sources/lib/plugins/extension/lang/it/intro_templates.txt new file mode 100644 index 0000000..a38d868 --- /dev/null +++ b/sources/lib/plugins/extension/lang/it/intro_templates.txt @@ -0,0 +1 @@ +Questi sono i temi attualmente installati nel tuo DokuWiki. Puoi selezionare il tema da usare in [[?do=admin&page=config|Configurazione Wiki]]. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/it/lang.php b/sources/lib/plugins/extension/lang/it/lang.php index 80ed0dd..d22cb9d 100644 --- a/sources/lib/plugins/extension/lang/it/lang.php +++ b/sources/lib/plugins/extension/lang/it/lang.php @@ -34,6 +34,7 @@ $lang['js']['display_disabled'] = 'disabilitato'; $lang['js']['display_updatable'] = 'aggiornabile'; $lang['search_for'] = 'Extension di Ricerca:'; $lang['search'] = 'Cerca'; +$lang['extensionby'] = '%s da %s'; $lang['screenshot'] = 'Screenshot di %s'; $lang['popularity'] = 'Popolarità: %s%%'; $lang['homepage_link'] = 'Documenti'; @@ -75,17 +76,23 @@ $lang['msg_plugin_install_success'] = 'Plugin %s installato con successo'; $lang['msg_plugin_update_success'] = 'Plugin %s aggiornato con successo'; $lang['msg_upload_failed'] = 'Caricamento del file fallito'; $lang['missing_dependency'] = 'Dipendenza mancante o disabilitata: %s'; +$lang['security_issue'] = 'Problema di sicurezza: %s'; +$lang['security_warning'] = 'Avvertimento di sicurezza: %s'; $lang['update_available'] = 'Aggiornamento: Nuova versione %s disponibile.'; $lang['wrong_folder'] = 'Plugin non installato correttamente: rinomina la directory del plugin "%s" in "%s".'; +$lang['url_change'] = 'URL cambiato: l\'URL per il download è cambiato dall\'ultima volta che è stato utilizzato. Controlla se il nuovo URL è valido prima di aggiornare l\'estensione.
      Nuovo: %s
      Vecchio: %s'; $lang['error_badurl'] = 'URLs deve iniziare con http o https'; $lang['error_dircreate'] = 'Impossibile creare una cartella temporanea per ricevere il download'; $lang['error_download'] = 'Impossibile scaricare il file: %s'; $lang['error_decompress'] = 'Impossibile decomprimere il file scaricato. Ciò può dipendere da errori in fase di download, nel qual caso dovreste ripetere l\'operazione; oppure il formato di compressione è sconosciuto, e in questo caso dovrete scaricare e installare manualmente.'; $lang['error_findfolder'] = 'Impossibile identificare la directory dell\'extension, dovrete scaricare e installare manualmente'; +$lang['error_copy'] = 'C\'è stato un errore di copia dei file mentre si tentava di copiare i file per la directory %s: il disco potrebbe essere pieno o i pemessi di accesso ai file potrebbero essere sbagliati. Questo potrebbe aver causato una parziale installazione dei plugin lasciando il tuo wiki instabile'; $lang['noperms'] = 'La directory Extension non è scrivibile'; $lang['notplperms'] = 'Il modello di cartella non è scrivibile'; $lang['nopluginperms'] = 'La cartella plugin non è scrivibile'; $lang['git'] = 'Questa extension è stata installata da git, potreste non volerla aggiornare qui.'; +$lang['auth'] = 'Questo plugin di autenticazione non è abilitato nella configurazione, considera di disabilitarlo.'; $lang['install_url'] = 'Installa da URL:'; $lang['install_upload'] = 'Caricamento Extension:'; $lang['repo_error'] = 'Il repository dei plugin non può essere raggiunto. Assicuratevi che il vostro server sia abilitato a contattare l\'indirizzo www.dokuwiki.org e controllate le impostazioni del vostro proxy.'; +$lang['nossl'] = 'La tua installazione PHP sembra mancare del supporto SSL. I download per molte estensioni di DokuWiki non funzioneranno.'; diff --git a/sources/lib/plugins/extension/lang/ja/lang.php b/sources/lib/plugins/extension/lang/ja/lang.php index 689a987..6b3ef67 100644 --- a/sources/lib/plugins/extension/lang/ja/lang.php +++ b/sources/lib/plugins/extension/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hideaki SAWADA * @author PzF_X * @author Satoshi Sahara diff --git a/sources/lib/plugins/extension/lang/ko/lang.php b/sources/lib/plugins/extension/lang/ko/lang.php index 31b230b..50ec739 100644 --- a/sources/lib/plugins/extension/lang/ko/lang.php +++ b/sources/lib/plugins/extension/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Young gon Cha * @author Myeongjin * @author hyeonsoft diff --git a/sources/lib/plugins/extension/lang/nl/lang.php b/sources/lib/plugins/extension/lang/nl/lang.php index ead2d9e..4fe8359 100644 --- a/sources/lib/plugins/extension/lang/nl/lang.php +++ b/sources/lib/plugins/extension/lang/nl/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Rene * @author Gerrit Uitslag * @author Johan Vervloet @@ -39,7 +39,7 @@ $lang['search_for'] = 'Zoek Uitbreiding:'; $lang['search'] = 'Zoek'; $lang['extensionby'] = '%s by %s'; $lang['screenshot'] = 'Schermafdruk bij %s'; -$lang['popularity'] = 'Populariteit:%s%%'; +$lang['popularity'] = 'Populariteit: %s%%'; $lang['homepage_link'] = 'Documentatie'; $lang['bugs_features'] = 'Bugs'; $lang['tags'] = 'Tags:'; @@ -82,7 +82,7 @@ $lang['missing_dependency'] = 'niet aanwezige of uitgeschakelde afhan $lang['security_issue'] = 'Veiligheids kwestie: %s'; $lang['security_warning'] = 'Veiligheids Waarschuwing %s'; $lang['update_available'] = 'Update: Nieuwe versie %s is beschikbaar.'; -$lang['wrong_folder'] = 'Plugin onjuist geïnstalleerd: Hernoem de plugin directory van "%s" naar"%s"'; +$lang['wrong_folder'] = 'Plugin onjuist geïnstalleerd: Hernoem de plugin directory van "%s" naar "%s"'; $lang['url_change'] = 'URL gewijzigd: Download URL is gewijzigd sinds de laatste download. Controleer of de nieuwe URL juist is voordat u de uitbreiding updatet.
      Nieuw:%s
      Vorig: %s'; $lang['error_badurl'] = 'URLs moeten beginnen met http of https'; $lang['error_dircreate'] = 'De tijdelijke map kon niet worden gemaakt om de download te ontvangen'; diff --git a/sources/lib/plugins/extension/lang/pt-br/lang.php b/sources/lib/plugins/extension/lang/pt-br/lang.php index 73012f3..ce4c3b8 100644 --- a/sources/lib/plugins/extension/lang/pt-br/lang.php +++ b/sources/lib/plugins/extension/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Felipe Castro * @author Hudson FAS * @author Frederico Gonçalves Guimarães diff --git a/sources/lib/plugins/extension/lang/pt/lang.php b/sources/lib/plugins/extension/lang/pt/lang.php index 1a36b4e..9713f91 100644 --- a/sources/lib/plugins/extension/lang/pt/lang.php +++ b/sources/lib/plugins/extension/lang/pt/lang.php @@ -6,6 +6,7 @@ * @author Guido Salatino * @author Romulo Pereira * @author Paulo Carmino + * @author Alfredo Silva */ $lang['menu'] = 'Gerenciador de Extensões'; $lang['tab_plugins'] = 'Plugins Instalados'; @@ -28,6 +29,9 @@ $lang['btn_install'] = 'Instalar'; $lang['btn_reinstall'] = 'Reinstalar'; $lang['js']['reallydel'] = 'Confirma a desinstalação desta extensão?'; $lang['js']['display_viewoptions'] = 'Ver Opções:'; +$lang['js']['display_enabled'] = 'ativado'; +$lang['js']['display_disabled'] = 'desativado'; +$lang['js']['display_updatable'] = 'atualizável'; $lang['search_for'] = 'Pesquisar Extensão:'; $lang['search'] = 'Pesquisar'; $lang['extensionby'] = '%s by %s'; diff --git a/sources/lib/plugins/extension/lang/ru/intro_install.txt b/sources/lib/plugins/extension/lang/ru/intro_install.txt index 7b8ac66..0c555ae 100644 --- a/sources/lib/plugins/extension/lang/ru/intro_install.txt +++ b/sources/lib/plugins/extension/lang/ru/intro_install.txt @@ -1 +1 @@ -ЗдеÑÑŒ вы можете ÑамоÑтоÑтельно уÑтановить плагины и шаблоны, загрузив их или предоÑтавив прÑмой URL Ð´Ð»Ñ ÑкачиваниÑ. \ No newline at end of file +ЗдеÑÑŒ вы можете ÑамоÑтоÑтельно уÑтановить плагины и шаблоны, загрузив их или предоÑтавив прÑмой URL Ð´Ð»Ñ ÑкачиваниÑ. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/ru/intro_plugins.txt b/sources/lib/plugins/extension/lang/ru/intro_plugins.txt index c5ea9e0..547ca71 100644 --- a/sources/lib/plugins/extension/lang/ru/intro_plugins.txt +++ b/sources/lib/plugins/extension/lang/ru/intro_plugins.txt @@ -1 +1 @@ -Плагины, уÑтановленные в вашей «Докувики». ЗдеÑÑŒ вы можете их включить или выключить, или даже полноÑтью удалить. Также здеÑÑŒ показываютÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²; обÑзательно прочтите документацию плагина перед обновлением. \ No newline at end of file +Плагины, уÑтановленные в вашей «Докувики». ЗдеÑÑŒ вы можете их включить или выключить, или даже полноÑтью удалить. Также здеÑÑŒ показываютÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð²; обÑзательно прочтите документацию плагина перед обновлением. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/ru/intro_search.txt b/sources/lib/plugins/extension/lang/ru/intro_search.txt index 3c16748..609985b 100644 --- a/sources/lib/plugins/extension/lang/ru/intro_search.txt +++ b/sources/lib/plugins/extension/lang/ru/intro_search.txt @@ -1 +1 @@ -Вкладка даёт вам доÑтуп ко вÑем имеющимÑÑ Ñторонним плагинам и шаблонам Ð´Ð»Ñ Â«Ð”Ð¾ÐºÑƒÐ²Ð¸ÐºÐ¸Â». Имейте ввиду, что уÑтановка Ñтороннего кода может предÑтавлÑÑ‚ÑŒ **угрозу безопаÑноÑти,** возможно вам нужно Ñперва прочитать о [[doku>security#plugin_security|безопаÑноÑти плагинов]]. \ No newline at end of file +Вкладка даёт вам доÑтуп ко вÑем имеющимÑÑ Ñторонним плагинам и шаблонам Ð´Ð»Ñ Â«Ð”Ð¾ÐºÑƒÐ²Ð¸ÐºÐ¸Â». Имейте в виду, что уÑтановка Ñтороннего кода может предÑтавлÑÑ‚ÑŒ **угрозу безопаÑноÑти,** возможно вам нужно Ñперва прочитать о [[doku>security#plugin_security|безопаÑноÑти плагинов]]. \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/ru/intro_templates.txt b/sources/lib/plugins/extension/lang/ru/intro_templates.txt index 787b32f..a71ad67 100644 --- a/sources/lib/plugins/extension/lang/ru/intro_templates.txt +++ b/sources/lib/plugins/extension/lang/ru/intro_templates.txt @@ -1 +1 @@ -Шаблоны (темы оформлениÑ), уÑтановленные в вашей «Докувики». Шаблон, который нужно иÑпользовать, выбираетÑÑ Ð² [[?do=admin&page=config|наÑтройках вики]] \ No newline at end of file +Шаблоны (темы оформлениÑ), уÑтановленные в вашей «Докувики». Шаблон, который нужно иÑпользовать, выбираетÑÑ в [[?do=admin&page=config|наÑтройках вики]] \ No newline at end of file diff --git a/sources/lib/plugins/extension/lang/ru/lang.php b/sources/lib/plugins/extension/lang/ru/lang.php index 746af3e..6df783c 100644 --- a/sources/lib/plugins/extension/lang/ru/lang.php +++ b/sources/lib/plugins/extension/lang/ru/lang.php @@ -22,7 +22,7 @@ $lang['alreadydisabled'] = 'Это дополнение уже отклю $lang['pluginlistsaveerror'] = 'Ошибка при Ñохранении ÑпиÑка плагинов'; $lang['unknownauthor'] = 'Ðвтор неизвеÑтен'; $lang['unknownversion'] = 'ВерÑÐ¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна'; -$lang['btn_info'] = 'Отобразить доп. информацию'; +$lang['btn_info'] = 'Подробнее'; $lang['btn_update'] = 'Обновить'; $lang['btn_uninstall'] = 'Удалить'; $lang['btn_enable'] = 'Включить'; @@ -31,40 +31,40 @@ $lang['btn_install'] = 'УÑтановить'; $lang['btn_reinstall'] = 'ПереуÑтановить'; $lang['js']['reallydel'] = 'ДейÑтвительно удалить Ñто дополнение?'; $lang['js']['display_viewoptions'] = 'Показать как:'; -$lang['js']['display_enabled'] = 'включено'; -$lang['js']['display_disabled'] = 'отключено'; +$lang['js']['display_enabled'] = 'включён'; +$lang['js']['display_disabled'] = 'отключён'; $lang['js']['display_updatable'] = 'обновление'; -$lang['search_for'] = 'ПоиÑк дополнениÑ:'; +$lang['search_for'] = 'ПоиÑк дополнениÑ'; $lang['search'] = 'Ðайти'; -$lang['extensionby'] = '%s — %s'; +$lang['extensionby'] = '%s %s'; $lang['screenshot'] = 'Скриншот: %s'; $lang['popularity'] = 'ПопулÑрноÑÑ‚ÑŒ: %s%%'; $lang['homepage_link'] = 'ОпиÑание'; $lang['bugs_features'] = 'Баг-трекер'; $lang['tags'] = 'Метки:'; $lang['author_hint'] = 'Ðайти Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñтого автора'; -$lang['installed'] = 'УÑтановлено:'; -$lang['downloadurl'] = 'Скачать:'; -$lang['repository'] = 'Репозиторий:'; +$lang['installed'] = 'УÑтановлен'; +$lang['downloadurl'] = 'URL ÑкачиваниÑ'; +$lang['repository'] = 'Репозиторий'; $lang['unknown'] = 'неизвеÑтно'; -$lang['installed_version'] = 'УÑÑ‚. верÑиÑ:'; -$lang['install_date'] = 'ПоÑл. обновление:'; -$lang['available_version'] = 'ДоÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ:'; -$lang['compatible'] = 'СовмеÑтим Ñ:'; -$lang['depends'] = 'ЗавиÑит от:'; -$lang['similar'] = 'Похож на:'; -$lang['conflicts'] = 'Конфликтует Ñ:'; +$lang['installed_version'] = 'ВерÑиÑ'; +$lang['install_date'] = 'Обновлено'; +$lang['available_version'] = 'ДоÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ'; +$lang['compatible'] = 'СовмеÑтимоÑÑ‚ÑŒ'; +$lang['depends'] = 'ЗавиÑит от'; +$lang['similar'] = 'Похож на'; +$lang['conflicts'] = 'Конфликтует Ñ'; $lang['donate'] = 'ÐравитÑÑ?'; $lang['donate_action'] = 'Купить автору кофе!'; $lang['repo_retry'] = 'Повторить'; -$lang['provides'] = 'ПредоÑтавлÑет:'; -$lang['status'] = 'СоÑтоÑние:'; -$lang['status_installed'] = 'уÑтановлено'; -$lang['status_not_installed'] = 'не уÑтановлено'; -$lang['status_protected'] = 'защищено'; -$lang['status_enabled'] = 'включено'; -$lang['status_disabled'] = 'отключено'; -$lang['status_unmodifiable'] = 'неизменÑемо'; +$lang['provides'] = 'ПредоÑтавлÑет'; +$lang['status'] = 'СтатуÑ'; +$lang['status_installed'] = 'уÑтановлен'; +$lang['status_not_installed'] = 'не уÑтановлен'; +$lang['status_protected'] = 'защищён'; +$lang['status_enabled'] = 'включён'; +$lang['status_disabled'] = 'отключён'; +$lang['status_unmodifiable'] = 'неизменÑем'; $lang['status_plugin'] = 'плагин'; $lang['status_template'] = 'шаблон'; $lang['status_bundled'] = 'в комплекте'; @@ -82,19 +82,19 @@ $lang['security_issue'] = 'Проблема безопаÑÐ½Ð¾Ñ $lang['security_warning'] = 'Предупреждение безопаÑноÑти: %s'; $lang['update_available'] = 'Обновление: доÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ %s'; $lang['wrong_folder'] = 'Плагин уÑтановлен неправильно: переименуйте директорию плагина из %s в %s'; -$lang['url_change'] = 'СÑылка изменилаÑÑŒ: ÑÑылка Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ изменилаÑÑŒ Ñ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³Ð¾ раза. Проверьте новую ÑÑылку прежде, чем обновлÑÑ‚ÑŒ дополнение.
      ÐоваÑ: %s
      СтараÑ: %s'; -$lang['error_badurl'] = 'СÑылка должна начинатьÑÑ Ñ http или https'; +$lang['url_change'] = 'СÑылка изменилаÑÑŒ: ÑÑылка Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ изменилаÑÑŒ Ѡпрошлого раза. Проверьте новую ÑÑылку прежде, чем обновлÑÑ‚ÑŒ дополнение.
      ÐоваÑ: %s
      СтараÑ: %s'; +$lang['error_badurl'] = 'СÑылка должна начинатьÑÑ Ñ http или https'; $lang['error_dircreate'] = 'Ðе удалоÑÑŒ Ñоздать временную директорию Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸'; $lang['error_download'] = 'Ðе удалоÑÑŒ загрузить файл: %s'; -$lang['error_decompress'] = 'Ðе удалоÑÑŒ раÑпаковать загруженный файл. Возможно, файл был повреждён при загрузке — тогда нужно попробовать ещё раз. Либо неизвеÑтен формат архива — тогда загрузку и уÑтановку надо произвеÑти вручную'; -$lang['error_findfolder'] = 'Ðе удалоÑÑŒ определить директорию Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ, загрузку и уÑтановку надо произвеÑти вручную.'; -$lang['error_copy'] = 'Возникла ошибка ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² в директорию %s: возможно, диÑк переполнен, или неверно выÑтавлены права доÑтупа. Это могло привеÑти к неполной уÑтановке плагина и нарушить работу вашей вики.'; -$lang['noperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¹ не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; -$lang['notplperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð² не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; -$lang['nopluginperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² не доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; +$lang['error_decompress'] = 'Ðе удалоÑÑŒ раÑпаковать загруженный файл. Возможно, файл был повреждён при загрузке — тогда нужно попробовать ещё раз. Либо неизвеÑтен формат архива — тогда загрузку и уÑтановку надо произвеÑти вручную'; +$lang['error_findfolder'] = 'Ðе удалоÑÑŒ определить директорию Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ, загрузку и уÑтановку надо произвеÑти вручную.'; +$lang['error_copy'] = 'Возникла ошибка ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² в директорию %s: возможно, диÑк переполнен, или неверно выÑтавлены права доÑтупа. Это могло привеÑти к неполной уÑтановке плагина и нарушить работу вашей вики.'; +$lang['noperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ð¹ недоÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; +$lang['notplperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð² недоÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; +$lang['nopluginperms'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² недоÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи'; $lang['git'] = 'Это дополнение было уÑтановлено через git. Ð’Ñ‹ не можете обновить его тут.'; -$lang['auth'] = 'Этот auth плагин не включен в конфигурации, подумайте о его отключении'; -$lang['install_url'] = 'УÑтановить Ñ Ð°Ð´Ñ€ÐµÑа:'; -$lang['install_upload'] = 'Скачать дополнение:'; -$lang['repo_error'] = 'Сайт Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°Ð¼Ð¸ недоÑтупен. УбедитеÑÑŒ, что у Ñайта еÑÑ‚ÑŒ доÑтуп на www.dokuwiki.org и также проверьте наÑтройки ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾ÐºÑи.'; -$lang['nossl'] = 'Ваша PHP ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ имеет SSL поддержки. Это поломает Ñкачивание Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¸Ñ… DokuWiki плагинов и дополнений.'; +$lang['auth'] = 'Этот auth-плагин не включён в конфигурации, подумайте об его отключении'; +$lang['install_url'] = 'УÑтановить Ñ Ð°Ð´Ñ€ÐµÑа'; +$lang['install_upload'] = 'Загрузить дополнение'; +$lang['repo_error'] = 'Сайт Ñ плагинами недоÑтупен. УбедитеÑÑŒ, что у Ñайта еÑÑ‚ÑŒ доÑтуп на www.dokuwiki.org, а также проверьте наÑтройки ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾ÐºÑи.'; +$lang['nossl'] = 'Ваша PHP-ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ имеет SSL-поддержки. Это нарушит Ñкачивание Ð´Ð»Ñ Ð¼Ð½Ð¾Ð³Ð¸Ñ… дополнений.'; diff --git a/sources/lib/plugins/extension/lang/sk/lang.php b/sources/lib/plugins/extension/lang/sk/lang.php index d00c2e3..286c932 100644 --- a/sources/lib/plugins/extension/lang/sk/lang.php +++ b/sources/lib/plugins/extension/lang/sk/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Martin Michalek */ $lang['tab_plugins'] = 'InÅ¡talované pluginy'; diff --git a/sources/lib/plugins/extension/lang/zh-tw/lang.php b/sources/lib/plugins/extension/lang/zh-tw/lang.php index 79657ff..c5b1e6d 100644 --- a/sources/lib/plugins/extension/lang/zh-tw/lang.php +++ b/sources/lib/plugins/extension/lang/zh-tw/lang.php @@ -6,6 +6,7 @@ * @author Stan * @author June-Hao Hou * @author lioujheyu + * @author Liou, Jhe-Yu */ $lang['menu'] = '延伸功能管ç†'; $lang['tab_plugins'] = '已安è£å¤–掛'; @@ -27,6 +28,9 @@ $lang['btn_disable'] = 'åœç”¨'; $lang['btn_install'] = '安è£'; $lang['btn_reinstall'] = 'é‡æ–°å®‰è£'; $lang['js']['reallydel'] = '確定è¦ç§»é™¤æ­¤å»¶ä¼¸åŠŸèƒ½ï¼Ÿ'; +$lang['js']['display_enabled'] = '啟用'; +$lang['js']['display_disabled'] = 'ç¦ç”¨'; +$lang['js']['display_updatable'] = 'å¯æ›´æ–°'; $lang['search_for'] = 'æœå°‹å»¶ä¼¸åŠŸèƒ½ï¼š'; $lang['search'] = 'æœå°‹'; $lang['homepage_link'] = '文件'; @@ -58,6 +62,7 @@ $lang['status_bundled'] = '已綑ç¶å…§é™„'; $lang['msg_enabled'] = '外掛 %s 已啟用'; $lang['msg_disabled'] = '外掛 %s å·²ç¦ç”¨'; $lang['msg_delete_success'] = '附加元件已移除'; +$lang['msg_delete_failed'] = 'è§£é™¤å®‰è£ %s 失敗'; $lang['msg_template_install_success'] = 'æ¨¡æ¿ %s 以æˆåŠŸå®‰è£'; $lang['msg_template_update_success'] = 'æ¨¡æ¿ %s 以æˆåŠŸæ›´æ–°'; $lang['msg_plugin_install_success'] = '外掛 %s 以æˆåŠŸå®‰è£'; @@ -69,6 +74,7 @@ $lang['security_warning'] = '安全å•é¡Œè­¦å‘Š: %s'; $lang['update_available'] = 'æ›´æ–°: å·²å¯å–å¾— %s 的新版本'; $lang['wrong_folder'] = '外掛安è£ä¸æ­£ç¢º: 將外掛資料夾從 "%s" æ›´å至 "%s"。'; $lang['url_change'] = '網å€å·²è®Šæ›´: 自從上次下載後下載網å€å·²è®Šæ›´ã€‚在更新延伸功能å‰è«‹å…ˆæª¢æŸ¥æ–°ç¶²å€æ˜¯å¦å¯ç”¨ã€‚
      æ–°: %s
      舊: %s'; +$lang['error_dircreate'] = '無法建立暫存目錄以接收下載檔案'; $lang['error_download'] = '無法下載檔案：%s'; $lang['error_decompress'] = '無法解壓縮檔案。這å¯èƒ½æ˜¯ä¸‹è¼‰å“質ä¸ä½³æ‰€è‡´ï¼Œåœ¨é€™å€‹æƒ…æ³ä¸‹ä½ æ‡‰è©²å†è©¦ä¸€æ¬¡ï¼›ä¹Ÿæœ‰å¯èƒ½æ˜¯å› ç‚ºç„¡æ³•è¾¨è­˜çš„壓縮格å¼ï¼Œåœ¨é€™å€‹æƒ…æ³ä¸‹ä½ æ‡‰è©²è‡ªè¡Œä¸‹è¼‰ä¸¦æ‰‹å‹•å®‰è£'; $lang['error_findfolder'] = '無法辨èªå»¶ä¼¸åŠŸèƒ½è³‡æ–™å¤¾ï¼Œä½ å¿…須自行下載並手動安è£'; diff --git a/sources/lib/plugins/extension/lang/zh/lang.php b/sources/lib/plugins/extension/lang/zh/lang.php index 62d54c1..f07bee0 100644 --- a/sources/lib/plugins/extension/lang/zh/lang.php +++ b/sources/lib/plugins/extension/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Cupen * @author xiqingongzi * @author qinghao diff --git a/sources/lib/plugins/extension/script.js b/sources/lib/plugins/extension/script.js index 0c43de6..8627db4 100644 --- a/sources/lib/plugins/extension/script.js +++ b/sources/lib/plugins/extension/script.js @@ -72,7 +72,7 @@ jQuery(function(){ .removeAttr('disabled') .removeClass('disable') .removeClass('enable') - .val(data.label) + .text(data.label) .addClass(data.reverse) .parents('li') .removeClass('disabled') @@ -116,18 +116,30 @@ jQuery(function(){ if ( $extmgr.find('.plugins, .templates').hasClass('active') ) { var $extlist = jQuery('#extension__list'); $extlist.addClass('hasDisplayOptions'); - var $displayOpts = jQuery('

      ', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' )); + var $displayOpts = jQuery('

      ', { id: 'extension__viewoptions'} ).appendTo($extmgr.find( '.panelHeader' )); $displayOpts.append(LANG.plugins.extension.display_viewoptions); var displayOptionsHandler = function(){ $extlist.toggleClass( this.name ); + DokuCookie.setValue('ext_'+this.name, $extlist.hasClass(this.name) ? '1' : '0'); }; jQuery(['enabled', 'disabled', 'updatable']).each(function(index, chkName){ - var $label = jQuery( '' ).appendTo($displayOpts); - jQuery( '', { type: 'checkbox', name: chkName }).change(displayOptionsHandler).appendTo($label).click(); - jQuery( '' ).append(' '+LANG.plugins.extension['display_'+chkName]).appendTo($label); + var $label = jQuery( '' ) + .appendTo($displayOpts); + var $input = jQuery( '', { type: 'checkbox', name: chkName }) + .change(displayOptionsHandler) + .appendTo($label); + + var previous = DokuCookie.getValue('ext_'+chkName); + if(typeof previous === "undefined" || previous == '1') { + $input.click(); + } + + jQuery( '' ) + .append(' '+LANG.plugins.extension['display_'+chkName]) + .appendTo($label); }); } }); diff --git a/sources/lib/plugins/extension/style.less b/sources/lib/plugins/extension/style.less index 38e6320..261fa1c 100644 --- a/sources/lib/plugins/extension/style.less +++ b/sources/lib/plugins/extension/style.less @@ -31,8 +31,6 @@ img { box-shadow: 0 0 25px #111; - -webkit-box-shadow: 0 0 25px #111; - -moz-box-shadow: 0 0 25px #111; max-width: 90%; max-height: 90%; } diff --git a/sources/lib/plugins/gallery/README b/sources/lib/plugins/gallery/README deleted file mode 100644 index f003735..0000000 --- a/sources/lib/plugins/gallery/README +++ /dev/null @@ -1,25 +0,0 @@ -gallery Plugin for DokuWiki - -All documentation for this plugin can be found at -http://www.dokuwiki.org/plugin:gallery - -If you install this plugin manually, make sure it is installed in -lib/plugins/gallery/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - ----- -Copyright (C) Andreas Gohr - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/sources/lib/plugins/gallery/all.less b/sources/lib/plugins/gallery/all.less deleted file mode 100644 index 9bafd7d..0000000 --- a/sources/lib/plugins/gallery/all.less +++ /dev/null @@ -1,30 +0,0 @@ -/* load swipe box */ -@import "swipebox/css/swipebox.less"; - -/* fix image paths */ -#swipebox-slider .slide-loading { - background: url(swipebox/img/loader.gif) no-repeat center center; -} - -#swipebox-prev, -#swipebox-next, -#swipebox-close { - background-image: url(swipebox/img/icons.png); -} - -/* style overrides */ -#swipebox-overlay { - background: rgba(0, 0, 0, 0.95); -} - -#swipebox-top-bar { - div.title { - font-size: 15px; - line-height: 1.5em; - } - div.caption { - font-size: 13px; - line-height: 1.5em; - } - padding: 10px; -} diff --git a/sources/lib/plugins/gallery/conf/default.php b/sources/lib/plugins/gallery/conf/default.php deleted file mode 100644 index f4b511e..0000000 --- a/sources/lib/plugins/gallery/conf/default.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ - -$conf['thumbnail_width'] = 120; -$conf['thumbnail_height'] = 120; -$conf['image_width'] = 800; -$conf['image_height'] = 600; -$conf['cols'] = 5; - -$conf['sort'] = 'file'; -$conf['options'] = 'cache'; diff --git a/sources/lib/plugins/gallery/conf/metadata.php b/sources/lib/plugins/gallery/conf/metadata.php deleted file mode 100644 index fd25663..0000000 --- a/sources/lib/plugins/gallery/conf/metadata.php +++ /dev/null @@ -1,16 +0,0 @@ - - */ - -$meta['thumbnail_width'] = array('numeric'); -$meta['thumbnail_height'] = array('numeric'); -$meta['image_width'] = array('numeric'); -$meta['image_height'] = array('numeric'); -$meta['cols'] = array('numeric'); - -$meta['sort'] = array('multichoice', '_choices' => array('file','mod','date','title')); -$meta['options'] = array('multicheckbox', '_choices' => array('cache','crop','direct','lightbox','random','reverse','showname','showtitle')); - diff --git a/sources/lib/plugins/gallery/deleted.files b/sources/lib/plugins/gallery/deleted.files deleted file mode 100644 index 010a113..0000000 --- a/sources/lib/plugins/gallery/deleted.files +++ /dev/null @@ -1,47 +0,0 @@ -jquery.prettyPhoto.js -prettyPhoto/dark_rounded/btnNext.png -prettyPhoto/dark_rounded/btnPrevious.png -prettyPhoto/dark_rounded/contentPattern.png -prettyPhoto/dark_rounded/default_thumbnail.gif -prettyPhoto/dark_rounded/loader.gif -prettyPhoto/dark_rounded/sprite.png -prettyPhoto/dark_rounded/ -prettyPhoto/dark_square/btnNext.png -prettyPhoto/dark_square/btnPrevious.png -prettyPhoto/dark_square/contentPattern.png -prettyPhoto/dark_square/default_thumbnail.gif -prettyPhoto/dark_square/loader.gif -prettyPhoto/dark_square/sprite.png -prettyPhoto/dark_square/ -prettyPhoto/default/default_thumb.png -prettyPhoto/default/loader.gif -prettyPhoto/default/sprite.png -prettyPhoto/default/sprite_next.png -prettyPhoto/default/sprite_prev.png -prettyPhoto/default/sprite_x.png -prettyPhoto/default/sprite_y.png -prettyPhoto/default/ -prettyPhoto/facebook/btnNext.png -prettyPhoto/facebook/btnPrevious.png -prettyPhoto/facebook/contentPatternBottom.png -prettyPhoto/facebook/contentPatternLeft.png -prettyPhoto/facebook/contentPatternRight.png -prettyPhoto/facebook/contentPatternTop.png -prettyPhoto/facebook/default_thumbnail.gif -prettyPhoto/facebook/loader.gif -prettyPhoto/facebook/sprite.png -prettyPhoto/facebook/ -prettyPhoto/light_rounded/btnNext.png -prettyPhoto/light_rounded/btnPrevious.png -prettyPhoto/light_rounded/default_thumbnail.gif -prettyPhoto/light_rounded/loader.gif -prettyPhoto/light_rounded/sprite.png -prettyPhoto/light_square/btnNext.png -prettyPhoto/light_square/btnPrevious.png -prettyPhoto/light_square/default_thumbnail.gif -prettyPhoto/light_square/loader.gif -prettyPhoto/light_square/sprite.png -prettyPhoto/light_square/ -prettyPhoto/ -screen.css -style.css diff --git a/sources/lib/plugins/gallery/images/blank.gif b/sources/lib/plugins/gallery/images/blank.gif deleted file mode 100644 index 9363639..0000000 Binary files a/sources/lib/plugins/gallery/images/blank.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/close.gif b/sources/lib/plugins/gallery/images/close.gif deleted file mode 100644 index 46abb0a..0000000 Binary files a/sources/lib/plugins/gallery/images/close.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/expand.gif b/sources/lib/plugins/gallery/images/expand.gif deleted file mode 100644 index 26d9ed0..0000000 Binary files a/sources/lib/plugins/gallery/images/expand.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/loading.gif b/sources/lib/plugins/gallery/images/loading.gif deleted file mode 100644 index 83d4d3f..0000000 Binary files a/sources/lib/plugins/gallery/images/loading.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/next.gif b/sources/lib/plugins/gallery/images/next.gif deleted file mode 100644 index 6fca51c..0000000 Binary files a/sources/lib/plugins/gallery/images/next.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/overlay.png b/sources/lib/plugins/gallery/images/overlay.png deleted file mode 100644 index 72b76bb..0000000 Binary files a/sources/lib/plugins/gallery/images/overlay.png and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/overlayie.png b/sources/lib/plugins/gallery/images/overlayie.png deleted file mode 100644 index 43c0747..0000000 Binary files a/sources/lib/plugins/gallery/images/overlayie.png and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/prev.gif b/sources/lib/plugins/gallery/images/prev.gif deleted file mode 100644 index 6901f61..0000000 Binary files a/sources/lib/plugins/gallery/images/prev.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/images/shrink.gif b/sources/lib/plugins/gallery/images/shrink.gif deleted file mode 100644 index ceae8e7..0000000 Binary files a/sources/lib/plugins/gallery/images/shrink.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/lang/ar/lang.php b/sources/lib/plugins/gallery/lang/ar/lang.php deleted file mode 100644 index 6c2b3ef..0000000 --- a/sources/lib/plugins/gallery/lang/ar/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'صÙحات المعرض '; -$lang['js']['addgal'] = 'أض٠نطاق كامعرض '; diff --git a/sources/lib/plugins/gallery/lang/ar/settings.php b/sources/lib/plugins/gallery/lang/ar/settings.php deleted file mode 100644 index d6113cb..0000000 --- a/sources/lib/plugins/gallery/lang/ar/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'عرض الصورة المصغرة'; -$lang['thumbnail_height'] = 'طول الصورة المصغرة '; -$lang['image_width'] = 'عرض الصورة '; -$lang['image_height'] = 'ارتÙاع الصورة '; -$lang['cols'] = 'صورة لكل صÙ'; -$lang['sort'] = 'كي٠تريد ترتيب صورة المعرض '; -$lang['sort_o_file'] = 'ترتيب حسب اسم الملÙ'; -$lang['sort_o_mod'] = 'ترتيب حسب تاريخ الملÙ'; -$lang['sort_o_date'] = 'ترتيب حسب التاريخ المسجل ÙÙŠ تÙاصيل الملÙات'; -$lang['sort_o_title'] = 'ترتيب حسب الاسم المسجل ÙÙŠ تÙاصيل الملÙات'; -$lang['options'] = 'اعدادت اضاÙية للمعرض '; diff --git a/sources/lib/plugins/gallery/lang/ca/lang.php b/sources/lib/plugins/gallery/lang/ca/lang.php deleted file mode 100644 index 2e42315..0000000 --- a/sources/lib/plugins/gallery/lang/ca/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Pàgines de la galeria'; -$lang['js']['addgal'] = 'Afegeix un espai com a galeria'; diff --git a/sources/lib/plugins/gallery/lang/ca/settings.php b/sources/lib/plugins/gallery/lang/ca/settings.php deleted file mode 100644 index 4b93619..0000000 --- a/sources/lib/plugins/gallery/lang/ca/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Amplada de la miniatura'; -$lang['thumbnail_height'] = 'Alçada de la miniatura'; -$lang['image_width'] = 'Amplada de la imatge'; -$lang['image_height'] = 'Alçada de la imatge'; -$lang['cols'] = 'Imatges per fila'; -$lang['sort'] = 'Com ordenar les imatges'; -$lang['sort_o_file'] = 'Ordenar per nom de l\'arxiu'; -$lang['sort_o_mod'] = 'Ordenar per data de l\'arxiu'; -$lang['sort_o_date'] = 'Ordenar per la data de l\'EXIF'; -$lang['sort_o_title'] = 'Ordenar pel títol de l\'EXIF'; -$lang['options'] = 'Opcions predeterminades de galeria adicionals'; diff --git a/sources/lib/plugins/gallery/lang/cs/lang.php b/sources/lib/plugins/gallery/lang/cs/lang.php deleted file mode 100644 index cca690a..0000000 --- a/sources/lib/plugins/gallery/lang/cs/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Stránky galerie:'; -$lang['js']['addgal'] = 'PÅ™idat jmenný prostor jako galerii'; diff --git a/sources/lib/plugins/gallery/lang/cs/settings.php b/sources/lib/plugins/gallery/lang/cs/settings.php deleted file mode 100644 index 13d7ad8..0000000 --- a/sources/lib/plugins/gallery/lang/cs/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Jaroslav Lichtblau - */ -$lang['thumbnail_width'] = 'Šířka náhledu'; -$lang['thumbnail_height'] = 'Výška náhledu'; -$lang['image_width'] = 'Šířka obrázku'; -$lang['image_height'] = 'Výška obrázku'; -$lang['cols'] = 'Obrázků na řádku'; -$lang['sort'] = 'Jak Å™adit obrázky v galerii'; -$lang['sort_o_file'] = 'Å™adit podle jména souboru'; -$lang['sort_o_mod'] = 'Å™adit podle data souboru'; -$lang['sort_o_date'] = 'Å™adit podle EXIF data'; -$lang['sort_o_title'] = 'Å™adit podle EXIF jména'; -$lang['options'] = 'DodateÄná výchozí nastavení galerie'; diff --git a/sources/lib/plugins/gallery/lang/da/lang.php b/sources/lib/plugins/gallery/lang/da/lang.php deleted file mode 100644 index 4d5ce88..0000000 --- a/sources/lib/plugins/gallery/lang/da/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Gallerisider:'; -$lang['js']['addgal'] = 'Tilføj navnerum som galleri'; diff --git a/sources/lib/plugins/gallery/lang/da/settings.php b/sources/lib/plugins/gallery/lang/da/settings.php deleted file mode 100644 index 9ca4ec6..0000000 --- a/sources/lib/plugins/gallery/lang/da/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Miniaturebillede bredde'; -$lang['thumbnail_height'] = 'Miniaturebillede højde'; -$lang['image_width'] = 'Billede bredde'; -$lang['image_height'] = 'Billede højde'; -$lang['cols'] = 'Billeder per række'; -$lang['sort'] = 'Sortér galleribilleder efter'; -$lang['sort_o_file'] = 'sortér efter filnavn'; -$lang['sort_o_mod'] = 'sortér efter fildato'; -$lang['sort_o_date'] = 'sortér efter EXIF dato'; -$lang['sort_o_title'] = 'sortér efter EXIF titel'; -$lang['options'] = 'Yderligere galleri-standardindstillinger'; diff --git a/sources/lib/plugins/gallery/lang/de/lang.php b/sources/lib/plugins/gallery/lang/de/lang.php deleted file mode 100644 index 8cb07dd..0000000 --- a/sources/lib/plugins/gallery/lang/de/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Gallerie-Seiten:'; -$lang['js']['addgal'] = 'Namensraum als Gallerie hinzufügen'; diff --git a/sources/lib/plugins/gallery/lang/de/settings.php b/sources/lib/plugins/gallery/lang/de/settings.php deleted file mode 100644 index bb8ffc0..0000000 --- a/sources/lib/plugins/gallery/lang/de/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Vorschaubildbreite'; -$lang['thumbnail_height'] = 'Vorschaubildhöhe'; -$lang['image_width'] = 'Bildbreite'; -$lang['image_height'] = 'Bildhöhe'; -$lang['cols'] = 'Bilder pro Zeile'; -$lang['sort'] = 'Sortierung der Galleriebilder'; -$lang['sort_o_file'] = 'nach Dateiname sortieren'; -$lang['sort_o_mod'] = 'nach Dateidatum sortieren'; -$lang['sort_o_date'] = 'nach EXIF-Datum sortieren'; -$lang['sort_o_title'] = 'nach EXIF-Titel sortieren'; -$lang['options'] = 'Zusätzliche Gallerie Standard-Einstellungen'; diff --git a/sources/lib/plugins/gallery/lang/en/lang.php b/sources/lib/plugins/gallery/lang/en/lang.php deleted file mode 100644 index 85df9a3..0000000 --- a/sources/lib/plugins/gallery/lang/en/lang.php +++ /dev/null @@ -1,4 +0,0 @@ - - * @author Andreas Gohr - */ - -$lang['thumbnail_width'] = 'Thumbnail image width'; -$lang['thumbnail_height'] = 'Thumbnail image height'; -$lang['image_width'] = 'Image width'; -$lang['image_height'] = 'Image height'; -$lang['cols'] = 'Images per row'; - -$lang['sort'] = 'How to sort the gallery images'; -$lang['sort_o_file'] = 'sort by filename'; -$lang['sort_o_mod'] = 'sort by file date'; -$lang['sort_o_date'] = 'sort by EXIF date'; -$lang['sort_o_title'] = 'sort by EXIF title'; - -$lang['options'] = 'Additional gallery default options'; - diff --git a/sources/lib/plugins/gallery/lang/eo/lang.php b/sources/lib/plugins/gallery/lang/eo/lang.php deleted file mode 100644 index 7f648cf..0000000 --- a/sources/lib/plugins/gallery/lang/eo/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'GaleripaÄoj:'; -$lang['js']['addgal'] = 'Aldoni nomspacon kiel galerio'; diff --git a/sources/lib/plugins/gallery/lang/eo/settings.php b/sources/lib/plugins/gallery/lang/eo/settings.php deleted file mode 100644 index 7d26c30..0000000 --- a/sources/lib/plugins/gallery/lang/eo/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Bildeta larÄeco'; -$lang['thumbnail_height'] = 'Bildeta alteco'; -$lang['image_width'] = 'BildlarÄeco'; -$lang['image_height'] = 'Bildalteco'; -$lang['cols'] = 'Bildoj po vico'; -$lang['sort'] = 'Kiel ordigi la galeribildojn'; -$lang['sort_o_file'] = 'ordigi per dosier-nomo'; -$lang['sort_o_mod'] = 'ordigi per dosier-dato'; -$lang['sort_o_date'] = 'ordigi per EXIF-dato'; -$lang['sort_o_title'] = 'ordigi per EXIF-titolo'; -$lang['options'] = 'Aldonaj galeriaj standardaj opcioj'; diff --git a/sources/lib/plugins/gallery/lang/es/lang.php b/sources/lib/plugins/gallery/lang/es/lang.php deleted file mode 100644 index 8de8a56..0000000 --- a/sources/lib/plugins/gallery/lang/es/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - * @author Domingo Redal - */ -$lang['pages'] = 'Páginas de Galería'; -$lang['js']['addgal'] = 'Añadir espacio de nombres de galería'; diff --git a/sources/lib/plugins/gallery/lang/es/settings.php b/sources/lib/plugins/gallery/lang/es/settings.php deleted file mode 100644 index 393e24a..0000000 --- a/sources/lib/plugins/gallery/lang/es/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Domingo Redal - */ -$lang['thumbnail_width'] = 'Ancho de la miniatura de la imagen'; -$lang['thumbnail_height'] = 'Alto de la miniatura de la imagen'; -$lang['image_width'] = 'Ancho de la imagen'; -$lang['image_height'] = 'Alto de la imagen'; -$lang['cols'] = 'Imágenes por fila'; -$lang['sort'] = 'Como ordenar las imágenes de la galería'; -$lang['sort_o_file'] = 'ordenar por nombre de archivo'; -$lang['sort_o_mod'] = 'ordenar por fecha de archivo'; -$lang['sort_o_date'] = 'ordenar por fecha EXIF'; -$lang['sort_o_title'] = 'ordenar por titulo EXIF'; -$lang['options'] = 'Opciones predeterminadas adicionales de la galería'; diff --git a/sources/lib/plugins/gallery/lang/fr/lang.php b/sources/lib/plugins/gallery/lang/fr/lang.php deleted file mode 100644 index 8b58603..0000000 --- a/sources/lib/plugins/gallery/lang/fr/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - * @author NicolasFriedli - * @author Schplurtz le Déboulonné - */ -$lang['pages'] = 'Pages galerie:'; -$lang['js']['addgal'] = 'Utiliser cette catégorie comme galerie'; diff --git a/sources/lib/plugins/gallery/lang/fr/settings.php b/sources/lib/plugins/gallery/lang/fr/settings.php deleted file mode 100644 index 504b2cd..0000000 --- a/sources/lib/plugins/gallery/lang/fr/settings.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @author Emmanuel Dupin - * @author NicolasFriedli - */ -$lang['thumbnail_width'] = 'Largeur des miniatures'; -$lang['thumbnail_height'] = 'Hauteur des miniatures'; -$lang['image_width'] = 'Largeur des images'; -$lang['image_height'] = 'Hauteur des images'; -$lang['cols'] = 'Nombre d\'images par ligne'; -$lang['sort'] = 'Critère de tri des images'; -$lang['sort_o_file'] = 'trier par nom du fichier'; -$lang['sort_o_mod'] = 'trier par date de modification du fichier'; -$lang['sort_o_date'] = 'trier par date EXIF'; -$lang['sort_o_title'] = 'trier par titre EXIF'; -$lang['options'] = 'Options par défaut supplémentaires'; diff --git a/sources/lib/plugins/gallery/lang/hu/lang.php b/sources/lib/plugins/gallery/lang/hu/lang.php deleted file mode 100644 index 5f00fbe..0000000 --- a/sources/lib/plugins/gallery/lang/hu/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Képgaléria oldalai:'; -$lang['js']['addgal'] = 'Névtér hozzáadása képgalériaként'; diff --git a/sources/lib/plugins/gallery/lang/hu/settings.php b/sources/lib/plugins/gallery/lang/hu/settings.php deleted file mode 100644 index 4e11d1b..0000000 --- a/sources/lib/plugins/gallery/lang/hu/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Bélyegkép szélessége'; -$lang['thumbnail_height'] = 'Bélyegkép magassága'; -$lang['image_width'] = 'Képszélesség'; -$lang['image_height'] = 'Képmagasság'; -$lang['cols'] = 'Képek száma soronként'; -$lang['sort'] = 'Galériaképek rendezése'; -$lang['sort_o_file'] = 'Fájlok neve szerint'; -$lang['sort_o_mod'] = 'Fájlok dátuma szerint'; -$lang['sort_o_date'] = 'EXIF-dátum szerint'; -$lang['sort_o_title'] = 'EXIF-cím szerint'; -$lang['options'] = 'További alapértelmezett beállítások'; diff --git a/sources/lib/plugins/gallery/lang/it/settings.php b/sources/lib/plugins/gallery/lang/it/settings.php deleted file mode 100644 index d5d367a..0000000 --- a/sources/lib/plugins/gallery/lang/it/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @author Diego Pierotto - */ - -$lang['thumbnail_width'] = 'Larghezza immagine anteprima'; -$lang['thumbnail_height'] = 'Altezza immagine anteprima'; -$lang['image_width'] = 'Larghezza immagine'; -$lang['image_height'] = 'Altezza immagine'; -$lang['cols'] = 'Immagini per riga'; -$lang['direct'] = 'Collegamento direct'; -$lang['lightbox'] = 'Utilizza Lightbox (implica il collegamento diretto)'; -$lang['showname'] = 'Mostra nome file immagine'; -$lang['reverse'] = 'Inverti ordine'; -$lang['js_ok'] = 'Allow javascript urls'; diff --git a/sources/lib/plugins/gallery/lang/ja/lang.php b/sources/lib/plugins/gallery/lang/ja/lang.php deleted file mode 100644 index 734ad14..0000000 --- a/sources/lib/plugins/gallery/lang/ja/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'ギャラリー・ページ'; -$lang['js']['addgal'] = 'åå‰ç©ºé–“ã®è¿½åŠ '; diff --git a/sources/lib/plugins/gallery/lang/ja/settings.php b/sources/lib/plugins/gallery/lang/ja/settings.php deleted file mode 100644 index d7af76e..0000000 --- a/sources/lib/plugins/gallery/lang/ja/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'サムãƒã‚¤ãƒ«ç”»åƒã®å¹…'; -$lang['thumbnail_height'] = 'サムãƒã‚¤ãƒ«ç”»åƒã®é«˜ã•'; -$lang['image_width'] = 'ç”»åƒã®å¹…'; -$lang['image_height'] = 'ç”»åƒã®é«˜ã•'; -$lang['cols'] = '一行ã®ç”»åƒæ•°'; -$lang['sort'] = 'ç”»åƒã®ã‚½ãƒ¼ãƒˆæ–¹æ³•'; -$lang['sort_o_file'] = 'ファイルåé †'; -$lang['sort_o_mod'] = 'ファイル日付順'; -$lang['sort_o_date'] = 'EXIF日付順'; -$lang['sort_o_title'] = 'EXIFタイトル順'; -$lang['options'] = 'デフォルトã«è¿½åŠ ã™ã‚‹ã‚®ãƒ£ãƒ©ãƒªãƒ¼ã®ã‚ªãƒ—ション'; diff --git a/sources/lib/plugins/gallery/lang/ko/lang.php b/sources/lib/plugins/gallery/lang/ko/lang.php deleted file mode 100644 index aadb882..0000000 --- a/sources/lib/plugins/gallery/lang/ko/lang.php +++ /dev/null @@ -1,8 +0,0 @@ - - * @author Andreas Gohr - * @author SC Yoo - * @author Myeongjin - */ -$lang['thumbnail_width'] = 'ì„¬ë„¤ì¼ ê·¸ë¦¼ 너비'; -$lang['thumbnail_height'] = 'ì„¬ë„¤ì¼ ê·¸ë¦¼ 높ì´'; -$lang['image_width'] = '그림 너비'; -$lang['image_height'] = '그림 높ì´'; -$lang['cols'] = '열당 그림 수'; -$lang['sort'] = '갤러리 그림 ì •ë ¬ 방법'; -$lang['sort_o_file'] = 'íŒŒì¼ ì´ë¦„ 순서로 ì •ë ¬'; -$lang['sort_o_mod'] = 'íŒŒì¼ ë‚ ì§œ 순서로 ì •ë ¬'; -$lang['sort_o_date'] = 'EXIF 날짜 순서로 ì •ë ¬'; -$lang['sort_o_title'] = 'EXIF 제목 순서로 ì •ë ¬'; -$lang['options'] = '추가ì ì¸ 갤러리 기본 설정'; diff --git a/sources/lib/plugins/gallery/lang/nl/lang.php b/sources/lib/plugins/gallery/lang/nl/lang.php deleted file mode 100644 index 7703677..0000000 --- a/sources/lib/plugins/gallery/lang/nl/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Beeldreeks pagina\'s:'; -$lang['js']['addgal'] = 'Voeg naamruimte toe als beeldreeks'; diff --git a/sources/lib/plugins/gallery/lang/nl/settings.php b/sources/lib/plugins/gallery/lang/nl/settings.php deleted file mode 100644 index f1cd4de..0000000 --- a/sources/lib/plugins/gallery/lang/nl/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Breedte van het miniatuur beeld'; -$lang['thumbnail_height'] = 'Hoogte van het miniatuur beeld'; -$lang['image_width'] = 'Beeld breedte'; -$lang['image_height'] = 'Beeld hoogte'; -$lang['cols'] = 'Aantal beelden per rij'; -$lang['sort'] = 'Hoe de beeldreeks sorteren'; -$lang['sort_o_file'] = 'sorteren op bestandsnaam'; -$lang['sort_o_mod'] = 'sorteren op bestandsdatum'; -$lang['sort_o_date'] = 'sorteren op EXIF datum'; -$lang['sort_o_title'] = 'sorteren op EXIF titel'; -$lang['options'] = 'Bijkomende beeldreeks verstek opties'; diff --git a/sources/lib/plugins/gallery/lang/no/lang.php b/sources/lib/plugins/gallery/lang/no/lang.php deleted file mode 100644 index 40683a8..0000000 --- a/sources/lib/plugins/gallery/lang/no/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Bildesider:'; -$lang['js']['addgal'] = 'Navnerom som bildearkiv'; diff --git a/sources/lib/plugins/gallery/lang/no/settings.php b/sources/lib/plugins/gallery/lang/no/settings.php deleted file mode 100644 index 0e0bb6a..0000000 --- a/sources/lib/plugins/gallery/lang/no/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Miniatyrbilde bredde'; -$lang['thumbnail_height'] = 'Miniatyrbilde høyde'; -$lang['image_width'] = 'Bildebredde'; -$lang['image_height'] = 'Bildehøyde'; -$lang['cols'] = 'Bilder pr. rad'; -$lang['sort'] = 'Sortering av bildene'; -$lang['sort_o_file'] = 'sorter etter filnavn'; -$lang['sort_o_mod'] = 'sorter etter fildato'; -$lang['sort_o_date'] = 'sorter etter EXIF dato'; -$lang['sort_o_title'] = 'sorter etter EXIT tittel'; -$lang['options'] = 'Andre standardvalg for bildearkivet'; diff --git a/sources/lib/plugins/gallery/lang/pt-br/lang.php b/sources/lib/plugins/gallery/lang/pt-br/lang.php deleted file mode 100644 index 2f3d09d..0000000 --- a/sources/lib/plugins/gallery/lang/pt-br/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Páginas da galeria:'; -$lang['js']['addgal'] = 'Adicionar domínio como galeria'; diff --git a/sources/lib/plugins/gallery/lang/pt-br/settings.php b/sources/lib/plugins/gallery/lang/pt-br/settings.php deleted file mode 100644 index c942a47..0000000 --- a/sources/lib/plugins/gallery/lang/pt-br/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Largura da imagem miniatura'; -$lang['thumbnail_height'] = 'Altura da imagem miniatura'; -$lang['image_width'] = 'Largura da imagem'; -$lang['image_height'] = 'Altura da imagem'; -$lang['cols'] = 'Imagens por linha'; -$lang['sort'] = 'Como ordenar as imagens da galeria'; -$lang['sort_o_file'] = 'ordenar por nome do arquivo'; -$lang['sort_o_mod'] = 'ordenar por data do arquivo'; -$lang['sort_o_date'] = 'ordenar por data EXIF'; -$lang['sort_o_title'] = 'ordenar por título EXIF'; -$lang['options'] = 'Opções padrão da galeria adicional'; diff --git a/sources/lib/plugins/gallery/lang/ru/lang.php b/sources/lib/plugins/gallery/lang/ru/lang.php deleted file mode 100644 index 752ca12..0000000 --- a/sources/lib/plugins/gallery/lang/ru/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Страницы галереи:'; -$lang['js']['addgal'] = 'Добавить проÑтранÑтво имён как галерею'; diff --git a/sources/lib/plugins/gallery/lang/ru/settings.php b/sources/lib/plugins/gallery/lang/ru/settings.php deleted file mode 100644 index 1830149..0000000 --- a/sources/lib/plugins/gallery/lang/ru/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Ширина миниатюры изображениÑ'; -$lang['thumbnail_height'] = 'Ð’Ñ‹Ñота миниатюры изображениÑ'; -$lang['image_width'] = 'Ширина изображениÑ'; -$lang['image_height'] = 'Ð’Ñ‹Ñота изображениÑ'; -$lang['cols'] = 'Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² Ñ€Ñд'; -$lang['sort'] = 'Как Ñортировать Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² галерее'; -$lang['sort_o_file'] = 'Ñортировать по имени файла'; -$lang['sort_o_mod'] = 'Ñортировать по дате файла'; -$lang['sort_o_date'] = 'Ñортировать по EXIF-дате'; -$lang['sort_o_title'] = 'Ñортировать по EXIF-заголовку'; -$lang['options'] = 'Дополнительные опции'; diff --git a/sources/lib/plugins/gallery/lang/sk/lang.php b/sources/lib/plugins/gallery/lang/sk/lang.php deleted file mode 100644 index 191afa9..0000000 --- a/sources/lib/plugins/gallery/lang/sk/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'Stránky galérie:'; -$lang['js']['addgal'] = 'Pridaj menný priestor ako galériu'; diff --git a/sources/lib/plugins/gallery/lang/sk/settings.php b/sources/lib/plugins/gallery/lang/sk/settings.php deleted file mode 100644 index 4fe1a3d..0000000 --- a/sources/lib/plugins/gallery/lang/sk/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'Šírka náhľadu'; -$lang['thumbnail_height'] = 'Výška náhľadu'; -$lang['image_width'] = 'Šírka obrázku'; -$lang['image_height'] = 'Výška obrázku'; -$lang['cols'] = 'PoÄet obrázkov na riadok'; -$lang['sort'] = 'Spôsob triedenia obrázkov galérie'; -$lang['sort_o_file'] = 'triedenie podľa mena'; -$lang['sort_o_mod'] = 'triedenie podľa dátumu'; -$lang['sort_o_date'] = 'triedenie podľa EXIF dátumu'; -$lang['sort_o_title'] = 'triedenie podľa EXIF názvu'; -$lang['options'] = 'DodatoÄné imlicitné voľby galérie'; diff --git a/sources/lib/plugins/gallery/lang/ta/lang.php b/sources/lib/plugins/gallery/lang/ta/lang.php deleted file mode 100644 index f28f650..0000000 --- a/sources/lib/plugins/gallery/lang/ta/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = 'பட தொகà¯à®ªà¯à®ªà¯ பகà¯à®•à®™à¯à®•à®³à¯ '; -$lang['js']['addgal'] = 'பட தொகà¯à®ªà¯à®ªà¯ˆ பெயரà¯à®µà¯‡à®³à®¿à®¯à®¾à®• சேர௠'; diff --git a/sources/lib/plugins/gallery/lang/ta/settings.php b/sources/lib/plugins/gallery/lang/ta/settings.php deleted file mode 100644 index 77b50fe..0000000 --- a/sources/lib/plugins/gallery/lang/ta/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = 'சிற௠படதà¯à®¤à®¿à®©à¯ உயரமà¯'; -$lang['thumbnail_height'] = 'சிற௠படதà¯à®¤à®¿à®©à¯ அகலம௠'; -$lang['image_width'] = 'படதà¯à®¤à®¿à®©à¯ அகலமà¯'; -$lang['image_height'] = 'படதà¯à®¤à®¿à®©à¯ உயரமà¯'; -$lang['cols'] = 'ஒர௠வரிசையில௠எதà¯à®¤à®©à¯ˆ படஙà¯à®•à®³à¯ '; -$lang['sort'] = 'இநà¯à®¤ பட தொகà¯à®ªà¯à®ªà¯ˆ எபà¯à®ªà®Ÿà®¿ வகைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®µà®¤à¯ '; -$lang['sort_o_file'] = 'கோபà¯à®ªà®¿à®©à¯ பெயரை வைதà¯à®¤à¯ வகைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ '; -$lang['sort_o_mod'] = 'கோபà¯à®ªà®¿à®©à¯ தேதியை வைதà¯à®¤à¯ வகைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯ '; -$lang['sort_o_date'] = 'EXIF தேதியை வைதà¯à®¤à¯ வகைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯'; -$lang['sort_o_title'] = 'EXIF பெயரை வைதà¯à®¤à¯ வகைபà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯'; -$lang['options'] = 'கூடà¯à®¤à®²à¯ படத௠தொகà¯à®ªà¯à®ªà®¿à®©à¯ à®®à¯à®©à¯à®©à®¿à®°à¯à®ªà¯à®ªà¯ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ '; diff --git a/sources/lib/plugins/gallery/lang/tr/lang.php b/sources/lib/plugins/gallery/lang/tr/lang.php deleted file mode 100644 index 5d294b4..0000000 --- a/sources/lib/plugins/gallery/lang/tr/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - * @author ilker Rifat Kapaç - */ -$lang['pages'] = 'Sergi Sayfaları'; -$lang['js']['addgal'] = 'Ä°simalanını sergi olarak ekle'; diff --git a/sources/lib/plugins/gallery/lang/tr/settings.php b/sources/lib/plugins/gallery/lang/tr/settings.php deleted file mode 100644 index 3e56595..0000000 --- a/sources/lib/plugins/gallery/lang/tr/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author ilker Rifat Kapaç - */ -$lang['thumbnail_width'] = 'Küçük resim geniÅŸliÄŸi'; -$lang['thumbnail_height'] = 'Küçük resim yüksekliÄŸi'; -$lang['image_width'] = 'Resim geniÅŸliÄŸi'; -$lang['image_height'] = 'Resim yüksekliÄŸi'; -$lang['cols'] = 'Satır başına görüntü sayısı'; -$lang['sort'] = 'Sergi resimleri nasıl sıralansın'; -$lang['sort_o_file'] = 'Dosya adına göre sırala'; -$lang['sort_o_mod'] = 'Dosya tarihine göre sıralama'; -$lang['sort_o_date'] = 'EXIF tarihine göre sırala'; -$lang['sort_o_title'] = 'EXIF baÅŸlığına göre sırala'; -$lang['options'] = 'Ä°lave serginin varsayılan seçenekleri'; diff --git a/sources/lib/plugins/gallery/lang/zh-tw/lang.php b/sources/lib/plugins/gallery/lang/zh-tw/lang.php deleted file mode 100644 index 52cec3e..0000000 --- a/sources/lib/plugins/gallery/lang/zh-tw/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = '相簿é ç¢¼'; -$lang['js']['addgal'] = '添加作為相簿的å字空間'; diff --git a/sources/lib/plugins/gallery/lang/zh-tw/settings.php b/sources/lib/plugins/gallery/lang/zh-tw/settings.php deleted file mode 100644 index 7883577..0000000 --- a/sources/lib/plugins/gallery/lang/zh-tw/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = '縮圖的寬度'; -$lang['thumbnail_height'] = '縮圖的高度'; -$lang['image_width'] = '圖åƒå¯¬åº¦'; -$lang['image_height'] = '圖åƒé«˜åº¦'; -$lang['cols'] = 'æ¯ä¸€åˆ—的圖åƒæ•¸'; -$lang['sort'] = '相簿圖åƒè¦å¦‚何排åº?'; -$lang['sort_o_file'] = 'ä¾æª”å排åº'; -$lang['sort_o_mod'] = 'ä¾å»ºæª”日期排åº'; -$lang['sort_o_date'] = 'ä¾EXIF日期排åº'; -$lang['sort_o_title'] = 'ä¾EXIF標題排åº'; -$lang['options'] = 'é¡å¤–的相簿é è¨­é¸é …'; diff --git a/sources/lib/plugins/gallery/lang/zh/lang.php b/sources/lib/plugins/gallery/lang/zh/lang.php deleted file mode 100644 index daf90a9..0000000 --- a/sources/lib/plugins/gallery/lang/zh/lang.php +++ /dev/null @@ -1,9 +0,0 @@ - - */ -$lang['pages'] = '相册页é¢'; -$lang['js']['addgal'] = '将命å空间添加为相册'; diff --git a/sources/lib/plugins/gallery/lang/zh/settings.php b/sources/lib/plugins/gallery/lang/zh/settings.php deleted file mode 100644 index 91f5198..0000000 --- a/sources/lib/plugins/gallery/lang/zh/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['thumbnail_width'] = '缩略图宽度'; -$lang['thumbnail_height'] = '缩略图高度'; -$lang['image_width'] = '图片宽度'; -$lang['image_height'] = '图片高度'; -$lang['cols'] = 'æ¯è¡Œå›¾ç‰‡æ•°'; -$lang['sort'] = '图片排åºæ–¹å¼'; -$lang['sort_o_file'] = '按文件å'; -$lang['sort_o_mod'] = '按文件时间'; -$lang['sort_o_date'] = '按 EXIF 时间'; -$lang['sort_o_title'] = '按 EXIT 标题'; -$lang['options'] = '附加相册默认选项'; diff --git a/sources/lib/plugins/gallery/plugin.info.txt b/sources/lib/plugins/gallery/plugin.info.txt deleted file mode 100644 index e2f0f36..0000000 --- a/sources/lib/plugins/gallery/plugin.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base gallery -author Andreas Gohr -email andi@splitbrain.org -date 2016-01-24 -name Gallery Plugin -desc Creates a gallery of images from a namespace or RSS/ATOM feed -url http://www.dokuwiki.org/plugin:gallery diff --git a/sources/lib/plugins/gallery/screen.less b/sources/lib/plugins/gallery/screen.less deleted file mode 100644 index 9536404..0000000 --- a/sources/lib/plugins/gallery/screen.less +++ /dev/null @@ -1,60 +0,0 @@ -div.dokuwiki div.gallery table { - border: none; -} -div.dokuwiki div.gallery table td { - padding: 1em; - text-align: center; - vertical-align: middle; - border: none; -} - -div.dokuwiki div.gallery table img.tn { - padding: 0.4em; - border: 1px solid __border__; - max-width: none; -} - -div.dokuwiki div.gallery { - clear: left; - margin-bottom: 1em; -} - -/*div.dokuwiki div.gallery div { - * float: left; - * }*/ - -div.dokuwiki div.gallery img.tn { - margin: 9px; - vertical-align: middle; - padding: 0.4em; - border: 1px solid #000; -} - -div.dokuwiki div.gallery_left { - float: left; -} - -div.dokuwiki div.gallery div { - float: left; -} - -div.dokuwiki div.gallery_right { - float: right; -} - -div.dokuwiki div.gallery_center { - margin-left: auto; - margin-right: auto; -} - -div.dokuwiki div.gallery_center { - width: 80%; - text-align: center; -} - -/* for pagination */ -div.dokuwiki div.gallery div.gallery_pages { - float: none; - text-align: left; -} - diff --git a/sources/lib/plugins/gallery/script.js b/sources/lib/plugins/gallery/script.js deleted file mode 100644 index 124eeac..0000000 --- a/sources/lib/plugins/gallery/script.js +++ /dev/null @@ -1,59 +0,0 @@ -/* DOKUWIKI:include_once swipebox/js/jquery.swipebox.js */ - -/** - * Add a quicklink to the media popup - */ -function gallery_plugin(){ - var $opts = jQuery('#media__opts'); - if(!$opts.length) return; - if(!window.opener) return; - - var glbl = document.createElement('label'); - var glnk = document.createElement('a'); - var gbrk = document.createElement('br'); - glnk.name = 'gallery_plugin'; - glnk.innerHTML = LANG.plugins.gallery.addgal; //FIXME localize - glnk.style.cursor = 'pointer'; - - glnk.onclick = function(){ - var $h1 = jQuery('#media__ns'); - if(!$h1.length) return; - var ns = $h1[0].innerHTML; - opener.insertAtCarret('wiki__text','{{gallery>'+ns+'}}'); - if(!dw_mediamanager.keepopen) window.close(); - }; - - $opts[0].appendChild(glbl); - glbl.appendChild(glnk); - $opts[0].appendChild(gbrk); -} - -/** - * Display a selected page and hide all others - */ -function gallery_pageselect(e){ - var galid = e.target.hash.substr(10,4); - var $pages = jQuery('div.gallery__'+galid); - $pages.hide(); - jQuery('#'+e.target.hash.substr(1)).show(); - return false; -} - -// === main === -jQuery(function(){ - // initialize the lightbox mechanism - jQuery("a.lightbox, a[rel^='lightbox']").swipebox({ - loopAtEnd: true - }); - - gallery_plugin(); - - // hide all pages except the first one - var $pages = jQuery('div.gallery_page'); - $pages.hide(); - $pages.eq(0).show(); - - // attach page selector - jQuery('a.gallery_pgsel').click(gallery_pageselect); -}); - diff --git a/sources/lib/plugins/gallery/swipebox/README b/sources/lib/plugins/gallery/swipebox/README deleted file mode 100644 index 48f58e7..0000000 --- a/sources/lib/plugins/gallery/swipebox/README +++ /dev/null @@ -1,6 +0,0 @@ -This is a silightly modified version of the SwipeBox script available at https://github.com/brutaldesign/swipebox.git - -The modfied sources are available at https://github.com/splitbrain/swipebox/tree/dokuwiki - only the src directory is -included here. - -css/swipebox.css has been renamed to css/swipebox.less to work with DokuWiki's less compiler inclusion mechanism diff --git a/sources/lib/plugins/gallery/swipebox/css/swipebox.less b/sources/lib/plugins/gallery/swipebox/css/swipebox.less deleted file mode 100644 index 07ce236..0000000 --- a/sources/lib/plugins/gallery/swipebox/css/swipebox.less +++ /dev/null @@ -1,291 +0,0 @@ -/*! Swipebox v1.3.0 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */ -html.swipebox-html.swipebox-touch { - overflow: hidden !important; -} - -#swipebox-overlay img { - border: none !important; -} - -#swipebox-overlay { - width: 100%; - height: 100%; - position: fixed; - top: 0; - left: 0; - z-index: 99999 !important; - overflow: hidden; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -#swipebox-container { - position: relative; - width: 100%; - height: 100%; -} - -#swipebox-slider { - -webkit-transition: -webkit-transform 0.4s ease; - transition: transform 0.4s ease; - height: 100%; - left: 0; - top: 0; - width: 100%; - white-space: nowrap; - position: absolute; - display: none; - cursor: pointer; -} -#swipebox-slider .slide { - height: 100%; - width: 100%; - line-height: 1px; - text-align: center; - display: inline-block; -} -#swipebox-slider .slide:before { - content: ""; - display: inline-block; - height: 50%; - width: 1px; - margin-right: -1px; -} -#swipebox-slider .slide img, -#swipebox-slider .slide .swipebox-video-container, -#swipebox-slider .slide .swipebox-inline-container { - display: inline-block; - max-height: 100%; - max-width: 100%; - margin: 0; - padding: 0; - width: auto; - height: auto; - vertical-align: middle; -} -#swipebox-slider .slide .swipebox-video-container { - background: none; - max-width: 1140px; - max-height: 100%; - width: 100%; - padding: 5%; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -#swipebox-slider .slide .swipebox-video-container .swipebox-video { - width: 100%; - height: 0; - padding-bottom: 56.25%; - overflow: hidden; - position: relative; -} -#swipebox-slider .slide .swipebox-video-container .swipebox-video iframe { - width: 100% !important; - height: 100% !important; - position: absolute; - top: 0; - left: 0; -} -#swipebox-slider .slide-loading { - background: url(../img/loader.gif) no-repeat center center; -} - -#swipebox-bottom-bar, -#swipebox-top-bar { - -webkit-transition: 0.5s; - transition: 0.5s; - position: absolute; - left: 0; - z-index: 999; - min-height: 50px; - width: 100%; -} - -#swipebox-bottom-bar { - bottom: -50px; -} -#swipebox-bottom-bar.visible-bars { - -webkit-transform: translate3d(0, -50px, 0); - transform: translate3d(0, -50px, 0); -} - -#swipebox-top-bar { - bottom: 100%; -} -#swipebox-top-bar.visible-bars { - -webkit-transform: translate3d(0, 100%, 0); - transform: translate3d(0, 100%, 0); -} - -#swipebox-title { - display: block; - width: 100%; - text-align: center; -} - -#swipebox-prev, -#swipebox-next, -#swipebox-close { - background-image: url(../img/icons.png); - background-repeat: no-repeat; - border: none !important; - text-decoration: none !important; - cursor: pointer; - width: 50px; - height: 50px; - top: 0; -} - -#swipebox-arrows { - display: block; - margin: 0 auto; - width: 100%; - height: 50px; -} - -#swipebox-prev { - background-position: -32px 13px; - float: left; -} - -#swipebox-next { - background-position: -78px 13px; - float: right; -} - -#swipebox-close { - top: 0; - right: 0; - position: absolute; - z-index: 9999; - background-position: 15px 12px; -} - -.swipebox-no-close-button #swipebox-close { - display: none; -} - -#swipebox-prev.disabled, -#swipebox-next.disabled { - opacity: 0.3; -} - -.swipebox-no-touch #swipebox-overlay.rightSpring #swipebox-slider { - -webkit-animation: rightSpring 0.3s; - animation: rightSpring 0.3s; -} -.swipebox-no-touch #swipebox-overlay.leftSpring #swipebox-slider { - -webkit-animation: leftSpring 0.3s; - animation: leftSpring 0.3s; -} - -.swipebox-touch #swipebox-container:before, .swipebox-touch #swipebox-container:after { - -webkit-backface-visibility: hidden; - backface-visibility: hidden; - -webkit-transition: all .3s ease; - transition: all .3s ease; - content: ' '; - position: absolute; - z-index: 999; - top: 0; - height: 100%; - width: 20px; - opacity: 0; -} -.swipebox-touch #swipebox-container:before { - left: 0; - -webkit-box-shadow: inset 10px 0px 10px -8px #656565; - box-shadow: inset 10px 0px 10px -8px #656565; -} -.swipebox-touch #swipebox-container:after { - right: 0; - -webkit-box-shadow: inset -10px 0px 10px -8px #656565; - box-shadow: inset -10px 0px 10px -8px #656565; -} -.swipebox-touch #swipebox-overlay.leftSpringTouch #swipebox-container:before { - opacity: 1; -} -.swipebox-touch #swipebox-overlay.rightSpringTouch #swipebox-container:after { - opacity: 1; -} - -@-webkit-keyframes rightSpring { - 0% { - left: 0; - } - 50% { - left: -30px; - } - 100% { - left: 0; - } -} - -@keyframes rightSpring { - 0% { - left: 0; - } - 50% { - left: -30px; - } - 100% { - left: 0; - } -} -@-webkit-keyframes leftSpring { - 0% { - left: 0; - } - 50% { - left: 30px; - } - 100% { - left: 0; - } -} -@keyframes leftSpring { - 0% { - left: 0; - } - 50% { - left: 30px; - } - 100% { - left: 0; - } -} -@media screen and (min-width: 800px) { - #swipebox-close { - right: 10px; - } - - #swipebox-arrows { - width: 92%; - max-width: 800px; - } -} -/* Skin ---------------------------*/ -#swipebox-overlay { - background: #0d0d0d; -} - -#swipebox-bottom-bar, -#swipebox-top-bar { - text-shadow: 1px 1px 1px black; - background: #000; - opacity: 0.95; -} - -#swipebox-top-bar { - color: white !important; - font-size: 15px; - line-height: 43px; - font-family: Helvetica, Arial, sans-serif; -} -#swipebox-top-bar div.caption { - font-size: 13px; - line-height: 20px; -} diff --git a/sources/lib/plugins/gallery/swipebox/css/swipebox.min.css b/sources/lib/plugins/gallery/swipebox/css/swipebox.min.css deleted file mode 100644 index a500a38..0000000 --- a/sources/lib/plugins/gallery/swipebox/css/swipebox.min.css +++ /dev/null @@ -1 +0,0 @@ -/*! Swipebox v1.3.0 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */html.swipebox-html.swipebox-touch{overflow:hidden!important}#swipebox-overlay img{border:none!important}#swipebox-overlay{width:100%;height:100%;position:fixed;top:0;left:0;z-index:99999!important;overflow:hidden;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#swipebox-container{position:relative;width:100%;height:100%}#swipebox-slider{-webkit-transition:-webkit-transform .4s ease;transition:transform .4s ease;height:100%;left:0;top:0;width:100%;white-space:nowrap;position:absolute;display:none;cursor:pointer}#swipebox-slider .slide{height:100%;width:100%;line-height:1px;text-align:center;display:inline-block}#swipebox-slider .slide:before{content:"";display:inline-block;height:50%;width:1px;margin-right:-1px}#swipebox-slider .slide .swipebox-inline-container,#swipebox-slider .slide .swipebox-video-container,#swipebox-slider .slide img{display:inline-block;max-height:100%;max-width:100%;margin:0;padding:0;width:auto;height:auto;vertical-align:middle}#swipebox-slider .slide .swipebox-video-container{background:0 0;max-width:1140px;max-height:100%;width:100%;padding:5%;-webkit-box-sizing:border-box;box-sizing:border-box}#swipebox-slider .slide .swipebox-video-container .swipebox-video{width:100%;height:0;padding-bottom:56.25%;overflow:hidden;position:relative}#swipebox-slider .slide .swipebox-video-container .swipebox-video iframe{width:100%!important;height:100%!important;position:absolute;top:0;left:0}#swipebox-slider .slide-loading{background:url(../img/loader.gif) center center no-repeat}#swipebox-bottom-bar,#swipebox-top-bar{-webkit-transition:.5s;transition:.5s;position:absolute;left:0;z-index:999;min-height:50px;width:100%}#swipebox-bottom-bar{bottom:-50px}#swipebox-bottom-bar.visible-bars{-webkit-transform:translate3d(0,-50px,0);transform:translate3d(0,-50px,0)}#swipebox-top-bar{bottom:100%}#swipebox-top-bar.visible-bars{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}#swipebox-title{display:block;width:100%;text-align:center}#swipebox-close,#swipebox-next,#swipebox-prev{background-image:url(../img/icons.png);background-repeat:no-repeat;border:none!important;text-decoration:none!important;cursor:pointer;width:50px;height:50px;top:0}#swipebox-arrows{display:block;margin:0 auto;width:100%;height:50px}#swipebox-prev{background-position:-32px 13px;float:left}#swipebox-next{background-position:-78px 13px;float:right}#swipebox-close{top:0;right:0;position:absolute;z-index:9999;background-position:15px 12px}.swipebox-no-close-button #swipebox-close{display:none}#swipebox-next.disabled,#swipebox-prev.disabled{opacity:.3}.swipebox-no-touch #swipebox-overlay.rightSpring #swipebox-slider{-webkit-animation:rightSpring .3s;animation:rightSpring .3s}.swipebox-no-touch #swipebox-overlay.leftSpring #swipebox-slider{-webkit-animation:leftSpring .3s;animation:leftSpring .3s}.swipebox-touch #swipebox-container:after,.swipebox-touch #swipebox-container:before{-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:all .3s ease;transition:all .3s ease;content:' ';position:absolute;z-index:999;top:0;height:100%;width:20px;opacity:0}.swipebox-touch #swipebox-container:before{left:0;-webkit-box-shadow:inset 10px 0 10px -8px #656565;box-shadow:inset 10px 0 10px -8px #656565}.swipebox-touch #swipebox-container:after{right:0;-webkit-box-shadow:inset -10px 0 10px -8px #656565;box-shadow:inset -10px 0 10px -8px #656565}.swipebox-touch #swipebox-overlay.leftSpringTouch #swipebox-container:before,.swipebox-touch #swipebox-overlay.rightSpringTouch #swipebox-container:after{opacity:1}@-webkit-keyframes rightSpring{0%{left:0}50%{left:-30px}100%{left:0}}@keyframes rightSpring{0%{left:0}50%{left:-30px}100%{left:0}}@-webkit-keyframes leftSpring{0%{left:0}50%{left:30px}100%{left:0}}@keyframes leftSpring{0%{left:0}50%{left:30px}100%{left:0}}@media screen and (min-width:800px){#swipebox-close{right:10px}#swipebox-arrows{width:92%;max-width:800px}}#swipebox-overlay{background:#0d0d0d}#swipebox-bottom-bar,#swipebox-top-bar{text-shadow:1px 1px 1px #000;background:#000;opacity:.95}#swipebox-top-bar{color:#fff!important;font-size:15px;line-height:43px;font-family:Helvetica,Arial,sans-serif}#swipebox-top-bar div.caption{font-size:13px;line-height:20px} \ No newline at end of file diff --git a/sources/lib/plugins/gallery/swipebox/img/icons.png b/sources/lib/plugins/gallery/swipebox/img/icons.png deleted file mode 100644 index 7a79f7a..0000000 Binary files a/sources/lib/plugins/gallery/swipebox/img/icons.png and /dev/null differ diff --git a/sources/lib/plugins/gallery/swipebox/img/icons.svg b/sources/lib/plugins/gallery/swipebox/img/icons.svg deleted file mode 100644 index 414e844..0000000 --- a/sources/lib/plugins/gallery/swipebox/img/icons.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/sources/lib/plugins/gallery/swipebox/img/loader.gif b/sources/lib/plugins/gallery/swipebox/img/loader.gif deleted file mode 100644 index a82c2aa..0000000 Binary files a/sources/lib/plugins/gallery/swipebox/img/loader.gif and /dev/null differ diff --git a/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.js b/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.js deleted file mode 100644 index f5e970b..0000000 --- a/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.js +++ /dev/null @@ -1,956 +0,0 @@ -/*! Swipebox v1.4.1 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */ - -;( function ( window, document, $, undefined ) { - - $.swipebox = function( elem, options ) { - - // Default options - var ui, - defaults = { - useCSS : true, - useSVG : true, - initialIndexOnArray : 0, - removeBarsOnMobile : true, - hideCloseButtonOnMobile : false, - hideBarsDelay : 3000, - videoMaxWidth : 1140, - vimeoColor : 'cccccc', - beforeOpen: null, - afterOpen: null, - afterClose: null, - nextSlide: null, - prevSlide: null, - loopAtEnd: false, - autoplayVideos: false, - queryStringData: {}, - toggleClassOnLoad: '', - titleAttribute: 'title', - captionAttribute: 'data-caption' - }, - - plugin = this, - elements = [], // slides array [ { href:'...', title:'...' }, ...], - $elem, - selector = elem.selector, - $selector = $( selector ), - isMobile = navigator.userAgent.match( /(iPad)|(iPhone)|(iPod)|(Android)|(PlayBook)|(BB10)|(BlackBerry)|(Opera Mini)|(IEMobile)|(webOS)|(MeeGo)/i ), - isTouch = isMobile !== null || document.createTouch !== undefined || ( 'ontouchstart' in window ) || ( 'onmsgesturechange' in window ) || navigator.msMaxTouchPoints, - supportSVG = !! document.createElementNS && !! document.createElementNS( 'http://www.w3.org/2000/svg', 'svg').createSVGRect, - winWidth = window.innerWidth ? window.innerWidth : $( window ).width(), - winHeight = window.innerHeight ? window.innerHeight : $( window ).height(), - currentX = 0, - /* jshint multistr: true */ - html = '

      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ -
      \ - \ - \ -
      \ -
      \ - \ -
      \ -
      '; - - plugin.settings = {}; - - $.swipebox.close = function () { - ui.closeSlide(); - }; - - $.swipebox.extend = function () { - return ui; - }; - - plugin.init = function() { - - plugin.settings = $.extend( {}, defaults, options ); - - if ( $.isArray( elem ) ) { - - elements = elem; - ui.target = $( window ); - ui.init( plugin.settings.initialIndexOnArray ); - - } else { - - $( document ).on( 'click', selector, function( event ) { - - // console.log( isTouch ); - - if ( event.target.parentNode.className === 'slide current' ) { - - return false; - } - - if ( ! $.isArray( elem ) ) { - ui.destroy(); - $elem = $( selector ); - ui.actions(); - } - - elements = []; - var index , relType, relVal; - - // Allow for HTML5 compliant attribute before legacy use of rel - if ( ! relVal ) { - relType = 'data-rel'; - relVal = $( this ).attr( relType ); - } - - if ( ! relVal ) { - relType = 'rel'; - relVal = $( this ).attr( relType ); - } - - if ( relVal && relVal !== '' && relVal !== 'nofollow' ) { - $elem = $selector.filter( '[' + relType + '="' + relVal + '"]' ); - } else { - $elem = $( selector ); - } - - $elem.each( function() { - - var title = null, - caption = null, - href = null; - - if ( $( this ).attr( plugin.settings.titleAttribute ) ) { - title = $( this ).attr( plugin.settings.titleAttribute ); - } - - if ( $( this ).attr( plugin.settings.captionAttribute ) ) { - caption = $( this ).attr( plugin.settings.captionAttribute ); - } - - if ( $( this ).attr( 'href' ) ) { - href = $( this ).attr( 'href' ); - } - - elements.push( { - href: href, - title: title, - caption: caption - } ); - } ); - - index = $elem.index( $( this ) ); - event.preventDefault(); - event.stopPropagation(); - ui.target = $( event.target ); - ui.init( index ); - } ); - } - }; - - ui = { - - /** - * Initiate Swipebox - */ - init : function( index ) { - if ( plugin.settings.beforeOpen ) { - plugin.settings.beforeOpen(); - } - this.target.trigger( 'swipebox-start' ); - $.swipebox.isOpen = true; - this.build(); - this.openSlide( index ); - this.openMedia( index ); - this.preloadMedia( index+1 ); - this.preloadMedia( index-1 ); - if ( plugin.settings.afterOpen ) { - plugin.settings.afterOpen(); - } - }, - - /** - * Built HTML containers and fire main functions - */ - build : function () { - var $this = this, bg; - - $( 'body' ).append( html ); - - if ( supportSVG && plugin.settings.useSVG === true ) { - bg = $( '#swipebox-close' ).css( 'background-image' ); - bg = bg.replace( 'png', 'svg' ); - $( '#swipebox-prev, #swipebox-next, #swipebox-close' ).css( { - 'background-image' : bg - } ); - } - - if ( isMobile && plugin.settings.removeBarsOnMobile ) { - $( '#swipebox-bottom-bar, #swipebox-top-bar' ).remove(); - } - - $.each( elements, function() { - $( '#swipebox-slider' ).append( '
      ' ); - } ); - - $this.setDim(); - $this.actions(); - - if ( isTouch ) { - $this.gesture(); - } - - // Devices can have both touch and keyboard input so always allow key events - $this.keyboard(); - - $this.animBars(); - $this.resize(); - - }, - - /** - * Set dimensions depending on windows width and height - */ - setDim : function () { - - var width, height, sliderCss = {}; - - // Reset dimensions on mobile orientation change - if ( 'onorientationchange' in window ) { - - window.addEventListener( 'orientationchange', function() { - if ( window.orientation === 0 ) { - width = winWidth; - height = winHeight; - } else if ( window.orientation === 90 || window.orientation === -90 ) { - width = winHeight; - height = winWidth; - } - }, false ); - - - } else { - - width = window.innerWidth ? window.innerWidth : $( window ).width(); - height = window.innerHeight ? window.innerHeight : $( window ).height(); - } - - sliderCss = { - width : width, - height : height - }; - - $( '#swipebox-overlay' ).css( sliderCss ); - - }, - - /** - * Reset dimensions on window resize envent - */ - resize : function () { - var $this = this; - - $( window ).resize( function() { - $this.setDim(); - } ).resize(); - }, - - /** - * Check if device supports CSS transitions - */ - supportTransition : function () { - - var prefixes = 'transition WebkitTransition MozTransition OTransition msTransition KhtmlTransition'.split( ' ' ), - i; - - for ( i = 0; i < prefixes.length; i++ ) { - if ( document.createElement( 'div' ).style[ prefixes[i] ] !== undefined ) { - return prefixes[i]; - } - } - return false; - }, - - /** - * Check if CSS transitions are allowed (options + devicesupport) - */ - doCssTrans : function () { - if ( plugin.settings.useCSS && this.supportTransition() ) { - return true; - } - }, - - /** - * Touch navigation - */ - gesture : function () { - - var $this = this, - index, - hDistance, - vDistance, - hDistanceLast, - vDistanceLast, - hDistancePercent, - vSwipe = false, - hSwipe = false, - hSwipMinDistance = 10, - vSwipMinDistance = 50, - startCoords = {}, - endCoords = {}, - bars = $( '#swipebox-top-bar, #swipebox-bottom-bar' ), - slider = $( '#swipebox-slider' ); - - bars.addClass( 'visible-bars' ); - $this.setTimeout(); - - $( 'body' ).bind( 'touchstart', function( event ) { - - $( this ).addClass( 'touching' ); - index = $( '#swipebox-slider .slide' ).index( $( '#swipebox-slider .slide.current' ) ); - endCoords = event.originalEvent.targetTouches[0]; - startCoords.pageX = event.originalEvent.targetTouches[0].pageX; - startCoords.pageY = event.originalEvent.targetTouches[0].pageY; - - $( '#swipebox-slider' ).css( { - '-webkit-transform' : 'translate3d(' + currentX +'%, 0, 0)', - 'transform' : 'translate3d(' + currentX + '%, 0, 0)' - } ); - - $( '.touching' ).bind( 'touchmove',function( event ) { - event.preventDefault(); - event.stopPropagation(); - endCoords = event.originalEvent.targetTouches[0]; - - if ( ! hSwipe ) { - vDistanceLast = vDistance; - vDistance = endCoords.pageY - startCoords.pageY; - if ( Math.abs( vDistance ) >= vSwipMinDistance || vSwipe ) { - var opacity = 0.75 - Math.abs(vDistance) / slider.height(); - - slider.css( { 'top': vDistance + 'px' } ); - slider.css( { 'opacity': opacity } ); - - vSwipe = true; - } - } - - hDistanceLast = hDistance; - hDistance = endCoords.pageX - startCoords.pageX; - hDistancePercent = hDistance * 100 / winWidth; - - if ( ! hSwipe && ! vSwipe && Math.abs( hDistance ) >= hSwipMinDistance ) { - $( '#swipebox-slider' ).css( { - '-webkit-transition' : '', - 'transition' : '' - } ); - hSwipe = true; - } - - if ( hSwipe ) { - - // swipe left - if ( 0 < hDistance ) { - - // first slide - if ( 0 === index ) { - // console.log( 'first' ); - $( '#swipebox-overlay' ).addClass( 'leftSpringTouch' ); - } else { - // Follow gesture - $( '#swipebox-overlay' ).removeClass( 'leftSpringTouch' ).removeClass( 'rightSpringTouch' ); - $( '#swipebox-slider' ).css( { - '-webkit-transform' : 'translate3d(' + ( currentX + hDistancePercent ) +'%, 0, 0)', - 'transform' : 'translate3d(' + ( currentX + hDistancePercent ) + '%, 0, 0)' - } ); - } - - // swipe rught - } else if ( 0 > hDistance ) { - - // last Slide - if ( elements.length === index +1 ) { - // console.log( 'last' ); - $( '#swipebox-overlay' ).addClass( 'rightSpringTouch' ); - } else { - $( '#swipebox-overlay' ).removeClass( 'leftSpringTouch' ).removeClass( 'rightSpringTouch' ); - $( '#swipebox-slider' ).css( { - '-webkit-transform' : 'translate3d(' + ( currentX + hDistancePercent ) +'%, 0, 0)', - 'transform' : 'translate3d(' + ( currentX + hDistancePercent ) + '%, 0, 0)' - } ); - } - - } - } - } ); - - return false; - - } ).bind( 'touchend',function( event ) { - event.preventDefault(); - event.stopPropagation(); - - $( '#swipebox-slider' ).css( { - '-webkit-transition' : '-webkit-transform 0.4s ease', - 'transition' : 'transform 0.4s ease' - } ); - - vDistance = endCoords.pageY - startCoords.pageY; - hDistance = endCoords.pageX - startCoords.pageX; - hDistancePercent = hDistance*100/winWidth; - - // Swipe to bottom to close - if ( vSwipe ) { - vSwipe = false; - if ( Math.abs( vDistance ) >= 2 * vSwipMinDistance && Math.abs( vDistance ) > Math.abs( vDistanceLast ) ) { - var vOffset = vDistance > 0 ? slider.height() : - slider.height(); - slider.animate( { top: vOffset + 'px', 'opacity': 0 }, - 300, - function () { - $this.closeSlide(); - } ); - } else { - slider.animate( { top: 0, 'opacity': 1 }, 300 ); - } - - } else if ( hSwipe ) { - - hSwipe = false; - - // swipeLeft - if( hDistance >= hSwipMinDistance && hDistance >= hDistanceLast) { - - $this.getPrev(); - - // swipeRight - } else if ( hDistance <= -hSwipMinDistance && hDistance <= hDistanceLast) { - - $this.getNext(); - } - - } else { // Top and bottom bars have been removed on touchable devices - // tap - if ( ! bars.hasClass( 'visible-bars' ) ) { - $this.showBars(); - $this.setTimeout(); - } else { - $this.clearTimeout(); - $this.hideBars(); - } - } - - $( '#swipebox-slider' ).css( { - '-webkit-transform' : 'translate3d(' + currentX + '%, 0, 0)', - 'transform' : 'translate3d(' + currentX + '%, 0, 0)' - } ); - - $( '#swipebox-overlay' ).removeClass( 'leftSpringTouch' ).removeClass( 'rightSpringTouch' ); - $( '.touching' ).off( 'touchmove' ).removeClass( 'touching' ); - - } ); - }, - - /** - * Set timer to hide the action bars - */ - setTimeout: function () { - if ( plugin.settings.hideBarsDelay > 0 ) { - var $this = this; - $this.clearTimeout(); - $this.timeout = window.setTimeout( function() { - $this.hideBars(); - }, - - plugin.settings.hideBarsDelay - ); - } - }, - - /** - * Clear timer - */ - clearTimeout: function () { - window.clearTimeout( this.timeout ); - this.timeout = null; - }, - - /** - * Show navigation and title bars - */ - showBars : function () { - var bars = $( '#swipebox-top-bar, #swipebox-bottom-bar' ); - bars.addClass( 'visible-bars' ); - }, - - /** - * Hide navigation and title bars - */ - hideBars : function () { - var bars = $( '#swipebox-top-bar, #swipebox-bottom-bar' ); - bars.removeClass( 'visible-bars' ); - }, - - /** - * Animate navigation and top bars - */ - animBars : function () { - var $this = this, - bars = $( '#swipebox-top-bar, #swipebox-bottom-bar' ); - - bars.addClass( 'visible-bars' ); - $this.setTimeout(); - - $( '#swipebox-slider' ).click( function() { - if ( ! bars.hasClass( 'visible-bars' ) ) { - $this.showBars(); - $this.setTimeout(); - } - } ); - - $( '#swipebox-bottom-bar' ).hover( function() { - $this.showBars(); - bars.addClass( 'visible-bars' ); - $this.clearTimeout(); - - }, function() { - if ( plugin.settings.hideBarsDelay > 0 ) { - bars.removeClass( 'visible-bars' ); - $this.setTimeout(); - } - - } ); - }, - - /** - * Keyboard navigation - */ - keyboard : function () { - var $this = this; - $( window ).bind( 'keyup', function( event ) { - event.preventDefault(); - event.stopPropagation(); - - if ( event.keyCode === 37 ) { - - $this.getPrev(); - - } else if ( event.keyCode === 39 ) { - - $this.getNext(); - - } else if ( event.keyCode === 27 ) { - - $this.closeSlide(); - } - } ); - }, - - /** - * Navigation events : go to next slide, go to prevous slide and close - */ - actions : function () { - var $this = this, - action = 'touchend click'; // Just detect for both event types to allow for multi-input - - if ( elements.length < 2 ) { - - $( '#swipebox-bottom-bar' ).hide(); - - if ( undefined === elements[ 1 ] ) { - $( '#swipebox-top-bar' ).hide(); - } - - } else { - $( '#swipebox-prev' ).bind( action, function( event ) { - event.preventDefault(); - event.stopPropagation(); - $this.getPrev(); - $this.setTimeout(); - } ); - - $( '#swipebox-next' ).bind( action, function( event ) { - event.preventDefault(); - event.stopPropagation(); - $this.getNext(); - $this.setTimeout(); - } ); - } - - $( '#swipebox-close' ).bind( action, function() { - $this.closeSlide(); - } ); - }, - - /** - * Set current slide - */ - setSlide : function ( index, isFirst ) { - - isFirst = isFirst || false; - - var slider = $( '#swipebox-slider' ); - - currentX = -index*100; - - if ( this.doCssTrans() ) { - slider.css( { - '-webkit-transform' : 'translate3d(' + (-index*100)+'%, 0, 0)', - 'transform' : 'translate3d(' + (-index*100)+'%, 0, 0)' - } ); - } else { - slider.animate( { left : ( -index*100 )+'%' } ); - } - - $( '#swipebox-slider .slide' ).removeClass( 'current' ); - $( '#swipebox-slider .slide' ).eq( index ).addClass( 'current' ); - this.setTitle( index ); - - if ( isFirst ) { - slider.fadeIn(); - } - - $( '#swipebox-prev, #swipebox-next' ).removeClass( 'disabled' ); - - if ( index === 0 ) { - $( '#swipebox-prev' ).addClass( 'disabled' ); - } else if ( index === elements.length - 1 && plugin.settings.loopAtEnd !== true ) { - $( '#swipebox-next' ).addClass( 'disabled' ); - } - - // reshow bars on each navigation - this.showBars(); - this.setTimeout(); - }, - - /** - * Open slide - */ - openSlide : function ( index ) { - $( 'html' ).addClass( 'swipebox-html' ); - if ( isTouch ) { - $( 'html' ).addClass( 'swipebox-touch' ); - - if ( plugin.settings.hideCloseButtonOnMobile ) { - $( 'html' ).addClass( 'swipebox-no-close-button' ); - } - } else { - $( 'html' ).addClass( 'swipebox-no-touch' ); - } - $( window ).trigger( 'resize' ); // fix scroll bar visibility on desktop - this.setSlide( index, true ); - }, - - /** - * Set a time out if the media is a video - */ - preloadMedia : function ( index ) { - var $this = this, - src = null; - - if ( elements[ index ] !== undefined ) { - src = elements[ index ].href; - } - - if ( ! $this.isVideo( src ) ) { - setTimeout( function() { - $this.openMedia( index ); - }, 1000); - } else { - $this.openMedia( index ); - } - }, - - /** - * Open - */ - openMedia : function ( index ) { - var $this = this, - src, - slide; - - if ( elements[ index ] !== undefined ) { - src = elements[ index ].href; - } - - if ( index < 0 || index >= elements.length ) { - return false; - } - - slide = $( '#swipebox-slider .slide' ).eq( index ); - - if ( ! $this.isVideo( src ) ) { - slide.addClass( 'slide-loading' ); - $this.loadMedia( src, function() { - slide.removeClass( 'slide-loading' ); - slide.html( this ); - } ); - } else { - slide.html( $this.getVideo( src ) ); - } - - }, - - /** - * Set link title attribute as caption - */ - setTitle : function ( index ) { - var title = null; - var caption = null; - - $( '#swipebox-title' ).empty(); - - if ( elements[ index ] !== undefined ) { - title = elements[ index ].title; - caption = elements[ index ].caption; - } - - if ( title || caption ) { - $( '#swipebox-top-bar' ).show(); - - if(title) { - var tdiv = $('
      ').addClass('title').text(title); - $('#swipebox-title').append(tdiv); - } - - if(caption) { - var cdiv = $('
      ').addClass('caption').text(caption); - $('#swipebox-title').append(cdiv); - } - } else { - $( '#swipebox-top-bar' ).hide(); - } - }, - - /** - * Check if the URL is a video - */ - isVideo : function ( src ) { - - if ( src ) { - if ( src.match( /(youtube\.com|youtube-nocookie\.com)\/watch\?v=([a-zA-Z0-9\-_]+)/) || src.match( /vimeo\.com\/([0-9]*)/ ) || src.match( /youtu\.be\/([a-zA-Z0-9\-_]+)/ ) ) { - return true; - } - - if ( src.toLowerCase().indexOf( 'swipeboxvideo=1' ) >= 0 ) { - - return true; - } - } - - }, - - /** - * Parse URI querystring and: - * - overrides value provided via dictionary - * - rebuild it again returning a string - */ - parseUri : function (uri, customData) { - var a = document.createElement('a'), - qs = {}; - - // Decode the URI - a.href = decodeURIComponent( uri ); - - // QueryString to Object - if ( a.search ) { - qs = JSON.parse( '{"' + a.search.toLowerCase().replace('?','').replace(/&/g,'","').replace(/=/g,'":"') + '"}' ); - } - - // Extend with custom data - if ( $.isPlainObject( customData ) ) { - qs = $.extend( qs, customData, plugin.settings.queryStringData ); // The dev has always the final word - } - - // Return querystring as a string - return $ - .map( qs, function (val, key) { - if ( val && val > '' ) { - return encodeURIComponent( key ) + '=' + encodeURIComponent( val ); - } - }) - .join('&'); - }, - - /** - * Get video iframe code from URL - */ - getVideo : function( url ) { - var iframe = '', - youtubeUrl = url.match( /((?:www\.)?youtube\.com|(?:www\.)?youtube-nocookie\.com)\/watch\?v=([a-zA-Z0-9\-_]+)/ ), - youtubeShortUrl = url.match(/(?:www\.)?youtu\.be\/([a-zA-Z0-9\-_]+)/), - vimeoUrl = url.match( /(?:www\.)?vimeo\.com\/([0-9]*)/ ), - qs = ''; - if ( youtubeUrl || youtubeShortUrl) { - if ( youtubeShortUrl ) { - youtubeUrl = youtubeShortUrl; - } - qs = ui.parseUri( url, { - 'autoplay' : ( plugin.settings.autoplayVideos ? '1' : '0' ), - 'v' : '' - }); - iframe = ''; - - } else if ( vimeoUrl ) { - qs = ui.parseUri( url, { - 'autoplay' : ( plugin.settings.autoplayVideos ? '1' : '0' ), - 'byline' : '0', - 'portrait' : '0', - 'color': plugin.settings.vimeoColor - }); - iframe = ''; - - } else { - iframe = ''; - } - - return '
      ' + iframe + '
      '; - }, - - /** - * Load image - */ - loadMedia : function ( src, callback ) { - // Inline content - if ( src.trim().indexOf('#') === 0 ) { - callback.call( - $('
      ', { - 'class' : 'swipebox-inline-container' - }) - .append( - $(src) - .clone() - .toggleClass( plugin.settings.toggleClassOnLoad ) - ) - ); - } - // Everything else - else { - if ( ! this.isVideo( src ) ) { - var img = $( '' ).on( 'load', function() { - callback.call( img ); - } ); - - img.attr( 'src', src ); - } - } - }, - - /** - * Get next slide - */ - getNext : function () { - var $this = this, - src, - index = $( '#swipebox-slider .slide' ).index( $( '#swipebox-slider .slide.current' ) ); - if ( index + 1 < elements.length ) { - - src = $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe' ).attr( 'src' ); - $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe' ).attr( 'src', src ); - index++; - $this.setSlide( index ); - $this.preloadMedia( index+1 ); - if ( plugin.settings.nextSlide ) { - plugin.settings.nextSlide(); - } - } else { - - if ( plugin.settings.loopAtEnd === true ) { - src = $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe' ).attr( 'src' ); - $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe' ).attr( 'src', src ); - index = 0; - $this.preloadMedia( index ); - $this.setSlide( index ); - $this.preloadMedia( index + 1 ); - if ( plugin.settings.nextSlide ) { - plugin.settings.nextSlide(); - } - } else { - $( '#swipebox-overlay' ).addClass( 'rightSpring' ); - setTimeout( function() { - $( '#swipebox-overlay' ).removeClass( 'rightSpring' ); - }, 500 ); - } - } - }, - - /** - * Get previous slide - */ - getPrev : function () { - var index = $( '#swipebox-slider .slide' ).index( $( '#swipebox-slider .slide.current' ) ), - src; - if ( index > 0 ) { - src = $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe').attr( 'src' ); - $( '#swipebox-slider .slide' ).eq( index ).contents().find( 'iframe' ).attr( 'src', src ); - index--; - this.setSlide( index ); - this.preloadMedia( index-1 ); - if ( plugin.settings.prevSlide ) { - plugin.settings.prevSlide(); - } - } else { - $( '#swipebox-overlay' ).addClass( 'leftSpring' ); - setTimeout( function() { - $( '#swipebox-overlay' ).removeClass( 'leftSpring' ); - }, 500 ); - } - }, - - nextSlide : function () { - // Callback for next slide - }, - - prevSlide : function () { - // Callback for prev slide - }, - - /** - * Close - */ - closeSlide : function () { - $( 'html' ).removeClass( 'swipebox-html' ); - $( 'html' ).removeClass( 'swipebox-touch' ); - $( window ).trigger( 'resize' ); - this.destroy(); - }, - - /** - * Destroy the whole thing - */ - destroy : function () { - $( window ).unbind( 'keyup' ); - $( 'body' ).unbind( 'touchstart' ); - $( 'body' ).unbind( 'touchmove' ); - $( 'body' ).unbind( 'touchend' ); - $( '#swipebox-slider' ).unbind(); - $( '#swipebox-overlay' ).remove(); - - if ( ! $.isArray( elem ) ) { - elem.removeData( '_swipebox' ); - } - - if ( this.target ) { - this.target.trigger( 'swipebox-destroy' ); - } - - $.swipebox.isOpen = false; - - if ( plugin.settings.afterClose ) { - plugin.settings.afterClose(); - } - } - }; - - plugin.init(); - }; - - $.fn.swipebox = function( options ) { - - if ( ! $.data( this, '_swipebox' ) ) { - var swipebox = new $.swipebox( this, options ); - this.data( '_swipebox', swipebox ); - } - return this.data( '_swipebox' ); - - }; - -}( window, document, jQuery ) ); \ No newline at end of file diff --git a/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.min.js b/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.min.js deleted file mode 100644 index 195d15c..0000000 --- a/sources/lib/plugins/gallery/swipebox/js/jquery.swipebox.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! Swipebox v1.4.1 | Constantin Saguin csag.co | MIT License | github.com/brutaldesign/swipebox */ -!function(a,b,c,d){c.swipebox=function(e,f){var g,h,i={useCSS:!0,useSVG:!0,initialIndexOnArray:0,removeBarsOnMobile:!0,hideCloseButtonOnMobile:!1,hideBarsDelay:3e3,videoMaxWidth:1140,vimeoColor:"cccccc",beforeOpen:null,afterOpen:null,afterClose:null,nextSlide:null,prevSlide:null,loopAtEnd:!1,autoplayVideos:!1,queryStringData:{},toggleClassOnLoad:"",titleAttribute:"title",captionAttribute:"data-caption"},j=this,k=[],l=e.selector,m=c(l),n=navigator.userAgent.match(/(iPad)|(iPhone)|(iPod)|(Android)|(PlayBook)|(BB10)|(BlackBerry)|(Opera Mini)|(IEMobile)|(webOS)|(MeeGo)/i),o=null!==n||b.createTouch!==d||"ontouchstart"in a||"onmsgesturechange"in a||navigator.msMaxTouchPoints,p=!!b.createElementNS&&!!b.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,q=a.innerWidth?a.innerWidth:c(a).width(),r=a.innerHeight?a.innerHeight:c(a).height(),s=0,t='
      ';j.settings={},c.swipebox.close=function(){g.closeSlide()},c.swipebox.extend=function(){return g},j.init=function(){j.settings=c.extend({},i,f),c.isArray(e)?(k=e,g.target=c(a),g.init(j.settings.initialIndexOnArray)):c(b).on("click",l,function(a){if("slide current"===a.target.parentNode.className)return!1;c.isArray(e)||(g.destroy(),h=c(l),g.actions()),k=[];var b,d,f;f||(d="data-rel",f=c(this).attr(d)),f||(d="rel",f=c(this).attr(d)),h=f&&""!==f&&"nofollow"!==f?m.filter("["+d+'="'+f+'"]'):c(l),h.each(function(){var a=null,b=null,d=null;c(this).attr(j.settings.titleAttribute)&&(a=c(this).attr(j.settings.titleAttribute)),c(this).attr(j.settings.captionAttribute)&&(b=c(this).attr(j.settings.captionAttribute)),c(this).attr("href")&&(d=c(this).attr("href")),k.push({href:d,title:a,caption:b})}),b=h.index(c(this)),a.preventDefault(),a.stopPropagation(),g.target=c(a.target),g.init(b)})},g={init:function(a){j.settings.beforeOpen&&j.settings.beforeOpen(),this.target.trigger("swipebox-start"),c.swipebox.isOpen=!0,this.build(),this.openSlide(a),this.openMedia(a),this.preloadMedia(a+1),this.preloadMedia(a-1),j.settings.afterOpen&&j.settings.afterOpen()},build:function(){var a,b=this;c("body").append(t),p&&j.settings.useSVG===!0&&(a=c("#swipebox-close").css("background-image"),a=a.replace("png","svg"),c("#swipebox-prev, #swipebox-next, #swipebox-close").css({"background-image":a})),n&&j.settings.removeBarsOnMobile&&c("#swipebox-bottom-bar, #swipebox-top-bar").remove(),c.each(k,function(){c("#swipebox-slider").append('
      ')}),b.setDim(),b.actions(),o&&b.gesture(),b.keyboard(),b.animBars(),b.resize()},setDim:function(){var b,d,e={};"onorientationchange"in a?a.addEventListener("orientationchange",function(){0===a.orientation?(b=q,d=r):(90===a.orientation||-90===a.orientation)&&(b=r,d=q)},!1):(b=a.innerWidth?a.innerWidth:c(a).width(),d=a.innerHeight?a.innerHeight:c(a).height()),e={width:b,height:d},c("#swipebox-overlay").css(e)},resize:function(){var b=this;c(a).resize(function(){b.setDim()}).resize()},supportTransition:function(){var a,c="transition WebkitTransition MozTransition OTransition msTransition KhtmlTransition".split(" ");for(a=0;a=m||i)){var p=.75-Math.abs(d)/r.height();r.css({top:d+"px"}),r.css({opacity:p}),i=!0}e=b,b=o.pageX-n.pageX,g=100*b/q,!j&&!i&&Math.abs(b)>=l&&(c("#swipebox-slider").css({"-webkit-transition":"",transition:""}),j=!0),j&&(b>0?0===a?c("#swipebox-overlay").addClass("leftSpringTouch"):(c("#swipebox-overlay").removeClass("leftSpringTouch").removeClass("rightSpringTouch"),c("#swipebox-slider").css({"-webkit-transform":"translate3d("+(s+g)+"%, 0, 0)",transform:"translate3d("+(s+g)+"%, 0, 0)"})):0>b&&(k.length===a+1?c("#swipebox-overlay").addClass("rightSpringTouch"):(c("#swipebox-overlay").removeClass("leftSpringTouch").removeClass("rightSpringTouch"),c("#swipebox-slider").css({"-webkit-transform":"translate3d("+(s+g)+"%, 0, 0)",transform:"translate3d("+(s+g)+"%, 0, 0)"}))))}),!1}).bind("touchend",function(a){if(a.preventDefault(),a.stopPropagation(),c("#swipebox-slider").css({"-webkit-transition":"-webkit-transform 0.4s ease",transition:"transform 0.4s ease"}),d=o.pageY-n.pageY,b=o.pageX-n.pageX,g=100*b/q,i)if(i=!1,Math.abs(d)>=2*m&&Math.abs(d)>Math.abs(f)){var k=d>0?r.height():-r.height();r.animate({top:k+"px",opacity:0},300,function(){h.closeSlide()})}else r.animate({top:0,opacity:1},300);else j?(j=!1,b>=l&&b>=e?h.getPrev():-l>=b&&e>=b&&h.getNext()):p.hasClass("visible-bars")?(h.clearTimeout(),h.hideBars()):(h.showBars(),h.setTimeout());c("#swipebox-slider").css({"-webkit-transform":"translate3d("+s+"%, 0, 0)",transform:"translate3d("+s+"%, 0, 0)"}),c("#swipebox-overlay").removeClass("leftSpringTouch").removeClass("rightSpringTouch"),c(".touching").off("touchmove").removeClass("touching")})},setTimeout:function(){if(j.settings.hideBarsDelay>0){var b=this;b.clearTimeout(),b.timeout=a.setTimeout(function(){b.hideBars()},j.settings.hideBarsDelay)}},clearTimeout:function(){a.clearTimeout(this.timeout),this.timeout=null},showBars:function(){var a=c("#swipebox-top-bar, #swipebox-bottom-bar");a.addClass("visible-bars")},hideBars:function(){var a=c("#swipebox-top-bar, #swipebox-bottom-bar");a.removeClass("visible-bars")},animBars:function(){var a=this,b=c("#swipebox-top-bar, #swipebox-bottom-bar");b.addClass("visible-bars"),a.setTimeout(),c("#swipebox-slider").click(function(){b.hasClass("visible-bars")||(a.showBars(),a.setTimeout())}),c("#swipebox-bottom-bar").hover(function(){a.showBars(),b.addClass("visible-bars"),a.clearTimeout()},function(){j.settings.hideBarsDelay>0&&(b.removeClass("visible-bars"),a.setTimeout())})},keyboard:function(){var b=this;c(a).bind("keyup",function(a){a.preventDefault(),a.stopPropagation(),37===a.keyCode?b.getPrev():39===a.keyCode?b.getNext():27===a.keyCode&&b.closeSlide()})},actions:function(){var a=this,b="touchend click";k.length<2?(c("#swipebox-bottom-bar").hide(),d===k[1]&&c("#swipebox-top-bar").hide()):(c("#swipebox-prev").bind(b,function(b){b.preventDefault(),b.stopPropagation(),a.getPrev(),a.setTimeout()}),c("#swipebox-next").bind(b,function(b){b.preventDefault(),b.stopPropagation(),a.getNext(),a.setTimeout()})),c("#swipebox-close").bind(b,function(){a.closeSlide()})},setSlide:function(a,b){b=b||!1;var d=c("#swipebox-slider");s=100*-a,this.doCssTrans()?d.css({"-webkit-transform":"translate3d("+100*-a+"%, 0, 0)",transform:"translate3d("+100*-a+"%, 0, 0)"}):d.animate({left:100*-a+"%"}),c("#swipebox-slider .slide").removeClass("current"),c("#swipebox-slider .slide").eq(a).addClass("current"),this.setTitle(a),b&&d.fadeIn(),c("#swipebox-prev, #swipebox-next").removeClass("disabled"),0===a?c("#swipebox-prev").addClass("disabled"):a===k.length-1&&j.settings.loopAtEnd!==!0&&c("#swipebox-next").addClass("disabled"),this.showBars(),this.setTimeout()},openSlide:function(b){c("html").addClass("swipebox-html"),o?(c("html").addClass("swipebox-touch"),j.settings.hideCloseButtonOnMobile&&c("html").addClass("swipebox-no-close-button")):c("html").addClass("swipebox-no-touch"),c(a).trigger("resize"),this.setSlide(b,!0)},preloadMedia:function(a){var b=this,c=null;k[a]!==d&&(c=k[a].href),b.isVideo(c)?b.openMedia(a):setTimeout(function(){b.openMedia(a)},1e3)},openMedia:function(a){var b,e,f=this;return k[a]!==d&&(b=k[a].href),0>a||a>=k.length?!1:(e=c("#swipebox-slider .slide").eq(a),void(f.isVideo(b)?e.html(f.getVideo(b)):(e.addClass("slide-loading"),f.loadMedia(b,function(){e.removeClass("slide-loading"),e.html(this)}))))},setTitle:function(a){var b=null,e=null;if(c("#swipebox-title").empty(),k[a]!==d&&(b=k[a].title,e=k[a].caption),b||e){if(c("#swipebox-top-bar").show(),b){var f=c("
      ").addClass("title").text(b);c("#swipebox-title").append(f)}if(e){var g=c("
      ").addClass("caption").text(e);c("#swipebox-title").append(g)}}else c("#swipebox-top-bar").hide()},isVideo:function(a){if(a){if(a.match(/(youtube\.com|youtube-nocookie\.com)\/watch\?v=([a-zA-Z0-9\-_]+)/)||a.match(/vimeo\.com\/([0-9]*)/)||a.match(/youtu\.be\/([a-zA-Z0-9\-_]+)/))return!0;if(a.toLowerCase().indexOf("swipeboxvideo=1")>=0)return!0}},parseUri:function(a,d){var e=b.createElement("a"),f={};return e.href=decodeURIComponent(a),e.search&&(f=JSON.parse('{"'+e.search.toLowerCase().replace("?","").replace(/&/g,'","').replace(/=/g,'":"')+'"}')),c.isPlainObject(d)&&(f=c.extend(f,d,j.settings.queryStringData)),c.map(f,function(a,b){return a&&a>""?encodeURIComponent(b)+"="+encodeURIComponent(a):void 0}).join("&")},getVideo:function(a){var b="",c=a.match(/((?:www\.)?youtube\.com|(?:www\.)?youtube-nocookie\.com)\/watch\?v=([a-zA-Z0-9\-_]+)/),d=a.match(/(?:www\.)?youtu\.be\/([a-zA-Z0-9\-_]+)/),e=a.match(/(?:www\.)?vimeo\.com\/([0-9]*)/),f="";return c||d?(d&&(c=d),f=g.parseUri(a,{autoplay:j.settings.autoplayVideos?"1":"0",v:""}),b=''):e?(f=g.parseUri(a,{autoplay:j.settings.autoplayVideos?"1":"0",byline:"0",portrait:"0",color:j.settings.vimeoColor}),b=''):b='','
      '+b+"
      "},loadMedia:function(a,b){if(0===a.trim().indexOf("#"))b.call(c("
      ",{"class":"swipebox-inline-container"}).append(c(a).clone().toggleClass(j.settings.toggleClassOnLoad)));else if(!this.isVideo(a)){var d=c("").on("load",function(){b.call(d)});d.attr("src",a)}},getNext:function(){var a,b=this,d=c("#swipebox-slider .slide").index(c("#swipebox-slider .slide.current"));d+10?(a=c("#swipebox-slider .slide").eq(b).contents().find("iframe").attr("src"),c("#swipebox-slider .slide").eq(b).contents().find("iframe").attr("src",a),b--,this.setSlide(b),this.preloadMedia(b-1),j.settings.prevSlide&&j.settings.prevSlide()):(c("#swipebox-overlay").addClass("leftSpring"),setTimeout(function(){c("#swipebox-overlay").removeClass("leftSpring")},500))},nextSlide:function(){},prevSlide:function(){},closeSlide:function(){c("html").removeClass("swipebox-html"),c("html").removeClass("swipebox-touch"),c(a).trigger("resize"),this.destroy()},destroy:function(){c(a).unbind("keyup"),c("body").unbind("touchstart"),c("body").unbind("touchmove"),c("body").unbind("touchend"),c("#swipebox-slider").unbind(),c("#swipebox-overlay").remove(),c.isArray(e)||e.removeData("_swipebox"),this.target&&this.target.trigger("swipebox-destroy"),c.swipebox.isOpen=!1,j.settings.afterClose&&j.settings.afterClose()}},j.init()},c.fn.swipebox=function(a){if(!c.data(this,"_swipebox")){var b=new c.swipebox(this,a);this.data("_swipebox",b)}return this.data("_swipebox")}}(window,document,jQuery); \ No newline at end of file diff --git a/sources/lib/plugins/gallery/syntax.php b/sources/lib/plugins/gallery/syntax.php deleted file mode 100644 index 33a74d0..0000000 --- a/sources/lib/plugins/gallery/syntax.php +++ /dev/null @@ -1,663 +0,0 @@ - - * @author Joe Lapp - * @author Dave Doyle - */ - -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/'); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'syntax.php'); -require_once(DOKU_INC.'inc/search.php'); -require_once(DOKU_INC.'inc/JpegMeta.php'); - -class syntax_plugin_gallery extends DokuWiki_Syntax_Plugin { - - /** - * What kind of syntax are we? - */ - function getType(){ - return 'substition'; - } - - /** - * What about paragraphs? - */ - function getPType(){ - return 'block'; - } - - /** - * Where to sort in? - */ - function getSort(){ - return 301; - } - - - /** - * Connect pattern to lexer - */ - function connectTo($mode) { - $this->Lexer->addSpecialPattern('\{\{gallery>[^}]*\}\}',$mode,'plugin_gallery'); - } - - /** - * Handle the match - */ - function handle($match, $state, $pos, Doku_Handler $handler){ - global $ID; - $match = substr($match,10,-2); //strip markup from start and end - - $data = array(); - - $data['galid'] = substr(md5($match),0,4); - - // alignment - $data['align'] = 0; - if(substr($match,0,1) == ' ') $data['align'] += 1; - if(substr($match,-1,1) == ' ') $data['align'] += 2; - - // extract params - list($ns,$params) = explode('?',$match,2); - $ns = trim($ns); - - // namespace (including resolving relatives) - if(!preg_match('/^https?:\/\//i',$ns)){ - $data['ns'] = resolve_id(getNS($ID),$ns); - }else{ - $data['ns'] = $ns; - } - - // set the defaults - $data['tw'] = $this->getConf('thumbnail_width'); - $data['th'] = $this->getConf('thumbnail_height'); - $data['iw'] = $this->getConf('image_width'); - $data['ih'] = $this->getConf('image_height'); - $data['cols'] = $this->getConf('cols'); - $data['filter'] = ''; - $data['lightbox'] = false; - $data['direct'] = false; - $data['showname'] = false; - $data['showtitle'] = false; - $data['reverse'] = false; - $data['random'] = false; - $data['cache'] = true; - $data['crop'] = false; - $data['recursive']= true; - $data['sort'] = $this->getConf('sort'); - $data['limit'] = 0; - $data['offset'] = 0; - $data['paginate'] = 0; - - // parse additional options - $params = $this->getConf('options').','.$params; - $params = preg_replace('/[,&\?]+/',' ',$params); - $params = explode(' ',$params); - foreach($params as $param){ - if($param === '') continue; - if($param == 'titlesort'){ - $data['sort'] = 'title'; - }elseif($param == 'datesort'){ - $data['sort'] = 'date'; - }elseif($param == 'modsort'){ - $data['sort'] = 'mod'; - }elseif(preg_match('/^=(\d+)$/',$param,$match)){ - $data['limit'] = $match[1]; - }elseif(preg_match('/^\+(\d+)$/',$param,$match)){ - $data['offset'] = $match[1]; - }elseif(is_numeric($param)){ - $data['cols'] = (int) $param; - }elseif(preg_match('/^~(\d+)$/',$param,$match)){ - $data['paginate'] = $match[1]; - }elseif(preg_match('/^(\d+)([xX])(\d+)$/',$param,$match)){ - if($match[2] == 'X'){ - $data['iw'] = $match[1]; - $data['ih'] = $match[3]; - }else{ - $data['tw'] = $match[1]; - $data['th'] = $match[3]; - } - }elseif(strpos($param,'*') !== false){ - $param = preg_quote($param,'/'); - $param = '/^'.str_replace('\\*','.*?',$param).'$/'; - $data['filter'] = $param; - }else{ - if(substr($param,0,2) == 'no'){ - $data[substr($param,2)] = false; - }else{ - $data[$param] = true; - } - } - } - - // implicit direct linking? - if($data['lightbox']) $data['direct'] = true; - - - return $data; - } - - /** - * Create output - */ - function render($mode, Doku_Renderer $R, $data){ - global $ID; - if($mode == 'xhtml'){ - $R->info['cache'] = $data['cache']; - $R->doc .= $this->_gallery($data); - return true; - }elseif($mode == 'metadata'){ - $rel = p_get_metadata($ID,'relation',METADATA_RENDER_USING_CACHE); - $img = $rel['firstimage']; - if(empty($img)){ - $files = $this->_findimages($data); - if(count($files)) $R->internalmedia($files[0]['id']); - } - return true; - } - return false; - } - - /** - * Loads images from a MediaRSS or ATOM feed - */ - function _loadRSS($url){ - require_once(DOKU_INC.'inc/FeedParser.php'); - $feed = new FeedParser(); - $feed->set_feed_url($url); - $feed->init(); - $files = array(); - - // base url to use for broken feeds with non-absolute links - $main = parse_url($url); - $host = $main['scheme'].'://'. - $main['host']. - (($main['port'])?':'.$main['port']:''); - $path = dirname($main['path']).'/'; - - foreach($feed->get_items() as $item){ - if ($enclosure = $item->get_enclosure()){ - // skip non-image enclosures - if($enclosure->get_type()){ - if(substr($enclosure->get_type(),0,5) != 'image') continue; - }else{ - if(!preg_match('/\.(jpe?g|png|gif)(\?|$)/i', - $enclosure->get_link())) continue; - } - - // non absolute links - $ilink = $enclosure->get_link(); - if(!preg_match('/^https?:\/\//i',$ilink)){ - if($ilink{0} == '/'){ - $ilink = $host.$ilink; - }else{ - $ilink = $host.$path.$ilink; - } - } - $link = $item->link; - if(!preg_match('/^https?:\/\//i',$link)){ - if($link{0} == '/'){ - $link = $host.$link; - }else{ - $link = $host.$path.$link; - } - } - - $files[] = array( - 'id' => $ilink, - 'isimg' => true, - 'file' => basename($ilink), - // decode to avoid later double encoding - 'title' => htmlspecialchars_decode($enclosure->get_title(),ENT_COMPAT), - 'desc' => strip_tags(htmlspecialchars_decode($enclosure->get_description(),ENT_COMPAT)), - 'width' => $enclosure->get_width(), - 'height' => $enclosure->get_height(), - 'mtime' => $item->get_date('U'), - 'ctime' => $item->get_date('U'), - 'detail' => $link, - ); - } - } - return $files; - } - - /** - * Gather all photos matching the given criteria - */ - function _findimages(&$data){ - global $conf; - $files = array(); - - // http URLs are supposed to be media RSS feeds - if(preg_match('/^https?:\/\//i',$data['ns'])){ - $files = $this->_loadRSS($data['ns']); - $data['_single'] = false; - }else{ - $dir = utf8_encodeFN(str_replace(':','/',$data['ns'])); - // all possible images for the given namespace (or a single image) - if(is_file($conf['mediadir'].'/'.$dir)){ - require_once(DOKU_INC.'inc/JpegMeta.php'); - $files[] = array( - 'id' => $data['ns'], - 'isimg' => preg_match('/\.(jpe?g|gif|png)$/',$dir), - 'file' => basename($dir), - 'mtime' => filemtime($conf['mediadir'].'/'.$dir), - 'meta' => new JpegMeta($conf['mediadir'].'/'.$dir) - ); - $data['_single'] = true; - }else{ - $depth = $data['recursive'] ? 0 : 1; - search($files, - $conf['mediadir'], - 'search_media', - array('depth'=>$depth), - $dir); - $data['_single'] = false; - } - } - - // done, yet? - $len = count($files); - if(!$len) return $files; - if($data['single']) return $files; - - // filter images - for($i=0; $i<$len; $i++){ - if(!$files[$i]['isimg']){ - unset($files[$i]); // this is faster, because RE was done before - }elseif($data['filter']){ - if(!preg_match($data['filter'],noNS($files[$i]['id']))) unset($files[$i]); - } - } - if($len<1) return $files; - - // random? - if($data['random']){ - shuffle($files); - }else{ - // sort? - if($data['sort'] == 'date'){ - usort($files,array($this,'_datesort')); - }elseif($data['sort'] == 'mod'){ - usort($files,array($this,'_modsort')); - }elseif($data['sort'] == 'title'){ - usort($files,array($this,'_titlesort')); - } - - // reverse? - if($data['reverse']) $files = array_reverse($files); - } - - // limits and offsets? - if($data['offset']) $files = array_slice($files,$data['offset']); - if($data['limit']) $files = array_slice($files,0,$data['limit']); - - return $files; - } - - /** - * usort callback to sort by file lastmodified time - */ - function _modsort($a,$b){ - if($a['mtime'] < $b['mtime']) return -1; - if($a['mtime'] > $b['mtime']) return 1; - return strcmp($a['file'],$b['file']); - } - - /** - * usort callback to sort by EXIF date - */ - function _datesort($a,$b){ - $da = $this->_meta($a,'cdate'); - $db = $this->_meta($b,'cdate'); - if($da < $db) return -1; - if($da > $db) return 1; - return strcmp($a['file'],$b['file']); - } - - /** - * usort callback to sort by EXIF title - */ - function _titlesort($a,$b){ - $ta = $this->_meta($a,'title'); - $tb = $this->_meta($b,'title'); - return strcmp($ta,$tb); - } - - - /** - * Does the gallery formatting - */ - function _gallery($data){ - global $conf; - global $lang; - $ret = ''; - - $files = $this->_findimages($data); - - //anything found? - if(!count($files)){ - $ret .= '
      '.$lang['nothingfound'].'
      '; - return $ret; - } - - // prepare alignment - $align = ''; - $xalign = ''; - if($data['align'] == 1){ - $align = ' gallery_right'; - $xalign = ' align="right"'; - } - if($data['align'] == 2){ - $align = ' gallery_left'; - $xalign = ' align="left"'; - } - if($data['align'] == 3){ - $align = ' gallery_center'; - $xalign = ' align="center"'; - } - if(!$data['_single']){ - if(!$align) $align = ' gallery_center'; // center galleries on default - if(!$xalign) $xalign = ' align="center"'; - } - - $page = 0; - - // build gallery - if($data['_single']){ - $ret .= $this->_image($files[0],$data); - $ret .= $this->_showname($files[0],$data); - $ret .= $this->_showtitle($files[0],$data); - }elseif($data['cols'] > 0){ // format as table - $close_pg = false; - - $i = 0; - foreach($files as $img){ - - // new page? - if($data['paginate'] && ($i % $data['paginate'] == 0)){ - $ret .= '
      '; - $close_pg = true; - } - - // new table? - if($i == 0 || ($data['paginate'] && ($i % $data['paginate'] == 0))){ - $ret .= ''; - - } - - // new row? - if($i % $data['cols'] == 0){ - $ret .= ''; - } - - // an image cell - $ret .= ''; - $i++; - - // done with this row? cloase it - $close_tr = true; - if($i % $data['cols'] == 0){ - $ret .= ''; - $close_tr = false; - } - - // close current page and table - if($data['paginate'] && ($i % $data['paginate'] == 0)){ - if ($close_tr){ - // add remaining empty cells - while($i % $data['cols']){ - $ret .= ''; - $i++; - } - $ret .= ''; - } - $ret .= '
      '; - $ret .= $this->_image($img,$data); - $ret .= $this->_showname($img,$data); - $ret .= $this->_showtitle($img,$data); - $ret .= '
      '; - $ret .= '
      '; - $close_pg = false; - } - - } - - if ($close_tr){ - // add remaining empty cells - while($i % $data['cols']){ - $ret .= ''; - $i++; - } - $ret .= ''; - } - - if(!$data['paginate']){ - $ret .= ''; - }elseif ($close_pg){ - $ret .= ''; - $ret .= '
      '; - } - }else{ // format as div sequence - $i = 0; - $close_pg = false; - foreach($files as $img){ - - if($data['paginate'] && ($i % $data['paginate'] == 0)){ - $ret .= '
      '; - $close_pg = true; - } - - $ret .= '
      '; - $ret .= $this->_image($img,$data); - $ret .= $this->_showname($img,$data); - $ret .= $this->_showtitle($img,$data); - $ret .= '
      '; - - $i++; - - if($data['paginate'] && ($i % $data['paginate'] == 0)){ - $ret .= '
      '; - $close_pg = false; - } - } - - if($close_pg) $ret .= '
      '; - - $ret .= '
      '; - } - - // pagination links - $pgret = ''; - if($page){ - $pgret .= '
      '.$this->getLang('pages').' '; - for($j=1; $j<=$page; $j++){ - $pgret .= ''.$j.' '; - } - $pgret .= '
      '; - } - - return '
      '.$pgret.$ret.'
      '; - } - - /** - * Defines how a thumbnail should look like - */ - function _image(&$img,$data){ - global $ID; - - // calculate thumbnail size - if(!$data['crop']){ - $w = (int) $this->_meta($img,'width'); - $h = (int) $this->_meta($img,'height'); - if($w && $h){ - $dim = array(); - if($w > $data['tw'] || $h > $data['th']){ - $ratio = $this->_ratio($img,$data['tw'],$data['th']); - $w = floor($w * $ratio); - $h = floor($h * $ratio); - $dim = array('w'=>$w,'h'=>$h); - } - }else{ - $data['crop'] = true; // no size info -> always crop - } - } - if($data['crop']){ - $w = $data['tw']; - $h = $data['th']; - $dim = array('w'=>$w,'h'=>$h); - } - - //prepare img attributes - $i = array(); - $i['width'] = $w; - $i['height'] = $h; - $i['border'] = 0; - $i['alt'] = $this->_meta($img,'title'); - $i['class'] = 'tn'; - $iatt = buildAttributes($i); - $src = ml($img['id'],$dim); - - // prepare lightbox dimensions - $w_lightbox = (int) $this->_meta($img,'width'); - $h_lightbox = (int) $this->_meta($img,'height'); - $dim_lightbox = array(); - if($w_lightbox > $data['iw'] || $h_lightbox > $data['ih']){ - $ratio = $this->_ratio($img,$data['iw'],$data['ih']); - $w_lightbox = floor($w_lightbox * $ratio); - $h_lightbox = floor($h_lightbox * $ratio); - $dim_lightbox = array('w'=>$w_lightbox,'h'=>$h_lightbox); - } - - //prepare link attributes - $a = array(); - $a['title'] = $this->_meta($img,'title'); - $a['data-caption'] = trim(str_replace("\n",' ',$this->_meta($img,'desc'))); - if(!$a['data-caption']) unset($a['data-caption']); - if($data['lightbox']){ - $href = ml($img['id'],$dim_lightbox); - $a['class'] = "lightbox JSnocheck"; - $a['rel'] = 'lightbox[gal-'.substr(md5($ID),4).']'; //unique ID for the gallery - }elseif($img['detail'] && !$data['direct']){ - $href = $img['detail']; - }else{ - $href = ml($img['id'],array('id'=>$ID),$data['direct']); - } - $aatt = buildAttributes($a); - - // prepare output - $ret = ''; - $ret .= ''; - $ret .= ''; - $ret .= ''; - return $ret; - } - - - /** - * Defines how a filename + link should look - */ - function _showname($img,$data){ - global $ID; - - if(!$data['showname'] ) { return ''; } - - //prepare link - $lnk = ml($img['id'],array('id'=>$ID),false); - - // prepare output - $ret = ''; - $ret .= '
      '; - $ret .= hsc($img['file']); - $ret .= ''; - return $ret; - } - - /** - * Defines how title + link should look - */ - function _showtitle($img,$data){ - global $ID; - - if(!$data['showtitle'] ) { return ''; } - - //prepare link - $lnk = ml($img['id'],array('id'=>$ID),false); - - // prepare output - $ret = ''; - $ret .= '
      '; - $ret .= hsc($this->_meta($img,'title')); - $ret .= ''; - return $ret; - } - - /** - * Return the metadata of an item - * - * Automatically checks if a JPEGMeta object is available or if all data is - * supplied in array - */ - function _meta(&$img,$opt){ - if($img['meta']){ - // map JPEGMeta calls to opt names - - switch($opt){ - case 'title': - return $img['meta']->getField('Simple.Title'); - case 'desc': - return $img['meta']->getField('Iptc.Caption'); - case 'cdate': - return $img['meta']->getField('Date.EarliestTime'); - case 'width': - return $img['meta']->getField('File.Width'); - case 'height': - return $img['meta']->getField('File.Height'); - - - default: - return ''; - } - - }else{ - // just return the array field - return $img[$opt]; - } - } - - /** - * Calculates the multiplier needed to resize the image to the given - * dimensions - * - * @author Andreas Gohr - */ - function _ratio(&$img,$maxwidth,$maxheight=0){ - if(!$maxheight) $maxheight = $maxwidth; - - $w = $this->_meta($img,'width'); - $h = $this->_meta($img,'height'); - - $ratio = 1; - if($w >= $h){ - if($w >= $maxwidth){ - $ratio = $maxwidth/$w; - }elseif($h > $maxheight){ - $ratio = $maxheight/$h; - } - }else{ - if($h >= $maxheight){ - $ratio = $maxheight/$h; - }elseif($w > $maxwidth){ - $ratio = $maxwidth/$w; - } - } - return $ratio; - } - -} - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/sources/lib/plugins/popularity/helper.php b/sources/lib/plugins/popularity/helper.php index 27755b0..b81ab70 100644 --- a/sources/lib/plugins/popularity/helper.php +++ b/sources/lib/plugins/popularity/helper.php @@ -310,7 +310,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin { * Convert php.ini shorthands to byte * * @author - * @link http://de3.php.net/manual/en/ini.core.php#79564 + * @link http://php.net/manual/en/ini.core.php#79564 * * @param string $v * @return int|string diff --git a/sources/lib/plugins/popularity/lang/cy/intro.txt b/sources/lib/plugins/popularity/lang/cy/intro.txt new file mode 100644 index 0000000..187dfe0 --- /dev/null +++ b/sources/lib/plugins/popularity/lang/cy/intro.txt @@ -0,0 +1,11 @@ +====== Adborth Poblogrwydd ====== + +Mae'r [[doku>popularity|teclyn]] hwn yn casglu data anhysbys am eich wici ac yn eich galluogi chi i'w anfon yn ôl i ddatblygwyr DokuWiki. Mae hwn yn eu helpu nhw i ddeall sut mae DokuWiki yn cael ei ddefnyddio gan ei ddefnyddwyr ac mae\'n sicrhau bod penderfyniadau datblygu yn y dyfodol yn cael eu cefnogi gan ystadegau defnydd go iawn. + +Cewch eich annog i ailadrodd y cam hwn o dro i dro er mwyn hysbysu datblygwyr wrth i'ch wici dyfu. Caiff eich setiau data eilfydd eu hadnabod gan ID anhysbys. + +Mae'r data sy'n cael ei gasglu yn cynnwys pethau fel fersiwn eich DokuWiki, nifer a maint eich tudalennau a'ch ffeiliau chi, ategion sydd wedi'u harsefydlu a gwybodaeth parthed eich arsefydliad PHP. + +Caiff y data crai i'w anfon ei ddangos isod. Pwyswch fotwm "Anfon Data" i drosglwyddo'r wybodaeth. + + diff --git a/sources/lib/plugins/popularity/lang/cy/lang.php b/sources/lib/plugins/popularity/lang/cy/lang.php new file mode 100644 index 0000000..7bee7bd --- /dev/null +++ b/sources/lib/plugins/popularity/lang/cy/lang.php @@ -0,0 +1,9 @@ + * @author Esben Laursen * @author Harith diff --git a/sources/lib/plugins/popularity/lang/ja/lang.php b/sources/lib/plugins/popularity/lang/ja/lang.php index 50346c7..81dc94c 100644 --- a/sources/lib/plugins/popularity/lang/ja/lang.php +++ b/sources/lib/plugins/popularity/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Ikuo Obataya * @author Daniel Dupriest * @author Kazutaka Miyasaka diff --git a/sources/lib/plugins/popularity/lang/ko/lang.php b/sources/lib/plugins/popularity/lang/ko/lang.php index f8cf452..fc8b373 100644 --- a/sources/lib/plugins/popularity/lang/ko/lang.php +++ b/sources/lib/plugins/popularity/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author jk Lee * @author dongnak@gmail.com * @author Song Younghwan diff --git a/sources/lib/plugins/popularity/lang/pt-br/lang.php b/sources/lib/plugins/popularity/lang/pt-br/lang.php index 280f072..6b2f7a2 100644 --- a/sources/lib/plugins/popularity/lang/pt-br/lang.php +++ b/sources/lib/plugins/popularity/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães * @author Lucien Raven * @author Enrico Nicoletto diff --git a/sources/lib/plugins/popularity/lang/sk/lang.php b/sources/lib/plugins/popularity/lang/sk/lang.php index ab7accf..d0937c8 100644 --- a/sources/lib/plugins/popularity/lang/sk/lang.php +++ b/sources/lib/plugins/popularity/lang/sk/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Michal Mesko * @author exusik@gmail.com * @author Martin Michalek diff --git a/sources/lib/plugins/popularity/lang/zh/lang.php b/sources/lib/plugins/popularity/lang/zh/lang.php index 532abb8..e1fa8fe 100644 --- a/sources/lib/plugins/popularity/lang/zh/lang.php +++ b/sources/lib/plugins/popularity/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/sources/lib/plugins/remote.php b/sources/lib/plugins/remote.php index 47f954e..c2253db 100644 --- a/sources/lib/plugins/remote.php +++ b/sources/lib/plugins/remote.php @@ -17,10 +17,82 @@ abstract class DokuWiki_Remote_Plugin extends DokuWiki_Plugin { /** * Get all available methods with remote access. * - * @abstract + * By default it exports all public methods of a remote plugin. Methods beginning + * with an underscore are skipped. + * * @return array Information about all provided methods. {@see RemoteAPI}. */ - public abstract function _getMethods(); + public function _getMethods() { + $result = array(); + + $reflection = new \ReflectionClass($this); + foreach($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) { + // skip parent methods, only methods further down are exported + $declaredin = $method->getDeclaringClass()->name; + if($declaredin == 'DokuWiki_Plugin' || $declaredin == 'DokuWiki_Remote_Plugin') continue; + $method_name = $method->name; + if(substr($method_name, 0, 1) == '_') continue; + + // strip asterisks + $doc = $method->getDocComment(); + $doc = preg_replace( + array('/^[ \t]*\/\*+[ \t]*/m', '/[ \t]*\*+[ \t]*/m', '/\*+\/\s*$/m','/\s*\/\s*$/m'), + array('', '', '', ''), + $doc + ); + + // prepare data + $data = array(); + $data['name'] = $method_name; + $data['public'] = 0; + $data['doc'] = $doc; + $data['args'] = array(); + + // get parameter type from doc block type hint + foreach($method->getParameters() as $parameter) { + $name = $parameter->name; + $type = 'string'; // we default to string + if(preg_match('/^@param[ \t]+([\w|\[\]]+)[ \t]\$'.$name.'/m', $doc, $m)){ + $type = $this->cleanTypeHint($m[1]); + } + $data['args'][] = $type; + } + + // get return type from doc block type hint + if(preg_match('/^@return[ \t]+([\w|\[\]]+)/m', $doc, $m)){ + $data['return'] = $this->cleanTypeHint($m[1]); + } else { + $data['return'] = 'string'; + } + + // add to result + $result[$method_name] = $data; + } + + return $result; + } + + /** + * Matches the given type hint against the valid options for the remote API + * + * @param string $hint + * @return string + */ + protected function cleanTypeHint($hint) { + $types = explode('|', $hint); + foreach($types as $t) { + if(substr($t, -2) == '[]') { + return 'array'; + } + if($t == 'boolean') { + return 'bool'; + } + if(in_array($t, array('array', 'string', 'int', 'double', 'bool', 'null', 'date', 'file'))) { + return $t; + } + } + return 'string'; + } /** * @return RemoteAPI diff --git a/sources/lib/plugins/revert/lang/cy/intro.txt b/sources/lib/plugins/revert/lang/cy/intro.txt new file mode 100644 index 0000000..0e09bab --- /dev/null +++ b/sources/lib/plugins/revert/lang/cy/intro.txt @@ -0,0 +1,3 @@ +====== Rheolwr Troi'n Ôl ====== + +Mae'r dudalen hon yn eich helpu chi i droi'n ôl yn awtomatig yn dilyn ymosodiad sbam. Er mwyn darganfod rhestr o dudalennau sbamllyd, rhowch linyn chwilio (ee. URL sbamllyd), yna cadarnhewch fod y tudalennau a ddarganfuwyd wir yn sbamllyd a throwch y golygiadau'n ôl. diff --git a/sources/lib/plugins/revert/lang/cy/lang.php b/sources/lib/plugins/revert/lang/cy/lang.php new file mode 100644 index 0000000..ce4f005 --- /dev/null +++ b/sources/lib/plugins/revert/lang/cy/lang.php @@ -0,0 +1,22 @@ +%s.'; + +//Setup VIM: ex: et ts=4 : diff --git a/sources/lib/plugins/revert/lang/da/lang.php b/sources/lib/plugins/revert/lang/da/lang.php index bb311f1..782ec12 100644 --- a/sources/lib/plugins/revert/lang/da/lang.php +++ b/sources/lib/plugins/revert/lang/da/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Kalle Sommer Nielsen * @author Esben Laursen * @author Harith diff --git a/sources/lib/plugins/revert/lang/ja/lang.php b/sources/lib/plugins/revert/lang/ja/lang.php index 9253ff5..1bca8a7 100644 --- a/sources/lib/plugins/revert/lang/ja/lang.php +++ b/sources/lib/plugins/revert/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuji Takenaka * @author Ikuo Obataya * @author Daniel Dupriest diff --git a/sources/lib/plugins/revert/lang/ko/lang.php b/sources/lib/plugins/revert/lang/ko/lang.php index f99b0ab..bf74f76 100644 --- a/sources/lib/plugins/revert/lang/ko/lang.php +++ b/sources/lib/plugins/revert/lang/ko/lang.php @@ -2,13 +2,14 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author jk Lee * @author dongnak@gmail.com * @author Song Younghwan * @author Seung-Chul Yoo * @author erial2@gmail.com * @author Myeongjin + * @author Erial */ $lang['menu'] = 'ë˜ëŒë¦¬ê¸° 관리ìž'; $lang['filter'] = '스팸 문서 검색'; diff --git a/sources/lib/plugins/revert/lang/pt-br/lang.php b/sources/lib/plugins/revert/lang/pt-br/lang.php index 1039704..36ab3dc 100644 --- a/sources/lib/plugins/revert/lang/pt-br/lang.php +++ b/sources/lib/plugins/revert/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães * @author Felipe Castro * @author Lucien Raven diff --git a/sources/lib/plugins/revert/lang/sk/lang.php b/sources/lib/plugins/revert/lang/sk/lang.php index 7ab21f2..97689f8 100644 --- a/sources/lib/plugins/revert/lang/sk/lang.php +++ b/sources/lib/plugins/revert/lang/sk/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Michal Mesko * @author exusik@gmail.com * @author Martin Michalek diff --git a/sources/lib/plugins/revert/lang/zh/lang.php b/sources/lib/plugins/revert/lang/zh/lang.php index 44a72f5..b56d830 100644 --- a/sources/lib/plugins/revert/lang/zh/lang.php +++ b/sources/lib/plugins/revert/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com diff --git a/sources/lib/plugins/styling/lang/bg/lang.php b/sources/lib/plugins/styling/lang/bg/lang.php index 5e45738..7d17caf 100644 --- a/sources/lib/plugins/styling/lang/bg/lang.php +++ b/sources/lib/plugins/styling/lang/bg/lang.php @@ -5,9 +5,12 @@ * * @author Kiril */ +$lang['menu'] = 'ÐаÑтройки на Ñтила на шаблона'; +$lang['error'] = 'За Ñъжаление шаблона не поддържа тази функционалноÑÑ‚.'; $lang['btn_preview'] = 'Преглед на промените'; $lang['btn_save'] = 'Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° промените'; $lang['btn_reset'] = 'Ðнулиране на промените'; +$lang['btn_revert'] = 'Връщане на Ñтила към Ñтандартните ÑтойноÑти'; $lang['__text__'] = 'ЦвÑÑ‚ на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ñ‚ÐµÐºÑÑ‚'; $lang['__background__'] = 'ЦвÑÑ‚ на оÑÐ½Ð¾Ð²Ð½Ð¸Ñ Ñ„Ð¾Ð½'; $lang['__text_alt__'] = 'Ðлтернативен цвÑÑ‚ за текÑта'; @@ -15,3 +18,4 @@ $lang['__background_alt__'] = 'Ðлтернативен цвÑÑ‚ за фон $lang['__text_neu__'] = 'Ðеутрален цвÑÑ‚ за текÑта'; $lang['__background_neu__'] = 'Ðеутрален цвÑÑ‚ за фона'; $lang['__border__'] = 'ЦвÑÑ‚ на рамката'; +$lang['__highlight__'] = 'ЦвÑÑ‚ за отличаване (оÑновно на резултата от Ñ‚ÑŠÑ€ÑениÑ)'; diff --git a/sources/lib/plugins/styling/lang/cs/intro.txt b/sources/lib/plugins/styling/lang/cs/intro.txt new file mode 100644 index 0000000..00365a0 --- /dev/null +++ b/sources/lib/plugins/styling/lang/cs/intro.txt @@ -0,0 +1,2 @@ +Tento nástroj umožňuje zmÄ›nu urÄitých nastavení stylu právÄ› používané Å¡ablony vzhledu. +VÅ¡echny zmÄ›ny jsou uloženy v lokálním konfiguraÄním souboru a tím chránÄ›ny pÅ™ed smazáním pÅ™i aktualizaci. \ No newline at end of file diff --git a/sources/lib/plugins/styling/lang/cy/intro.txt b/sources/lib/plugins/styling/lang/cy/intro.txt new file mode 100644 index 0000000..7c82596 --- /dev/null +++ b/sources/lib/plugins/styling/lang/cy/intro.txt @@ -0,0 +1,2 @@ +Mae'r teclyn hwn yn eich galluogi chi newid gosodiadau arddull penodol y templed rydych chi'n defnyddio'n bresennol. +Caiff pob newid ei storio mewn ffeil ffurfwedd leol sy'n uwchradd-ddiogel. \ No newline at end of file diff --git a/sources/lib/plugins/styling/lang/cy/lang.php b/sources/lib/plugins/styling/lang/cy/lang.php new file mode 100644 index 0000000..4d22a59 --- /dev/null +++ b/sources/lib/plugins/styling/lang/cy/lang.php @@ -0,0 +1,36 @@ + + * @author Alan Davies + */ + +// menu entry for admin plugins +$lang['menu'] = 'Gosodiadau Arddull Templed'; + +$lang['js']['loader'] = 'Rhagolwg yn llwytho...
      os \'dyw hwn ddim yn diflannu, efallai bod eich gwerthoedd yn annilys'; +$lang['js']['popup'] = 'Agor fel ffurflen naid'; + +// custom language strings for the plugin +$lang['error'] = 'Sori, \'dyw\'r templed hwn ddim yn cynnal y swyddogaethedd hwn.'; + +$lang['btn_preview'] = 'Rhagolwg newidiadau'; +$lang['btn_save'] = 'Cadw newidiadau'; +$lang['btn_reset'] = 'Ailosod newidiadau cyfredol'; +$lang['btn_revert'] = 'Troi arddulliau\'n ôl i ddiofyn y templed'; + +// default guaranteed placeholders +$lang['__text__'] = 'Lliw\'r prif destun'; +$lang['__background__'] = 'Lliw\'r prif gefndir'; +$lang['__text_alt__'] = 'Lliw testun amgen'; +$lang['__background_alt__'] = 'Lliw cefndir amgen'; +$lang['__text_neu__'] = 'lliw testun niwtral'; +$lang['__background_neu__'] = 'Lliw cefndir niwtral'; +$lang['__border__'] = 'Lliw border'; +$lang['__highlight__'] = 'Lliw uwcholeuad (am ganlyniadau chwiliad yn bennaf)'; + + + + +//Setup VIM: ex: et ts=4 : diff --git a/sources/lib/plugins/styling/lang/fa/intro.txt b/sources/lib/plugins/styling/lang/fa/intro.txt new file mode 100644 index 0000000..428a251 --- /dev/null +++ b/sources/lib/plugins/styling/lang/fa/intro.txt @@ -0,0 +1,2 @@ +این ابزار این امکان را Ùراهم می‌سازد Ú©Ù‡ برخی تنظیمات مشخص از قالبی Ú©Ù‡ انتخاب کردید را تغییر دهید. +تمام تغییرات در Ùایل داخلی تنظیمات ذخیره می‌شود Ùˆ به‌روزرسانی هم ایمن است. \ No newline at end of file diff --git a/sources/lib/plugins/styling/lang/fa/lang.php b/sources/lib/plugins/styling/lang/fa/lang.php new file mode 100644 index 0000000..c8d1bd6 --- /dev/null +++ b/sources/lib/plugins/styling/lang/fa/lang.php @@ -0,0 +1,23 @@ + + */ +$lang['menu'] = 'تنظیمات ظاهری تمپلیت'; +$lang['js']['loader'] = 'پیش‌نمایش در حال باز شدن است...
      اگر این پیش نرÙت یعنی مقادیرتان اشکال دارد'; +$lang['js']['popup'] = 'باز کردن به صورت popup'; +$lang['error'] = 'ببخشید، این قالب از این قابلیت پشتیبانی نمی‌کند'; +$lang['btn_preview'] = 'نمایش تغییرات'; +$lang['btn_save'] = 'ذخیره تغییرات'; +$lang['btn_reset'] = 'بازگردانی تغییر Ùعلی'; +$lang['btn_revert'] = 'بازگردانی ظاهر به پیشÙرض قالب'; +$lang['__text__'] = 'رنگ اصلی متن'; +$lang['__background__'] = 'رنگ اصلی زمینه'; +$lang['__text_alt__'] = 'رنگ ثانویه متن'; +$lang['__background_alt__'] = 'رنگ ثانویه زمینه'; +$lang['__text_neu__'] = 'رنگ خنثی متن'; +$lang['__background_neu__'] = 'رنگ خنثی زمینه'; +$lang['__border__'] = 'رنگ حاشیه'; +$lang['__highlight__'] = 'رنگ برجسته‌سازی (برای نتیجه جستجو)'; diff --git a/sources/lib/plugins/styling/lang/hr/intro.txt b/sources/lib/plugins/styling/lang/hr/intro.txt new file mode 100644 index 0000000..5c947dd --- /dev/null +++ b/sources/lib/plugins/styling/lang/hr/intro.txt @@ -0,0 +1,2 @@ +Ovaj alat omogućava izmjenu nekih postavki stila vaÅ¡eg tekućeg wiki predloÅ¡ka. +Sve postavke su snimljene u lokalnu konfiguracijsku datoteku i neće biti prebrisane kod nadogradnje. \ No newline at end of file diff --git a/sources/lib/plugins/styling/lang/hr/lang.php b/sources/lib/plugins/styling/lang/hr/lang.php new file mode 100644 index 0000000..ab7c14f --- /dev/null +++ b/sources/lib/plugins/styling/lang/hr/lang.php @@ -0,0 +1,23 @@ + + */ +$lang['menu'] = 'Postavke stila predloÅ¡ka'; +$lang['js']['loader'] = 'Pregled se uÄitava...
      ako ovo ne nestane, vaše vrijednosti su možda neispravne'; +$lang['js']['popup'] = 'Otvori kao zasebni prozor'; +$lang['error'] = 'Oprostite ali ovaj predložak ne podržava ovu funkcionalnost'; +$lang['btn_preview'] = 'Pregled izmjena'; +$lang['btn_save'] = 'Snimi promjene'; +$lang['btn_reset'] = 'Resetiraj trenutne promjene'; +$lang['btn_revert'] = 'Vrati postavke nazad na inicijalne vrijednosti predloška'; +$lang['__text__'] = 'Primarna boja teksta'; +$lang['__background__'] = 'Primarna boja pozadine'; +$lang['__text_alt__'] = 'Alternativna boja teksta'; +$lang['__background_alt__'] = 'Alternativna boja pozadine'; +$lang['__text_neu__'] = 'Boja neutralnog teksta'; +$lang['__background_neu__'] = 'Boja neutralne pozadine'; +$lang['__border__'] = 'Boja ruba'; +$lang['__highlight__'] = 'Boja isticanja (uglavnom za rezultat pretrage)'; diff --git a/sources/lib/plugins/styling/lang/it/intro.txt b/sources/lib/plugins/styling/lang/it/intro.txt new file mode 100644 index 0000000..6c798e4 --- /dev/null +++ b/sources/lib/plugins/styling/lang/it/intro.txt @@ -0,0 +1,2 @@ +Questo strumento ti permette di cambiare certe configurazioni di stile del tema attualmente in uso. +Tutte le modifiche sono salvate in un file di configurazione locale e sono aggiornate in modo sicuro. \ No newline at end of file diff --git a/sources/lib/plugins/styling/lang/it/lang.php b/sources/lib/plugins/styling/lang/it/lang.php index b986a67..aea011f 100644 --- a/sources/lib/plugins/styling/lang/it/lang.php +++ b/sources/lib/plugins/styling/lang/it/lang.php @@ -5,13 +5,19 @@ * * @author Torpedo */ +$lang['menu'] = 'Configurazioni di stile del tema'; +$lang['js']['loader'] = 'Anteprima in corso...
      se questo non sparisce, potresti aver fornito dei valori sbagliati'; $lang['js']['popup'] = 'Apri in un finestra a parte'; $lang['error'] = 'Spiacente, questo template non supporta questa funzionalità.'; $lang['btn_preview'] = 'Cambiamenti precedenti'; $lang['btn_save'] = 'Salva i cambiamenti'; +$lang['btn_reset'] = 'Azzera le modifiche correnti'; +$lang['btn_revert'] = 'Ripristina gli stili ai valori originari del tema'; $lang['__text__'] = 'Colore principale del testo'; $lang['__background__'] = 'Colore principale dello sfondo'; $lang['__text_alt__'] = 'Colore alternativo per il testo'; $lang['__background_alt__'] = 'Colore alternativo dello sfondo'; +$lang['__text_neu__'] = 'Colore testo neutrale'; +$lang['__background_neu__'] = 'Colore sfondo neutrale'; $lang['__border__'] = 'Colore del bordo'; $lang['__highlight__'] = 'Colore di evidenziazione (principalmente per i risultati di ricerca)'; diff --git a/sources/lib/plugins/styling/lang/ja/lang.php b/sources/lib/plugins/styling/lang/ja/lang.php index da18829..5c546a7 100644 --- a/sources/lib/plugins/styling/lang/ja/lang.php +++ b/sources/lib/plugins/styling/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Hideaki SAWADA */ $lang['menu'] = 'テンプレートã®ã‚¹ã‚¿ã‚¤ãƒ«è¨­å®š'; diff --git a/sources/lib/plugins/styling/lang/ko/lang.php b/sources/lib/plugins/styling/lang/ko/lang.php index 96da76d..bcdf9dc 100644 --- a/sources/lib/plugins/styling/lang/ko/lang.php +++ b/sources/lib/plugins/styling/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Myeongjin */ $lang['menu'] = '템플릿 ìŠ¤íƒ€ì¼ ì„¤ì •'; diff --git a/sources/lib/plugins/styling/lang/pt-br/lang.php b/sources/lib/plugins/styling/lang/pt-br/lang.php index b7ac1fc..4ebcbe5 100644 --- a/sources/lib/plugins/styling/lang/pt-br/lang.php +++ b/sources/lib/plugins/styling/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães */ $lang['menu'] = 'Configurações de estilo do modelo'; diff --git a/sources/lib/plugins/styling/lang/pt/lang.php b/sources/lib/plugins/styling/lang/pt/lang.php new file mode 100644 index 0000000..6929a40 --- /dev/null +++ b/sources/lib/plugins/styling/lang/pt/lang.php @@ -0,0 +1,13 @@ + + */ +$lang['js']['popup'] = 'Abrir como uma janela extra'; +$lang['error'] = 'Desculpe, este modelo não suporta esta funcionalidade.'; +$lang['btn_preview'] = 'Pré-visualizar alterações'; +$lang['btn_save'] = 'Guardar alterações'; +$lang['btn_reset'] = 'Reiniciar alterações atuais'; +$lang['__text__'] = 'Cor do texto principal'; diff --git a/sources/lib/plugins/styling/lang/ru/intro.txt b/sources/lib/plugins/styling/lang/ru/intro.txt index 39a09c0..3a01411 100644 --- a/sources/lib/plugins/styling/lang/ru/intro.txt +++ b/sources/lib/plugins/styling/lang/ru/intro.txt @@ -1 +1 @@ -Этот инÑтрумент позволÑет изменÑÑ‚ÑŒ Ñтилевые наÑтройки выбранного шаблона. Ð’Ñе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ…Ñ€Ð°Ð½ÑÑ‚ÑÑ Ð² файле конфигурации и защищены от ÑброÑа при обновлении. +Этот инÑтрумент позволÑет изменÑÑ‚ÑŒ Ñтилевые наÑтройки выбранного шаблона. Ð’Ñе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ…Ñ€Ð°Ð½ÑÑ‚ÑÑ Ð²Â Ñ„Ð°Ð¹Ð»Ðµ конфигурации и защищены от ÑброÑа при обновлении. diff --git a/sources/lib/plugins/styling/lang/ru/lang.php b/sources/lib/plugins/styling/lang/ru/lang.php index 1c2dfa5..beda176 100644 --- a/sources/lib/plugins/styling/lang/ru/lang.php +++ b/sources/lib/plugins/styling/lang/ru/lang.php @@ -1,7 +1,8 @@ */ $lang['menu'] = 'ÐаÑтройки Ñтилей шаблона'; diff --git a/sources/lib/plugins/styling/lang/sk/lang.php b/sources/lib/plugins/styling/lang/sk/lang.php new file mode 100644 index 0000000..0058358 --- /dev/null +++ b/sources/lib/plugins/styling/lang/sk/lang.php @@ -0,0 +1,18 @@ + + */ +$lang['btn_preview'] = 'Náhľad zmien'; +$lang['btn_save'] = 'Uloženie zmien'; +$lang['btn_reset'] = 'ZruÅ¡ prevedené zmeny'; +$lang['__text__'] = 'Primárna farba textu'; +$lang['__background__'] = 'Primárna farba pozadia'; +$lang['__text_alt__'] = 'Alternatívna farba textu'; +$lang['__background_alt__'] = 'Alternatívna farba pozadia'; +$lang['__text_neu__'] = 'Neutrálna farba textu'; +$lang['__background_neu__'] = 'Neutrálna farba pozadia'; +$lang['__border__'] = 'Farba okraja'; +$lang['__highlight__'] = 'Farba zvýraznenia (zvyÄajne výsledkov vyhľadávania)'; diff --git a/sources/lib/plugins/styling/lang/zh-tw/lang.php b/sources/lib/plugins/styling/lang/zh-tw/lang.php new file mode 100644 index 0000000..ce4a9a9 --- /dev/null +++ b/sources/lib/plugins/styling/lang/zh-tw/lang.php @@ -0,0 +1,15 @@ + + */ +$lang['menu'] = '模æ¿é¢¨æ ¼è¨­å®š'; +$lang['error'] = '抱歉，該模æ¿ä¸æ”¯æŒé€™å€‹åŠŸèƒ½'; +$lang['btn_preview'] = 'é è¦½'; +$lang['btn_save'] = '儲存'; +$lang['btn_reset'] = 'é‡è¨­'; +$lang['btn_revert'] = '將風格復原至模æ¿é è¨­å€¼'; +$lang['__text__'] = '主è¦æ–‡å­—é¡è‰²'; +$lang['__background__'] = '主è¦èƒŒæ™¯é¡è‰²'; diff --git a/sources/lib/plugins/styling/lang/zh/lang.php b/sources/lib/plugins/styling/lang/zh/lang.php index 805d070..386312a 100644 --- a/sources/lib/plugins/styling/lang/zh/lang.php +++ b/sources/lib/plugins/styling/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author lainme */ $lang['menu'] = '模æ¿æ ·å¼è®¾ç½®'; diff --git a/sources/lib/plugins/translation/README b/sources/lib/plugins/translation/README deleted file mode 100644 index 1a5b5ef..0000000 --- a/sources/lib/plugins/translation/README +++ /dev/null @@ -1,25 +0,0 @@ -translation Plugin for DokuWiki - -All documentation for this plugin can be found at -http://www.dokuwiki.org/plugin:translation - -If you install this plugin manually, make sure it is installed in -lib/plugins/translation/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - ----- -Copyright (C) Andreas Gohr - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/sources/lib/plugins/translation/action.php b/sources/lib/plugins/translation/action.php deleted file mode 100644 index 3319e61..0000000 --- a/sources/lib/plugins/translation/action.php +++ /dev/null @@ -1,289 +0,0 @@ - - * @author Guy Brand - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/'); -require_once(DOKU_PLUGIN . 'action.php'); - -class action_plugin_translation extends DokuWiki_Action_Plugin { - - /** - * For the helper plugin - * @var helper_plugin_translation - */ - var $helper = null; - - var $locale; - - /** - * Constructor. Load helper plugin - */ - function action_plugin_translation() { - $this->helper =& plugin_load('helper', 'translation'); - } - - /** - * Register the events - */ - function register(&$controller) { - $scriptName = basename($_SERVER['PHP_SELF']); - - // should the lang be applied to UI? - if($this->getConf('translateui')) { - switch($scriptName) { - case 'js.php': - $controller->register_hook('INIT_LANG_LOAD', 'BEFORE', $this, 'translation_js'); - $controller->register_hook('JS_CACHE_USE', 'BEFORE', $this, 'translation_jscache'); - break; - - case 'ajax.php': - $controller->register_hook('INIT_LANG_LOAD', 'BEFORE', $this, 'translate_media_manager'); - break; - - case 'mediamanager.php': - $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'setJsCacheKey'); - break; - - default: - $controller->register_hook('TPL_METAHEADER_OUTPUT', 'BEFORE', $this, 'setJsCacheKey'); - } - } - - if($scriptName !== 'js.php' && $scriptName !== 'ajax.php') { - $controller->register_hook('DOKUWIKI_STARTED', 'BEFORE', $this, 'translation_hook'); - $controller->register_hook('MEDIAMANAGER_STARTED', 'BEFORE', $this, 'translation_hook'); - } - - $controller->register_hook('SEARCH_QUERY_PAGELOOKUP', 'AFTER', $this, 'translation_search'); - $controller->register_hook('COMMON_PAGETPL_LOAD', 'AFTER', $this, 'page_template_replacement'); - } - - /** - * Hook Callback. Make current language available as page template placeholder and handle - * original language copying - * - * @param $event - * @param $args - */ - function page_template_replacement(&$event, $args) { - global $ID; - - // load orginal content as template? - if($this->getConf('copytrans') && $this->helper->istranslatable($ID, false)) { - // look for existing translations - $translations = $this->helper->getAvailableTranslations($ID); - if($translations) { - // find original language (might've been provided via parameter or use first translation) - $orig = (string) $_REQUEST['fromlang']; - if(!$orig) $orig = array_shift(array_keys($translations)); - - // load file - $origfile = $translations[$orig]; - $event->data['tpl'] = io_readFile(wikiFN($origfile)); - - // prefix with warning - $warn = io_readFile($this->localFN('totranslate')); - if($warn) $warn .= "\n\n"; - $event->data['tpl'] = $warn . $event->data['tpl']; - - // show user a choice of translations if any - if(count($translations) > 1) { - $links = array(); - foreach($translations as $t => $l) { - $links[] = '' . $this->helper->getLocalName($t) . ''; - } - - msg( - sprintf( - $this->getLang('transloaded'), - $this->helper->getLocalName($orig), - join(', ', $links) - ) - ); - } - - } - } - - // apply placeholders - $event->data['tpl'] = str_replace('@LANG@', $this->helper->realLC(''), $event->data['tpl']); - $event->data['tpl'] = str_replace('@TRANS@', $this->helper->getLangPart($ID), $event->data['tpl']); - } - - /** - * Hook Callback. Load correct translation when loading JavaScript - * - * @param $event - * @param $args - */ - function translation_js(&$event, $args) { - global $conf; - if(!isset($_GET['lang'])) return; - if(!in_array($_GET['lang'], $this->helper->translations)) return; - $lang = $_GET['lang']; - $event->data = $lang; - $conf['lang'] = $lang; - } - - /** - * Hook Callback. Pass language code to JavaScript dispatcher - * - * @param $event - * @param $args - * @return bool - */ - function setJsCacheKey(&$event, $args) { - if(!isset($this->locale)) return false; - $count = count($event->data['script']); - for($i = 0; $i < $count; $i++) { - if(strpos($event->data['script'][$i]['src'], '/lib/exe/js.php') !== false) { - $event->data['script'][$i]['src'] .= '&lang=' . hsc($this->locale); - } - } - - return false; - } - - /** - * Hook Callback. Make sure the JavaScript is translation dependent - * - * @param $event - * @param $args - */ - function translation_jscache(&$event, $args) { - if(!isset($_GET['lang'])) return; - if(!in_array($_GET['lang'], $this->helper->translations)) return; - - $lang = $_GET['lang']; - // reuse the constructor to reinitialize the cache key - if(method_exists($event->data, '__construct')) { - // New PHP 5 style constructor - $event->data->__construct( - $event->data->key . $lang, - $event->data->ext - ); - } else { - // Old PHP 4 style constructor - deprecated - $event->data->cache( - $event->data->key . $lang, - $event->data->ext - ); - } - } - - /** - * Hook Callback. Translate the AJAX loaded media manager - * - * @param $event - * @param $args - */ - function translate_media_manager(&$event, $args) { - global $conf; - if(isset($_REQUEST['ID'])) { - $id = getID(); - $lc = $this->helper->getLangPart($id); - } elseif(isset($_SESSION[DOKU_COOKIE]['translationlc'])) { - $lc = $_SESSION[DOKU_COOKIE]['translationlc']; - } else { - return; - } - if(!$lc) return; - - $conf['lang'] = $lc; - $event->data = $lc; - } - - /** - * Hook Callback. Change the UI language in foreign language namespaces - */ - function translation_hook(&$event, $args) { - global $ID; - global $lang; - global $conf; - global $ACT; - // redirect away from start page? - if($this->conf['redirectstart'] && $ID == $conf['start'] && $ACT == 'show') { - $lc = $this->helper->getBrowserLang(); - if(!$lc) $lc = $conf['lang']; - header('Location: ' . wl($lc . ':' . $conf['start'], '', true, '&')); - exit; - } - - // check if we are in a foreign language namespace - $lc = $this->helper->getLangPart($ID); - - // store language in session (for page related views only) - if(in_array($ACT, array('show', 'recent', 'diff', 'edit', 'preview', 'source', 'subscribe'))) { - $_SESSION[DOKU_COOKIE]['translationlc'] = $lc; - } - if(!$lc) $lc = $_SESSION[DOKU_COOKIE]['translationlc']; - if(!$lc) return; - $this->locale = $lc; - - if(!$this->getConf('translateui')) { - return true; - } - - if(file_exists(DOKU_INC . 'inc/lang/' . $lc . '/lang.php')) { - require(DOKU_INC . 'inc/lang/' . $lc . '/lang.php'); - } - $conf['lang_before_translation'] = $conf['lang']; //store for later access in syntax plugin - $conf['lang'] = $lc; - - return true; - } - - /** - * Hook Callback. Resort page match results so that results are ordered by translation, having the - * default language first - */ - function translation_search(&$event, $args) { - - if($event->data['has_titles']) { - // sort into translation slots - $res = array(); - foreach($event->result as $r => $t) { - $tr = $this->helper->getLangPart($r); - if(!is_array($res["x$tr"])) $res["x$tr"] = array(); - $res["x$tr"][] = array($r, $t); - } - // sort by translations - ksort($res); - // combine - $event->result = array(); - foreach($res as $r) { - foreach($r as $l) { - $event->result[$l[0]] = $l[1]; - } - } - } else { - # legacy support for old DokuWiki hooks - - // sort into translation slots - $res = array(); - foreach($event->result as $r) { - $tr = $this->helper->getLangPart($r); - if(!is_array($res["x$tr"])) $res["x$tr"] = array(); - $res["x$tr"][] = $r; - } - // sort by translations - ksort($res); - // combine - $event->result = array(); - foreach($res as $r) { - $event->result = array_merge($event->result, $r); - } - } - } - -} - -//Setup VIM: ex: et ts=4 : diff --git a/sources/lib/plugins/translation/conf/default.php b/sources/lib/plugins/translation/conf/default.php deleted file mode 100644 index 49672b4..0000000 --- a/sources/lib/plugins/translation/conf/default.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ - -$conf['translations'] = ''; -$conf['translationns'] = ''; -$conf['skiptrans'] = ''; -$conf['dropdown'] = 0; -$conf['translateui'] = 0; -$conf['redirectstart'] = 0; -$conf['checkage'] = 0; -$conf['about'] = ''; -$conf['localabout'] = 0; -$conf['display'] = 'langcode,title'; -$conf['copytrans'] = 0; diff --git a/sources/lib/plugins/translation/conf/metadata.php b/sources/lib/plugins/translation/conf/metadata.php deleted file mode 100644 index 6164ecd..0000000 --- a/sources/lib/plugins/translation/conf/metadata.php +++ /dev/null @@ -1,20 +0,0 @@ - - */ - -$meta['translations'] = array('string','_pattern' => '/^(|[a-zA-Z\- ,]+)$/'); -$meta['translationns'] = array('string','_pattern' => '/^(|[\w:\-]+)$/'); -$meta['skiptrans'] = array('string'); -$meta['dropdown'] = array('onoff'); -$meta['display'] = array('multicheckbox', - '_choices' => array('langcode','name','flag','title','twolines')); -$meta['translateui'] = array('onoff'); -$meta['redirectstart'] = array('onoff'); -$meta['checkage'] = array('onoff'); -$meta['about'] = array('string','_pattern' => '/^(|[\w:\-]+)$/'); -$meta['localabout'] = array('onoff'); -$meta['copytrans'] = array('onoff'); - diff --git a/sources/lib/plugins/translation/flags/af.gif b/sources/lib/plugins/translation/flags/af.gif deleted file mode 100644 index 9889408..0000000 Binary files a/sources/lib/plugins/translation/flags/af.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ar.gif b/sources/lib/plugins/translation/flags/ar.gif deleted file mode 100644 index 179961b..0000000 Binary files a/sources/lib/plugins/translation/flags/ar.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/da.gif b/sources/lib/plugins/translation/flags/da.gif deleted file mode 100644 index 03e75bd..0000000 Binary files a/sources/lib/plugins/translation/flags/da.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/de.gif b/sources/lib/plugins/translation/flags/de.gif deleted file mode 100644 index 75728dd..0000000 Binary files a/sources/lib/plugins/translation/flags/de.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/el.gif b/sources/lib/plugins/translation/flags/el.gif deleted file mode 100644 index b4c8c04..0000000 Binary files a/sources/lib/plugins/translation/flags/el.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/en.gif b/sources/lib/plugins/translation/flags/en.gif deleted file mode 100644 index 3c6bce1..0000000 Binary files a/sources/lib/plugins/translation/flags/en.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/es.gif b/sources/lib/plugins/translation/flags/es.gif deleted file mode 100644 index c27d65e..0000000 Binary files a/sources/lib/plugins/translation/flags/es.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/et.gif b/sources/lib/plugins/translation/flags/et.gif deleted file mode 100644 index 9397a2d..0000000 Binary files a/sources/lib/plugins/translation/flags/et.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/fa.gif b/sources/lib/plugins/translation/flags/fa.gif deleted file mode 100644 index 156040f..0000000 Binary files a/sources/lib/plugins/translation/flags/fa.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/fr.gif b/sources/lib/plugins/translation/flags/fr.gif deleted file mode 100644 index 43d0b80..0000000 Binary files a/sources/lib/plugins/translation/flags/fr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ga.gif b/sources/lib/plugins/translation/flags/ga.gif deleted file mode 100644 index 506ad28..0000000 Binary files a/sources/lib/plugins/translation/flags/ga.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/he.gif b/sources/lib/plugins/translation/flags/he.gif deleted file mode 100644 index c8483ae..0000000 Binary files a/sources/lib/plugins/translation/flags/he.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/hu.gif b/sources/lib/plugins/translation/flags/hu.gif deleted file mode 100644 index 6142d86..0000000 Binary files a/sources/lib/plugins/translation/flags/hu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/it.gif b/sources/lib/plugins/translation/flags/it.gif deleted file mode 100644 index d79e90e..0000000 Binary files a/sources/lib/plugins/translation/flags/it.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ja.gif b/sources/lib/plugins/translation/flags/ja.gif deleted file mode 100644 index 444c1d0..0000000 Binary files a/sources/lib/plugins/translation/flags/ja.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ko.gif b/sources/lib/plugins/translation/flags/ko.gif deleted file mode 100644 index 1cddbe7..0000000 Binary files a/sources/lib/plugins/translation/flags/ko.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ad.gif b/sources/lib/plugins/translation/flags/more/ad.gif deleted file mode 100644 index 57b4997..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ad.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ae.gif b/sources/lib/plugins/translation/flags/more/ae.gif deleted file mode 100644 index 78d15b6..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ae.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ag.gif b/sources/lib/plugins/translation/flags/more/ag.gif deleted file mode 100644 index 48f8e7b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ag.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ai.gif b/sources/lib/plugins/translation/flags/more/ai.gif deleted file mode 100644 index 1cbc579..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ai.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/al.gif b/sources/lib/plugins/translation/flags/more/al.gif deleted file mode 100644 index c44fe0a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/al.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/am.gif b/sources/lib/plugins/translation/flags/more/am.gif deleted file mode 100644 index 2915e30..0000000 Binary files a/sources/lib/plugins/translation/flags/more/am.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/an.gif b/sources/lib/plugins/translation/flags/more/an.gif deleted file mode 100644 index cb570c6..0000000 Binary files a/sources/lib/plugins/translation/flags/more/an.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ao.gif b/sources/lib/plugins/translation/flags/more/ao.gif deleted file mode 100644 index 8c854fa..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ao.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ar.gif b/sources/lib/plugins/translation/flags/more/ar.gif deleted file mode 100644 index a9f71f7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ar.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/as.gif b/sources/lib/plugins/translation/flags/more/as.gif deleted file mode 100644 index d776ec2..0000000 Binary files a/sources/lib/plugins/translation/flags/more/as.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/at.gif b/sources/lib/plugins/translation/flags/more/at.gif deleted file mode 100644 index 87e1217..0000000 Binary files a/sources/lib/plugins/translation/flags/more/at.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/au.gif b/sources/lib/plugins/translation/flags/more/au.gif deleted file mode 100644 index 5269c6a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/au.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/aw.gif b/sources/lib/plugins/translation/flags/more/aw.gif deleted file mode 100644 index 27fdb4d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/aw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ax.gif b/sources/lib/plugins/translation/flags/more/ax.gif deleted file mode 100644 index 0ceb684..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ax.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/az.gif b/sources/lib/plugins/translation/flags/more/az.gif deleted file mode 100644 index d771618..0000000 Binary files a/sources/lib/plugins/translation/flags/more/az.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ba.gif b/sources/lib/plugins/translation/flags/more/ba.gif deleted file mode 100644 index 9bf5f0a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ba.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bb.gif b/sources/lib/plugins/translation/flags/more/bb.gif deleted file mode 100644 index b7d08e5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bb.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bd.gif b/sources/lib/plugins/translation/flags/more/bd.gif deleted file mode 100644 index 0fd27ec..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bd.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/be.gif b/sources/lib/plugins/translation/flags/more/be.gif deleted file mode 100644 index ae09bfb..0000000 Binary files a/sources/lib/plugins/translation/flags/more/be.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bf.gif b/sources/lib/plugins/translation/flags/more/bf.gif deleted file mode 100644 index 9d6772c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bg.gif b/sources/lib/plugins/translation/flags/more/bg.gif deleted file mode 100644 index 11cf8ff..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bh.gif b/sources/lib/plugins/translation/flags/more/bh.gif deleted file mode 100644 index 56aa72b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bi.gif b/sources/lib/plugins/translation/flags/more/bi.gif deleted file mode 100644 index 6e2cbe1..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bi.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bj.gif b/sources/lib/plugins/translation/flags/more/bj.gif deleted file mode 100644 index e676116..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bj.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/blankflag.gif b/sources/lib/plugins/translation/flags/more/blankflag.gif deleted file mode 100644 index 9935f82..0000000 Binary files a/sources/lib/plugins/translation/flags/more/blankflag.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bm.gif b/sources/lib/plugins/translation/flags/more/bm.gif deleted file mode 100644 index 9feb87b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bn.gif b/sources/lib/plugins/translation/flags/more/bn.gif deleted file mode 100644 index b7b6b0f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bo.gif b/sources/lib/plugins/translation/flags/more/bo.gif deleted file mode 100644 index 4844f85..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bo.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bs.gif b/sources/lib/plugins/translation/flags/more/bs.gif deleted file mode 100644 index c0a741e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bs.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bt.gif b/sources/lib/plugins/translation/flags/more/bt.gif deleted file mode 100644 index abe2f3c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bv.gif b/sources/lib/plugins/translation/flags/more/bv.gif deleted file mode 100644 index 6202d1f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bw.gif b/sources/lib/plugins/translation/flags/more/bw.gif deleted file mode 100644 index 986ab63..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/by.gif b/sources/lib/plugins/translation/flags/more/by.gif deleted file mode 100644 index 43ffcd4..0000000 Binary files a/sources/lib/plugins/translation/flags/more/by.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/bz.gif b/sources/lib/plugins/translation/flags/more/bz.gif deleted file mode 100644 index 791737f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/bz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ca.gif b/sources/lib/plugins/translation/flags/more/ca.gif deleted file mode 100644 index 457d966..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ca.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/catalonia.gif b/sources/lib/plugins/translation/flags/more/catalonia.gif deleted file mode 100644 index 73df9a0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/catalonia.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cc.gif b/sources/lib/plugins/translation/flags/more/cc.gif deleted file mode 100644 index 3f78327..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cd.gif b/sources/lib/plugins/translation/flags/more/cd.gif deleted file mode 100644 index 1df717a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cd.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cf.gif b/sources/lib/plugins/translation/flags/more/cf.gif deleted file mode 100644 index 35787ca..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cg.gif b/sources/lib/plugins/translation/flags/more/cg.gif deleted file mode 100644 index e0a62a5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ch.gif b/sources/lib/plugins/translation/flags/more/ch.gif deleted file mode 100644 index d5c0e5b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ch.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ci.gif b/sources/lib/plugins/translation/flags/more/ci.gif deleted file mode 100644 index 844120a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ci.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ck.gif b/sources/lib/plugins/translation/flags/more/ck.gif deleted file mode 100644 index 2edb739..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ck.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cl.gif b/sources/lib/plugins/translation/flags/more/cl.gif deleted file mode 100644 index cbc370e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cm.gif b/sources/lib/plugins/translation/flags/more/cm.gif deleted file mode 100644 index 1fb102b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/co.gif b/sources/lib/plugins/translation/flags/more/co.gif deleted file mode 100644 index d0e15ca..0000000 Binary files a/sources/lib/plugins/translation/flags/more/co.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cr.gif b/sources/lib/plugins/translation/flags/more/cr.gif deleted file mode 100644 index 0728dd6..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cs.gif b/sources/lib/plugins/translation/flags/more/cs.gif deleted file mode 100644 index 101db64..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cs.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cu.gif b/sources/lib/plugins/translation/flags/more/cu.gif deleted file mode 100644 index 291255c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cv.gif b/sources/lib/plugins/translation/flags/more/cv.gif deleted file mode 100644 index 43c6c6c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cx.gif b/sources/lib/plugins/translation/flags/more/cx.gif deleted file mode 100644 index a5b4308..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cx.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cy.gif b/sources/lib/plugins/translation/flags/more/cy.gif deleted file mode 100644 index 35c661e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cy.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/cz.gif b/sources/lib/plugins/translation/flags/more/cz.gif deleted file mode 100644 index 0a605e5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/cz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/dj.gif b/sources/lib/plugins/translation/flags/more/dj.gif deleted file mode 100644 index 212406d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/dj.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/dm.gif b/sources/lib/plugins/translation/flags/more/dm.gif deleted file mode 100644 index 2f87f3c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/dm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/do.gif b/sources/lib/plugins/translation/flags/more/do.gif deleted file mode 100644 index f7d0bad..0000000 Binary files a/sources/lib/plugins/translation/flags/more/do.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/dz.gif b/sources/lib/plugins/translation/flags/more/dz.gif deleted file mode 100644 index ed580a7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/dz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ec.gif b/sources/lib/plugins/translation/flags/more/ec.gif deleted file mode 100644 index 9e41e0e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ec.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/eg.gif b/sources/lib/plugins/translation/flags/more/eg.gif deleted file mode 100644 index 6857c7d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/eg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/eh.gif b/sources/lib/plugins/translation/flags/more/eh.gif deleted file mode 100644 index dd0391c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/eh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/england.gif b/sources/lib/plugins/translation/flags/more/england.gif deleted file mode 100644 index 933a4f0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/england.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/er.gif b/sources/lib/plugins/translation/flags/more/er.gif deleted file mode 100644 index 3d4d612..0000000 Binary files a/sources/lib/plugins/translation/flags/more/er.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/et.gif b/sources/lib/plugins/translation/flags/more/et.gif deleted file mode 100644 index f77995d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/et.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/europeanunion.gif b/sources/lib/plugins/translation/flags/more/europeanunion.gif deleted file mode 100644 index 28a762a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/europeanunion.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fam.gif b/sources/lib/plugins/translation/flags/more/fam.gif deleted file mode 100644 index 7d52885..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fam.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fi.gif b/sources/lib/plugins/translation/flags/more/fi.gif deleted file mode 100644 index 8d3a191..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fi.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fj.gif b/sources/lib/plugins/translation/flags/more/fj.gif deleted file mode 100644 index 486151c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fj.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fk.gif b/sources/lib/plugins/translation/flags/more/fk.gif deleted file mode 100644 index 37b5ecf..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fm.gif b/sources/lib/plugins/translation/flags/more/fm.gif deleted file mode 100644 index 7f8723b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/fo.gif b/sources/lib/plugins/translation/flags/more/fo.gif deleted file mode 100644 index 4a90fc0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/fo.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ga.gif b/sources/lib/plugins/translation/flags/more/ga.gif deleted file mode 100644 index 23fd5f0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ga.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gd.gif b/sources/lib/plugins/translation/flags/more/gd.gif deleted file mode 100644 index 25ea312..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gd.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ge.gif b/sources/lib/plugins/translation/flags/more/ge.gif deleted file mode 100644 index faa7f12..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ge.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gf.gif b/sources/lib/plugins/translation/flags/more/gf.gif deleted file mode 100644 index 43d0b80..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gh.gif b/sources/lib/plugins/translation/flags/more/gh.gif deleted file mode 100644 index 273fb7d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gi.gif b/sources/lib/plugins/translation/flags/more/gi.gif deleted file mode 100644 index 7b1984b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gi.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gl.gif b/sources/lib/plugins/translation/flags/more/gl.gif deleted file mode 100644 index ef445be..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gm.gif b/sources/lib/plugins/translation/flags/more/gm.gif deleted file mode 100644 index 6847c5a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gn.gif b/sources/lib/plugins/translation/flags/more/gn.gif deleted file mode 100644 index a982ac6..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gp.gif b/sources/lib/plugins/translation/flags/more/gp.gif deleted file mode 100644 index 31166db..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gp.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gq.gif b/sources/lib/plugins/translation/flags/more/gq.gif deleted file mode 100644 index 8b4e0cc..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gq.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gs.gif b/sources/lib/plugins/translation/flags/more/gs.gif deleted file mode 100644 index ccc96ec..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gs.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gt.gif b/sources/lib/plugins/translation/flags/more/gt.gif deleted file mode 100644 index 7e94d1d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gu.gif b/sources/lib/plugins/translation/flags/more/gu.gif deleted file mode 100644 index eafef68..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gw.gif b/sources/lib/plugins/translation/flags/more/gw.gif deleted file mode 100644 index 55f7571..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/gy.gif b/sources/lib/plugins/translation/flags/more/gy.gif deleted file mode 100644 index 1cb4cd7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/gy.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/hk.gif b/sources/lib/plugins/translation/flags/more/hk.gif deleted file mode 100644 index 798af96..0000000 Binary files a/sources/lib/plugins/translation/flags/more/hk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/hm.gif b/sources/lib/plugins/translation/flags/more/hm.gif deleted file mode 100644 index 5269c6a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/hm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/hn.gif b/sources/lib/plugins/translation/flags/more/hn.gif deleted file mode 100644 index 6c4ffe8..0000000 Binary files a/sources/lib/plugins/translation/flags/more/hn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/hr.gif b/sources/lib/plugins/translation/flags/more/hr.gif deleted file mode 100644 index 557c660..0000000 Binary files a/sources/lib/plugins/translation/flags/more/hr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ht.gif b/sources/lib/plugins/translation/flags/more/ht.gif deleted file mode 100644 index 059604a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ht.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/id.gif b/sources/lib/plugins/translation/flags/more/id.gif deleted file mode 100644 index 865161b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/id.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/in.gif b/sources/lib/plugins/translation/flags/more/in.gif deleted file mode 100644 index 1cd8027..0000000 Binary files a/sources/lib/plugins/translation/flags/more/in.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/io.gif b/sources/lib/plugins/translation/flags/more/io.gif deleted file mode 100644 index de7e7ab..0000000 Binary files a/sources/lib/plugins/translation/flags/more/io.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/iq.gif b/sources/lib/plugins/translation/flags/more/iq.gif deleted file mode 100644 index c34fe3c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/iq.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/is.gif b/sources/lib/plugins/translation/flags/more/is.gif deleted file mode 100644 index b42502d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/is.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ja.gif b/sources/lib/plugins/translation/flags/more/ja.gif deleted file mode 100644 index 444c1d0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ja.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/jm.gif b/sources/lib/plugins/translation/flags/more/jm.gif deleted file mode 100644 index 0bed67c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/jm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/jo.gif b/sources/lib/plugins/translation/flags/more/jo.gif deleted file mode 100644 index 03daf8a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/jo.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ke.gif b/sources/lib/plugins/translation/flags/more/ke.gif deleted file mode 100644 index c2b5d45..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ke.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kg.gif b/sources/lib/plugins/translation/flags/more/kg.gif deleted file mode 100644 index 72a4d41..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kh.gif b/sources/lib/plugins/translation/flags/more/kh.gif deleted file mode 100644 index 30a1831..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ki.gif b/sources/lib/plugins/translation/flags/more/ki.gif deleted file mode 100644 index 4a0751a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ki.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/km.gif b/sources/lib/plugins/translation/flags/more/km.gif deleted file mode 100644 index 5859595..0000000 Binary files a/sources/lib/plugins/translation/flags/more/km.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kn.gif b/sources/lib/plugins/translation/flags/more/kn.gif deleted file mode 100644 index bb9cc34..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ko.gif b/sources/lib/plugins/translation/flags/more/ko.gif deleted file mode 100644 index 1cddbe7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ko.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kp.gif b/sources/lib/plugins/translation/flags/more/kp.gif deleted file mode 100644 index 6e0ca09..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kp.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kw.gif b/sources/lib/plugins/translation/flags/more/kw.gif deleted file mode 100644 index 1efc734..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ky.gif b/sources/lib/plugins/translation/flags/more/ky.gif deleted file mode 100644 index d3d02ee..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ky.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/kz.gif b/sources/lib/plugins/translation/flags/more/kz.gif deleted file mode 100644 index 24baebe..0000000 Binary files a/sources/lib/plugins/translation/flags/more/kz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/la.gif b/sources/lib/plugins/translation/flags/more/la.gif deleted file mode 100644 index d14cf4d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/la.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lb.gif b/sources/lib/plugins/translation/flags/more/lb.gif deleted file mode 100644 index 003d83a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lb.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lc.gif b/sources/lib/plugins/translation/flags/more/lc.gif deleted file mode 100644 index f5fe5bf..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/li.gif b/sources/lib/plugins/translation/flags/more/li.gif deleted file mode 100644 index 713c58e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/li.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lk.gif b/sources/lib/plugins/translation/flags/more/lk.gif deleted file mode 100644 index 1b3ee7f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lr.gif b/sources/lib/plugins/translation/flags/more/lr.gif deleted file mode 100644 index 435af9e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ls.gif b/sources/lib/plugins/translation/flags/more/ls.gif deleted file mode 100644 index 427ae95..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ls.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lt.gif b/sources/lib/plugins/translation/flags/more/lt.gif deleted file mode 100644 index dee9c60..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lu.gif b/sources/lib/plugins/translation/flags/more/lu.gif deleted file mode 100644 index 7d7293e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/lv.gif b/sources/lib/plugins/translation/flags/more/lv.gif deleted file mode 100644 index 17e71b7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/lv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ly.gif b/sources/lib/plugins/translation/flags/more/ly.gif deleted file mode 100644 index a654c30..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ly.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ma.gif b/sources/lib/plugins/translation/flags/more/ma.gif deleted file mode 100644 index fc78411..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ma.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mc.gif b/sources/lib/plugins/translation/flags/more/mc.gif deleted file mode 100644 index 02a7c8e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/md.gif b/sources/lib/plugins/translation/flags/more/md.gif deleted file mode 100644 index e4b8a7e..0000000 Binary files a/sources/lib/plugins/translation/flags/more/md.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/me.gif b/sources/lib/plugins/translation/flags/more/me.gif deleted file mode 100644 index a260453..0000000 Binary files a/sources/lib/plugins/translation/flags/more/me.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mg.gif b/sources/lib/plugins/translation/flags/more/mg.gif deleted file mode 100644 index a91b577..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mh.gif b/sources/lib/plugins/translation/flags/more/mh.gif deleted file mode 100644 index 92f5f48..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mk.gif b/sources/lib/plugins/translation/flags/more/mk.gif deleted file mode 100644 index 7aeb831..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ml.gif b/sources/lib/plugins/translation/flags/more/ml.gif deleted file mode 100644 index 53d6f49..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ml.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mm.gif b/sources/lib/plugins/translation/flags/more/mm.gif deleted file mode 100644 index 9e0a275..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mn.gif b/sources/lib/plugins/translation/flags/more/mn.gif deleted file mode 100644 index dff8ea5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mo.gif b/sources/lib/plugins/translation/flags/more/mo.gif deleted file mode 100644 index 66cf5b4..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mo.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mp.gif b/sources/lib/plugins/translation/flags/more/mp.gif deleted file mode 100644 index 73b7147..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mp.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mq.gif b/sources/lib/plugins/translation/flags/more/mq.gif deleted file mode 100644 index 570bc5d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mq.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mr.gif b/sources/lib/plugins/translation/flags/more/mr.gif deleted file mode 100644 index f52fcf0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ms.gif b/sources/lib/plugins/translation/flags/more/ms.gif deleted file mode 100644 index 5e5a67a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ms.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mt.gif b/sources/lib/plugins/translation/flags/more/mt.gif deleted file mode 100644 index 45c709f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mu.gif b/sources/lib/plugins/translation/flags/more/mu.gif deleted file mode 100644 index 081ab45..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mv.gif b/sources/lib/plugins/translation/flags/more/mv.gif deleted file mode 100644 index 46b6387..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mw.gif b/sources/lib/plugins/translation/flags/more/mw.gif deleted file mode 100644 index ad045a0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mx.gif b/sources/lib/plugins/translation/flags/more/mx.gif deleted file mode 100644 index ddc75d0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mx.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/my.gif b/sources/lib/plugins/translation/flags/more/my.gif deleted file mode 100644 index fc7d523..0000000 Binary files a/sources/lib/plugins/translation/flags/more/my.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/mz.gif b/sources/lib/plugins/translation/flags/more/mz.gif deleted file mode 100644 index 7d63508..0000000 Binary files a/sources/lib/plugins/translation/flags/more/mz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/na.gif b/sources/lib/plugins/translation/flags/more/na.gif deleted file mode 100644 index c0babe7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/na.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/nc.gif b/sources/lib/plugins/translation/flags/more/nc.gif deleted file mode 100644 index b1e91b9..0000000 Binary files a/sources/lib/plugins/translation/flags/more/nc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ne.gif b/sources/lib/plugins/translation/flags/more/ne.gif deleted file mode 100644 index ff4eaf0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ne.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/nf.gif b/sources/lib/plugins/translation/flags/more/nf.gif deleted file mode 100644 index c83424c..0000000 Binary files a/sources/lib/plugins/translation/flags/more/nf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ng.gif b/sources/lib/plugins/translation/flags/more/ng.gif deleted file mode 100644 index bdde7cb..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ng.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ni.gif b/sources/lib/plugins/translation/flags/more/ni.gif deleted file mode 100644 index d05894d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ni.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/np.gif b/sources/lib/plugins/translation/flags/more/np.gif deleted file mode 100644 index 1096893..0000000 Binary files a/sources/lib/plugins/translation/flags/more/np.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/nr.gif b/sources/lib/plugins/translation/flags/more/nr.gif deleted file mode 100644 index 2e4c0c5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/nr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/nu.gif b/sources/lib/plugins/translation/flags/more/nu.gif deleted file mode 100644 index 618210a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/nu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/nz.gif b/sources/lib/plugins/translation/flags/more/nz.gif deleted file mode 100644 index 028a5dc..0000000 Binary files a/sources/lib/plugins/translation/flags/more/nz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/om.gif b/sources/lib/plugins/translation/flags/more/om.gif deleted file mode 100644 index 2b8c775..0000000 Binary files a/sources/lib/plugins/translation/flags/more/om.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pa.gif b/sources/lib/plugins/translation/flags/more/pa.gif deleted file mode 100644 index d518b2f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pa.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pe.gif b/sources/lib/plugins/translation/flags/more/pe.gif deleted file mode 100644 index 3bc7639..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pe.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pf.gif b/sources/lib/plugins/translation/flags/more/pf.gif deleted file mode 100644 index 849297a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pg.gif b/sources/lib/plugins/translation/flags/more/pg.gif deleted file mode 100644 index 2d20b07..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ph.gif b/sources/lib/plugins/translation/flags/more/ph.gif deleted file mode 100644 index 12b380a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ph.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pk.gif b/sources/lib/plugins/translation/flags/more/pk.gif deleted file mode 100644 index f3f62c2..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pl.gif b/sources/lib/plugins/translation/flags/more/pl.gif deleted file mode 100644 index bf10646..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pm.gif b/sources/lib/plugins/translation/flags/more/pm.gif deleted file mode 100644 index 99bf6fd..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pn.gif b/sources/lib/plugins/translation/flags/more/pn.gif deleted file mode 100644 index 4bc86a1..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pr.gif b/sources/lib/plugins/translation/flags/more/pr.gif deleted file mode 100644 index 6d5d589..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ps.gif b/sources/lib/plugins/translation/flags/more/ps.gif deleted file mode 100644 index 6afa3b7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ps.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/pw.gif b/sources/lib/plugins/translation/flags/more/pw.gif deleted file mode 100644 index 5854510..0000000 Binary files a/sources/lib/plugins/translation/flags/more/pw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/py.gif b/sources/lib/plugins/translation/flags/more/py.gif deleted file mode 100644 index f2e66af..0000000 Binary files a/sources/lib/plugins/translation/flags/more/py.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/qa.gif b/sources/lib/plugins/translation/flags/more/qa.gif deleted file mode 100644 index 2e843ff..0000000 Binary files a/sources/lib/plugins/translation/flags/more/qa.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/re.gif b/sources/lib/plugins/translation/flags/more/re.gif deleted file mode 100644 index 43d0b80..0000000 Binary files a/sources/lib/plugins/translation/flags/more/re.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/rs.gif b/sources/lib/plugins/translation/flags/more/rs.gif deleted file mode 100644 index 3bd1fb2..0000000 Binary files a/sources/lib/plugins/translation/flags/more/rs.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/rw.gif b/sources/lib/plugins/translation/flags/more/rw.gif deleted file mode 100644 index 0d095f7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/rw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sb.gif b/sources/lib/plugins/translation/flags/more/sb.gif deleted file mode 100644 index 8f5ff83..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sb.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sc.gif b/sources/lib/plugins/translation/flags/more/sc.gif deleted file mode 100644 index 31b4767..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/scotland.gif b/sources/lib/plugins/translation/flags/more/scotland.gif deleted file mode 100644 index 03f3f1d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/scotland.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sd.gif b/sources/lib/plugins/translation/flags/more/sd.gif deleted file mode 100644 index 53ae214..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sd.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sg.gif b/sources/lib/plugins/translation/flags/more/sg.gif deleted file mode 100644 index 5663d39..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sh.gif b/sources/lib/plugins/translation/flags/more/sh.gif deleted file mode 100644 index dcc7f3b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/si.gif b/sources/lib/plugins/translation/flags/more/si.gif deleted file mode 100644 index 23852b5..0000000 Binary files a/sources/lib/plugins/translation/flags/more/si.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sj.gif b/sources/lib/plugins/translation/flags/more/sj.gif deleted file mode 100644 index 6202d1f..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sj.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sk.gif b/sources/lib/plugins/translation/flags/more/sk.gif deleted file mode 100644 index 1b3f22b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sl.gif b/sources/lib/plugins/translation/flags/more/sl.gif deleted file mode 100644 index f0f3492..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sm.gif b/sources/lib/plugins/translation/flags/more/sm.gif deleted file mode 100644 index 04d98de..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sn.gif b/sources/lib/plugins/translation/flags/more/sn.gif deleted file mode 100644 index 6dac870..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/so.gif b/sources/lib/plugins/translation/flags/more/so.gif deleted file mode 100644 index f196169..0000000 Binary files a/sources/lib/plugins/translation/flags/more/so.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sr.gif b/sources/lib/plugins/translation/flags/more/sr.gif deleted file mode 100644 index 0f7499a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/st.gif b/sources/lib/plugins/translation/flags/more/st.gif deleted file mode 100644 index 4f1e6e0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/st.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sv.gif b/sources/lib/plugins/translation/flags/more/sv.gif deleted file mode 100644 index 2d7b159..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sy.gif b/sources/lib/plugins/translation/flags/more/sy.gif deleted file mode 100644 index dc8bd50..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sy.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/sz.gif b/sources/lib/plugins/translation/flags/more/sz.gif deleted file mode 100644 index f37aaf8..0000000 Binary files a/sources/lib/plugins/translation/flags/more/sz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tc.gif b/sources/lib/plugins/translation/flags/more/tc.gif deleted file mode 100644 index 11a8c23..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/td.gif b/sources/lib/plugins/translation/flags/more/td.gif deleted file mode 100644 index 7aa8a10..0000000 Binary files a/sources/lib/plugins/translation/flags/more/td.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tf.gif b/sources/lib/plugins/translation/flags/more/tf.gif deleted file mode 100644 index 51a4325..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tg.gif b/sources/lib/plugins/translation/flags/more/tg.gif deleted file mode 100644 index ca6b4e7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tj.gif b/sources/lib/plugins/translation/flags/more/tj.gif deleted file mode 100644 index 2fe38d4..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tj.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tk.gif b/sources/lib/plugins/translation/flags/more/tk.gif deleted file mode 100644 index 3d3a727..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tk.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tl.gif b/sources/lib/plugins/translation/flags/more/tl.gif deleted file mode 100644 index df22d58..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tm.gif b/sources/lib/plugins/translation/flags/more/tm.gif deleted file mode 100644 index 36d0994..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tn.gif b/sources/lib/plugins/translation/flags/more/tn.gif deleted file mode 100644 index 917d428..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tn.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/to.gif b/sources/lib/plugins/translation/flags/more/to.gif deleted file mode 100644 index d7ed4d1..0000000 Binary files a/sources/lib/plugins/translation/flags/more/to.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tt.gif b/sources/lib/plugins/translation/flags/more/tt.gif deleted file mode 100644 index 47d3b80..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tv.gif b/sources/lib/plugins/translation/flags/more/tv.gif deleted file mode 100644 index 3c33827..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tw.gif b/sources/lib/plugins/translation/flags/more/tw.gif deleted file mode 100644 index cacfd9b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/tz.gif b/sources/lib/plugins/translation/flags/more/tz.gif deleted file mode 100644 index 82b52ca..0000000 Binary files a/sources/lib/plugins/translation/flags/more/tz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ua.gif b/sources/lib/plugins/translation/flags/more/ua.gif deleted file mode 100644 index 5d6cd83..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ua.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ug.gif b/sources/lib/plugins/translation/flags/more/ug.gif deleted file mode 100644 index 58b731a..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ug.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/um.gif b/sources/lib/plugins/translation/flags/more/um.gif deleted file mode 100644 index 3b4c848..0000000 Binary files a/sources/lib/plugins/translation/flags/more/um.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/us.gif b/sources/lib/plugins/translation/flags/more/us.gif deleted file mode 100644 index 8f198f7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/us.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/uy.gif b/sources/lib/plugins/translation/flags/more/uy.gif deleted file mode 100644 index 12848c7..0000000 Binary files a/sources/lib/plugins/translation/flags/more/uy.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/uz.gif b/sources/lib/plugins/translation/flags/more/uz.gif deleted file mode 100644 index dc9daec..0000000 Binary files a/sources/lib/plugins/translation/flags/more/uz.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/va.gif b/sources/lib/plugins/translation/flags/more/va.gif deleted file mode 100644 index 2bd7446..0000000 Binary files a/sources/lib/plugins/translation/flags/more/va.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/vc.gif b/sources/lib/plugins/translation/flags/more/vc.gif deleted file mode 100644 index 4821381..0000000 Binary files a/sources/lib/plugins/translation/flags/more/vc.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ve.gif b/sources/lib/plugins/translation/flags/more/ve.gif deleted file mode 100644 index 19ce6c1..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ve.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/vg.gif b/sources/lib/plugins/translation/flags/more/vg.gif deleted file mode 100644 index 1fc0f96..0000000 Binary files a/sources/lib/plugins/translation/flags/more/vg.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/vi.gif b/sources/lib/plugins/translation/flags/more/vi.gif deleted file mode 100644 index 66f9e74..0000000 Binary files a/sources/lib/plugins/translation/flags/more/vi.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/vu.gif b/sources/lib/plugins/translation/flags/more/vu.gif deleted file mode 100644 index 8a8b2b0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/vu.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/wales.gif b/sources/lib/plugins/translation/flags/more/wales.gif deleted file mode 100644 index 901d175..0000000 Binary files a/sources/lib/plugins/translation/flags/more/wales.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/wf.gif b/sources/lib/plugins/translation/flags/more/wf.gif deleted file mode 100644 index eaa954b..0000000 Binary files a/sources/lib/plugins/translation/flags/more/wf.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ws.gif b/sources/lib/plugins/translation/flags/more/ws.gif deleted file mode 100644 index a51f939..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ws.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/ye.gif b/sources/lib/plugins/translation/flags/more/ye.gif deleted file mode 100644 index 7b0183d..0000000 Binary files a/sources/lib/plugins/translation/flags/more/ye.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/yt.gif b/sources/lib/plugins/translation/flags/more/yt.gif deleted file mode 100644 index a2267c0..0000000 Binary files a/sources/lib/plugins/translation/flags/more/yt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/za.gif b/sources/lib/plugins/translation/flags/more/za.gif deleted file mode 100644 index ede5258..0000000 Binary files a/sources/lib/plugins/translation/flags/more/za.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/zm.gif b/sources/lib/plugins/translation/flags/more/zm.gif deleted file mode 100644 index b2851d2..0000000 Binary files a/sources/lib/plugins/translation/flags/more/zm.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/more/zw.gif b/sources/lib/plugins/translation/flags/more/zw.gif deleted file mode 100644 index 02901f6..0000000 Binary files a/sources/lib/plugins/translation/flags/more/zw.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/nl.gif b/sources/lib/plugins/translation/flags/nl.gif deleted file mode 100644 index c1c8f46..0000000 Binary files a/sources/lib/plugins/translation/flags/nl.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/no.gif b/sources/lib/plugins/translation/flags/no.gif deleted file mode 100644 index 6202d1f..0000000 Binary files a/sources/lib/plugins/translation/flags/no.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/pt-br.gif b/sources/lib/plugins/translation/flags/pt-br.gif deleted file mode 100644 index 8c86616..0000000 Binary files a/sources/lib/plugins/translation/flags/pt-br.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/pt.gif b/sources/lib/plugins/translation/flags/pt.gif deleted file mode 100644 index e735f74..0000000 Binary files a/sources/lib/plugins/translation/flags/pt.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ro.gif b/sources/lib/plugins/translation/flags/ro.gif deleted file mode 100644 index f5d5f12..0000000 Binary files a/sources/lib/plugins/translation/flags/ro.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/ru.gif b/sources/lib/plugins/translation/flags/ru.gif deleted file mode 100644 index b525c46..0000000 Binary files a/sources/lib/plugins/translation/flags/ru.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/sv.gif b/sources/lib/plugins/translation/flags/sv.gif deleted file mode 100644 index 80f6285..0000000 Binary files a/sources/lib/plugins/translation/flags/sv.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/th.gif b/sources/lib/plugins/translation/flags/th.gif deleted file mode 100644 index 0130792..0000000 Binary files a/sources/lib/plugins/translation/flags/th.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/tr.gif b/sources/lib/plugins/translation/flags/tr.gif deleted file mode 100644 index e407d55..0000000 Binary files a/sources/lib/plugins/translation/flags/tr.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/vi.gif b/sources/lib/plugins/translation/flags/vi.gif deleted file mode 100644 index f1e20c9..0000000 Binary files a/sources/lib/plugins/translation/flags/vi.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/flags/zh.gif b/sources/lib/plugins/translation/flags/zh.gif deleted file mode 100644 index b052530..0000000 Binary files a/sources/lib/plugins/translation/flags/zh.gif and /dev/null differ diff --git a/sources/lib/plugins/translation/helper.php b/sources/lib/plugins/translation/helper.php deleted file mode 100644 index 6d184ce..0000000 --- a/sources/lib/plugins/translation/helper.php +++ /dev/null @@ -1,392 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -class helper_plugin_translation extends DokuWiki_Plugin { - var $translations = array(); - var $translationNs = ''; - var $defaultlang = ''; - var $LN = array(); // hold native names - var $opts = array(); // display options - - /** - * Initialize - */ - function helper_plugin_translation() { - global $conf; - require_once(DOKU_INC . 'inc/pageutils.php'); - require_once(DOKU_INC . 'inc/utf8.php'); - - // load wanted translation into array - $this->translations = strtolower(str_replace(',', ' ', $this->getConf('translations'))); - $this->translations = array_unique(array_filter(explode(' ', $this->translations))); - sort($this->translations); - - // load language names - $this->LN = confToHash(dirname(__FILE__) . '/lang/langnames.txt'); - - // display options - $this->opts = $this->getConf('display'); - $this->opts = explode(',', $this->opts); - $this->opts = array_map('trim', $this->opts); - $this->opts = array_fill_keys($this->opts, true); - - // get default translation - if(!$conf['lang_before_translation']) { - $dfl = $conf['lang']; - } else { - $dfl = $conf['lang_before_translation']; - } - if(in_array($dfl, $this->translations)) { - $this->defaultlang = $dfl; - } else { - $this->defaultlang = ''; - array_unshift($this->translations, ''); - } - - $this->translationNs = cleanID($this->getConf('translationns')); - if($this->translationNs) $this->translationNs .= ':'; - } - - /** - * Check if the given ID is a translation and return the language code. - */ - function getLangPart($id) { - list($lng) = $this->getTransParts($id); - return $lng; - } - - /** - * Check if the given ID is a translation and return the language code and - * the id part. - */ - function getTransParts($id) { - $rx = '/^' . $this->translationNs . '(' . join('|', $this->translations) . '):(.*)/'; - if(preg_match($rx, $id, $match)) { - return array($match[1], $match[2]); - } - return array('', $id); - } - - /** - * Returns the browser language if it matches with one of the configured - * languages - */ - function getBrowserLang() { - $rx = '/(^|,|:|;|-)(' . join('|', $this->translations) . ')($|,|:|;|-)/i'; - if(preg_match($rx, $_SERVER['HTTP_ACCEPT_LANGUAGE'], $match)) { - return strtolower($match[2]); - } - return false; - } - - /** - * Returns the ID and name to the wanted translation, empty - * $lng is default lang - */ - function buildTransID($lng, $idpart) { - global $conf; - if($lng) { - $link = ':' . $this->translationNs . $lng . ':' . $idpart; - $name = $lng; - } else { - $link = ':' . $this->translationNs . $idpart; - $name = $this->realLC(''); - } - return array($link, $name); - } - - /** - * Returns the real language code, even when an empty one is given - * (eg. resolves th default language) - */ - function realLC($lc) { - global $conf; - if($lc) { - return $lc; - } elseif(!$conf['lang_before_translation']) { - return $conf['lang']; - } else { - return $conf['lang_before_translation']; - } - } - - /** - * Check if current ID should be translated and any GUI - * should be shown - */ - function istranslatable($id, $checkact = true) { - global $ACT; - - if($checkact && $ACT != 'show') return false; - if($this->translationNs && strpos($id, $this->translationNs) !== 0) return false; - $skiptrans = trim($this->getConf('skiptrans')); - if($skiptrans && preg_match('/' . $skiptrans . '/ui', ':' . $id)) return false; - $meta = p_get_metadata($id); - if($meta['plugin']['translation']['notrans']) return false; - - return true; - } - - /** - * Return the (localized) about link - */ - function showAbout() { - global $ID; - global $conf; - global $INFO; - - $curlc = $this->getLangPart($ID); - - $about = $this->getConf('about'); - if($this->getConf('localabout')) { - list($lc, $idpart) = $this->getTransParts($about); - list($about, $name) = $this->buildTransID($curlc, $idpart); - $about = cleanID($about); - } - - $out = ''; - $out .= ''; - $out .= html_wikilink($about, '?'); - $out .= ''; - - return $out; - } - - /** - * Returns a list of (lc => link) for all existing translations of a page - * - * @param $id - * @return array - */ - function getAvailableTranslations($id) { - $result = array(); - - list($lc, $idpart) = $this->getTransParts($id); - $lang = $this->realLC($lc); - - foreach($this->translations as $t) { - if($t == $lc) continue; //skip self - list($link, $name) = $this->buildTransID($t, $idpart); - if(page_exists($link)) { - $result[$name] = $link; - } - } - - return $result; - } - - /** - * Creates an UI for linking to the available and configured translations - * - * Can be called from the template or via the ~~TRANS~~ syntax component. - */ - public function showTranslations() { - global $conf; - global $INFO; - - if(!$this->istranslatable($INFO['id'])) return ''; - $this->checkage(); - - list($lc, $idpart) = $this->getTransParts($INFO['id']); - $lang = $this->realLC($lc); - - $out = '
      '; - - //show title and about - if(isset($this->opts['title'])) { - $out .= '' . $this->getLang('translations'); - if($this->getConf('about')) $out .= $this->showAbout(); - $out .= ': '; - if(isset($this->opts['twolines'])) $out .= '
      '; - } - - // open wrapper - if($this->getConf('dropdown')) { - // select needs its own styling - if($INFO['exists']) { - $class = 'wikilink1'; - } else { - $class = 'wikilink2'; - } - if(isset($this->opts['flag'])) { - $flag = DOKU_BASE . 'lib/plugins/translation/flags/' . hsc($lang) . '.gif'; - }else{ - $flag = ''; - } - - if($conf['userewrite']) { - $action = wl(); - } else { - $action = script(); - } - - $out .= '
      '; - if($flag) $out .= '' . hsc($lang) . ' '; - $out .= ''; - $out .= ''; - $out .= '
      '; - } else { - $out .= '
'; - } - - // show about if not already shown - if(!isset($this->opts['title']) && $this->getConf('about')) { - $out .= ' '; - $out .= $this->showAbout(); - } - - $out .= ''; - - return $out; - } - - /** - * Return the local name - * - * @param $lang - * @return string - */ - function getLocalName($lang) { - if($this->LN[$lang]) { - return $this->LN[$lang]; - } - return $lang; - } - - /** - * Create the link or option for a single translation - * - * @param $lc string The language code - * @param $idpart string The ID of the translated page - * @returns string The item - */ - function getTransItem($lc, $idpart) { - global $ID; - global $conf; - - list($link, $lang) = $this->buildTransID($lc, $idpart); - $link = cleanID($link); - - // class - if(page_exists($link, '', false)) { - $class = 'wikilink1'; - } else { - $class = 'wikilink2'; - } - - // local language name - $localname = $this->getLocalName($lang); - - // current? - if($ID == $link) { - $sel = ' selected="selected"'; - $class .= ' cur'; - } else { - $sel = ''; - } - - // flag - if(isset($this->opts['flag'])) { - $flag = DOKU_BASE . 'lib/plugins/translation/flags/' . hsc($lang) . '.gif'; - $style = ' style="background-image: url(\'' . $flag . '\')"'; - $class .= ' flag'; - } - - // what to display as name - if(isset($this->opts['name'])) { - $display = hsc($localname); - if(isset($this->opts['langcode'])) $display .= ' (' . hsc($lang) . ')'; - } elseif(isset($this->opts['langcode'])) { - $display = hsc($lang); - } else { - $display = ' '; - } - - // prepare output - $out = ''; - if($this->getConf('dropdown')) { - if($conf['useslash']) $link = str_replace(':', '/', $link); - - $out .= ''; - } else { - $out .= '
  • '; - $out .= ''; - if($flag) $out .= '' . hsc($lang) . ''; - $out .= $display; - $out .= ''; - $out .= '
    • '; - } - - return $out; - } - - /** - * Checks if the current page is a translation of a page - * in the default language. Displays a notice when it is - * older than the original page. Tries to lin to a diff - * with changes on the original since the translation - */ - function checkage() { - global $ID; - global $INFO; - if(!$this->getConf('checkage')) return; - if(!$INFO['exists']) return; - $lng = $this->getLangPart($ID); - if($lng == $this->defaultlang) return; - - $rx = '/^' . $this->translationNs . '((' . join('|', $this->translations) . '):)?/'; - $idpart = preg_replace($rx, '', $ID); - - // compare modification times - list($orig, $name) = $this->buildTransID($this->defaultlang, $idpart); - $origfn = wikiFN($orig); - if($INFO['lastmod'] >= @filemtime($origfn)) return; - - // get revision from before translation - $orev = 0; - $revs = getRevisions($orig, 0, 100); - foreach($revs as $rev) { - if($rev < $INFO['lastmod']) { - $orev = $rev; - break; - } - } - - // see if the found revision still exists - if($orev && !page_exists($orig, $orev)) $orev = 0; - - // build the message and display it - $orig = cleanID($orig); - $msg = sprintf($this->getLang('outdated'), wl($orig)); - if($orev) { - $msg .= sprintf( - ' ' . $this->getLang('diff'), - wl($orig, array('do' => 'diff', 'rev' => $orev)) - ); - } - - echo '
    ' . $msg . '
    '; - } -} diff --git a/sources/lib/plugins/translation/lang/bn/lang.php b/sources/lib/plugins/translation/lang/bn/lang.php deleted file mode 100644 index 5bfc73b..0000000 --- a/sources/lib/plugins/translation/lang/bn/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ -$lang['translations'] = 'à¦à¦‡ পাতার অনà§à¦¬à¦¾à¦¦'; -$lang['outdated'] = 'à¦à¦‡ অনà§à¦¬à¦¾à¦¦ মূল পাতা তà§à¦²à¦¨à¦¾à¦¯à¦¼ পà§à¦°à§‹à¦¨à§‹ হয় à¦à¦¬à¦‚ পà§à¦°à¦¾à¦¨ হতে পারে.'; -$lang['diff'] = 'দেখà§à¦¨ কি পরিবরà§à¦¤à¦¨ হয়েছে'; diff --git a/sources/lib/plugins/translation/lang/bn/settings.php b/sources/lib/plugins/translation/lang/bn/settings.php deleted file mode 100644 index d1df06b..0000000 --- a/sources/lib/plugins/translation/lang/bn/settings.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ -$lang['about'] = 'à¦à¦–ানে à¦à¦•à¦Ÿà¦¿ পৃষà§à¦ à¦¾à¦¯à¦¼ নাম লিখà§à¦¨ যেখানে অনà§à¦¬à¦¾à¦¦à§‡à¦° বৈশিষà§à¦Ÿà§à¦¯à¦Ÿà¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦¦à§‡à¦° জনà§à¦¯ বà§à¦¯à¦¾à¦–à§à¦¯à¦¾ করা আছে. à¦à¦Ÿà¦¾ ভাষা নিরà§à¦¬à¦¾à¦šà¦• থেকে লিঙà§à¦• করা হবে.'; -$lang['checkage'] = 'সমà§à¦­à¦¬à¦¤ পà§à¦°à§‹à¦¨à§‹ অনà§à¦¬à¦¾à¦¦à§‡à¦° বিষয়ে সাবধান.'; -$lang['copytrans'] = 'à¦à¦•à¦Ÿà¦¿ নতà§à¦¨ অনà§à¦¬à¦¾à¦¦ শà§à¦°à§ যখন সমà§à¦ªà¦¾à¦¦à¦• মধà§à¦¯à§‡ মূল ভাষা টেকà§à¦¸à¦Ÿ কপি করà§à¦¨?'; diff --git a/sources/lib/plugins/translation/lang/bn/totranslate.txt b/sources/lib/plugins/translation/lang/bn/totranslate.txt deleted file mode 100644 index 46e5f1c..0000000 --- a/sources/lib/plugins/translation/lang/bn/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FixMe ** à¦à¦‡ পাতা সমà§à¦ªà§‚রà§à¦£à¦°à§‚পে à¦à¦–নো অনà§à¦¬à¦¾à¦¦ করা হয়নি. অনà§à¦¬à¦¾à¦¦ সমাপà§à¦¤à¦¿à¦° সাহাযà§à¦¯ করà§à¦¨. ** \ \ / / (অনà§à¦¬à¦¾à¦¦ সমাপà§à¦¤ হয় à¦à¦•à¦¬à¦¾à¦° à¦à¦‡ অনà§à¦šà§à¦›à§‡à¦¦ মà§à¦›à§‡ ফেলà§à¦¨) / / \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/cs/lang.php b/sources/lib/plugins/translation/lang/cs/lang.php deleted file mode 100644 index 9df18eb..0000000 --- a/sources/lib/plugins/translation/lang/cs/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'PÅ™eklady této stránky'; -$lang['outdated'] = 'Tento pÅ™eklad je starší než originální stránka a nejspíše i zastaralý.'; -$lang['diff'] = 'Zobrazit zmÄ›ny.'; -$lang['transloaded'] = 'Text pro pÅ™eklad této stránky do %s byl pro ulehÄení pÅ™ekládání automaticky naÄten.
    Můžete ale použít pÅ™edeÅ¡lé dostupné pÅ™eklady: %s.'; diff --git a/sources/lib/plugins/translation/lang/cs/settings.php b/sources/lib/plugins/translation/lang/cs/settings.php deleted file mode 100644 index f512ab2..0000000 --- a/sources/lib/plugins/translation/lang/cs/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = 'Seznam pÅ™eložených jazyků (ISO kódů) oddÄ›lený mezerami. Nezahrnujte defaultní jazyk!'; -$lang['translationns'] = 'Chcete-li udržovat pÅ™eklad jen pro konkrétní jmenný prostor, vložte jeho jméno sem.'; -$lang['skiptrans'] = 'Pokud jméno stránky obsahuje tento regulární výraz, nezobrazovat pÅ™ekladové menu.'; -$lang['dropdown'] = 'Použít rozbalovací seznam dostupných pÅ™ekladů (doporuÄeno pro 5 a více jazyků).'; -$lang['translateui'] = 'MÄ›lo by se pÅ™eložit i uživatelské rozhraní pÅ™i zmÄ›nÄ› pÅ™ekladu stránky?'; -$lang['redirectstart'] = 'Má hlavní stránka automaticky pÅ™esmÄ›rovávat na dostupnou jazykovou verzi jmenného prostoru dle nastavení jazyka prohlížeÄe?'; -$lang['about'] = 'Vložte jméno stránky s nápovÄ›dou ohlednÄ› možnosti pÅ™ekládat stránky na DokuWiki s pomoci Translation pluginu. Tento odkaz bude k dispozici z výbÄ›ru pÅ™eložených jazyků.'; -$lang['localabout'] = 'Použít pÅ™eložené verze stran o aplikaci (namísto té globální).'; -$lang['checkage'] = 'Upozorňovat na možné zastaralé pÅ™eklady.'; -$lang['display'] = 'Vybrat co se má zobrazovat v menu pro výbÄ›r jazyka. Experti na použitelnost webu nedoporuÄují zobrazování obrázků vlajek zemí pro výbÄ›r jazyka.'; -$lang['copytrans'] = 'Kopírovat výchozí jazykovou verzi do editoru pro nový pÅ™eklad?'; diff --git a/sources/lib/plugins/translation/lang/cs/totranslate.txt b/sources/lib/plugins/translation/lang/cs/totranslate.txt deleted file mode 100644 index 5cdeee6..0000000 --- a/sources/lib/plugins/translation/lang/cs/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Tato stránka jeÅ¡tÄ› není plnÄ› pÅ™eložena. Pomozte s dokonÄením pÅ™ekladu.**\\ //(odstraňte tento odstavec, jakmile je pÅ™eklad dokonÄen)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/da/lang.php b/sources/lib/plugins/translation/lang/da/lang.php deleted file mode 100644 index af5f450..0000000 --- a/sources/lib/plugins/translation/lang/da/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @author Soren Birk - */ -$lang['translations'] = 'Oversættelser af denne side'; -$lang['outdated'] = 'Denne oversættelse er ældre end den originale side og er muligvis forældet.'; -$lang['diff'] = 'Se hvad der er ændret.'; -$lang['transloaded'] = 'Indholdet af denne sides oversættelse i %s er blevet præ-indlæst for lettere oversættelse.
    Du kan basere din oversættelse på følgende nuværende oversættelser: %s.'; diff --git a/sources/lib/plugins/translation/lang/da/settings.php b/sources/lib/plugins/translation/lang/da/settings.php deleted file mode 100644 index 7b43734..0000000 --- a/sources/lib/plugins/translation/lang/da/settings.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @author Soren Birk - * @author Jacob Palm - */ -$lang['translations'] = 'Mellemrums-separeret liste a oversættelsessprog (ISO koder). Lad være med at inkludere standardsproget.'; -$lang['translationns'] = 'Hvis du kun vil have oversættelser under et bestemt navnerum, indsæt det her.'; -$lang['skiptrans'] = 'Hvis navnet på siden matcher dette regulære udtryk, så lad være med at vise oversættelsesmenuen.'; -$lang['dropdown'] = 'Benyt en rulleliste til at vise oversættelserne (anbefales til 5 sprog eller mere).'; -$lang['translateui'] = 'Skal brugerfladens sprog også skiftes i fremmedsprogets navnerum?'; -$lang['redirectstart'] = 'Skal startsiden automatisk henvise til et sprog-navnerum vha browserens sprog-genkendelse?'; -$lang['about'] = 'Skriv et sidenavn her hvor oversættelsesfunktionen er forklaret for dine brugere. Siden vil blive linket til fra sprogvælgeren.'; -$lang['localabout'] = 'Anvend lokaliserede versions af "Om" siden (i stedet for en global "Om" side)'; -$lang['checkage'] = 'Advar om mulige forældede oversættelser.'; -$lang['display'] = 'Angiv hvad du ønsker der skal vises menuen til valg af sprog. Bemærk venligst, at det frarådes at benytte landeflag til sprogvalg.'; -$lang['copytrans'] = 'Kopier tekst fra originalt sporg ind i editorern når en ny oversættelse påbegyndes?'; diff --git a/sources/lib/plugins/translation/lang/da/totranslate.txt b/sources/lib/plugins/translation/lang/da/totranslate.txt deleted file mode 100644 index 3109105..0000000 --- a/sources/lib/plugins/translation/lang/da/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Denne side er endnu ikke fuldt oversat. Måske kan du hjælpe med at færdiggøre oversættelsen?**\\ //(fjern dette afsnit når siden er oversat)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/de-informal/lang.php b/sources/lib/plugins/translation/lang/de-informal/lang.php deleted file mode 100644 index e402a02..0000000 --- a/sources/lib/plugins/translation/lang/de-informal/lang.php +++ /dev/null @@ -1,3 +0,0 @@ - - */ -$lang['translations'] = 'Übersetzungen dieser Seite'; -$lang['outdated'] = 'Diese Übersetzung ist älter als das Original und ist eventuell veraltet.'; -$lang['diff'] = 'Änderungen zeigen.'; -$lang['transloaded'] = 'Der Inhalt dieser Seite auf %s wurde in den Editor geladen um die Übersetzung zu erleichtern.
    Sie können Ihre Arbeit auch mit einer der folgenden vorhandenen Übersetzungen beginnen: %s.'; diff --git a/sources/lib/plugins/translation/lang/de/settings.php b/sources/lib/plugins/translation/lang/de/settings.php deleted file mode 100644 index 80bd4d9..0000000 --- a/sources/lib/plugins/translation/lang/de/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = 'Liste der Sprachen (ISO codes), mittels Leerzeichen separiert. Die Default-Sprache nicht angeben.'; -$lang['translationns'] = 'Wenn die Übersetzung nur unterhalb eines Namensraumes gelten soll, diesen hier angeben.'; -$lang['skiptrans'] = 'Wenn der Seitennamen dem regulären Ausdruck entspricht, dann den Sprachumschalter nicht anzeigen.'; -$lang['dropdown'] = 'Eine Auswahlliste benutzen, um die Übersetzungen anzuzeigen (zu bevorzugen bei mehr als fünf Sprachen).'; -$lang['translateui'] = 'Soll die Sprache der Benutzerschnittstelle auch in die jeweilige Fremdspache umgeschaltet werden?'; -$lang['redirectstart'] = 'Anhand des Browsers des Benutzers erkennen, welche Sprache angezeigt werden soll. (Startseite leitet in den passenden Namensraum um).'; -$lang['about'] = 'Geben Sie hier eine Seite an, welche den Mechanismus der Übersetzung erklärt. Sie wird vom Sprachumschalter verlinkt.'; -$lang['localabout'] = 'Sprachspezifische Versionen der oben angegebenen Seite (anstelle einer globalen) nutzen.'; -$lang['checkage'] = 'Warnungen von möglicherweise veralteten Übersetzungen anzeigen.'; -$lang['display'] = 'Geben Sie an welches/r Symbol/Text im Sprachumschalter angezeigt werden soll. (Die Nutzung von länderspezifischen Flaggen wird aus Gründen der Benutzbarkeit nicht empfohlen.)'; -$lang['copytrans'] = 'Original Sprachversion in den Editor kopieren wenn eine neue Übersetzung begonnen wird?'; diff --git a/sources/lib/plugins/translation/lang/de/totranslate.txt b/sources/lib/plugins/translation/lang/de/totranslate.txt deleted file mode 100644 index 37d03ae..0000000 --- a/sources/lib/plugins/translation/lang/de/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Diese Seite wurde noch nicht vollständig übersetzt. Bitte helfen Sie bei der Übersetzung.**\\ //(diesen Absatz entfernen, wenn die Übersetzung abgeschlossen wurde)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/en/lang.php b/sources/lib/plugins/translation/lang/en/lang.php deleted file mode 100644 index 37178eb..0000000 --- a/sources/lib/plugins/translation/lang/en/lang.php +++ /dev/null @@ -1,7 +0,0 @@ -original page and might be outdated.'; -$lang['diff'] = 'See what has changed.'; -$lang['transloaded'] = 'The contents of this page\'s translation in %s have been pre-loaded for easy translation.
    But you can base your translation on the following existing translations: %s.'; - diff --git a/sources/lib/plugins/translation/lang/en/settings.php b/sources/lib/plugins/translation/lang/en/settings.php deleted file mode 100644 index f36ce4d..0000000 --- a/sources/lib/plugins/translation/lang/en/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - */ - -$lang['translations'] = 'Space separated list of translation languages (ISO codes).'; -$lang['translationns'] = 'If you only want translations below a certain namespace, put it here.'; -$lang['skiptrans'] = 'When the pagename matches this regular expression, don\'t show the translation menu.'; -$lang['dropdown'] = 'Use a dropdown list to display the translations (recommended for more than 5 languages).'; -$lang['translateui'] = 'Should the language of the user interface be switched in foreign language namespaces, too?'; -$lang['redirectstart'] = 'Should the start page automatically redirect into a language namespace using browser language detection?'; -$lang['about'] = 'Enter a pagename here where the translation feature is explained for your users. It will be linked from the language selector.'; -$lang['localabout'] = 'Use localized versions of about page (instead of one global about page).'; -$lang['checkage'] = 'Warn about possibly outdated translations.'; -$lang['display'] = 'Select what you\'d like to have shown in the language selector. Note that using country flags for language selection is not recommended by usability experts.'; - -$lang['copytrans'] = 'Copy original language text into the editor when starting a new translation?'; \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/en/totranslate.txt b/sources/lib/plugins/translation/lang/en/totranslate.txt deleted file mode 100644 index ab42d5f..0000000 --- a/sources/lib/plugins/translation/lang/en/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **This page is not fully translated, yet. Please help completing the translation.**\\ //(remove this paragraph once the translation is finished)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/eo/lang.php b/sources/lib/plugins/translation/lang/eo/lang.php deleted file mode 100644 index 3b325da..0000000 --- a/sources/lib/plugins/translation/lang/eo/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'Tradukoj de tiu paÄo'; -$lang['outdated'] = 'Tiu traduko estas pli malnova ol la origina paÄo kaj povus esti malaktuala.'; -$lang['diff'] = 'Vidi kio ÅanÄiÄis.'; -$lang['transloaded'] = 'La enhavo de la paÄtraduko en %s disponeblas por facila tradukado.
    Sed vi povas bazi vian tradukon sur la sekvaj tradukoj: %s.'; diff --git a/sources/lib/plugins/translation/lang/eo/settings.php b/sources/lib/plugins/translation/lang/eo/settings.php deleted file mode 100644 index 6edf642..0000000 --- a/sources/lib/plugins/translation/lang/eo/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = 'Spaco-disigita listo de tradukaj lingvoj (ISO-kodoj).'; -$lang['translationns'] = 'Se vi volas traduki nur ene de certa nomspaco, indiku Äin.'; -$lang['skiptrans'] = 'Ne montri la tradukmenuon, kiam la paÄnomo kongruas al tiu regula esprimo.'; -$lang['dropdown'] = 'Uzi falmenuon por montri la tradukojn (rekomendata por pli ol 5 lingvoj).'; -$lang['translateui'] = 'Ĉu ankaÅ­ ÅanÄi la lingvon de la uzanto-interfaco en alilingvaj nomspacoj?'; -$lang['redirectstart'] = 'Ĉu la startpaÄo aÅ­tomate redirektiÄu al lingva nomspaco laÅ­ foliumila rekonado?'; -$lang['about'] = 'PaÄnomo, kie klariÄas la tradukad-funkcio al uzantoj. La lingvo-selektilo ligos tien.'; -$lang['localabout'] = 'Uzi lokajn versiojn de la pri-paÄo (anstataÅ­ unu Äenerala pri-paÄo).'; -$lang['checkage'] = 'Averti pri eble malaktualaj tradukoj.'; -$lang['display'] = 'Kion montri en la lingvo-selektilo. Notu ke uzeblec-fakuloj ne rekomendas uzi landajn flagetojn por lingvo-elekto.'; -$lang['copytrans'] = 'Ĉu kopii la originlingvan tekston en la redaktokampon por komenci novan tradukon?'; diff --git a/sources/lib/plugins/translation/lang/eo/totranslate.txt b/sources/lib/plugins/translation/lang/eo/totranslate.txt deleted file mode 100644 index 1987959..0000000 --- a/sources/lib/plugins/translation/lang/eo/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Tiu paÄo ankoraÅ­ ne plene tradukiÄis. Bv. helpi kompletigi la tradukon.**\\ //(forigu tiun alineon post fintraduko)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/es/lang.php b/sources/lib/plugins/translation/lang/es/lang.php deleted file mode 100644 index c46669e..0000000 --- a/sources/lib/plugins/translation/lang/es/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @author carlos - */ -$lang['translations'] = 'Traducciones de esta página'; -$lang['outdated'] = 'Esta traducción es más antigua que la página original y podría estar obsoleta.'; -$lang['diff'] = 'Ver lo que ha cambiado.'; -$lang['transloaded'] = 'Los contenidos de la traducción de esta página en %s han sido precargados para facilitar la traducción.
    Pero puedes basar tu traducción en las siguientes traducciones existentes: %s.'; diff --git a/sources/lib/plugins/translation/lang/es/settings.php b/sources/lib/plugins/translation/lang/es/settings.php deleted file mode 100644 index 2f9ee2d..0000000 --- a/sources/lib/plugins/translation/lang/es/settings.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @author Camilo Sampedro - * @author carlos - */ -$lang['translations'] = 'Lista de lenguajes para traducción (Códigos ISO), separados por espacios. No incluir el lenguaje por defecto.'; -$lang['translationns'] = 'Si sólo quieres traducciones en determinados espacios de nombre, indícalos aquí.'; -$lang['skiptrans'] = 'Cuando el nombre de la página concuerda con esta expresión regular, no mostrar el menú de traducción.'; -$lang['dropdown'] = 'Utiliza una lista desplegable para mostrar las traducciones (recomendado para más de 5 idiomas).'; -$lang['translateui'] = '¿También debería el lenguaje del interfaz de usuario cambiarse en los espacios de nombre foráneos?'; -$lang['redirectstart'] = '¿Debería la página principal redireccionar automáticamente a una página de un idioma según sea detectado por el navegador?'; -$lang['about'] = 'Introduce aquí un nombre de página donde se explique a tus usuarios la funcionalidad de traducción. Se enlazará desde el selector de lenguaje.'; -$lang['localabout'] = 'Utiliza versiones localizadas de la página \'acerca de\' (en lugar de una página \'acerca de\' global)'; -$lang['checkage'] = 'Alertar sobre posibles traducciones obsoletas.'; -$lang['display'] = 'Selecciona lo que quieras que sea mostrado en el selector de idioma. Ten en cuenta que el uso de parámetros de país para la selección de idioma no está recomendada por los expertos en usabilidad.'; -$lang['copytrans'] = '¿Mostrar el texto en el idioma original en el editor cuando se comienza una nueva traducción?'; diff --git a/sources/lib/plugins/translation/lang/es/totranslate.txt b/sources/lib/plugins/translation/lang/es/totranslate.txt deleted file mode 100644 index 6dc2803..0000000 --- a/sources/lib/plugins/translation/lang/es/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Esta página no está completamente traducida, aún. Por favor, contribuye a su traducción.**\\ //(Elimina este párrafo una vez la traducción esté completa)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/fr/lang.php b/sources/lib/plugins/translation/lang/fr/lang.php deleted file mode 100644 index 6944d07..0000000 --- a/sources/lib/plugins/translation/lang/fr/lang.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @author NicolasFriedli - * @author Gilles-Philippe Morin - */ -$lang['translations'] = 'Traductions de cette page'; -$lang['outdated'] = 'Cette traduction est plus ancienne que la page originale et est peut-être dépassée.'; -$lang['diff'] = 'Voir ce qui a changé.'; -$lang['transloaded'] = 'Le contenu de cette page en %s a été pré-chargé pour faciliter la traduction.
    Mais vous pouvez baser votre traduction sur les traductions existantes: %s'; diff --git a/sources/lib/plugins/translation/lang/fr/settings.php b/sources/lib/plugins/translation/lang/fr/settings.php deleted file mode 100644 index 2e347b5..0000000 --- a/sources/lib/plugins/translation/lang/fr/settings.php +++ /dev/null @@ -1,21 +0,0 @@ - - * @author Vincent Feltz - * @author NicolasFriedli - * @author Schplurtz le Déboulonné - */ -$lang['translations'] = 'Liste des langues disponibles séparées par des espaces (codes ISO).'; -$lang['translationns'] = 'Si vous souhaitez ne traduire qu\'une certaine catégorie, indiquez-la ici.'; -$lang['skiptrans'] = 'Quand le nom de la page correspond à cette expression régulière, ne pas montrer le menu de traduction.'; -$lang['dropdown'] = 'Utiliser un menu déroulant pour afficher les traductions (recommandé pour plus de 5 langues).'; -$lang['translateui'] = 'Faut-il changer la langue de l\'interface utilisateur dans les catégories traduites ?'; -$lang['redirectstart'] = 'La page de départ devrait-elle rediriger vers une catégorie traduite en utilisant la détection de langue du navigateur ?'; -$lang['about'] = 'Entrez ici un nom de page où la fonctionnalité de traduction est expliquée aux utilisateurs. Elle sera accessible depuis le sélecteur de langue.'; -$lang['localabout'] = 'Utiliser des versions traduites de la page à propos (au lieu d\'une page à propos globale).'; -$lang['checkage'] = 'Avertir de la possibilité de traductions dépassées.'; -$lang['display'] = 'Sélectionnez ce que vous voudriez afficher dans le sélecteur de langue. Notez qu\'utiliser les drapeaux de pays pour la sélection de langue n\'est pas recommandé par les experts en ergonomie.'; -$lang['copytrans'] = 'Copier le texte en langue source dans l\'éditeur quand une nouvelle traduction est lancée ?'; diff --git a/sources/lib/plugins/translation/lang/fr/totranslate.txt b/sources/lib/plugins/translation/lang/fr/totranslate.txt deleted file mode 100644 index 3603d4e..0000000 --- a/sources/lib/plugins/translation/lang/fr/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Cette page n'est pas encore traduite entièrement. Merci de terminer la traduction**\\ //(supprimez ce paragraphe une fois la traduction terminée)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/hr/lang.php b/sources/lib/plugins/translation/lang/hr/lang.php deleted file mode 100644 index efeea2f..0000000 --- a/sources/lib/plugins/translation/lang/hr/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'Prijevodi ove stranice'; -$lang['outdated'] = 'Prijevod ove stranice je stariji od originalne stranice i može biti zastario.'; -$lang['diff'] = 'Pogledajte što je izmijenjeno.'; -$lang['transloaded'] = 'Sadržaj ove stranice u jeziku %s je napunjeno radi lakšeg prevođenja.
    Ali možete bazirati VaÅ¡ prijevod i prema slijedećim raspoloživim prijevodima: %s.'; diff --git a/sources/lib/plugins/translation/lang/hr/settings.php b/sources/lib/plugins/translation/lang/hr/settings.php deleted file mode 100644 index 91bf26e..0000000 --- a/sources/lib/plugins/translation/lang/hr/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = 'Razmacima odvojena lista podržanih jezika (ISO oznake).'; -$lang['translationns'] = 'Ako želite prijevode samo ispod odreÄ‘enog imenskog prostora, navedite ga ovdje.'; -$lang['skiptrans'] = 'Kada ime stranice odgovara ovom regularnom izrazu, ne prikazujte meni za prijevode.'; -$lang['dropdown'] = 'Koristi padajuću listu za prikaz prijevoda (preporuÄeno kada ima viÅ¡e od 5 jezika).'; -$lang['translateui'] = 'Da li da jezik korisniÄkog suÄelja takoÄ‘er bude prebaÄen u jezik stranog imenskog prostora ?'; -$lang['redirectstart'] = 'Da li da se poÄetna strana automatski preusmjeri na imenski prostor koristeći detektirani jezik preglednika?'; -$lang['about'] = 'Unesi naziv stranice gdje je korisnicima pojaÅ¡njene mogućnosti prevoÄ‘enja. Ona će biti povezana na izbornik jezika.'; -$lang['localabout'] = 'Koristi lokaliziranu inaÄicu "about" stranice (umjesto jedinstvene globalne)'; -$lang['checkage'] = 'Upozori o mogućem zastarjelom prijevodu.'; -$lang['display'] = 'Odaberite Å¡to želite da bude prikazano u izborniku jezika. Budite svjesni da koriÅ¡tenje zastava za odabir jezika nije preporuÄeno od strane eksperata.'; -$lang['copytrans'] = 'Kopirati originalni tekst u editor kada otvorite novi prijevod ?'; diff --git a/sources/lib/plugins/translation/lang/hr/totranslate.txt b/sources/lib/plugins/translation/lang/hr/totranslate.txt deleted file mode 100644 index b49e869..0000000 --- a/sources/lib/plugins/translation/lang/hr/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Ova stranica joÅ¡ nije prevedena u cijelosti. Molimo pomognite u njenom prijevodu.**\\ //(uklonite ovaj paragraf jednom kada je prevoÄ‘enje zavrÅ¡eno)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/hu/lang.php b/sources/lib/plugins/translation/lang/hu/lang.php deleted file mode 100644 index 6a576ff..0000000 --- a/sources/lib/plugins/translation/lang/hu/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'Oldal fordításai'; -$lang['outdated'] = 'A fordítás régebbi, mint az eredeti oldal, ezért lehet, hogy már elavult.'; -$lang['diff'] = 'Módosítások megtekintése.'; -$lang['transloaded'] = 'Az oldal tartalmának %s nyelvi fordítását elÅ‘re betöltöttem a könnyebb módosítás érdekében.
    Ugyanakkor a fordítást elvégezhetjük a már létezÅ‘ %s fordítás alapján is.'; diff --git a/sources/lib/plugins/translation/lang/hu/settings.php b/sources/lib/plugins/translation/lang/hu/settings.php deleted file mode 100644 index 5a27108..0000000 --- a/sources/lib/plugins/translation/lang/hu/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = 'Szóközzel elválasztott lista a nyelvi fordításokról (ISO-kódokkal).'; -$lang['translationns'] = 'Ha csak egy bizonyos névtér alatt lévÅ‘ fordítást szeretnénk, tegyük ide.'; -$lang['skiptrans'] = 'Ha az oldal neve illeszkedik ehhez a reguláris kifejezéshez, ne jelenjen meg a fordítások menüje.'; -$lang['dropdown'] = 'LegördülÅ‘ lista használata a fordításokhoz (5 nyelvnél több esetén javasolt).'; -$lang['translateui'] = 'Módosuljon a felhasználói felület nyelve is idegen nyelvi névterek alatt?'; -$lang['redirectstart'] = 'Ãtirányítsuk automatikusan a kezdÅ‘oldalt abba a nyelvi névtérbe, amely nyelv a böngészÅ‘ben van beállítva?'; -$lang['about'] = 'Itt adhatjuk meg annak az oldalnak a nevét, amelyen a fordítási lehetÅ‘ségeket ismertetjük a felhasználókkal. Erre fog hivatkozni a nyelvkiválasztó képernyÅ‘elem.'; -$lang['localabout'] = 'A névjegy oldal fordított változátanak használata (a globális névjegy oldal helyett).'; -$lang['checkage'] = 'Figyelmeztetés az esetlegesen elavult fordításokra.'; -$lang['display'] = 'Válasszuk ki, mi jelenjen meg a nyelvi kiválasztó képernyÅ‘elemében. Jegyezzük meg: az országzászlókat nem javasolják a használhatósági szakértÅ‘k.'; -$lang['copytrans'] = 'Ãtmásoljuk az eredeti nyelvi szöveget a szövegszerkesztÅ‘be új fordítás indításakor?'; diff --git a/sources/lib/plugins/translation/lang/hu/totranslate.txt b/sources/lib/plugins/translation/lang/hu/totranslate.txt deleted file mode 100644 index e072d8a..0000000 --- a/sources/lib/plugins/translation/lang/hu/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -JAVÃTANDÓ **Az oldal még nincs teljesen lefordítva. Kérjük, segítsen a befejezésében!**\\ //(Töröljük ezt a bekezdést a fordítás elkészültekor.)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/it/lang.php b/sources/lib/plugins/translation/lang/it/lang.php deleted file mode 100644 index 23d3bd6..0000000 --- a/sources/lib/plugins/translation/lang/it/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ -$lang['translations'] = 'Traduzioni di questa pagina'; -$lang['outdated'] = 'Questa traduzione è più vecchia di quella della pagina originale è potrebbe essere superata.'; -$lang['diff'] = 'Vedi cosa è cambiato.'; diff --git a/sources/lib/plugins/translation/lang/it/settings.php b/sources/lib/plugins/translation/lang/it/settings.php deleted file mode 100644 index aea6810..0000000 --- a/sources/lib/plugins/translation/lang/it/settings.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @author Diego Pierotto - */ -$lang['translations'] = 'Elenco delle lingue di traduzione separati da spazi (codici ISO). Non includere la lingua predefinita'; -$lang['translationns'] = 'Scrivi qui solo se vuoi le traduzioni all\'interno di una certa categoria.'; -$lang['translateui'] = 'Vuoi che anche la lingua dell\'interfaccia utente sia modificata in categorie della stessa lingua?'; -$lang['about'] = 'Inserisci qui una pagina dove la funzione di traduzione viene spiegata agli utenti. Sarà collegata al selettore lingua.'; diff --git a/sources/lib/plugins/translation/lang/ja/lang.php b/sources/lib/plugins/translation/lang/ja/lang.php deleted file mode 100644 index 6739f3e..0000000 --- a/sources/lib/plugins/translation/lang/ja/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'ã“ã®ãƒšãƒ¼ã‚¸ã®ç¿»è¨³'; -$lang['outdated'] = 'ã“ã®ç¿»è¨³ã¯å…ƒã®ãƒšãƒ¼ã‚¸ã‚ˆã‚Šã‚‚å¤ãã€æ™‚代é…ã‚Œãªå¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚'; -$lang['diff'] = '変更点をå‚ç…§ã—ã¦ä¸‹ã•ã„。'; -$lang['transloaded'] = '翻訳ã—易ãã™ã‚‹ãŸã‚ã« %s ã«ã‚ã‚‹ã“ã®ãƒšãƒ¼ã‚¸ã®ç¿»è¨³å†…容を事å‰ã«èª­ã¿è¾¼ã¿ã¾ã—ãŸã€‚
    以下ã®æ—¢å­˜ã®ç¿»è¨³ã‚’翻訳ã®åŸºã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼š%s。'; diff --git a/sources/lib/plugins/translation/lang/ja/settings.php b/sources/lib/plugins/translation/lang/ja/settings.php deleted file mode 100644 index bc37b1e..0000000 --- a/sources/lib/plugins/translation/lang/ja/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = '翻訳言語（ISOコード）ã®ã‚¹ãƒšãƒ¼ã‚¹åŒºåˆ‡ã‚Šä¸€è¦§'; -$lang['translationns'] = '特定ã®åå‰ç©ºé–“以下ã®ã¿ã‚’翻訳ã—ãŸã„å ´åˆã€åå‰ç©ºé–“を記入ã™ã‚‹ã€‚'; -$lang['skiptrans'] = 'ページåãŒã“ã®æ­£è¦è¡¨ç¾ã¨ä¸€è‡´ã™ã‚‹ã¨ã€ç¿»è¨³ãƒ¡ãƒ‹ãƒ¥ãƒ¼ãŒè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。'; -$lang['dropdown'] = '翻訳を表示ã™ã‚‹ãŸã‚ã«ãƒ‰ãƒ­ãƒƒãƒ—ダウン一覧を使用ã™ã‚‹ï¼ˆï¼•è¨€èªžä»¥ä¸Šã®å ´åˆæŽ¨å¥¨ï¼‰ã€‚'; -$lang['translateui'] = 'ユーザーインターフェイスã®è¨€èªžã‚‚ã€åå‰ç©ºé–“ã®å¤–国語ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã‹ï¼Ÿ'; -$lang['redirectstart'] = 'ブラウザーã®è¨€èªžã‚’検出ã—ã¦ã€ã‚¹ã‚¿ãƒ¼ãƒˆãƒšãƒ¼ã‚¸ã‚’言語ã®åå‰ç©ºé–“ã«è‡ªå‹•çš„ã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã™ã‚‹ã‹ï¼Ÿ'; -$lang['about'] = '翻訳機能をユーザーã«èª¬æ˜Žã™ã‚‹ãƒšãƒ¼ã‚¸åを入力ã—ã¦ä¸‹ã•ã„。言語セレクタã‹ã‚‰ãƒªãƒ³ã‚¯ã•ã‚Œã¾ã™ã€‚'; -$lang['localabout'] = '（包括的ãªæ¦‚è¦ãƒšãƒ¼ã‚¸ã®ä»£ã‚ã‚Šã«ï¼‰ç¿»è¨³ç‰ˆã®æ¦‚è¦ãƒšãƒ¼ã‚¸ã‚’使用ã™ã‚‹ã€‚'; -$lang['checkage'] = 'å¤ã„翻訳ã«ã¤ã„ã¦è­¦å‘Šã™ã‚‹ã€‚'; -$lang['display'] = '言語セレクタã«ä½•ã‚’表示ã™ã‚‹ã‹ã‚’é¸æŠžã™ã‚‹ã€‚言語é¸æŠžã«å›½æ——を使用ã™ã‚‹ã“ã¨ã‚’ユーザビリティ専門家ã¯å¥¨åŠ±ã—ãªã„ã®ã§æ³¨æ„ã—ã¦ãã ã•ã„。'; -$lang['copytrans'] = 'æ–°ã—ã翻訳を開始ã™ã‚‹æ™‚ã€ã‚¨ãƒ‡ã‚£ã‚¿ã«å…ƒã®è¨€èªžã®æ–‡ç« ã‚’コピーã™ã‚‹ã‹ï¼Ÿ'; diff --git a/sources/lib/plugins/translation/lang/ja/totranslate.txt b/sources/lib/plugins/translation/lang/ja/totranslate.txt deleted file mode 100644 index 05ac184..0000000 --- a/sources/lib/plugins/translation/lang/ja/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **ã“ã®ãƒšãƒ¼ã‚¸ã¯ã¾ã å®Œå…¨ã«ã¯ã€ç¿»è¨³ã•ã‚Œã¾ã›ã‚“。翻訳ã®å®Œäº†ã‚’支æ´ã—ã¦ä¸‹ã•ã„。**\\ //（翻訳ãŒå®Œäº†ã—ãŸã‚‰ã“ã®æ®µè½ã‚’削除ã—ã¦ä¸‹ã•ã„）// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/ko/lang.php b/sources/lib/plugins/translation/lang/ko/lang.php deleted file mode 100644 index 9174b0a..0000000 --- a/sources/lib/plugins/translation/lang/ko/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'ì´ ë¬¸ì„œì˜ ë²ˆì—­'; -$lang['outdated'] = 'ì´ ë²ˆì—­ì€ ì›ëž˜ 문서보다 오래ë˜ì—ˆê³  ì˜¤ëž˜ëœ ë²ˆì—­ì¼ ìˆ˜ 있습니다.'; -$lang['diff'] = 'ë¬´ì—‡ì´ ë°”ë€Œì—ˆëŠ”ì§€ 참조하세요.'; -$lang['transloaded'] = '%sì— ìžˆëŠ” ì´ ë¬¸ì„œì˜ ë²ˆì—­ì˜ ë‚´ìš©ì„ ì‰½ê²Œ 번역하기 위해 미리 불러왔습니다.
    하지만 ë‹¤ìŒ ê¸°ì¡´ ë²ˆì—­ì— ë‹¹ì‹ ì˜ ë²ˆì—­ì„ ê¸°ë°˜ìœ¼ë¡œ í•  수 있습니다: %s.'; diff --git a/sources/lib/plugins/translation/lang/ko/settings.php b/sources/lib/plugins/translation/lang/ko/settings.php deleted file mode 100644 index 9f5e36a..0000000 --- a/sources/lib/plugins/translation/lang/ko/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ -$lang['translations'] = '번역 ì–¸ì–´ì˜ ê³µë°±ìœ¼ë¡œ 구분한 ëª©ë¡ (ISO 코드).'; -$lang['translationns'] = '특정 ì´ë¦„ê³µê°„ì— ë”°ë¼ ë²ˆì—­ì„ ì›í•˜ë©´ ì—¬ê¸°ì— ë„£ìœ¼ì„¸ìš”.'; -$lang['skiptrans'] = '문서ì´ë¦„ì´ ì •ê·œ 표현ì‹ê³¼ ì¼ì¹˜í•˜ë©´, 번역 메뉴를 보여주지 마세요.'; -$lang['dropdown'] = 'ë²ˆì—­ì„ ë³´ì—¬ì¤„ 드롭다운 목ë¡ì„ 사용합니다. (5ê°œ ì´ìƒì˜ 언어ì´ë©´ 권장)'; -$lang['translateui'] = 'ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ì˜ ì–¸ì–´ë„ ì™¸êµ­ì–´ ì´ë¦„공간으로 전환해야 합니까?'; -$lang['redirectstart'] = '시작 문서가 ìžë™ìœ¼ë¡œ 브ë¼ìš°ì € 언어 ê°ì§€ë¥¼ 사용해 언어 ì´ë¦„공간으로 넘겨줘야 합니까?'; -$lang['about'] = '사용ìžì—게 설명할 번역 ê¸°ëŠ¥ì´ ì–´ë””ì— ìžˆëŠ”ì§€ ì—¬ê¸°ì— ë¬¸ì„œì´ë¦„ì„ ìž…ë ¥í•˜ì„¸ìš”.'; -$lang['localabout'] = '(í•˜ë‚˜ì˜ ì „ì—­ 소개 문서 대신) 소개 ë¬¸ì„œì˜ ì§€ì—­í™”ëœ ë²„ì „ì„ ì‚¬ìš©í•©ë‹ˆë‹¤.'; -$lang['checkage'] = '가능하면 ì˜¤ëž˜ëœ ë²ˆì—­ì— ëŒ€í•´ 경고합니다.'; -$lang['display'] = '언어 ì„ íƒê¸°ì— 보여주고 ì‹¶ì€ ê²ƒì„ ì„ íƒí•˜ì„¸ìš”. 언어 ì„ íƒì— 국기를 사용하는 ê²ƒì€ ì‚¬ìš©ì„± 전문가ì—게 권장하지 ì•ŠìŒì„ 참고하세요.'; -$lang['copytrans'] = '새 ë²ˆì—­ì„ ì‹œìž‘í•  ë•Œ íŽ¸ì§‘ê¸°ì— ì›ëž˜ 언어 ë¬¸ìž¥ì„ ë³µì‚¬í•˜ê² ìŠµë‹ˆê¹Œ?'; diff --git a/sources/lib/plugins/translation/lang/ko/totranslate.txt b/sources/lib/plugins/translation/lang/ko/totranslate.txt deleted file mode 100644 index 9a19833..0000000 --- a/sources/lib/plugins/translation/lang/ko/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **ì´ ë¬¸ì„œëŠ” ì•„ì§ ì™„ì „ížˆ 번역ë˜ì§€ 않았습니다. ë²ˆì—­ì„ ì™„ë£Œí•˜ëŠ” ë° ë„와주세요.**\\ //(ë²ˆì—­ì„ ë§ˆì¹˜ë©´ ì´ ë‹¨ë½ì„ 지우세요)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/lv/lang.php b/sources/lib/plugins/translation/lang/lv/lang.php deleted file mode 100644 index af85894..0000000 --- a/sources/lib/plugins/translation/lang/lv/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'CitÄs valodÄs'; -$lang['outdated'] = 'Å is tulkojums ir vecÄks par oriÄ£inÄlo lapu un varbÅ«t ir novecojis.'; -$lang['diff'] = 'RedzÄ“t, ka ir mainÄ«jies.'; -$lang['transloaded'] = 'VieglÄkai tulkoÅ¡anai ir ielÄdÄ“ts lapas saturs no %s .
    Bet varat balstÄ«ties arÄ« uz Å¡Ädiem tulkojumiem: %s.'; diff --git a/sources/lib/plugins/translation/lang/lv/settings.php b/sources/lib/plugins/translation/lang/lv/settings.php deleted file mode 100644 index 1b61b46..0000000 --- a/sources/lib/plugins/translation/lang/lv/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Aivars MiÅ¡ka - */ -$lang['translations'] = 'Ar atstarpÄ“m atdalÄ«ts tulkojumu valodu saraksts (ISO kodi). Izņemot noklusÄ“to valodu.'; -$lang['translationns'] = 'Ja tulkojumus vajag tikai noteiktÄ nodaļÄ, ieraksti to Å¡eit.'; -$lang['skiptrans'] = 'Ja lapas nosaukums atbilst regulÄrajai izteiksmei, tulkoÅ¡anas izvÄ“lni nerÄdÄ«t.'; -$lang['dropdown'] = 'Lietot izkrÄ«toÅ¡o izvÄ“lni tulkojumu parÄdÄ«Å¡anai (ieteikt, ja ir vairÄk par 5 valodÄm). '; -$lang['translateui'] = 'Vai sveÅ¡valodu nodaļÄs jÄpÄrslÄ“dz arÄ« lietotÄja sakarnes valoda?'; -$lang['redirectstart'] = 'Vai sÄkuma lapai automÄtiski jÄpÄrslÄ“dzas atkarÄ«bÄ no pÄrlÅ«kprogrammas noteiktÄs valodas?'; -$lang['about'] = 'Ieraksti Å¡eit lapu, kurÄ lietotÄjiem izskaidrotas tulkoÅ¡as iespÄ“jas. TÄ tiks piesaistÄ«ta valodu izvÄ“lei.'; -$lang['localabout'] = 'Lietot "par" lapas lokalizÄ“to versiju, nevis globÄlo "par" lapu.'; -$lang['checkage'] = 'BrÄ«dinÄt pa varbÅ«t novecojuÅ¡iem tulkojumiem. '; -$lang['display'] = 'NorÄdiet, ko lietot valodas izvÄ“lei. Å…emiet vÄ“rÄ, ka valodÄm izmantot valstu karogus neiesaka.'; -$lang['copytrans'] = 'SÄkot tulkojumu, iekopÄ“t redaktorÄ oriÄ£inÄltekstu?'; diff --git a/sources/lib/plugins/translation/lang/lv/totranslate.txt b/sources/lib/plugins/translation/lang/lv/totranslate.txt deleted file mode 100644 index c46c14e..0000000 --- a/sources/lib/plugins/translation/lang/lv/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -IZLABO **Lapa nav pilnÄ«bÄ pÄrtulkota. LÅ«dzu palÄ«dzi pabeigt tulkojumu!** \\ //(IzdzÄ“s Å¡o rindkopu, kad tulkojums pabeigts!)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/nl/lang.php b/sources/lib/plugins/translation/lang/nl/lang.php deleted file mode 100644 index b3397fe..0000000 --- a/sources/lib/plugins/translation/lang/nl/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['translations'] = 'Paginavertalingen'; -$lang['outdated'] = 'Deze vertaling is ouder dan de originele pagina en kan verouderd zijn.'; -$lang['diff'] = 'Kijk wat er is veranderd.'; -$lang['transloaded'] = 'De inhoud van vertaling van deze pagina in %s is al geladen om vertalen makkelijker te maken.
    Maar je kunt je vertaling ook baseren op één van de volgende bestaande vertalingen: %s.'; diff --git a/sources/lib/plugins/translation/lang/nl/settings.php b/sources/lib/plugins/translation/lang/nl/settings.php deleted file mode 100644 index 9f0464a..0000000 --- a/sources/lib/plugins/translation/lang/nl/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Gerrit Uitslag - */ -$lang['translations'] = 'Spatiegescheiden lijst van vertalingen (ISO codes).'; -$lang['translationns'] = 'Als je alleen vertalingen in een bepaalde namespace wenst, plaatst die dan hier.'; -$lang['skiptrans'] = 'Wanneer een paginanaam overeenstemt met deze reguliere expressie, wordt het vertaalmenu niet getoond.'; -$lang['dropdown'] = 'Gebruik een dropdownlijst om vertalingen weer te geven (aanbevolen bij meer dan 5 talen).'; -$lang['translateui'] = 'Moet de taal van de gebruikersinterface ook veranderen naar de taal van vertaalde namespace?'; -$lang['redirectstart'] = 'Moet de startpagina automatisch doorverwijzen naar de namespace van de taal die de taaldetectie van de browser doorgeeft?'; -$lang['about'] = 'Geef een paginanaam waar de vertaalfunctie wordt uitgelegd voor je gebruikers. Het zal worden gelinkt vanuit de talenkiezer.'; -$lang['localabout'] = 'Gebruik vertaalde versies van bovengenoemde vertalingsuitlegpagina (in plaats van één globale uitlegpagina).'; -$lang['checkage'] = 'Waarschuw voor mogelijk gedateerde vertalingen.'; -$lang['display'] = 'Selecteer wat je wil zien in de talenkiezer. Let op dat het gebruik van landenvlaggen in de talenkiezer niet altijd gebruiksvriendelijkheid is.'; -$lang['copytrans'] = 'De tekst in de oorspronkelijke taal naar het bewerkvenster kopiëren als er een nieuwe vertaling wordt begonnen.'; diff --git a/sources/lib/plugins/translation/lang/nl/totranslate.txt b/sources/lib/plugins/translation/lang/nl/totranslate.txt deleted file mode 100644 index d5f8cee..0000000 --- a/sources/lib/plugins/translation/lang/nl/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Deze pagina is nog niet volledig vertaald. Help alsjeblieft de vertaling compleet te maken.**\\ //(verwijder deze paragraaf als de vertaling is voltooid)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/pt-br/lang.php b/sources/lib/plugins/translation/lang/pt-br/lang.php deleted file mode 100644 index acc3cdf..0000000 --- a/sources/lib/plugins/translation/lang/pt-br/lang.php +++ /dev/null @@ -1,3 +0,0 @@ - - - * @date Oct 17, 2007 - */ - -$lang['translations'] = "Lista de idiomas (códigos ISO) separada por espaços. Não inclua o idioma padrão."; -$lang['translationns'] = "Se você deseja traduções somente abaixo de um determinado namespace, informe-o aqui."; -$lang['translateui'] = "A interface também deve ser alterada para o idioma selecionado pelo usuário?"; -$lang['about'] = "Informe uma página onde a funcionalidade de tradução é explicada para o usuário. Ela pode ser conectada com o selecionador de idiomas."; - diff --git a/sources/lib/plugins/translation/lang/pt/lang.php b/sources/lib/plugins/translation/lang/pt/lang.php deleted file mode 100644 index a17ab35..0000000 --- a/sources/lib/plugins/translation/lang/pt/lang.php +++ /dev/null @@ -1,11 +0,0 @@ - - * @author Alfredo Silva - */ -$lang['translations'] = 'Traduções para esta página'; -$lang['outdated'] = 'Esta tradução é mais antiga do que a página original e poderá estar desatualizada.'; -$lang['diff'] = 'Veja o que foi alterado.'; diff --git a/sources/lib/plugins/translation/lang/pt/settings.php b/sources/lib/plugins/translation/lang/pt/settings.php deleted file mode 100644 index 4cdd114..0000000 --- a/sources/lib/plugins/translation/lang/pt/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Alfredo Silva - */ -$lang['translations'] = 'Lista de idiomas de tradução (códigos ISO) separada por espaço.'; -$lang['translationns'] = 'Se pretender apenas as traduções abaixo de um determinado espaço de nome, coloque-as aqui.'; -$lang['skiptrans'] = 'Quando o nome da página corresponder com esta expressão regular, não mostrar o menu de tradução.'; -$lang['dropdown'] = 'Utilizar uma lista de menu para exibir as traduções (recomendado para mais de 5 idiomas).'; -$lang['translateui'] = 'O idioma da interface do utilizador também deverá ser alterado nos espaços de nome do idioma estrangeiro?'; -$lang['redirectstart'] = 'A página inicial deve redirecionar automaticamente para um espaço de nome do idioma utilizando a deteção de idioma do navegador?'; -$lang['about'] = 'Insira aqui um nome de página onde a funcionalidade de tradução é explicada aos seus utilizadores. O seletor de língua terá uma ligação para lá.'; -$lang['localabout'] = 'Utilizar versões localizadas da página sobre (em vez de uma página global sobre).'; -$lang['checkage'] = 'Avisar sobre as possíveis traduções desatualizadas.'; -$lang['display'] = 'Selecione o que gostaria de ver mostrado no seletor de linguagem. Note que usar bandeiras de países para seleção de linguagem não é recomendado por peritos de usabilidade.'; -$lang['copytrans'] = 'Copiar o texto do idioma original no editor quando iniciar uma nova tradução?'; diff --git a/sources/lib/plugins/translation/lang/ru/lang.php b/sources/lib/plugins/translation/lang/ru/lang.php deleted file mode 100644 index bd6a93b..0000000 --- a/sources/lib/plugins/translation/lang/ru/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @author Vasilyy Balyasnyy - */ -$lang['translations'] = 'Перевод Ñтой Ñтраницы'; -$lang['outdated'] = 'Этот перевод Ñтарее, чем Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»ÑŒÐ½Ð°Ñ Ñтраница, и может быть неактуальным.'; -$lang['diff'] = 'Смотрите, что было изменено.'; -$lang['transloaded'] = 'Содержание перевода Ñтой Ñтраницы в %s было предварительно загружено Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð¾Ñ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð°.
    Ðо вы можете переводить на оÑнове Ñледующего ÑущеÑтвующего перевода: %s.'; diff --git a/sources/lib/plugins/translation/lang/ru/settings.php b/sources/lib/plugins/translation/lang/ru/settings.php deleted file mode 100644 index fa2be4f..0000000 --- a/sources/lib/plugins/translation/lang/ru/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author Aleksandr Selivanov - */ -$lang['translations'] = 'СпиÑок поддерживаемых Ñзыков перевода (двухÑимвольные коды ISO). Разделите Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð±ÐµÐ»Ð°Ð¼Ð¸.'; -$lang['translationns'] = 'ЕÑли вы хотите перевеÑти только определённое проÑтранÑтво имён, тогда впишите здеÑÑŒ его имÑ.'; -$lang['skiptrans'] = 'ЕÑли Ð¸Ð¼Ñ Ñтраницы ÑоответÑтвует Ñтому регулÑрному выражению, тогда не отображать меню перевода.'; -$lang['dropdown'] = 'ИÑпользовать выпадающий ÑпиÑок Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупных переводов (рекомендуетÑÑ, еÑли более 5 переводов)'; -$lang['translateui'] = 'Должен ли Ñзык интерфейÑа Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ‚Ð°ÐºÐ¶Ðµ переключатьÑÑ ÑоглаÑно Ñзыку проÑтранÑтва имён?'; -$lang['redirectstart'] = 'Должна ли ÑÑ‚Ð°Ñ€Ñ‚Ð¾Ð²Ð°Ñ Ñтраница автоматичеÑки перенаправлÑÑ‚ÑŒÑÑ Ð½Ð° проÑтранÑтво имён Ñзыка, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ð°Ð²Ñ‚Ð¾Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ Ñзыка браузера?'; -$lang['about'] = 'Введите здеÑÑŒ Ð¸Ð¼Ñ Ñтраницы, на которой будут разъÑÑнены функции перевода Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… пользователей. Она будет ÑвÑзана Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð¾Ð¼ Ñзыка.'; -$lang['localabout'] = 'ИÑпользовать локализованную верÑию Ñтраницы разъÑÑнений (вмеÑто одной глобальной Ñтраницы разъÑÑнений).'; -$lang['checkage'] = 'Отображать предупреждение о возможной неактуальноÑти перевода?'; -$lang['display'] = 'Выберите? что бы вы хотели отображать в Ñелекторе Ñзыков. Заметка: иÑпользовать флаг Ñтраны Ð´Ð»Ñ Ñелектора Ñзыков не рекомендуеÑÑ ÑкÑпертами по удобноÑти иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа.'; -$lang['copytrans'] = 'Копировать текÑÑ‚ оригинала в окно Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¸ Ñоздании нового перевода?'; diff --git a/sources/lib/plugins/translation/lang/ru/totranslate.txt b/sources/lib/plugins/translation/lang/ru/totranslate.txt deleted file mode 100644 index b34588e..0000000 --- a/sources/lib/plugins/translation/lang/ru/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Эта Ñтраница пока что не переведена полноÑтью. ПожалуйÑта, помогите завершить перевод.**\\ //(Сотрите Ñто Ñообщение по окончании перевода.)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/sl/lang.php b/sources/lib/plugins/translation/lang/sl/lang.php deleted file mode 100644 index be8a195..0000000 --- a/sources/lib/plugins/translation/lang/sl/lang.php +++ /dev/null @@ -1,9 +0,0 @@ -izvorne strani in je zato lahko zastarel.'; -$lang['diff'] = 'Oglejte si spremembe.'; diff --git a/sources/lib/plugins/translation/lang/sl/settings.php b/sources/lib/plugins/translation/lang/sl/settings.php deleted file mode 100644 index 6bdcff4..0000000 --- a/sources/lib/plugins/translation/lang/sl/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @author Matej UrbanÄiÄ - */ -$lang['translations'] = 'Space separated list of translation languages (ISO codes).'; -$lang['translationns'] = 'If you only want translations below a certain namespace, put it here.'; -$lang['skiptrans'] = 'When the pagename matches this regular expression, don\'t show the translation menu.'; -$lang['dropdown'] = 'Use a dropdown list to display the translations (recommended for more than 5 languages).'; -$lang['translateui'] = 'Should the language of the user interface be switched in foreign language namespaces, too?'; -$lang['redirectstart'] = 'Should the start page automatically redirect into a language namespace using browser language detection?'; -$lang['about'] = 'Enter a pagename here where the translation feature is explained for your users. It will be linked from the language selector.'; -$lang['localabout'] = 'Uporabi prevedeno razliÄico strani o vstavku (namesto sploÅ¡ne strani).'; -$lang['checkage'] = 'Opozori o zastarelem prevodu.'; -$lang['display'] = 'Izbor možnosti za prikaz jezika v izbirniku jezika. Izbor zastave jezika v izbiri ni priporoÄen.'; diff --git a/sources/lib/plugins/translation/lang/tr/lang.php b/sources/lib/plugins/translation/lang/tr/lang.php deleted file mode 100644 index 9f447b6..0000000 --- a/sources/lib/plugins/translation/lang/tr/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ -$lang['translations'] = 'Bu sayfanın çevirileri'; -$lang['outdated'] = 'Bu çeviri orjinal sayfadan daha eski tarihli. Dolayısıyla güncel olmayabilir.'; -$lang['diff'] = 'Nelerin deÄŸiÅŸtiÄŸini görmek için tıklayın.'; diff --git a/sources/lib/plugins/translation/lang/tr/settings.php b/sources/lib/plugins/translation/lang/tr/settings.php deleted file mode 100644 index 368ddd4..0000000 --- a/sources/lib/plugins/translation/lang/tr/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['translations'] = 'Tercüme dillerinin listesi. (boÅŸluk ile ayrılmış, ISO kodları)'; -$lang['translationns'] = 'EÄŸer tercümelerin bir isim alanın (namespace) altında olmasını istiyorsanız, buraya yazın.'; -$lang['skiptrans'] = 'Ä°sim alanı (Namespace) buradaki tanıma uyduÄŸunda, tercüme arayüzünü gösterme.'; -$lang['dropdown'] = 'Dilleri listelemek için açılır arayüz kullan. (5\'ten fazla dil olduÄŸunda kullanılması önerilir)'; -$lang['localabout'] = 'Bir tane genel hakkında sayfası yerine, yerelleÅŸtirilmiÅŸ hakkında sayfaları kullan. '; -$lang['checkage'] = 'Eski tarihli tercümeler hakkında uyarı göster.'; -$lang['display'] = 'Dil seçiminde görünmesini istediklerinizi seçin. Lütfen unutmayın, dil seçiminde ülke bayrağı kullanmak, eriÅŸilebilirlik uzmanları tarafından tavsiye edilmez.'; -$lang['copytrans'] = 'Yeni tercümeye baÅŸlarken orjinal dildeki metin, düzenleme ekranına kopyalansın mı?'; diff --git a/sources/lib/plugins/translation/lang/tr/totranslate.txt b/sources/lib/plugins/translation/lang/tr/totranslate.txt deleted file mode 100644 index e281874..0000000 --- a/sources/lib/plugins/translation/lang/tr/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -FIXME **Bu sayfanın çevirisi henüz tamamlanmadı. Lütfen çevirinin tamamlanmasına yardımcı olun.**\\ //(Çeviri tamamlandığında bu paragrafı silin)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/lang/uk/lang.php b/sources/lib/plugins/translation/lang/uk/lang.php deleted file mode 100644 index 06e1938..0000000 --- a/sources/lib/plugins/translation/lang/uk/lang.php +++ /dev/null @@ -1,5 +0,0 @@ -оригінальна Ñторінка Ñ– може бути не актуальним.'; -$lang['diff'] = 'ДивітьÑÑ Ñ‰Ð¾ було змінено.'; diff --git a/sources/lib/plugins/translation/lang/uk/settings.php b/sources/lib/plugins/translation/lang/uk/settings.php deleted file mode 100644 index 11e87a0..0000000 --- a/sources/lib/plugins/translation/lang/uk/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - */ - -$lang['translations'] = 'СпиÑок підтримуваних мов перекладу (двохÑимвольні коди ISO). Розділіть Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð¼Ð¸ або пробілами.'; -$lang['translationns'] = 'Якщо ви хочете переклаÑти тільки визначений ПроÑÑ‚Ñ–Ñ€ імен, тоді впишіть тут його ім\'Ñ.'; -$lang['skiptrans'] = 'Якщо ім\'Ñ Ñторінки відповідає цьому регулÑрному виразу, тоді не відображувати меню перекладів.'; -$lang['dropdown'] = 'ВикориÑтовувати випадаючий ÑпиÑок Ð´Ð»Ñ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð¾Ñтупних перекладів (рекомендуєтьÑÑ, Ñкщо більше 5 перекладів)'; -$lang['translateui'] = 'Чи повинна мова інтерфейÑу кориÑтувача також перемикатиÑÑŒ відповідно до мови ПроÑтору імен?'; -$lang['redirectstart'] = 'Чи повинна Ñтартова Ñторінка автоматично перенаправлÑтиÑÑŒ на ПроÑÑ‚Ñ–Ñ€ імен мови, викориÑтовуючи детектекцію мови оглÑдача?'; -$lang['about'] = 'Введіть тут ім\'Ñ Ñторінки, на Ñкій буде роз\'ÑÑнено функції перекладу Ð´Ð»Ñ Ð²Ð°ÑˆÐ¸Ñ… кориÑтувачів. Вона буде пов\'Ñзана з вибором мови.'; -$lang['localabout'] = 'ВикориÑтовувати локалізовану верÑÑ–ÑŽ Ñторінки роз\'ÑÑнень (заміÑÑ‚ÑŒ однієї глобальної Ñторінки роз\'ÑÑнень).'; -$lang['checkage'] = 'Відображувати Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ можливу не актуальніÑÑ‚ÑŒ перекладу Ñторінок?'; -$lang['display'] = 'Оберіть що б ви хотіли відображувати в перемикачі мов. Примітка: викориÑтовувати прапор країни Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ñ‡Ð° мов не рекомендуєтьÑÑ ÐµÐºÑпертами по зручноÑÑ‚Ñ– викориÑÑ‚Ð°Ð½Ð½Ñ Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñу.'; -?> diff --git a/sources/lib/plugins/translation/lang/zh-tw/lang.php b/sources/lib/plugins/translation/lang/zh-tw/lang.php deleted file mode 100644 index 7b9f694..0000000 --- a/sources/lib/plugins/translation/lang/zh-tw/lang.php +++ /dev/null @@ -1,6 +0,0 @@ -原始é é¢èˆŠï¼Œå¯èƒ½å·²éŽæ™‚。'; -$lang['diff'] = '檢視變更。'; - diff --git a/sources/lib/plugins/translation/lang/zh-tw/settings.php b/sources/lib/plugins/translation/lang/zh-tw/settings.php deleted file mode 100644 index 7cc76dc..0000000 --- a/sources/lib/plugins/translation/lang/zh-tw/settings.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @author oott123 - */ -$lang['translations'] = '本页é¢çš„其他翻译'; -$lang['outdated'] = '翻译跟原始页é¢æ¯”较起æ¥æ˜¾å¾—有些陈旧，所以å¯èƒ½å¤±æ•ˆã€‚'; -$lang['diff'] = '查看更新'; -$lang['transloaded'] = '此页é¢çš„ %s å·²ç»ç”± easy translation 预翻译。
    但你å¯ä»¥ä»¥ä»¥ä¸‹çŽ°å­˜çš„语言为基础翻译你的版本。%s'; diff --git a/sources/lib/plugins/translation/lang/zh/settings.php b/sources/lib/plugins/translation/lang/zh/settings.php deleted file mode 100644 index 229337c..0000000 --- a/sources/lib/plugins/translation/lang/zh/settings.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author oott123 - */ -$lang['translations'] = '使用空格分隔的翻译语言列表（ISO ç ï¼‰ã€‚请勿填入默认语言。'; -$lang['translationns'] = '如果您åªå¸Œæœ›æœ¬æ’件作用于æŸä¸ªç‰¹å®šçš„å称空间，请在这里写上其å称。'; -$lang['skiptrans'] = '当页é¢å称与此正则匹é…时，ä¸è¦æ˜¾ç¤ºç¿»è¯‘èœå•ã€‚'; -$lang['dropdown'] = '使用下拉列表显示翻译语言（5+语言时建议å¯ç”¨ï¼‰'; -$lang['translateui'] = '整个用户界é¢ä¹Ÿè·ŸéšæŸä¸ªé¡µé¢çš„翻译语言而改å˜å—？'; -$lang['redirectstart'] = '首页是å¦æ ¹æ®æµè§ˆå™¨è¯­è¨€è‡ªåŠ¨åˆ‡æ¢åˆ°ç›¸åº”语言？'; -$lang['about'] = '请在此输入å‘用户解释翻译功能的页é¢çš„å称空间。它的链接将出现在语言选择器上。'; -$lang['localabout'] = '使用本地化的关于页é¢ï¼ˆè€Œä¸æ˜¯ä¸€ä¸ªå…¨å±€å…³äºŽé¡µé¢ï¼‰ã€‚'; -$lang['checkage'] = '警告：å¯èƒ½è¿‡æ—¶äº†çš„翻译。'; -$lang['display'] = '选择你想在选择器中显示什么。注æ„å¯ç”¨æ€§ä¸“家并ä¸æŽ¨è使用国旗选择语言。'; -$lang['copytrans'] = '开始新翻译的时候在编辑器中å¤åˆ¶åŽŸå§‹è¯­è¨€ç‰ˆæœ¬ï¼Ÿ'; diff --git a/sources/lib/plugins/translation/lang/zh/totranslate.txt b/sources/lib/plugins/translation/lang/zh/totranslate.txt deleted file mode 100644 index aaa32f9..0000000 --- a/sources/lib/plugins/translation/lang/zh/totranslate.txt +++ /dev/null @@ -1 +0,0 @@ -ç­‰å¾…ä¿®å¤ **此页é¢æ²¡æœ‰è¢«ç¿»è¯‘完全。请帮助翻译本页。**\\ //(当全文翻译完时请移除这个段è½ã€‚)// \ No newline at end of file diff --git a/sources/lib/plugins/translation/plugin.info.txt b/sources/lib/plugins/translation/plugin.info.txt deleted file mode 100644 index 3b8dd7e..0000000 --- a/sources/lib/plugins/translation/plugin.info.txt +++ /dev/null @@ -1,8 +0,0 @@ -# General Plugin Info do not edit -base translation -author Andreas Gohr -email andi@splitbrain.org -date 2015-06-30 -name Translation Plugin -desc Supports the easy setup of a multi-language wiki. -url http://www.dokuwiki.org/plugin:translation diff --git a/sources/lib/plugins/translation/print.css b/sources/lib/plugins/translation/print.css deleted file mode 100644 index c2fd328..0000000 --- a/sources/lib/plugins/translation/print.css +++ /dev/null @@ -1 +0,0 @@ -.dokuwiki div.plugin_translation { display: none } diff --git a/sources/lib/plugins/translation/script.js b/sources/lib/plugins/translation/script.js deleted file mode 100644 index 819b80e..0000000 --- a/sources/lib/plugins/translation/script.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Remove go button from translation dropdown - */ -jQuery(function(){ - var $frm = jQuery('#translation__dropdown'); - if(!$frm.length) return; - $frm.find('input[name=go]').hide(); - $frm.find('select[name=id]').change(function(){ - var id = jQuery(this).val(); - // this should hopefully detect rewriting good enough: - var action = $frm.attr('action'); - if(action.substr(action.length-1) == '/'){ - var link = action + id; - }else{ - var link = action + '?id=' + id; - } - - window.location.href= link; - }); -}); diff --git a/sources/lib/plugins/translation/style.css b/sources/lib/plugins/translation/style.css deleted file mode 100644 index b89172a..0000000 --- a/sources/lib/plugins/translation/style.css +++ /dev/null @@ -1,80 +0,0 @@ -.dokuwiki div.plugin_translation { - float: right; - font-size: 95%; - padding-right: 0.1em; - margin : 0.0em 0 0.3em 0; - text-align: right; -} - -/* List */ - -.dokuwiki div.plugin_translation ul { - padding: 0; - margin: 0; -} -.dokuwiki div.plugin_translation ul li { - float: left; - list-style-type: none; - padding: 0; - margin: 0.2em 0 0 0; -} -.dokuwiki div.plugin_translation ul li img { - margin: -0.1em 0.2em; -} - -.dokuwiki div.plugin_translation ul li a.wikilink1:link, -.dokuwiki div.plugin_translation ul li a.wikilink1:hover, -.dokuwiki div.plugin_translation ul li a.wikilink1:active, -.dokuwiki div.plugin_translation ul li a.wikilink1:visited { - background-color: #000080; - color: #fff !important; - text-decoration:none; - padding: 0 0.2em; - margin: 0.1em 0.2em; - border: none !important; -} - -.dokuwiki div.plugin_translation ul li a.wikilink2:link, -.dokuwiki div.plugin_translation ul li a.wikilink2:hover, -.dokuwiki div.plugin_translation ul li a.wikilink2:active, -.dokuwiki div.plugin_translation ul li a.wikilink2:visited { - background-color: #808080; - color: #fff !important; - text-decoration:none; - padding: 0 0.2em; - margin: 0.1em 0.2em; - border: none !important; -} - - -/* Dropdown */ - -.dokuwiki div.plugin_translation select, -.dokuwiki div.plugin_translation input { - border: none; - background-color: #ccc; -} - -.dokuwiki div.plugin_translation option.flag { - padding-left: 18px; - background-repeat: no-repeat; - background-position: left center; -} - -.dokuwiki div.plugin_translation select.wikilink1, -.dokuwiki div.plugin_translation option.wikilink1 { - color: #000080; - text-align: center; -} - -.dokuwiki div.plugin_translation select.wikilink2, -.dokuwiki div.plugin_translation option.wikilink2 { - color: #808080; - text-align: center; -} - -/* flags for non-existing pages */ -.dokuwiki div.plugin_translation img.wikilink2, -.dokuwiki div.plugin_translation .wikilink2 img { - opacity: 0.5; -} diff --git a/sources/lib/plugins/translation/syntax/notrans.php b/sources/lib/plugins/translation/syntax/notrans.php deleted file mode 100644 index b4d8f6d..0000000 --- a/sources/lib/plugins/translation/syntax/notrans.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -class syntax_plugin_translation_notrans extends DokuWiki_Syntax_Plugin { - - /** - * for th helper plugin - */ - var $hlp = null; - - /** - * Constructor. Load helper plugin - */ - function syntax_plugin_translation(){ - $this->hlp =& plugin_load('helper', 'translation'); - } - - /** - * What kind of syntax are we? - */ - function getType(){ - return 'substition'; - } - - /** - * Where to sort in? - */ - function getSort(){ - return 155; - } - - - /** - * Connect pattern to lexer - */ - function connectTo($mode) { - $this->Lexer->addSpecialPattern('~~NOTRANS~~',$mode,'plugin_translation_notrans'); - } - - - /** - * Handle the match - */ - function handle($match, $state, $pos, &$handler){ - return array('notrans'); - } - - /** - * Create output - */ - function render($format, &$renderer, $data) { - // store info in metadata - if($format == 'metadata'){ - $renderer->meta['plugin']['translation']['notrans'] = true; - } - return false; - } - - // for backward compatibility - function _showTranslations(){ - return $this->hlp->showTranslations(); - } - -} - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/sources/lib/plugins/translation/syntax/trans.php b/sources/lib/plugins/translation/syntax/trans.php deleted file mode 100644 index b177fd4..0000000 --- a/sources/lib/plugins/translation/syntax/trans.php +++ /dev/null @@ -1,57 +0,0 @@ - - */ -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -class syntax_plugin_translation_trans extends DokuWiki_Syntax_Plugin { - /** - * What kind of syntax are we? - */ - function getType() { - return 'substition'; - } - - /** - * Where to sort in? - */ - function getSort() { - return 155; - } - - /** - * Connect pattern to lexer - */ - function connectTo($mode) { - $this->Lexer->addSpecialPattern('~~TRANS~~', $mode, 'plugin_translation_trans'); - } - - /** - * Handle the match - */ - function handle($match, $state, $pos, &$handler) { - return array(); - } - - /** - * Create output - */ - function render($format, &$renderer, $data) { - if($format != 'xhtml') return false; - - // disable caching - $renderer->nocache(); - - /** @var helper_plugin_translation $hlp */ - $hlp = plugin_load('helper', 'translation'); - $renderer->doc .= $hlp->showTranslations(); - return true; - } - -} - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/sources/lib/plugins/upgrade/VerboseTarLib.class.php b/sources/lib/plugins/upgrade/VerboseTarLib.class.php deleted file mode 100644 index 74103b1..0000000 --- a/sources/lib/plugins/upgrade/VerboseTarLib.class.php +++ /dev/null @@ -1,599 +0,0 @@ - - * @author Bouchon (Maxg) - * @license GPL 2 - */ -class VerboseTar { - - const COMPRESS_AUTO = 0; - const COMPRESS_NONE = 1; - const COMPRESS_GZIP = 2; - const COMPRESS_BZIP = 3; - - protected $file = ''; - protected $comptype = self::COMPRESS_AUTO; - protected $fh; - protected $memory = ''; - protected $closed = true; - protected $writeaccess = false; - - /** - * Open an existing TAR file for reading - * - * @param string $file - * @param int $comptype - * @throws VerboseTarIOException - */ - public function open($file, $comptype = self::COMPRESS_AUTO) { - // determine compression - if($comptype == self::COMPRESS_AUTO) $comptype = $this->filetype($file); - $this->compressioncheck($comptype); - - $this->comptype = $comptype; - $this->file = $file; - - if($this->comptype === self::COMPRESS_GZIP) { - $this->fh = @gzopen($this->file, 'rb'); - } elseif($this->comptype === self::COMPRESS_BZIP) { - $this->fh = @bzopen($this->file, 'r'); - } else { - $this->fh = @fopen($this->file, 'rb'); - } - - if(!$this->fh) throw new VerboseTarIOException('Could not open file for reading: '.$this->file); - $this->closed = false; - } - - /** - * Read the contents of a TAR archive - * - * This function lists the files stored in the archive, and returns an indexed array of associative - * arrays containing for each file the following information: - * - * checksum Tar Checksum of the file - * filename The full name of the stored file (up to 100 c.) - * mode UNIX permissions in DECIMAL, not octal - * uid The Owner ID - * gid The Group ID - * size Uncompressed filesize - * mtime Timestamp of last modification - * typeflag Empty for files, set for folders - * link Is it a symlink? - * uname Owner name - * gname Group name - * - * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams. - * Reopen the file with open() again if you want to do additional operations - */ - public function contents() { - if($this->closed || !$this->file) throw new VerboseTarIOException('Can not read from a closed archive'); - - $result = array(); - while($read = $this->readbytes(512)) { - $header = $this->parseHeader($read); - if(!is_array($header)) continue; - - $this->skipbytes(ceil($header['size'] / 512) * 512); - $result[] = $header; - } - - $this->close(); - return $result; - } - - /** - * Extract an existing TAR archive - * - * The $strip parameter allows you to strip a certain number of path components from the filenames - * found in the tar file, similar to the --strip-components feature of GNU tar. This is triggered when - * an integer is passed as $strip. - * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix, - * the prefix will be stripped. It is recommended to give prefixes with a trailing slash. - * - * By default this will extract all files found in the archive. You can restrict the output using the $include - * and $exclude parameter. Both expect a full regular expression (including delimiters and modifiers). If - * $include is set only files that match this expression will be extracted. Files that match the $exclude - * expression will never be extracted. Both parameters can be used in combination. Expressions are matched against - * stripped filenames as described above. - * - * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams. - * Reopen the file with open() again if you want to do additional operations - * - * @param string $outdir the target directory for extracting - * @param int|string $strip either the number of path components or a fixed prefix to strip - * @param string $exclude a regular expression of files to exclude - * @param string $include a regular expression of files to include - * @throws VerboseTarIOException - * @return array - */ - function extract($outdir, $strip = '', $exclude = '', $include = '') { - if($this->closed || !$this->file) throw new VerboseTarIOException('Can not read from a closed archive'); - - $outdir = rtrim($outdir, '/'); - io_mkdir_p($outdir); - $striplen = strlen($strip); - - $extracted = array(); - - while($dat = $this->readbytes(512)) { - // read the file header - $header = $this->parseHeader($dat); - if(!is_array($header)) continue; - if(!$header['filename']) continue; - - // strip prefix - $filename = $this->cleanPath($header['filename']); - if(is_int($strip)) { - // if $strip is an integer we strip this many path components - $parts = explode('/', $filename); - if(!$header['typeflag']) { - $base = array_pop($parts); // keep filename itself - } else { - $base = ''; - } - $filename = join('/', array_slice($parts, $strip)); - if($base) $filename .= "/$base"; - } else { - // ifstrip is a string, we strip a prefix here - if(substr($filename, 0, $striplen) == $strip) $filename = substr($filename, $striplen); - } - - // check if this should be extracted - $extract = true; - if(!$filename) { - $extract = false; - } else { - if($include) { - if(preg_match($include, $filename)) { - $extract = true; - } else { - $extract = false; - } - } - if($exclude && preg_match($exclude, $filename)) { - $extract = false; - } - } - - // Now do the extraction (or not) - if($extract) { - $extracted[] = $header; - - $output = "$outdir/$filename"; - $directory = ($header['typeflag']) ? $output : dirname($output); - io_mkdir_p($directory); - - // print status - admin_plugin_upgrade::_say(hsc($filename)); - - // is this a file? - if(!$header['typeflag']) { - $fp = fopen($output, "wb"); - if(!$fp) throw new VerboseTarIOException('Could not open file for writing: '.$output); - - $size = floor($header['size'] / 512); - for($i = 0; $i < $size; $i++) { - fwrite($fp, $this->readbytes(512), 512); - } - if(($header['size'] % 512) != 0) fwrite($fp, $this->readbytes(512), $header['size'] % 512); - - fclose($fp); - touch($output, $header['mtime']); - chmod($output, $header['perm']); - } else { - $this->skipbytes(ceil($header['size'] / 512) * 512); // the size is usually 0 for directories - } - } else { - $this->skipbytes(ceil($header['size'] / 512) * 512); - } - } - - $this->close(); - return $extracted; - } - - /** - * Create a new TAR file - * - * If $file is empty, the tar file will be created in memory - * - * @param string $file - * @param int $comptype - * @param int $complevel - * @throws VerboseTarIOException - * @throws VerboseTarIllegalCompressionException - */ - public function create($file = '', $comptype = self::COMPRESS_AUTO, $complevel = 9) { - // determine compression - if($comptype == self::COMPRESS_AUTO) $comptype = $this->filetype($file); - $this->compressioncheck($comptype); - - $this->comptype = $comptype; - $this->file = $file; - $this->memory = ''; - $this->fh = 0; - - if($this->file) { - if($this->comptype === self::COMPRESS_GZIP) { - $this->fh = @gzopen($this->file, 'wb'.$complevel); - } elseif($this->comptype === self::COMPRESS_BZIP) { - $this->fh = @bzopen($this->file, 'w'); - } else { - $this->fh = @fopen($this->file, 'wb'); - } - - if(!$this->fh) throw new VerboseTarIOException('Could not open file for writing: '.$this->file); - } - $this->writeaccess = true; - $this->closed = false; - } - - /** - * Add a file to the current TAR archive using an existing file in the filesystem - * - * @todo handle directory adding - * @param string $file the original file - * @param string $name the name to use for the file in the archive - * @throws VerboseTarIOException - */ - public function addFile($file, $name = '') { - if($this->closed) throw new VerboseTarIOException('Archive has been closed, files can no longer be added'); - - if(!$name) $name = $file; - $name = $this->cleanPath($name); - - $fp = fopen($file, 'rb'); - if(!$fp) throw new VerboseTarIOException('Could not open file for reading: '.$file); - - // create file header and copy all stat info from the original file - clearstatcache(false, $file); - $stat = stat($file); - $this->writeFileHeader( - $name, - $stat[4], - $stat[5], - fileperms($file), - filesize($file), - filemtime($file) - ); - - while(!feof($fp)) { - $data = fread($fp, 512); - if($data === false) break; - if($data === '') break; - $packed = pack("a512", $data); - $this->writebytes($packed); - } - fclose($fp); - } - - /** - * Add a file to the current TAR archive using the given $data as content - * - * @param string $name - * @param string $data - * @param int $uid - * @param int $gid - * @param int $perm - * @param int $mtime - * @throws VerboseTarIOException - */ - public function addData($name, $data, $uid = 0, $gid = 0, $perm = 0666, $mtime = 0) { - if($this->closed) throw new VerboseTarIOException('Archive has been closed, files can no longer be added'); - - $name = $this->cleanPath($name); - $len = strlen($data); - - $this->writeFileHeader( - $name, - $uid, - $gid, - $perm, - $len, - ($mtime) ? $mtime : time() - ); - - for($s = 0; $s < $len; $s += 512) { - $this->writebytes(pack("a512", substr($data, $s, 512))); - } - } - - /** - * Add the closing footer to the archive if in write mode, close all file handles - * - * After a call to this function no more data can be added to the archive, for - * read access no reading is allowed anymore - * - * "Physically, an archive consists of a series of file entries terminated by an end-of-archive entry, which - * consists of two 512 blocks of zero bytes" - * - * @link http://www.gnu.org/software/tar/manual/html_chapter/tar_8.html#SEC134 - */ - public function close() { - if($this->closed) return; // we did this already - - // write footer - if($this->writeaccess) { - $this->writebytes(pack("a512", "")); - $this->writebytes(pack("a512", "")); - } - - // close file handles - if($this->file) { - if($this->comptype === self::COMPRESS_GZIP) { - gzclose($this->fh); - } elseif($this->comptype === self::COMPRESS_BZIP) { - bzclose($this->fh); - } else { - fclose($this->fh); - } - - $this->file = ''; - $this->fh = 0; - } - - $this->closed = true; - } - - /** - * Returns the created in-memory archive data - * - * This implicitly calls close() on the Archive - */ - public function getArchive($comptype = self::COMPRESS_AUTO, $complevel = 9) { - $this->close(); - - if($comptype === self::COMPRESS_AUTO) $comptype = $this->comptype; - $this->compressioncheck($comptype); - - if($comptype === self::COMPRESS_GZIP) return gzcompress($this->memory, $complevel); - if($comptype === self::COMPRESS_BZIP) return bzcompress($this->memory); - return $this->memory; - } - - /** - * Save the created in-memory archive data - * - * Note: It more memory effective to specify the filename in the create() function and - * let the library work on the new file directly. - * - * @param $file - * @param int $comptype - * @param int $complevel - * @throws VerboseTarIOException - */ - public function save($file, $comptype = self::COMPRESS_AUTO, $complevel = 9) { - if($comptype === self::COMPRESS_AUTO) $comptype = $this->filetype($file); - - if(!file_put_contents($file, $this->getArchive($comptype, $complevel))) { - throw new VerboseTarIOException('Could not write to file: '.$file); - } - } - - /** - * Read from the open file pointer - * - * @param int $length bytes to read - * @return string - */ - protected function readbytes($length) { - if($this->comptype === self::COMPRESS_GZIP) { - return @gzread($this->fh, $length); - } elseif($this->comptype === self::COMPRESS_BZIP) { - return @bzread($this->fh, $length); - } else { - return @fread($this->fh, $length); - } - } - - /** - * Write to the open filepointer or memory - * - * @param string $data - * @throws VerboseTarIOException - * @return int number of bytes written - */ - protected function writebytes($data) { - if(!$this->file) { - $this->memory .= $data; - $written = strlen($data); - } elseif($this->comptype === self::COMPRESS_GZIP) { - $written = @gzwrite($this->fh, $data); - } elseif($this->comptype === self::COMPRESS_BZIP) { - $written = @bzwrite($this->fh, $data); - } else { - $written = @fwrite($this->fh, $data); - } - if($written === false) throw new VerboseTarIOException('Failed to write to archive stream'); - return $written; - } - - /** - * Skip forward in the open file pointer - * - * This is basically a wrapper around seek() (and a workaround for bzip2) - * - * @param int $bytes seek to this position - */ - function skipbytes($bytes) { - if($this->comptype === self::COMPRESS_GZIP) { - @gzseek($this->fh, $bytes, SEEK_CUR); - } elseif($this->comptype === self::COMPRESS_BZIP) { - // there is no seek in bzip2, we simply read on - @bzread($this->fh, $bytes); - } else { - @fseek($this->fh, $bytes, SEEK_CUR); - } - } - - /** - * Write a file header - * - * @param string $name - * @param int $uid - * @param int $gid - * @param int $perm - * @param int $size - * @param int $mtime - * @param string $typeflag Set to '5' for directories - */ - protected function writeFileHeader($name, $uid, $gid, $perm, $size, $mtime, $typeflag = '') { - // handle filename length restrictions - $prefix = ''; - $namelen = strlen($name); - if($namelen > 100) { - $file = basename($name); - $dir = dirname($name); - if(strlen($file) > 100 || strlen($dir) > 155) { - // we're still too large, let's use GNU longlink - $this->writeFileHeader('././@LongLink', 0, 0, 0, $namelen, 0, 'L'); - for($s = 0; $s < $namelen; $s += 512) { - $this->writebytes(pack("a512", substr($name, $s, 512))); - } - $name = substr($name, 0, 100); // cut off name - } else { - // we're fine when splitting, use POSIX ustar - $prefix = $dir; - $name = $file; - } - } - - // values are needed in octal - $uid = sprintf("%6s ", decoct($uid)); - $gid = sprintf("%6s ", decoct($gid)); - $perm = sprintf("%6s ", decoct($perm)); - $size = sprintf("%11s ", decoct($size)); - $mtime = sprintf("%11s", decoct($mtime)); - - $data_first = pack("a100a8a8a8a12A12", $name, $perm, $uid, $gid, $size, $mtime); - $data_last = pack("a1a100a6a2a32a32a8a8a155a12", $typeflag, '', 'ustar', '', '', '', '', '', $prefix, ""); - - for($i = 0, $chks = 0; $i < 148; $i++) - $chks += ord($data_first[$i]); - - for($i = 156, $chks += 256, $j = 0; $i < 512; $i++, $j++) - $chks += ord($data_last[$j]); - - $this->writebytes($data_first); - - $chks = pack("a8", sprintf("%6s ", decoct($chks))); - $this->writebytes($chks.$data_last); - } - - /** - * Decode the given tar file header - * - * @param string $block a 512 byte block containign the header data - * @return array|bool - */ - protected function parseHeader($block) { - if(!$block || strlen($block) != 512) return false; - - for($i = 0, $chks = 0; $i < 148; $i++) - $chks += ord($block[$i]); - - for($i = 156, $chks += 256; $i < 512; $i++) - $chks += ord($block[$i]); - - $header = @unpack("a100filename/a8perm/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155prefix", $block); - if(!$header) return false; - - $return['checksum'] = OctDec(trim($header['checksum'])); - if($return['checksum'] != $chks) return false; - - $return['filename'] = trim($header['filename']); - $return['perm'] = OctDec(trim($header['perm'])); - $return['uid'] = OctDec(trim($header['uid'])); - $return['gid'] = OctDec(trim($header['gid'])); - $return['size'] = OctDec(trim($header['size'])); - $return['mtime'] = OctDec(trim($header['mtime'])); - $return['typeflag'] = $header['typeflag']; - $return['link'] = trim($header['link']); - $return['uname'] = trim($header['uname']); - $return['gname'] = trim($header['gname']); - - // Handle ustar Posix compliant path prefixes - if(trim($header['prefix'])) $return['filename'] = trim($header['prefix']).'/'.$return['filename']; - - // Handle Long-Link entries from GNU Tar - if($return['typeflag'] == 'L') { - // following data block(s) is the filename - $filename = trim($this->readbytes(ceil($header['size'] / 512) * 512)); - // next block is the real header - $block = $this->readbytes(512); - $return = $this->parseHeader($block); - // overwrite the filename - $return['filename'] = $filename; - } - - return $return; - } - - /** - * Cleans up a path and removes relative parts, also strips leading slashes - * - * @param string $p_dir - * @return string - */ - public function cleanPath($path) { - $path=explode('/', $path); - $newpath=array(); - foreach($path as $p) { - if ($p === '' || $p === '.') continue; - if ($p==='..') { - array_pop($newpath); - continue; - } - array_push($newpath, $p); - } - return trim(implode('/', $newpath), '/'); - } - - /** - * Checks if the given compression type is available and throws an exception if not - * - * @param $comptype - * @throws VerboseTarIllegalCompressionException - */ - protected function compressioncheck($comptype) { - if($comptype === self::COMPRESS_GZIP && !function_exists('gzopen')) { - throw new VerboseTarIllegalCompressionException('No gzip support available'); - } - - if($comptype === self::COMPRESS_BZIP && !function_exists('bzopen')) { - throw new VerboseTarIllegalCompressionException('No bzip2 support available'); - } - } - - /** - * Guesses the wanted compression from the given filename extension - * - * You don't need to call this yourself. It's used when you pass self::COMPRESS_AUTO somewhere - * - * @param string $file - * @return int - */ - public function filetype($file) { - $file = strtolower($file); - if(substr($file, -3) == '.gz' || substr($file, -4) == '.tgz') { - $comptype = self::COMPRESS_GZIP; - } elseif(substr($file, -4) == '.bz2' || substr($file, -4) == '.tbz') { - $comptype = self::COMPRESS_BZIP; - } else { - $comptype = self::COMPRESS_NONE; - } - return $comptype; - } -} - -class VerboseTarIOException extends Exception { -} - -class VerboseTarIllegalCompressionException extends Exception { -} diff --git a/sources/lib/plugins/upgrade/admin.php b/sources/lib/plugins/upgrade/admin.php deleted file mode 100644 index e5681c1..0000000 --- a/sources/lib/plugins/upgrade/admin.php +++ /dev/null @@ -1,508 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC.'lib/plugins/'); -require_once DOKU_PLUGIN.'admin.php'; -require_once DOKU_PLUGIN.'upgrade/VerboseTarLib.class.php'; - -class admin_plugin_upgrade extends DokuWiki_Admin_Plugin { - private $tgzurl; - private $tgzfile; - private $tgzdir; - private $tgzversion; - private $pluginversion; - - protected $haderrors = false; - - public function __construct() { - global $conf; - - $branch = 'stable'; - - $this->tgzurl = "https://github.com/splitbrain/dokuwiki/archive/$branch.tar.gz"; - $this->tgzfile = $conf['tmpdir'].'/dokuwiki-upgrade.tgz'; - $this->tgzdir = $conf['tmpdir'].'/dokuwiki-upgrade/'; - $this->tgzversion = "https://raw.githubusercontent.com/splitbrain/dokuwiki/$branch/VERSION"; - $this->pluginversion = "https://raw.githubusercontent.com/splitbrain/dokuwiki-plugin-upgrade/master/plugin.info.txt"; - } - - public function getMenuSort() { - return 555; - } - - public function handle() { - if($_REQUEST['step'] && !checkSecurityToken()) { - unset($_REQUEST['step']); - } - } - - public function html() { - $abrt = false; - $next = false; - - echo '

    '.$this->getLang('menu').'

    '; - - global $conf; - if($conf['safemodehack']) { - $abrt = false; - $next = false; - echo $this->locale_xhtml('safemode'); - return; - } - - $this->_say('
    '); - // enable auto scroll - ?> - - _stepit($abrt, $next); - - // disable auto scroll - ?> - - _say('
    '); - - $careful = ''; - if($this->haderrors) { - echo '
    '.$this->getLang('careful').'
    '; - $careful = 'careful'; - } - - $action = script(); - echo '
    '; - echo ''; - echo ''; - echo ''; - if($next) echo ''; - if($abrt) echo ''; - echo '
    '; - - $this->_progress($next); - } - - /** - * Display a progress bar of all steps - * - * @param string $next the next step - */ - private function _progress($next) { - $steps = array('version', 'download', 'unpack', 'check', 'upgrade'); - $active = true; - $count = 0; - - echo '
      '; - foreach($steps as $step) { - $count++; - if($step == $next) $active = false; - if($active) { - echo '
    1. '; - echo '✔'; - } else { - echo '
    2. '; - echo ''.$count.''; - } - - echo ''.$this->getLang('step_'.$step).''; - echo '
      3. '; - } - echo '
    '; - } - - /** - * Decides the current step and executes it - * - * @param bool $abrt - * @param bool $next - */ - private function _stepit(&$abrt, &$next) { - - if(isset($_REQUEST['step']) && is_array($_REQUEST['step'])) { - $step = array_shift(array_keys($_REQUEST['step'])); - } else { - $step = ''; - } - - if($step == 'cancel' || $step == 'done') { - # cleanup - @unlink($this->tgzfile); - $this->_rdel($this->tgzdir); - if($step == 'cancel') $step = ''; - } - - if($step) { - $abrt = true; - $next = false; - if($step == 'version') { - $this->_step_version(); - $next = 'download'; - } elseif ($step == 'done') { - $this->_step_done(); - $next = ''; - $abrt = ''; - } elseif(!file_exists($this->tgzfile)) { - if($this->_step_download()) $next = 'unpack'; - } elseif(!is_dir($this->tgzdir)) { - if($this->_step_unpack()) $next = 'check'; - } elseif($step != 'upgrade') { - if($this->_step_check()) $next = 'upgrade'; - } elseif($step == 'upgrade') { - if($this->_step_copy()) { - $next = 'done'; - $abrt = ''; - } - } else { - echo 'uhm. what happened? where am I? This should not happen'; - } - } else { - # first time run, show intro - echo $this->locale_xhtml('step0'); - $abrt = false; - $next = 'version'; - } - } - - /** - * Output the given arguments using vsprintf and flush buffers - */ - public function _say() { - $args = func_get_args(); - echo ' '; - echo vsprintf(array_shift($args)."
    \n", $args); - flush(); - ob_flush(); - } - - /** - * Print a warning using the given arguments with vsprintf and flush buffers - */ - public function _warn() { - $this->haderrors = true; - - $args = func_get_args(); - echo '! '; - echo vsprintf(array_shift($args)."
    \n", $args); - flush(); - ob_flush(); - } - - /** - * Recursive delete - * - * @author Jon Hassall - * @link http://de.php.net/manual/en/function.unlink.php#87045 - */ - private function _rdel($dir) { - if(!$dh = @opendir($dir)) { - return false; - } - while(false !== ($obj = readdir($dh))) { - if($obj == '.' || $obj == '..') continue; - - if(!@unlink($dir.'/'.$obj)) { - $this->_rdel($dir.'/'.$obj); - } - } - closedir($dh); - return @rmdir($dir); - } - - /** - * Check various versions - * - * @return bool - */ - private function _step_version() { - $ok = true; - - // we need SSL - only newer HTTPClients check that themselves - if(!in_array('ssl', stream_get_transports())) { - $this->_warn($this->getLang('vs_ssl')); - $ok = false; - } - - // get the available version - $http = new DokuHTTPClient(); - $tgzversion = $http->get($this->tgzversion); - if(!$tgzversion) { - $this->_warn($this->getLang('vs_tgzno').' '.hsc($http->error)); - $ok = false; - } - if(!preg_match('/(^| )(\d\d\d\d-\d\d-\d\d[a-z]*)( |$)/i', $tgzversion, $m)) { - $this->_warn($this->getLang('vs_tgzno')); - $ok = false; - $tgzversionnum = 0; - } else { - $tgzversionnum = $m[2]; - $this->_say($this->getLang('vs_tgz'), $tgzversion); - } - - // get the current version - $version = getVersion(); - if(!preg_match('/(^| )(\d\d\d\d-\d\d-\d\d[a-z]*)( |$)/i', $version, $m)) { - $versionnum = 0; - } else { - $versionnum = $m[2]; - } - $this->_say($this->getLang('vs_local'), $version); - - // compare versions - if(!$versionnum) { - $this->_warn($this->getLang('vs_localno')); - $ok = false; - } else if($tgzversionnum) { - if($tgzversionnum < $versionnum) { - $this->_warn($this->getLang('vs_newer')); - $ok = false; - } elseif($tgzversionnum == $versionnum) { - $this->_warn($this->getLang('vs_same')); - $ok = false; - } - } - - // check plugin version - $pluginversion = $http->get($this->pluginversion); - if($pluginversion) { - $plugininfo = linesToHash(explode("\n", $pluginversion)); - $myinfo = $this->getInfo(); - if($plugininfo['date'] > $myinfo['date']) { - $this->_warn($this->getLang('vs_plugin'), $plugininfo['date']); - $ok = false; - } - } - - // check if PHP is up to date - $minphp = '5.3.3'; - if(version_compare(phpversion(), $minphp, '<')) { - $this->_warn($this->getLang('vs_php'), $minphp, phpversion()); - $ok = false; - } - - return $ok; - } - - /** - * Redirect to the start page - */ - private function _step_done() { - echo $this->getLang('finish'); - echo ""; - } - - /** - * Download the tarball - * - * @return bool - */ - private function _step_download() { - $this->_say($this->getLang('dl_from'), $this->tgzurl); - - @set_time_limit(300); - @ignore_user_abort(); - - $http = new DokuHTTPClient(); - $http->timeout = 300; - $data = $http->get($this->tgzurl); - - if(!$data) { - $this->_warn($http->error); - $this->_warn($this->getLang('dl_fail')); - return false; - } - - if(!io_saveFile($this->tgzfile, $data)) { - $this->_warn($this->getLang('dl_fail')); - return false; - } - - $this->_say($this->getLang('dl_done'), filesize_h(strlen($data))); - - return true; - } - - /** - * Unpack the tarball - * - * @return bool - */ - private function _step_unpack() { - $this->_say(''.$this->getLang('pk_extract').''); - - @set_time_limit(300); - @ignore_user_abort(); - - try { - $tar = new VerboseTar(); - $tar->open($this->tgzfile); - $tar->extract($this->tgzdir, 1); - $tar->close(); - } catch (Exception $e) { - $this->_warn($e->getMessage()); - $this->_warn($this->getLang('pk_fail')); - return false; - } - - $this->_say($this->getLang('pk_done')); - - $this->_say( - $this->getLang('pk_version'), - hsc(file_get_contents($this->tgzdir.'/VERSION')), - getVersion() - ); - return true; - } - - /** - * Check permissions of files to change - * - * @return bool - */ - private function _step_check() { - $this->_say($this->getLang('ck_start')); - $ok = $this->_traverse('', true); - if($ok) { - $this->_say(''.$this->getLang('ck_done').''); - } else { - $this->_warn(''.$this->getLang('ck_fail').''); - } - return $ok; - } - - /** - * Copy over new files - * - * @return bool - */ - private function _step_copy() { - $this->_say($this->getLang('cp_start')); - $ok = $this->_traverse('', false); - if($ok) { - $this->_say(''.$this->getLang('cp_done').''); - $this->_rmold(); - $this->_say(''.$this->getLang('finish').''); - } else { - $this->_warn(''.$this->getLang('cp_fail').''); - } - return $ok; - } - - /** - * Delete outdated files - */ - private function _rmold() { - global $conf; - - $list = file($this->tgzdir.'data/deleted.files'); - foreach($list as $line) { - $line = trim(preg_replace('/#.*$/', '', $line)); - if(!$line) continue; - $file = DOKU_INC.$line; - if(!file_exists($file)) continue; - if((is_dir($file) && $this->_rdel($file)) || - @unlink($file) - ) { - $this->_say($this->getLang('rm_done'), hsc($line)); - } else { - $this->_warn($this->getLang('rm_fail'), hsc($line)); - } - } - // delete install - @unlink(DOKU_INC.'install.php'); - - // make sure update message will be gone - @touch(DOKU_INC.'doku.php'); - @unlink($conf['cachedir'].'/messages.txt'); - } - - /** - * Traverse over the given dir and compare it to the DokuWiki dir - * - * Checks what files need an update, tests for writability and copies - * - * @param string $dir - * @param bool $dryrun do not copy but only check permissions - * @return bool - */ - private function _traverse($dir, $dryrun) { - $base = $this->tgzdir; - $ok = true; - - $dh = @opendir($base.'/'.$dir); - if(!$dh) return false; - while(($file = readdir($dh)) !== false) { - if($file == '.' || $file == '..') continue; - $from = "$base/$dir/$file"; - $to = DOKU_INC."$dir/$file"; - - if(is_dir($from)) { - if($dryrun) { - // just check for writability - if(!is_dir($to)) { - if(is_dir(dirname($to)) && !is_writable(dirname($to))) { - $this->_warn(''.$this->getLang('tv_noperm').'', hsc("$dir/$file")); - $ok = false; - } - } - } - - // recursion - if(!$this->_traverse("$dir/$file", $dryrun)) { - $ok = false; - } - } else { - $fmd5 = md5(@file_get_contents($from)); - $tmd5 = md5(@file_get_contents($to)); - if($fmd5 != $tmd5 || !file_exists($to)) { - if($dryrun) { - // just check for writability - if((file_exists($to) && !is_writable($to)) || - (!file_exists($to) && is_dir(dirname($to)) && !is_writable(dirname($to))) - ) { - - $this->_warn(''.$this->getLang('tv_noperm').'', hsc("$dir/$file")); - $ok = false; - } else { - $this->_say($this->getLang('tv_upd'), hsc("$dir/$file")); - } - } else { - // check dir - if(io_mkdir_p(dirname($to))) { - // copy - if(!copy($from, $to)) { - $this->_warn(''.$this->getLang('tv_nocopy').'', hsc("$dir/$file")); - $ok = false; - } else { - $this->_say($this->getLang('tv_done'), hsc("$dir/$file")); - } - } else { - $this->_warn(''.$this->getLang('tv_nodir').'', hsc("$dir")); - $ok = false; - } - } - } - } - } - closedir($dh); - return $ok; - } -} - -// vim:ts=4:sw=4:et:enc=utf-8: diff --git a/sources/lib/plugins/upgrade/lang/cs/lang.php b/sources/lib/plugins/upgrade/lang/cs/lang.php deleted file mode 100644 index 6a27715..0000000 --- a/sources/lib/plugins/upgrade/lang/cs/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - */ -$lang['menu'] = 'Wiki Upgrade'; -$lang['vs_php'] = 'Nová vydání DokuWiki potÅ™ebují PHP v minimální verzi %s, ale momentálnÄ› běží %s. MÄ›li byste aktualizovat verzi PHP než budete pokraÄovat!'; -$lang['vs_tgzno'] = 'Nelze zjistit nejnovÄ›jší verzi DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s je dostupná ke stažení.'; -$lang['vs_local'] = 'MomentálnÄ› používáte DokuWiki %s.'; -$lang['vs_localno'] = 'Není jasné jaká je vaÅ¡e momentální verze, je doporuÄena manuální aktualizace.'; -$lang['vs_newer'] = 'Vypadá to, že běžící DokuWiki je jeÅ¡tÄ› novÄ›jší, než poslední dostupná stabilní verze. Aktualizace není doporuÄena.'; -$lang['vs_same'] = 'VaÅ¡e běžící DokuWiki je již v aktuální verzi. Není tÅ™eba aktualizovat.'; -$lang['vs_plugin'] = 'Je dostupný novÄ›jší zásuvný modul pro upgrade (%s). Než budete pokraÄovat, tak byste ho mÄ›li aktualizovat.'; -$lang['vs_ssl'] = 'Vypadá to, že používané PHP nepodporuje SSL proudy, stahování potÅ™ebných dat nejspíš selže. Aktualizujte místo toho ruÄnÄ›.'; -$lang['dl_from'] = 'Stahování archivu z %s...'; -$lang['dl_fail'] = 'Stahování selhalo.'; -$lang['dl_done'] = 'Stahování dokonÄeno (%s).'; -$lang['pk_extract'] = 'Rozbalování archivu...'; -$lang['pk_fail'] = 'Rozbalování selhalo.'; -$lang['pk_done'] = 'Rozbalování dokonÄeno.'; -$lang['pk_version'] = 'DokuWiki %s je pÅ™ipravena k instalaci (MomentálnÄ› používáte %s).'; -$lang['ck_start'] = 'Ověřování práv souborů...'; -$lang['ck_done'] = 'Do vÅ¡ech souborů lze zapisovat. Je možné aktualizovat.'; -$lang['ck_fail'] = 'Do nÄ›kterých souborů nelze zapisovat. Automatická aktualizace není možná.'; -$lang['cp_start'] = 'Aktualizace souborů...'; -$lang['cp_done'] = 'VÅ¡echny soubory aktualizovány.'; -$lang['cp_fail'] = 'Uff. NÄ›co se nezdaÅ™ilo. RadÅ¡i to ověřte ruÄnÄ›.'; -$lang['tv_noperm'] = '%s není zapisovatelný!'; -$lang['tv_upd'] = '%s bude aktualizován.'; -$lang['tv_nocopy'] = 'Nelze zkopírovat soubor %s!'; -$lang['tv_nodir'] = 'Nelze vytvoÅ™it adresář %s!'; -$lang['tv_done'] = 'aktualizován %s'; -$lang['rm_done'] = 'Zastaralý %s smazán.'; -$lang['rm_fail'] = 'Nelze smazat zastaralý %s. Je tÅ™eba smazat ruÄnÄ›!'; -$lang['finish'] = 'Aktualizace probÄ›hla. Užijte si svou novou DokuWiki'; -$lang['btn_continue'] = 'PokraÄovat'; -$lang['btn_abort'] = 'UkonÄit'; -$lang['step_version'] = 'Zkontrolovat'; -$lang['step_download'] = 'Stáhnout'; -$lang['step_unpack'] = 'Rozbalit'; -$lang['step_check'] = 'Ověřit'; -$lang['step_upgrade'] = 'Instalovat'; -$lang['careful'] = 'DoÅ¡lo k chybám výše! NepokraÄujte!'; diff --git a/sources/lib/plugins/upgrade/lang/cs/safemode.txt b/sources/lib/plugins/upgrade/lang/cs/safemode.txt deleted file mode 100644 index 0a00751..0000000 --- a/sources/lib/plugins/upgrade/lang/cs/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Tato wiki je nakonfigurována pro použití safemode hacku. Za tÄ›chto podmínek nelze provést bezpeÄnou automatickou aktualizaci. Aktualizujte prosím [[doku>install:upgrade|svou wiki ruÄnÄ›]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/cs/step0.txt b/sources/lib/plugins/upgrade/lang/cs/step0.txt deleted file mode 100644 index cab46f8..0000000 --- a/sources/lib/plugins/upgrade/lang/cs/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Tento zásuvný modul automaticky aktualizuje vaÅ¡i wiki na nejnovÄ›jší dostupnou verzi DokuWiki. Než budete pokraÄovat, mÄ›li byste si pÅ™eÄíst [[doku>changes|Changelog]] a zkontrolovat, jestli jsou tÅ™eba provést nÄ›jaké dodateÄné kroky pÅ™ed nebo po aktualizaci. - -Pro povolení automatické aktualizace je tÅ™eba zajistit PHP procesu zapisovací práva do souborů DokuWiki. Zásuvný modul ověří dostupnost potÅ™ebných oprávnÄ›ní pÅ™ed spuÅ¡tÄ›ním aktualizace. - -Tento modul nebude aktualizovat nainstalované Å¡ablony ani ostatní zásuvné moduly. - -PÅ™ed spuÅ¡tÄ›ním se doporuÄuje vytvoÅ™ení zálohy vaší wiki. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/da/lang.php b/sources/lib/plugins/upgrade/lang/da/lang.php deleted file mode 100644 index d4eb0a6..0000000 --- a/sources/lib/plugins/upgrade/lang/da/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author Søren Birk - */ -$lang['menu'] = 'Wiki Opgradering'; -$lang['vs_php'] = 'Nye DokuWiki udgivelser kræver som minimum PHP %s, men du benytter i øjeblikket %s. Du bør opdatere din PHP-version, før du opgraderer!'; -$lang['vs_tgzno'] = 'Kunne ikke fastlægge den nyeste version af DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s er klar til download.'; -$lang['vs_local'] = 'Du benytter i øjeblikket DokuWiki %s.'; -$lang['vs_localno'] = 'Det er ikke klart, hvor gammel din nuværende version er. Manuel opgradering anbefales.'; -$lang['vs_newer'] = 'Det ser ud til at din nuværende DokuWiki er nyere end den nyeste stabile version. Opgradering anbefales ikke.'; -$lang['vs_same'] = 'Din nuværende DokuWiki er allerede ajourført. Det er ikke nødvendigt at opgradere.'; -$lang['vs_plugin'] = 'Der er et nyere opgraderingsplugin tilgængeligt (%s). Du bør opdatere dit plugin, før du fortsætter.'; -$lang['vs_ssl'] = 'Det ser ud til at dit PHP ikke supportere SSL streams - download af nødvendigt data vil højst sandsynligt fejle. Opgradér manuelt i stedet.'; -$lang['dl_from'] = 'Downloader arkiv fra %s...'; -$lang['dl_fail'] = 'Download fejlet'; -$lang['dl_done'] = 'Download færdig (%s).'; -$lang['pk_extract'] = 'Pakker arkiv ud...'; -$lang['pk_fail'] = 'Udpakning fejlet.'; -$lang['pk_done'] = 'Udpakning færdig.'; -$lang['pk_version'] = 'DokuWiki %s er klar til installation (Du benytter i øjeblikket %s).'; -$lang['ck_start'] = 'Kontrollerer filtilladelser'; -$lang['ck_done'] = 'Alle filer er skrivbare. Klar til at opgradere.'; -$lang['ck_fail'] = 'Nogle filer er ikke skrivbare. Automatisk opgradering er ikke muligt.'; -$lang['cp_start'] = 'Opdaterer filer...'; -$lang['cp_done'] = 'Alle filer opdateret.'; -$lang['cp_fail'] = 'Ã…-Ã…h. Noget gik galt. Du mÃ¥ hellere tjekke manuelt.'; -$lang['tv_noperm'] = '%s er ikke skrivbar!'; -$lang['tv_upd'] = '%s vil blive opdateret.'; -$lang['tv_nocopy'] = 'Kunne ikke kopiere filen %s!'; -$lang['tv_nodir'] = 'Kunne ikke oprette mappen %s!'; -$lang['tv_done'] = 'Opdaterede %s'; -$lang['rm_done'] = 'Forældet %s slettet.'; -$lang['rm_fail'] = 'Kunne ikke slette forældet %s. Slet venligst manuelt!'; -$lang['finish'] = 'Opgradering færdig. Nyd din nye DokuWiki'; -$lang['btn_continue'] = 'Fortsæt'; -$lang['btn_abort'] = 'Afbryd'; -$lang['step_version'] = 'Tjek'; -$lang['step_download'] = 'Download'; -$lang['step_unpack'] = 'Pak Ud'; -$lang['step_check'] = 'Verificér'; -$lang['step_upgrade'] = 'Installér'; diff --git a/sources/lib/plugins/upgrade/lang/da/safemode.txt b/sources/lib/plugins/upgrade/lang/da/safemode.txt deleted file mode 100644 index 8f6c1dd..0000000 --- a/sources/lib/plugins/upgrade/lang/da/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Denne wiki er konfigureret til at benytte safemode hack'et. Vi kan desværre ikke opgradere wikien automatisk under disse forhold. Venligst [[doku>install:upgrade|opgradér din wiki manuelt]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/da/step0.txt b/sources/lib/plugins/upgrade/lang/da/step0.txt deleted file mode 100644 index a2745e7..0000000 --- a/sources/lib/plugins/upgrade/lang/da/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Dette plugin vil automatisk opgradere din wiki til nyeste tilgængelige DokuWiki-version. Før du fortsætter, bør du læse [[doku>changes|Ændringsloggen]] for at kontrollere om der er yderligere punkter, som du skal udføre før eller efter opgraderingen. - -For at opgradere automatisk, skal PHP-processen have skriverettigheder til DokuWiki filerne. Plugin'et vil tjekke for nødvendige rettigheder, før opgraderingsprocessen startes. - -Dette plugin vil ikke opgradere installerede plugins eller skabeloner. - -Vi anbefaler at du opretter en backup af din wiki, før du fortsætter. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/de-informal/lang.php b/sources/lib/plugins/upgrade/lang/de-informal/lang.php deleted file mode 100644 index 38242ef..0000000 --- a/sources/lib/plugins/upgrade/lang/de-informal/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author rnck - */ -$lang['menu'] = 'Wiki aktualisieren'; -$lang['vs_php'] = 'Neue DokuWiki Versionen benötigen mindestens PHP Version %s. Du verwendest PHP Version %s. Du solltest PHP aktualisieren bevor Du DokuWiki aktualisierst.'; -$lang['vs_tgzno'] = 'Die neueste Version von DokuWiki konnte nicht ermittelt werden.'; -$lang['vs_tgz'] = 'DokuWiki %s ist zum Download verfügbar.'; -$lang['vs_local'] = 'Du verwendest DokuWiki %s.'; -$lang['vs_localno'] = 'Es ist unklar, wie alt die von Dir verwendete DokuWiki Version ist. Ein manuell Upgrade wird empfohlen.'; -$lang['vs_newer'] = 'Es sieht so aus, als ob die von Dir verwendete DokuWiki Version neuer ist als die letzte stabile Version. Ein Upgrade wird nicht empfohlen.'; -$lang['vs_same'] = 'Deine DokuWiki Version ist aktuell. Kein Upgrade notwendig.'; -$lang['vs_plugin'] = 'Es ist eine neuere Version des Upgrade-Plugins verfügbar (%s). Du solltest das Plugin aktualisieren bevor Du fortfährst.'; -$lang['vs_ssl'] = 'Dein PHP scheint SSL nicht zu unterstützen. Der Download der benötigten Daten wird vermutlich fehlschlagen. Akstualisiere stattdessen manuell.'; -$lang['dl_from'] = 'Archiv wird von %s heruntergeladen...'; -$lang['dl_fail'] = 'Herunterladen fehlgeschlagen.'; -$lang['dl_done'] = 'Herunterladen abgeschlossen (%s).'; -$lang['pk_extract'] = 'Archiv wird entpackt...'; -$lang['pk_fail'] = 'Entpacken fehlgeschlagen.'; -$lang['pk_done'] = 'Entpacken abgeschlossen.'; -$lang['pk_version'] = 'DokuWiki %s ist zur Installation bereit (Du betreibst momentan %s).'; -$lang['ck_start'] = 'Dateirechte werden überprüft...'; -$lang['ck_done'] = 'Alle Dateien sind beschreibbar. Zur Aktualisierung bereit.'; -$lang['ck_fail'] = 'Einige Dateien sind nicht beschreibbar. Die automatische Aktualisierung ist nicht möglich.'; -$lang['cp_start'] = 'Dateien werden aktualisiert...'; -$lang['cp_done'] = 'Dateien wurden aktualisiert.'; -$lang['cp_fail'] = 'Autsch. Irgendetwas funktioniert nicht. Überprüfe es besser von Hand.'; -$lang['tv_noperm'] = '%s ist nicht beschreibbar!'; -$lang['tv_upd'] = '%s wird aktualisiert.'; -$lang['tv_nocopy'] = 'Konnte Datei %s nicht kopieren!'; -$lang['tv_nodir'] = 'Konnte Verzeichnis %s nicht erstellen!'; -$lang['tv_done'] = '%s wurde aktualisiert.'; -$lang['rm_done'] = 'Veraltete %s wurde gelöscht.'; -$lang['rm_fail'] = 'Konnte veraltete Datei %s nicht löschen. Bitte löschen Sie von Hand!'; -$lang['finish'] = 'Aktualisierung abgeschlossen. Genießen Sie Ihr neues DokuWiki!'; -$lang['btn_continue'] = 'Fortsetzen'; -$lang['btn_abort'] = 'Abbrechen'; -$lang['step_version'] = 'Prüfen'; -$lang['step_download'] = 'Herunterladen'; -$lang['step_unpack'] = 'Entpacken'; -$lang['step_check'] = 'Verifizieren'; -$lang['step_upgrade'] = 'Installieren'; diff --git a/sources/lib/plugins/upgrade/lang/de-informal/safemode.txt b/sources/lib/plugins/upgrade/lang/de-informal/safemode.txt deleted file mode 100644 index 8487169..0000000 --- a/sources/lib/plugins/upgrade/lang/de-informal/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Dieses Wiki ist so eingestellt, dass es den safemode hack verwendet. Leider kann so das Wiki nicht automatisch aktualisiert werden. Bitte besuche Reguläre[[doku>install:upgrade|upgrade your wiki manually]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/de/lang.php b/sources/lib/plugins/upgrade/lang/de/lang.php deleted file mode 100644 index 1cef2c0..0000000 --- a/sources/lib/plugins/upgrade/lang/de/lang.php +++ /dev/null @@ -1,49 +0,0 @@ - - * @author Alex Timmermann - * @author Patrick Kastner - * @author Padhie - */ -$lang['menu'] = 'Wiki aktualisieren'; -$lang['vs_php'] = 'Neue DokuWiki-Versionen benötigen mindestens PHP-Version %s. Ihre Version ist %d. Bitte aktualisieren Sie PHP bevor Sie DokuWiki aktualisieren.'; -$lang['vs_tgzno'] = 'Die neuste Version von DokuWiki konnte nicht ermittelt werden.'; -$lang['vs_tgz'] = 'DokuWiki %s steht zum Download bereit.'; -$lang['vs_local'] = 'Ihre DokuWiki-Version ist %s'; -$lang['vs_localno'] = 'Es konnte nicht festgestellt werden, wie alt die aktuell laufende Version ist. Ein manuelles Upgrade wird empfohlen.'; -$lang['vs_newer'] = 'Es sieht so aus als sie Ihre DokuWiki-Version aktueller als die letzte stabile Version. Ein Upgrade wird nicht empfohlen.'; -$lang['vs_same'] = 'Ihre DokuWiki-Version ist aktuell. Ein Upgrade ist nicht nötig.'; -$lang['vs_plugin'] = 'Es existiert ein neueres Update Plugin (%s), Sie sollten das Plugin updaten bevor Sie aktualisieren.'; -$lang['vs_ssl'] = 'Ihre php-Version scheine keine SSL-Streams zu unterstützen, das Laden Sie die benötigten Daten wird daher vermutlich nicht funktionieren. Ein manuelles Update wird daher benötigt.'; -$lang['dl_from'] = 'Archiv wird von %s heruntergeladen...'; -$lang['dl_fail'] = 'Herunterladen fehlgeschlagen.'; -$lang['dl_done'] = 'Herunterladen abgeschlossen (%s).'; -$lang['pk_extract'] = 'Archiv wird entpackt...'; -$lang['pk_fail'] = 'Entpacken fehlgeschlagen.'; -$lang['pk_done'] = 'Entpacken abgeschlossen.'; -$lang['pk_version'] = 'DokuWiki %s ist zur Installation bereit (Sie betreiben momentan %s).'; -$lang['ck_start'] = 'Dateirechte werden überprüft...'; -$lang['ck_done'] = 'Alle Dateien sind beschreibbar. Zur Aktualisierung bereit.'; -$lang['ck_fail'] = 'Einige Dateien sind nicht beschreibbar. Die automatische Aktualisierung ist nicht möglich.'; -$lang['cp_start'] = 'Dateien werden aktualisiert...'; -$lang['cp_done'] = 'Dateien wurden aktualisiert.'; -$lang['cp_fail'] = 'Irgendetwas funktioniert nicht. Überprüfen Sie von Hand.'; -$lang['tv_noperm'] = '%s ist nicht beschreibbar!'; -$lang['tv_upd'] = '%s wird aktualisiert.'; -$lang['tv_nocopy'] = 'Konnte Datei %s nicht kopieren!'; -$lang['tv_nodir'] = 'Konnte Verzeichnis %s nicht erstellen!'; -$lang['tv_done'] = '%s wurde aktualisiert.'; -$lang['rm_done'] = 'Veraltete %s wurde gelöscht.'; -$lang['rm_fail'] = 'Konnte veraltete Datei %s nicht löschen. Bitte löschen Sie von Hand!'; -$lang['finish'] = 'Aktualisierung abgeschlossen. Genießen Sie Ihr neues DokuWiki!'; -$lang['btn_continue'] = 'Fortfahren'; -$lang['btn_abort'] = 'Abbrechen'; -$lang['step_version'] = 'Ãœberprüfen'; -$lang['step_download'] = 'Herunterladen'; -$lang['step_unpack'] = 'Entpacken'; -$lang['step_check'] = 'Verifizieren'; -$lang['step_upgrade'] = 'Installieren'; -$lang['careful'] = 'Siehe Fehler! Sie sollten nicht fortfahren!'; diff --git a/sources/lib/plugins/upgrade/lang/de/safemode.txt b/sources/lib/plugins/upgrade/lang/de/safemode.txt deleted file mode 100644 index 7fa6fa9..0000000 --- a/sources/lib/plugins/upgrade/lang/de/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Dieses Wiki ist so eingestellt dass es den safemode hack verwendet. Leider kann so das Wiki nicht automatisch aktualisiert werden. Bitte besuchen Sie [[doku>install:upgrade|upgrade your wiki manually]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/de/step0.txt b/sources/lib/plugins/upgrade/lang/de/step0.txt deleted file mode 100644 index 6d7329f..0000000 --- a/sources/lib/plugins/upgrade/lang/de/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Dieses Plugin aktualisiert ihr Wiki automatisch auf die aktuelle DokuWiki Version. Bevor Sie fortsetzen, sollten Sie den[[doku>changes|Änderungsverlauf]] lesen und überprüfen, ob vor oder nach der Aktualisierung weitere Schritte notwendig sind. - -Damit die automatische Aktualisierung möglich ist, sollte der PHP Prozess auf die DokuWiki Dateien zugreifen können. Das Plugin überprüft die erforderlichen Dateiberechtigungen, bevor der Aktualisierungsprozess startet. - -Dieses Plugin aktualisiert keine installierten Plugins oder Vorlagen. - -Wir empfehlen eine Sicherung ihres Wikis zu erstellen, bevor Sie fortsetzen. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/en/lang.php b/sources/lib/plugins/upgrade/lang/en/lang.php deleted file mode 100644 index 1dde181..0000000 --- a/sources/lib/plugins/upgrade/lang/en/lang.php +++ /dev/null @@ -1,55 +0,0 @@ - - */ - -// menu entry for admin plugins -$lang['menu'] = 'Wiki Upgrade'; - -// custom language strings for the plugin -$lang['vs_php'] = 'New DokuWiki releases need at least PHP %s, but you\'re running %s. You should upgrade your PHP version before upgrading!'; -$lang['vs_tgzno'] = 'Could not determine the newest version of DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s is available for download.'; -$lang['vs_local'] = 'You\'re currently running DokuWiki %s.'; -$lang['vs_localno'] = 'It\'s not clear how old your currently running version is, manual upgrade is recommended.'; -$lang['vs_newer'] = 'It seems your current DokuWiki is even newer than the latest stable release. Upgrade not recommended.'; -$lang['vs_same'] = 'Your current DokuWiki is already up to date. No need for upgrading.'; -$lang['vs_plugin'] = 'There is a newer upgrade plugin available (%s) you should update the plugin before continuing.'; -$lang['vs_ssl'] = 'Your PHP seems not to support SSL streams, downloading the needed data will most likely fail. Upgrade manually instead.'; - -$lang['dl_from'] = 'Downloading archive from %s...'; -$lang['dl_fail'] = 'Download failed.'; -$lang['dl_done'] = 'Download completed (%s).'; -$lang['pk_extract'] = 'Unpacking archive...'; -$lang['pk_fail'] = 'Unpacking failed.'; -$lang['pk_done'] = 'Unpacking completed.'; -$lang['pk_version'] = 'DokuWiki %s is ready to install (You\'re currently running %s).'; -$lang['ck_start'] = 'Checking file permissions...'; -$lang['ck_done'] = 'All files are writable. Ready to upgrade.'; -$lang['ck_fail'] = 'Some files aren\'t writable. Automatic upgrade not possible.'; -$lang['cp_start'] = 'Updating files...'; -$lang['cp_done'] = 'All files updated.'; -$lang['cp_fail'] = 'Uh-Oh. Something went wrong. Better check manually.'; -$lang['tv_noperm'] = '%s is not writable!'; -$lang['tv_upd'] = '%s will be updated.'; -$lang['tv_nocopy'] = 'Could not copy file %s!'; -$lang['tv_nodir'] = 'Could not create directory %s!'; -$lang['tv_done'] = 'updated %s'; -$lang['rm_done'] = 'Deprecated %s deleted.'; -$lang['rm_fail'] = 'Could not delete deprecated %s. Please delete manually!'; -$lang['finish'] = 'Upgrade completed. Enjoy your new DokuWiki'; - -$lang['btn_continue'] = 'Continue'; -$lang['btn_abort'] = 'Abort'; - -$lang['step_version'] = 'Check'; -$lang['step_download'] = 'Download'; -$lang['step_unpack'] = 'Unpack'; -$lang['step_check'] = 'Verify'; -$lang['step_upgrade'] = 'Install'; - -$lang['careful'] = 'Errors above! You should not continue!'; - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff --git a/sources/lib/plugins/upgrade/lang/en/safemode.txt b/sources/lib/plugins/upgrade/lang/en/safemode.txt deleted file mode 100644 index bb24e05..0000000 --- a/sources/lib/plugins/upgrade/lang/en/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -This wiki is configured to use the safemode hack. Unfortunately we cannot safely upgrade the wiki automatically under this conditions. Please [[doku>install:upgrade|upgrade your wiki manually]]. diff --git a/sources/lib/plugins/upgrade/lang/en/step0.txt b/sources/lib/plugins/upgrade/lang/en/step0.txt deleted file mode 100644 index e25280d..0000000 --- a/sources/lib/plugins/upgrade/lang/en/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -This plugin will automatically upgrade your wiki to the newest available DokuWiki version. Before continuing, you should read the [[doku>changes|Changelog]] to check if there are any additional steps for you to perform before or after upgrading. - -To allow automatic upgrading, the PHP process requires write permissions for Dokuwiki files. The plugin will check for the necessary file permissions before starting the upgrade process. - -This plugin will not upgrade any installed plugins or templates. - -We recommend that you create a backup of your wiki before continuing. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/eo/lang.php b/sources/lib/plugins/upgrade/lang/eo/lang.php deleted file mode 100644 index 52f89d2..0000000 --- a/sources/lib/plugins/upgrade/lang/eo/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author Robert Bogenschneider - */ -$lang['menu'] = 'Viki-Aktualigo'; -$lang['vs_php'] = 'Novaj DokuWiki-eldonoj bezonas minumime PHP-version %s, sed vi uzas %s. Vi devus aktualigi vian PHP-version antaÅ­ ol aktualigi la vikion!'; -$lang['vs_tgzno'] = 'Ne eblis ekkoni la plej novan DokuWiki-version.'; -$lang['vs_tgz'] = 'DokuWiki %s haveblas por elÅuto.'; -$lang['vs_local'] = 'Momente vi uzas DokuWiki %s.'; -$lang['vs_localno'] = 'Ne estas klare, kiom malnova via momenta versio estas, permana aktualigo estas rekomendata.'; -$lang['vs_newer'] = 'Aspektas, ke via momenta DokuWiki-versio estas eĉ pli nova ol la plej freÅa stabila eldono. Aktualigo estas malrekomendata.'; -$lang['vs_same'] = 'Via momenta DokuWiki estas jam Äisdata. Neniu bezono aktualigi.'; -$lang['vs_plugin'] = 'Ekzistas pli nova kromaĵo (%s), vi devus aktualigi la kromaĵon antaÅ­ ol daÅ­rigi.'; -$lang['vs_ssl'] = 'Åœajne via PHP ne subtenas SSL-fluojn, elÅuti la necesajn datumojn verÅajne malsukcesos. Aktualigu anstataÅ­e permane.'; -$lang['dl_from'] = 'ElÅutanta arkivon de %s...'; -$lang['dl_fail'] = 'La elÅuto ne funkciis.'; -$lang['dl_done'] = 'ElÅuto kompleta (%s).'; -$lang['pk_extract'] = 'Malpakanta arkivon...'; -$lang['pk_fail'] = 'Malpakado ne funkciis.'; -$lang['pk_done'] = 'Malpakado kompleta.'; -$lang['pk_version'] = 'DokuWiki %s pretas por instalado (Momente vi uzas %s).'; -$lang['ck_start'] = 'Kontrolanta dosier-permesojn...'; -$lang['ck_done'] = 'Ĉiuj dosieroj estas skribeblaj. Preta por aktualigo.'; -$lang['ck_fail'] = 'Iuj dosieroj ne estas skribeblaj. AÅ­tomata aktualigo ne eblas.'; -$lang['cp_start'] = 'Aktualiganta dosierojn...'; -$lang['cp_done'] = 'Ĉiuj dosieroj aktualigitaj.'; -$lang['cp_fail'] = 'Aj, io misiris. Pli bone kontrolu permane.'; -$lang['tv_noperm'] = '%s ne estas skribebla!'; -$lang['tv_upd'] = '%s estos aktualigata.'; -$lang['tv_nocopy'] = 'Ne eblis kopii la dosieron %s!'; -$lang['tv_nodir'] = 'Ne eblis krei la dosierujon %s!'; -$lang['tv_done'] = 'aktualiÄis %s'; -$lang['rm_done'] = 'Malaktuala %s forigita.'; -$lang['rm_fail'] = 'Ne eblis forigi la malaktualan %s. Bonvolu forigi Äin permane!'; -$lang['finish'] = 'Aktualigo kompleta. Äœuu vian novan DokuWiki.'; -$lang['btn_continue'] = 'DaÅ­rigi'; -$lang['btn_abort'] = 'Ĉesi'; -$lang['step_version'] = 'Kontroli'; -$lang['step_download'] = 'ElÅuti'; -$lang['step_unpack'] = 'Malpaki'; -$lang['step_check'] = 'Certigi'; -$lang['step_upgrade'] = 'Instali'; diff --git a/sources/lib/plugins/upgrade/lang/eo/safemode.txt b/sources/lib/plugins/upgrade/lang/eo/safemode.txt deleted file mode 100644 index 310017b..0000000 --- a/sources/lib/plugins/upgrade/lang/eo/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Tiu-ĉi vikio laÅ­agorde uzas la safemode-econ. BedaÅ­rinde tiel ne eblas sekure aktualigi la vikion aÅ­tomate. Bonvolu [[doku>install:upgrade|aktualigi vian vikion permane]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/eo/step0.txt b/sources/lib/plugins/upgrade/lang/eo/step0.txt deleted file mode 100644 index d9ebf01..0000000 --- a/sources/lib/plugins/upgrade/lang/eo/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Tiu kromaĵo aÅ­tomate aktualigos vian vikion al la plej freÅe havebla DokuWiki-versio. AntaÅ­ ol daÅ­rigi, legu [[doku>changes|la ÅanÄ-liston]] por kontroli, ĉu vi devus fari aldonajn paÅojn antaÅ­ aÅ­ post la aktualigo. - -Por permesi aÅ­tomatan aktualigon, la PHP-procezo bezonas skribpermeson por Dokuwiki-dosieroj. La kromaĵo kontrolos la necesajn dosierpermesojn antaÅ­ la komenco de la aktualigado. - -Tiu kromaĵo **ne aktualigos** instalitajn kromaĵojn aÅ­ Åablonojn. - -Ni rekomendas, ke vi faru sekurkopion de via vikio antaÅ­ ol daÅ­rigi. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/es/lang.php b/sources/lib/plugins/upgrade/lang/es/lang.php deleted file mode 100644 index f19673d..0000000 --- a/sources/lib/plugins/upgrade/lang/es/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author Domingo Redal - */ -$lang['menu'] = 'Actualización de Wiki'; -$lang['vs_php'] = 'Las nuevas versiones de DokuWiki necesitan al menos PHP %s, pero tú estás ejecutando %s. ¡Deberías subir la versión de PHP antes de actualizar!'; -$lang['vs_tgzno'] = 'No se puede determinar la versión más reciente de DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s está disponible para descargar.'; -$lang['vs_local'] = 'Actualmente estás ejecutando DokuWiki %s'; -$lang['vs_localno'] = 'No está clara la antigüedad de la versión que ejecutas actualmente; se recomienda una actualización manual.'; -$lang['vs_newer'] = 'Parece que tu DokuWiki actual es incluso más nueva que la última versión estable. No se recomienda actualizarla.'; -$lang['vs_same'] = 'Tú DokuWiki actual ya está al día. No se necesita actualización.'; -$lang['vs_plugin'] = 'Hay disponible una nueva actualización del //plugin// (%s), deberías actualizar el //plugin// antes de continuar.'; -$lang['vs_ssl'] = 'Tu PHP parece no soportar canales SSL, la descarga de los datos necesarios lo más probable es que falle. Actualizalo manualmente en su lugar.'; -$lang['dl_from'] = 'Descargando el archivo desde %s...'; -$lang['dl_fail'] = 'Fallo en la descarga.'; -$lang['dl_done'] = 'Descarga completada (%s).'; -$lang['pk_extract'] = 'Desempaquetando el archivo...'; -$lang['pk_fail'] = 'Fallo en el desempaquetado.'; -$lang['pk_done'] = 'Desempaquetado completado.'; -$lang['pk_version'] = 'DokuWiki %s listo para instalar (Actualmente estás ejecutando %s).'; -$lang['ck_start'] = 'Comprobando permisos de fichero...'; -$lang['ck_done'] = 'Todos los ficheros se pueden escribir. Listo para actualizar.'; -$lang['ck_fail'] = 'Algunos ficheros no se pueden escribir. No es posible la actualización automática.'; -$lang['cp_start'] = 'Actualizando ficheros...'; -$lang['cp_done'] = 'Todos los ficheros están actualizados.'; -$lang['cp_fail'] = '¡Vaya! Algo fue mal. Mejor compruébalo manualmente.'; -$lang['tv_noperm'] = '¡%s no se puede escribir!'; -$lang['tv_upd'] = '%s se actualizará.'; -$lang['tv_nocopy'] = '¡No se puede copiar el fichero %s!'; -$lang['tv_nodir'] = '¡No se puede crear el directorio %s!'; -$lang['tv_done'] = '%s actualizado'; -$lang['rm_done'] = '%s obsoleto borrado.'; -$lang['rm_fail'] = 'No se puede borrar %s obsoleto. ¡Por favor, bórralo manualmente!'; -$lang['finish'] = 'Actualización completada. Disfruta de tu nueva DokuWiki'; -$lang['btn_continue'] = 'Continuar'; -$lang['btn_abort'] = 'Abortar'; -$lang['step_version'] = 'Comprobar'; -$lang['step_download'] = 'Descargar'; -$lang['step_unpack'] = 'Desempaquetar'; -$lang['step_check'] = 'Verificar'; -$lang['step_upgrade'] = 'Instalar'; diff --git a/sources/lib/plugins/upgrade/lang/es/safemode.txt b/sources/lib/plugins/upgrade/lang/es/safemode.txt deleted file mode 100644 index 5a084f3..0000000 --- a/sources/lib/plugins/upgrade/lang/es/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Este wiki está configurado para utilizar el hack modo seguro. Desafortunadamente, no podemos actualizar el wiki automáticamente con seguridad bajo estas condiciones. Por favor [[doku>install:upgrade| actualiza tu wiki manualmente]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/es/step0.txt b/sources/lib/plugins/upgrade/lang/es/step0.txt deleted file mode 100644 index b042f59..0000000 --- a/sources/lib/plugins/upgrade/lang/es/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Este plugin actualizará automáticamente tu wiki a la nueva versión disponible de DokuWiki. Antes de continuar, debe leer el [[doku>changes|Histórico de Cambios]] para comprobar si hay pasos adicionales para llevar a cabo antes o después de la actualización. - -Para permitir la actualización automática, el proceso PHP requiere permisos de escritura para los archivos de Dokuwiki. El plugin comprobará los permisos de archivo necesarios antes de iniciar el proceso de actualización. - -Este plugin no actualiza los plugins o plantillas instaladas. - -Le recomendamos que cree una copia de seguridad de su wiki antes de continuar. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/fr/lang.php b/sources/lib/plugins/upgrade/lang/fr/lang.php deleted file mode 100644 index 2a3080b..0000000 --- a/sources/lib/plugins/upgrade/lang/fr/lang.php +++ /dev/null @@ -1,49 +0,0 @@ - - * @author Nicolas Friedli - * @author Schplurtz le Déboulonné - * @author Thomas Ballarin - */ -$lang['menu'] = 'Mise à jour du wiki'; -$lang['vs_php'] = 'Les nouvelles version de DokuWiki requièrent au moins la version %s de PHP, mais votre serveur propose %s. Il faut mettre PHP à jour avant DokuWiki.'; -$lang['vs_tgzno'] = 'Ne peut déterminer quelle est la plus récente version de DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s est disponible au téléchargement.'; -$lang['vs_local'] = 'Vous utilisez actuellement DokuWiki %s.'; -$lang['vs_localno'] = 'La version que vous utilisez actuellement ne peut pas être déterminée. Une mise à jour manuelle est recommandée.'; -$lang['vs_newer'] = 'Il semble que votre version actuelle de DokuWiki soit plus récente que l\'actuelle version stable. La mise à jour n\'est pas recommandée.'; -$lang['vs_same'] = 'Votre DokuWiki est le dernier en date. Pas besoin de mise à jour.'; -$lang['vs_plugin'] = 'Une nouvelle version de l\'extension de mise à jour est disponible (%s). Vous devriez la mettre à jour avant de continuer.'; -$lang['vs_ssl'] = 'Votre PHP semble ne pas prendre en charge les flux SSL; le téléchargement des données nécessaires va très probablement échouer. Faites la mise à jour manuellement.'; -$lang['dl_from'] = 'Téléchargement de l\'archive depuis %s...'; -$lang['dl_fail'] = 'Échec du téléchargement.'; -$lang['dl_done'] = 'Téléchargement achevé (%s).'; -$lang['pk_extract'] = 'Décompression de l\'archive...'; -$lang['pk_fail'] = 'Échec de la décompression.'; -$lang['pk_done'] = 'Décompression achevée.'; -$lang['pk_version'] = 'DokuWiki %s est prêt à être installé (Vous utilisez actuellement %s).'; -$lang['ck_start'] = 'Vérification des permissions des fichiers...'; -$lang['ck_done'] = 'Tous les fichiers sont autorisés en écriture. Prêt à mettre à jour.'; -$lang['ck_fail'] = 'Quelques fichiers sont interdits en écriture. La mise à jour automatique n\'est pas possible.'; -$lang['cp_start'] = 'Mise à jour des fichiers...'; -$lang['cp_done'] = 'Tous les fichiers ont été mis à jour.'; -$lang['cp_fail'] = 'Oh-oh. Quelque chose est allé de travers. Il vaudrait mieux vérifier à la main.'; -$lang['tv_noperm'] = '%s est interdit en écriture !'; -$lang['tv_upd'] = '%s sera mis à jour.'; -$lang['tv_nocopy'] = 'Impossible de copier le fichier %s!'; -$lang['tv_nodir'] = 'Impossible de créer le répertoire %s!'; -$lang['tv_done'] = 'Mis à jour : %s'; -$lang['rm_done'] = 'Suppression du fichier obsolète %s.'; -$lang['rm_fail'] = 'Impossible de supprimer le fichier obsolète %s. Veuillez le supprimer à la main.'; -$lang['finish'] = 'Mise à jour accomplie. Profitez de votre nouveau Dokuwiki !'; -$lang['btn_continue'] = 'Continuer'; -$lang['btn_abort'] = 'Arrêter'; -$lang['step_version'] = 'Contrôler'; -$lang['step_download'] = 'Télécharger'; -$lang['step_unpack'] = 'Décompresser'; -$lang['step_check'] = 'Vérifier'; -$lang['step_upgrade'] = 'Installer'; -$lang['careful'] = 'Il y as des erreurs! Vous ne devriez < b > pas < / b > continuer !'; diff --git a/sources/lib/plugins/upgrade/lang/fr/safemode.txt b/sources/lib/plugins/upgrade/lang/fr/safemode.txt deleted file mode 100644 index 6d8ab80..0000000 --- a/sources/lib/plugins/upgrade/lang/fr/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Ce wiki est configuré pour utiliser le mode sans échec. Il n'est malheureusement pas possible de mettre à jour automatiquement le wiki dans ces conditions. Veuillez [[doku>install:upgrade|mettre à jour votre wiki manuellement]]. diff --git a/sources/lib/plugins/upgrade/lang/fr/step0.txt b/sources/lib/plugins/upgrade/lang/fr/step0.txt deleted file mode 100644 index 906367f..0000000 --- a/sources/lib/plugins/upgrade/lang/fr/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Cette extension met votre DokuWiki à jour automatiquement, en installant la dernière version. Avant d'aller plus loin, vous devriez lire la liste des modifications apportées ([[doku>changes|Changelog]]), afin de voir s'il y a des étapes supplémentaires à faire avant ou après la mise à jour. - -Pour rendre la mise à jour automatique possible, PHP doit avoir les droits en écriture sur les fichiers de DokuWiki. Cette extension contrôle les permissions avant le début du processus de mise à jour. - -Cette extension ne met pas à jour les extensions et les thèmes. - -Nous vous recommandons d'effectuer une sauvegarde de votre wiki avant de poursuivre ! \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/hu/lang.php b/sources/lib/plugins/upgrade/lang/hu/lang.php deleted file mode 100644 index fdebeae..0000000 --- a/sources/lib/plugins/upgrade/lang/hu/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author DelD - */ -$lang['menu'] = 'Wiki-frissítÅ‘'; -$lang['vs_php'] = 'Az új DokuWiki-verzióknak legalább a PHP %s verziójára van szükség, miközben mi a %s verziót használjuk. Frissítenünk kell a PHP-t, mielÅ‘tt a wikit frissítenénk!'; -$lang['vs_tgzno'] = 'Nem tudom megállapítani a DokuWiki legújabb verzióját.'; -$lang['vs_tgz'] = 'LetölthetÅ‘ a DokuWiki %s.'; -$lang['vs_local'] = 'Jelenleg a DokuWiki %s változatát használjuk.'; -$lang['vs_localno'] = 'Nem tudom, hogy mennyire régi a jelenleg használt DokuWiki-verzió. Javaslom a manuális frissítést.'; -$lang['vs_newer'] = 'Úgy tűnik, hogy a DokuWiki-nk újabb, mint a jelenleg elérhetÅ‘, stabil kiadás, ezért nem ajánlatott a frissítés.'; -$lang['vs_same'] = 'A DokuWiki-nk már naprakész. Nincs szükség frissítésre.'; -$lang['vs_plugin'] = 'ElérhetÅ‘ egy újabb bÅ‘vítmény (%s\'), a folytatás elÅ‘tt a frissítsük a bÅ‘vítményt.'; -$lang['vs_ssl'] = 'Úgy tűnik, hogy a PHP-nk nem támogatja az SSL-adatfolyamokat, ezért a szükséges adatok letöltése nagy eséllyel hibás lesz. Frissítsünk manuálisan inkább.'; -$lang['dl_from'] = 'Archívum letöltése innen: %s...'; -$lang['dl_fail'] = 'A letöltés sikertelen.'; -$lang['dl_done'] = 'A letöltés befejezÅ‘dött (%s).'; -$lang['pk_extract'] = 'Archívum kicsomagolása...'; -$lang['pk_fail'] = 'A kicsomagolás sikertelen.'; -$lang['pk_done'] = 'A kicsomagolás befejezÅ‘dött.'; -$lang['pk_version'] = 'A DokuWiki %s készen áll a telepítésre. (Jelenleg telepítve: b>%s)'; -$lang['ck_start'] = 'Fájlok hozzáférési jogosultságainak ellenÅ‘rzése...'; -$lang['ck_done'] = 'Minden fájl írható. A frissítés készen áll a telepítésre.'; -$lang['ck_fail'] = 'Néhány fájl nem írható. Az automatikus frissítés nem lehetséges.'; -$lang['cp_start'] = 'Fájlok frissítése...'; -$lang['cp_done'] = 'Minden fájl frissítve.'; -$lang['cp_fail'] = 'Ejha. Valami nem sikerült. Jobb, ha manuálisan ellenÅ‘rizzük.'; -$lang['tv_noperm'] = 'A(z) %s nem írható!'; -$lang['tv_upd'] = 'A(z) %s frissítésre kerül!'; -$lang['tv_nocopy'] = 'Nem tudtam lemásolni a(z) %s nevű fájlt!'; -$lang['tv_nodir'] = 'Nem tudtam létrehozni a(z) %s nevű könyvtárat!'; -$lang['tv_done'] = '%s frissítve'; -$lang['rm_done'] = 'Elavult fájl törölve: %s.'; -$lang['rm_fail'] = 'Nem tudtam törölni az elavult fájlt: %s. Töröljük manuálisan!'; -$lang['finish'] = 'Frissítés kész. Élvezzük az új DokuWiki-t!'; -$lang['btn_continue'] = 'Folytatás'; -$lang['btn_abort'] = 'Megszakítás'; -$lang['step_version'] = 'EllenÅ‘rzés'; -$lang['step_download'] = 'Letöltés'; -$lang['step_unpack'] = 'Kicsomagolás'; -$lang['step_check'] = 'EllenÅ‘rzés'; -$lang['step_upgrade'] = 'Telepítés'; diff --git a/sources/lib/plugins/upgrade/lang/hu/safemode.txt b/sources/lib/plugins/upgrade/lang/hu/safemode.txt deleted file mode 100644 index e4e5f81..0000000 --- a/sources/lib/plugins/upgrade/lang/hu/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -A wiki a safemode hack használatára van beállítva. Sajnos, ilyen körülmények mellett nem tudjuk a wikit biztonsággal frissíteni automatikusan. Próbáljuk meg a [[doku>install:upgrade|wiki manuális frissítését]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/hu/step0.txt b/sources/lib/plugins/upgrade/lang/hu/step0.txt deleted file mode 100644 index 984d935..0000000 --- a/sources/lib/plugins/upgrade/lang/hu/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -A bÅ‘vítmény automatikusan frissíti a wiki-t a legújabb elérhetÅ‘ DokuWiki-verzióra. A folytatás elÅ‘tt olvassuk el a [[doku>changes|Changelog-ot (változások naplóját)]], ellenÅ‘rizendÅ‘, hogy a frissítés elÅ‘tt vagy után szükséges-e bármilyen további lépés. - -Az automatikus frissítéshez a PHP-folyamatnak írási jogosultságra van szüksége a DokuWiki-fájlokhoz. A bÅ‘vítmény ellenÅ‘rzi a szükséges fájljogosultságokat a frissítési folyamat megkezdése elÅ‘tt. - -A bÅ‘vítmény nem frissíti a már telepített bÅ‘vítményeket vagy sablonokat. - -Javasoljuk, hogy a frissítés elÅ‘tt készítsünk biztonsági másolatot. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/is/lang.php b/sources/lib/plugins/upgrade/lang/is/lang.php deleted file mode 100644 index 88d3ccf..0000000 --- a/sources/lib/plugins/upgrade/lang/is/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - */ -$lang['menu'] = 'Wiki uppfærsla'; -$lang['vs_php'] = 'Nýjar DokuWiki útgáfur þurfa að minnsta kosti PHP %s en þú ert að nota %s. Þú ættir að uppfæra PHP áður en þú uppfærir DokuWiki.'; -$lang['vs_tgzno'] = 'Gat ekki greint hvað er nýjasta útgáfan af DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s er fáanleg til niðurhals.'; -$lang['vs_local'] = 'Þú ert að nota DokuWiki %s núna.'; -$lang['vs_localno'] = 'Það er ekki ljóst hversu gömul núverandi útgáfa þín er. Það er mælt með handvirkri uppfærslu.'; -$lang['vs_newer'] = 'Það lítur út fyrir að núverandi útgáfa þín af DokuWiki sé jafnvel nýrri en nýjasta stöðuga útgáfan. Það er ekki mælt með því að uppfæra.'; -$lang['vs_same'] = 'Núverandi útgáfa þín af DokuWiki er þegar sú nýjasta. Engin þörf er á uppfærslu.'; -$lang['vs_plugin'] = 'Það er nýrri útgáfa til af uppfærsluviðbótinni (%s). Þú ættir að uppfæra viðbótina áður en þú heldur áfram.'; -$lang['vs_ssl'] = 'PHP virðist ekki styðja SSL strauma. Það mun líklegast mistakast að hala niður gögnin sem vantar. Uppfærðu handvirkt í staðinn.'; -$lang['dl_from'] = 'Sæki safnskrá frá %s...'; -$lang['dl_fail'] = 'Niðurhal mistókst.'; -$lang['dl_done'] = 'Niðurhali lokið (%s).'; -$lang['pk_extract'] = 'Afþjappa safnskrá...'; -$lang['pk_fail'] = 'Afþjöppun mistókst.'; -$lang['pk_done'] = 'Afþjöppun lokið.'; -$lang['pk_version'] = 'DokuWiki %s er tilbúinn til innsetningar (þú ert að nota %s eins og er.)'; -$lang['ck_start'] = 'Athuga réttindi...'; -$lang['ck_done'] = 'Allar skrár eru yfirskrifanlegar. Tilbúin til uppfærslu.'; -$lang['ck_fail'] = 'Sumar skrár eru ekki yfirskrifanlegar. Sjálfvirk uppfærsla er ekki möguleg.'; -$lang['cp_start'] = 'Uppfæri skrár...'; -$lang['cp_done'] = 'Allar skrár uppfærðar.'; -$lang['cp_fail'] = 'Æ og ó! Eitthvað fór úrskeiðis. Þú ættir að skoða þetta handvirkt.'; -$lang['tv_noperm'] = '%s er ekki yfirskrifanleg!'; -$lang['tv_upd'] = '%s verður uppfærð.'; -$lang['tv_nocopy'] = 'Gat ekki afritað skrá %s!'; -$lang['tv_nodir'] = 'Gat ekki búið til skráarsafn %s!'; -$lang['tv_done'] = 'uppfærði %s'; -$lang['rm_done'] = 'Úreldri skrá %s eytt.'; -$lang['rm_fail'] = 'Gat ekki eytt úreldri skrá %s. Vinsamlegast eyddu henni handvirkt!'; -$lang['finish'] = 'Uppfærsla tókst! Njóttu nýja DokuWikisins.'; -$lang['btn_continue'] = 'Halda áfram'; -$lang['btn_abort'] = 'Hætta við'; -$lang['step_version'] = 'Athuga'; -$lang['step_download'] = 'Sækja'; -$lang['step_unpack'] = 'Afþjappa'; -$lang['step_check'] = 'Staðfesta'; -$lang['step_upgrade'] = 'Innsetja'; -$lang['careful'] = 'Villur að ofan! Þú ættir ekki að halda áfram!'; diff --git a/sources/lib/plugins/upgrade/lang/is/safemode.txt b/sources/lib/plugins/upgrade/lang/is/safemode.txt deleted file mode 100644 index 0a22b41..0000000 --- a/sources/lib/plugins/upgrade/lang/is/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Þessi wiki er stilltur á að nota safemode breytinguna. Því miður getum við ekki uppfært wiki-inn örugglega undir þessum skilyrðum. Vinsamlegast [[doku>install:upgrade|uppfærðu wiki-inn handvirkt]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/is/step0.txt b/sources/lib/plugins/upgrade/lang/is/step0.txt deleted file mode 100644 index c644f05..0000000 --- a/sources/lib/plugins/upgrade/lang/is/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Þessi viðbót mun sjálfvirkt uppfæra wiki-inn þinn í nýjustu DokuWiki útgáfu. Ãður en haldið er áfram ættir þú að lesa [[doku>changes|Breytingasöguna]] til að sjá hvort einhver viðbótar skref þurfi að taka fyrir eða eftir uppfærslu. - -Til að leyfa sjálfvirka uppfærslu þarf PHP forritið skriftar-réttindi á DokuWiki skrárnar. Viðbótin mun athuga hvort viðeigandi réttindi séu til staðar áður en uppfærslan hefst. - -Þessi viðbót mun ekki uppfæra neinar innsettar viðbætur eða skapalón. - -Við mælum með því að þú takir afrit af wiki-inum þínum áður en þú heldur áfram. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/it/lang.php b/sources/lib/plugins/upgrade/lang/it/lang.php deleted file mode 100644 index 9e2bf76..0000000 --- a/sources/lib/plugins/upgrade/lang/it/lang.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @author Fabio - * @author Torpedo - */ -$lang['menu'] = 'Aggiornamento della Wiki'; -$lang['vs_php'] = 'La nuova versione DokuWiki necessita almeno di PHP %s, ma stai utilizzando %s. E\' necessario aggiornare PHP prima di aggiornare DokuWiki.'; -$lang['vs_tgzno'] = 'Impossibile determinare la nuova versione di DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s è disponibile per il download.'; -$lang['vs_local'] = 'Attualmente stai utilizzando DokuWiki %s.'; -$lang['vs_localno'] = 'Non è stato possibile determinare l\'età della versione DokuWiki in uso; si raccomanda di eseguire un aggiornamento manuale.'; -$lang['vs_newer'] = 'Sembra che la versione corrente di DokuWiki sia più recente dell\'ultima release stabile. L\'aggiornamento è sconsigliato.'; -$lang['vs_same'] = 'La versione DokuWiki che si sta usando è già aggiornata. Non è necessario alcun aggiornamento.'; -$lang['vs_plugin'] = 'C\'è un nuovo plugin di aggiornamento disponibile (%s); si consiglia di aggiornare il plugin di aggiornamento prima di continuare.'; -$lang['vs_ssl'] = 'La versione PHP in uso sembra non supportare stream SSL: il download dei dati probabilmente fallirà. Sarà necessario aggiornare manualmente.'; -$lang['dl_from'] = 'Sto scaricando l\'archivio da %s...'; -$lang['dl_fail'] = 'Download fallito.'; -$lang['dl_done'] = 'Download completato (%s).'; -$lang['pk_extract'] = 'Scompattando l\'archivio...'; -$lang['pk_fail'] = 'Scompattamento fallito.'; -$lang['pk_done'] = 'Scompattamento completo.'; -$lang['pk_version'] = 'DokuWiki %s è pronto per essere installato (attualmente stai eseguendo %s).'; -$lang['ck_start'] = 'Controllo i permessi sui file...'; -$lang['ck_done'] = 'Tutti i file sono scrivibili. Pronto per aggiornare.'; -$lang['ck_fail'] = 'Alcuni file non sono scrivibili. L\'aggiornamento automatico non è possibile.'; -$lang['cp_start'] = 'Aggiornamento file...'; -$lang['cp_done'] = 'Tutti i file sono aggiornati.'; -$lang['cp_fail'] = 'Uh-Oh! Qualcosa è andato storto. Meglio controllare a mano.'; -$lang['tv_noperm'] = '%s non è scrivibile!'; -$lang['tv_upd'] = '%s sarà aggiornato.'; -$lang['tv_nocopy'] = 'Non posso copiare il file %s!'; -$lang['tv_nodir'] = 'Non posso creare la directory %s!'; -$lang['tv_done'] = 'aggiornato %s'; -$lang['rm_done'] = '%s deprecato cancellato.'; -$lang['rm_fail'] = 'Non posso cancellare %s deprecato. Per favore cancellalo a mano!'; -$lang['finish'] = 'Aggiornamento completato. Divertiti con la tua nuova DokuWiki'; -$lang['btn_continue'] = 'Continua'; -$lang['btn_abort'] = 'Annulla'; -$lang['step_version'] = 'Controllo'; -$lang['step_download'] = 'Download'; -$lang['step_unpack'] = 'Scompattamento'; -$lang['step_check'] = 'Verifica'; -$lang['step_upgrade'] = 'Installazione'; -$lang['careful'] = 'Ci sono degli errori qua sopra! Non dovresti continuare!'; diff --git a/sources/lib/plugins/upgrade/lang/it/safemode.txt b/sources/lib/plugins/upgrade/lang/it/safemode.txt deleted file mode 100644 index 2296327..0000000 --- a/sources/lib/plugins/upgrade/lang/it/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Questa wiki è configurata per usare il trucco safemode. Sfortunatamente non possiamo aggiornare senza rischi la wiki automaticamente sotto queste condizioni. Per favore [[doku>install:upgrade|aggiorna la tua wiki manualmente]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/it/step0.txt b/sources/lib/plugins/upgrade/lang/it/step0.txt deleted file mode 100644 index b7e1a36..0000000 --- a/sources/lib/plugins/upgrade/lang/it/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Questo plugin aggiornerà automaticamente la wiki alla versione più recente disponibile di DokuWiki. Prima di continuare è consigliabile leggere il [[doku>changes|Changelog]] e controllare che non ci siano operazioni aggiuntive da eseguire prima o dopo l'aggiornamento. - -Per permettere l'aggiornamento automatico, il processo PHP necessita di impostare i permessi sui file DokuWiki. Il plugin controllerà i permessi necessari prima di avviare il processo di aggiornamento. - -Questo procedimento non aggiornerà nessun plugin installato e nessun template. - -Raccomandiamo di creare un backup della vostra wiki prima di continuare. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/ja/lang.php b/sources/lib/plugins/upgrade/lang/ja/lang.php deleted file mode 100644 index af93ff3..0000000 --- a/sources/lib/plugins/upgrade/lang/ja/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - */ -$lang['menu'] = 'Wiki ã®ã‚¢ãƒƒãƒ—グレード'; -$lang['vs_php'] = 'æ–°ã—ã„ DokuWiki ã«ã¯ PHP %s 以上ãŒå¿…è¦ã§ã™ãŒ %s ãŒç¨¼åƒä¸­ã§ã™ã€‚DokuWiki ã®ã‚¢ãƒƒãƒ—グレードå‰ã« PHP ã®ã‚¢ãƒƒãƒ—グレードãŒå¿…è¦ã§ã™ï¼'; -$lang['vs_tgzno'] = 'DokuWiki ã®æœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒç¢ºèªã§ãã¾ã›ã‚“ã§ã—ãŸã€‚'; -$lang['vs_tgz'] = 'DokuWiki %s ãŒãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰å¯èƒ½ã§ã™ã€‚'; -$lang['vs_local'] = 'DokuWiki %s ãŒç¨¼åƒä¸­ã§ã™ã€‚'; -$lang['vs_localno'] = '稼åƒä¸­ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒæ˜Žç¢ºã§ãªã„ã®ã§æ‰‹å‹•ã§ã®ã‚¢ãƒƒãƒ—グレードをãŠå‹§ã‚ã—ã¾ã™ã€‚'; -$lang['vs_newer'] = '稼åƒä¸­ã® DokuWiki ã¯ã€æœ€æ–°ã®å®‰å®šç‰ˆãƒªãƒªãƒ¼ã‚¹ã‚ˆã‚Šã‚‚æ–°ã—ã„ã§ã™ã€‚アップグレードã¯ãŠå‹§ã‚ã—ã¾ã›ã‚“。'; -$lang['vs_same'] = 'ã“ã® DokuWiki ã¯æ—¢ã«æœ€æ–°ã§ã™ã€‚アップグレードã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。'; -$lang['vs_plugin'] = 'æ–°ã—ã„アップグレードプラグインãŒåˆ©ç”¨å¯èƒ½ã§ã™(%s) 。続行ã™ã‚‹å‰ã«ã€ãƒ—ラグインã®æ›´æ–°ãŒå¿…è¦ã§ã™ã€‚'; -$lang['vs_ssl'] = 'PHP ㌠SSL 接続ã«æœªå¯¾å¿œã£ã½ã„ã®ã§ã€ãƒ‡ãƒ¼ã‚¿ã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ãŒã§ãã¾ã›ã‚“。手動ã§ã‚¢ãƒƒãƒ—グレードã—ã¦ä¸‹ã•ã„。'; -$lang['dl_from'] = '%s ã‹ã‚‰ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–をダウンロード中...'; -$lang['dl_fail'] = 'ダウンロードãŒå¤±æ•—ã—ã¾ã—ãŸã€‚'; -$lang['dl_done'] = 'ダウンロードãŒå®Œäº†ã—ã¾ã—ãŸï¼ˆ%s）。'; -$lang['pk_extract'] = 'アーカイブを解å‡ä¸­...'; -$lang['pk_fail'] = '解å‡ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚'; -$lang['pk_done'] = '解å‡ãŒå®Œäº†ã—ã¾ã—ãŸã€‚'; -$lang['pk_version'] = 'DokuWiki %s をインストールã™ã‚‹æº–å‚™ãŒã§ãã¾ã—ãŸï¼ˆç¾åœ¨ %s を実行中ã§ã™ï¼‰ã€‚'; -$lang['ck_start'] = 'ファイル権é™ã‚’確èªä¸­...'; -$lang['ck_done'] = '全ファイルãŒæ›¸è¾¼ã¿å¯èƒ½ã§ã™ã€‚アップグレードã™ã‚‹æº–å‚™ãŒã§ãã¾ã—ãŸã€‚'; -$lang['ck_fail'] = 'ã„ãã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒæ›¸è¾¼ä¸å¯ã§ã™ã€‚自動アップグレードã¯ä¸å¯èƒ½ã§ã™ã€‚'; -$lang['cp_start'] = 'ファイルã®æ›´æ–°ä¸­...'; -$lang['cp_done'] = '全ファイルã®æ›´æ–°å®Œäº†ã€‚'; -$lang['cp_fail'] = '何ã‹ãŒé–“é•ã£ã¦ã„ã¾ã—ãŸã€‚手動ã§ç¢ºèªã—ã¦ä¸‹ã•ã„。'; -$lang['tv_noperm'] = '%s ã¯æ›¸è¾¼ã¿ä¸å¯ã§ã™ï¼'; -$lang['tv_upd'] = '%s ã¯æ›´æ–°å¯èƒ½ã§ã™ã€‚'; -$lang['tv_nocopy'] = '%s ファイルãŒã‚³ãƒ”ーã§ãã¾ã›ã‚“ã§ã—ãŸï¼'; -$lang['tv_nodir'] = '%s ディレクトリãŒä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸï¼'; -$lang['tv_done'] = '%s ã®æ›´æ–°å®Œäº†ã€‚'; -$lang['rm_done'] = '廃止予定㮠%s ã®å‰Šé™¤å®Œäº†ã€‚'; -$lang['rm_fail'] = '廃止予定㮠%s ãŒå‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚手動ã§å‰Šé™¤ã—ã¦ä¸‹ã•ã„ï¼'; -$lang['finish'] = 'アップグレードãŒå®Œäº†ã—ã¾ã—ãŸã€‚æ–°ã—ã„ DokuWiki ã‚’ãŠæ¥½ã—ã¿ä¸‹ã•ã„。'; -$lang['btn_continue'] = '続行'; -$lang['btn_abort'] = '中止'; -$lang['step_version'] = '確èª'; -$lang['step_download'] = 'ダウンロード'; -$lang['step_unpack'] = '解å‡'; -$lang['step_check'] = '検証'; -$lang['step_upgrade'] = 'インストール'; -$lang['careful'] = 'é‡å¤§ãªã‚¨ãƒ©ãƒ¼ï¼ç¶šè¡Œã™ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“ï¼'; diff --git a/sources/lib/plugins/upgrade/lang/ja/safemode.txt b/sources/lib/plugins/upgrade/lang/ja/safemode.txt deleted file mode 100644 index f01e9d0..0000000 --- a/sources/lib/plugins/upgrade/lang/ja/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -ã“ã®Wikiã¯ã€ã‚»ãƒ¼ãƒ•ãƒ¢ãƒ¼ãƒ‰ãƒãƒƒã‚¯ã‚’使用ã™ã‚‹ã‚ˆã†ã«è¨­å®šã•ã‚Œã¦ã„ã¾ã™ã€‚残念ãªãŒã‚‰ã€ã“ã®è¨­å®šã§ã¯è‡ªå‹•ã§å®‰å…¨ã« Wiki ã®ã‚¢ãƒƒãƒ—グレードãŒã§ãã¾ã›ã‚“。[[doku>ja:install:upgrade|手動ã§Wiki ã®ã‚¢ãƒƒãƒ—グレード]]ã‚’ã—ã¦ãã ã•ã„。 diff --git a/sources/lib/plugins/upgrade/lang/ja/step0.txt b/sources/lib/plugins/upgrade/lang/ja/step0.txt deleted file mode 100644 index 025b0fb..0000000 --- a/sources/lib/plugins/upgrade/lang/ja/step0.txt +++ /dev/null @@ -1,9 +0,0 @@ -ã“ã®ãƒ—ラグインã¯ã€ç¨¼åƒä¸­ã® DokuWiki を利用å¯èƒ½ãªæœ€æ–°ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã«ã‚¢ãƒƒãƒ—グレードã—ã¾ã™ã€‚ -続行ã™ã‚‹å‰ã«ã€[[doku>ja:changes|更新履歴]]を読んã§ã€ã‚¢ãƒƒãƒ—グレードã®å‰å¾Œã«å®Ÿè¡Œã™ã¹ã追加ã®æ‰‹é †ãŒã‚ã‚‹ã‹ã©ã†ã‹ã‚’確èªã—ã¦ãã ã•ã„。 - -自動アップグレードã®ãŸã‚ã«ã€DokuWikiã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ PHP プロセスã‹ã‚‰ã®æ›¸ãè¾¼ã¿æ¨©é™ãŒå¿…è¦ã§ã™ã€‚ -実際ã«ã‚¢ãƒƒãƒ—グレードã™ã‚‹å‰ã«ã€å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’検証ã—ã¾ã™ã€‚ - -インストール済ã®ãƒ—ラグインやテンプレートã¯ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã›ã‚“。 - -処ç†ã‚’続行ã™ã‚‹å‰ã« wiki ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ä½œæˆã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚ \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/ko/lang.php b/sources/lib/plugins/upgrade/lang/ko/lang.php deleted file mode 100644 index 7e2ef2b..0000000 --- a/sources/lib/plugins/upgrade/lang/ko/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - */ -$lang['menu'] = '위키 업그레ì´ë“œ'; -$lang['vs_php'] = '새 ë„쿠위키 릴리스는 ì ì–´ë„ PHP %sì´(ê°€) 필요하지만, 현재 %sì„(를) 실행하고 있습니다. 업그레ì´ë“œí•˜ê¸° ì „ì— PHP ë²„ì „ì„ ì—…ê·¸ë ˆì´ë“œí•´ì•¼ 합니다!'; -$lang['vs_tgzno'] = 'ë„ì¿ ìœ„í‚¤ì˜ ìµœì‹  ë²„ì „ì„ í™•ì¸í•  수 없습니다.'; -$lang['vs_tgz'] = 'ë„쿠위키 %sì„(를) 다운로드할 수 있습니다.'; -$lang['vs_local'] = '현재 ë„쿠위키 %sì„(를) 실행하고 있습니다.'; -$lang['vs_localno'] = '현재 실행 ì¤‘ì¸ ë²„ì „ì€ ì–¼ë§ˆë‚˜ 오래ë˜ì—ˆëŠ”지 분명하지 않습니다, ìˆ˜ë™ ì—…ê·¸ë ˆì´ë“œë¥¼ 권장합니다.'; -$lang['vs_newer'] = '현재 ë„쿠위키가 최신 안정 릴리스보다 새 ë¦´ë¦¬ìŠ¤ì¸ ê²ƒìœ¼ë¡œ 보입니다. 업그레ì´ë“œí•˜ì§€ 않는 ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤.'; -$lang['vs_same'] = '현재 ë„쿠위키가 ì´ë¯¸ 최신입니다. 업그레ì´ë“œí•  필요가 없습니다.'; -$lang['vs_plugin'] = '새 upgrade 플러그ì¸ì„ 사용할 수 있으므로 (%s) 계ì†í•˜ê¸° ì „ì— í”ŒëŸ¬ê·¸ì¸ì„ ì—…ë°ì´íŠ¸í•´ì•¼ 합니다.'; -$lang['vs_ssl'] = 'PHPê°€ SSL ìŠ¤íŠ¸ë¦¼ì„ ì§€ì›í•˜ì§€ ì•Šì€ ê²ƒìœ¼ë¡œ ë³´ì´ë©°, 필요한 ë°ì´í„°ë¥¼ 다운로드하는 ê²ƒì€ ì‹¤íŒ¨í•  ê°€ëŠ¥ì„±ì´ ë†’ìŠµë‹ˆë‹¤. 대신 수ë™ìœ¼ë¡œ 업그레ì´ë“œí•˜ì„¸ìš”.'; -$lang['dl_from'] = '%sì—ì„œ ì•„ì¹´ì´ë¸Œ 다운로드 중...'; -$lang['dl_fail'] = '다운로드가 실패ë˜ì—ˆìŠµë‹ˆë‹¤.'; -$lang['dl_done'] = '다운로드가 완료ë˜ì—ˆìŠµë‹ˆë‹¤. (%s)'; -$lang['pk_extract'] = 'ì•„ì¹´ì´ë¸Œë¥¼ 압축 푸는 중...'; -$lang['pk_fail'] = '압축 풀기가 실패ë˜ì—ˆìŠµë‹ˆë‹¤.'; -$lang['pk_done'] = '압축 풀기가 완료ë˜ì—ˆìŠµë‹ˆë‹¤.'; -$lang['pk_version'] = 'ë„쿠위키 %sì€(는) 설치할 준비가 ë˜ì–´ 있습니다. (현재 %sì„(를) 실행하고 있습니다)'; -$lang['ck_start'] = 'íŒŒì¼ ê¶Œí•œ í™•ì¸ ì¤‘...'; -$lang['ck_done'] = '모든 파ì¼ì„ 쓸 수 있습니다. 업그레ì´ë“œë¥¼ 준비합니다.'; -$lang['ck_fail'] = 'ì¼ë¶€ 파ì¼ì„ 쓸 수 없습니다. ìžë™ìœ¼ë¡œ 업그레ì´ë“œëŠ” í•  수 없습니다.'; -$lang['cp_start'] = '파ì¼ì„ ì—…ë°ì´íŠ¸ 중...'; -$lang['cp_done'] = '모든 파ì¼ì„ ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤.'; -$lang['cp_fail'] = '어머나. 무언가가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤. 수ë™ìœ¼ë¡œ 잘 확ì¸í•˜ì„¸ìš”.'; -$lang['tv_noperm'] = '%sì„(를) 쓸 수 없습니다!'; -$lang['tv_upd'] = '%sì€(는) ì—…ë°ì´íŠ¸ë©ë‹ˆë‹¤.'; -$lang['tv_nocopy'] = '%s 파ì¼ì„ 복사할 수 없습니다!'; -$lang['tv_nodir'] = '%s 디렉터리를 만들 수 없습니다!'; -$lang['tv_done'] = '%sì„(를) ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤'; -$lang['rm_done'] = '사용ë˜ì§€ 않는 %sì€(는) ì‚­ì œë˜ì—ˆìŠµë‹ˆë‹¤.'; -$lang['rm_fail'] = '사용ë˜ì§€ 않는 %sì„(를) 삭제할 수 없습니다. 수ë™ìœ¼ë¡œ 삭제하세요!'; -$lang['finish'] = '업그레ì´ë“œê°€ 완료ë˜ì—ˆìŠµë‹ˆë‹¤. 새 ë„쿠위키를 ì¦ê¸°ì„¸ìš”'; -$lang['btn_continue'] = '계ì†'; -$lang['btn_abort'] = '중단'; -$lang['step_version'] = '확ì¸'; -$lang['step_download'] = '다운로드'; -$lang['step_unpack'] = '압축 풀기'; -$lang['step_check'] = 'ê²€ì¦'; -$lang['step_upgrade'] = '설치'; -$lang['careful'] = 'ìœ„ì— ì˜¤ë¥˜ê°€ 있습니다! 계ì†í•´ì„œëŠ” 안ë©ë‹ˆë‹¤!'; diff --git a/sources/lib/plugins/upgrade/lang/ko/safemode.txt b/sources/lib/plugins/upgrade/lang/ko/safemode.txt deleted file mode 100644 index 366c3de..0000000 --- a/sources/lib/plugins/upgrade/lang/ko/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -ì´ ìœ„í‚¤ëŠ” 안전 모드 í•´í‚¹ì„ ì‚¬ìš©í•˜ë„ë¡ ì„¤ì •ë˜ì–´ 있습니다. ë¶ˆí–‰ížˆë„ ì´ ì¡°ê±´ì—ì„œ ìžë™ìœ¼ë¡œ 안전하게 위키를 업그레ì´ë“œí•  수 없습니다. [[doku>install:upgrade|수ë™ìœ¼ë¡œ 위키를 업그레ì´ë“œ]]하세요. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/ko/step0.txt b/sources/lib/plugins/upgrade/lang/ko/step0.txt deleted file mode 100644 index f52bee5..0000000 --- a/sources/lib/plugins/upgrade/lang/ko/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -ì´ í”ŒëŸ¬ê·¸ì¸ì€ ìžë™ìœ¼ë¡œ 사용할 수 있는 최신 ë„쿠위키 버전으로 위키를 업그레ì´ë“œí•©ë‹ˆë‹¤. 계ì†í•˜ê¸° ì „ì—, 업그레ì´ë“œí•˜ê¸° ì „ì´ë‚˜ í›„ì— ìˆ˜í–‰í•˜ê¸° 위한 ì–´ë–¤ 추가 단계가 있는지 확ì¸í•˜ê¸° 위해 [[doku>changes|바뀜기ë¡]]ì„ ì½ì–´ì•¼ 합니다. - -ìžë™ìœ¼ë¡œ 업그레ì´ë“œë¥¼ 허용하려면, PHP 프로세스ì—는 ë„쿠위키 파ì¼ì— 쓰기 ê¶Œí•œì´ í•„ìš”í•©ë‹ˆë‹¤. 플러그ì¸ì€ 업그레ì´ë“œ ê³¼ì •ì„ ì‹œìž‘í•˜ê¸° ì „ì— í•„ìš”í•œ íŒŒì¼ ê¶Œí•œì„ í™•ì¸í•©ë‹ˆë‹¤. - -ì´ í”ŒëŸ¬ê·¸ì¸ì€ ì–´ë– í•œ ì„¤ì¹˜ëœ í”ŒëŸ¬ê·¸ì¸ì´ë‚˜ í…œí”Œë¦¿ë„ ì—…ê·¸ë ˆì´ë“œí•˜ì§€ 않습니다. - -계ì†í•˜ê¸° ì „ì— ìœ„í‚¤ì˜ ë°±ì—…ì„ ë§Œë“œëŠ” ê²ƒì´ ì¢‹ìŠµë‹ˆë‹¤. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/nl/lang.php b/sources/lib/plugins/upgrade/lang/nl/lang.php deleted file mode 100644 index 5a67bac..0000000 --- a/sources/lib/plugins/upgrade/lang/nl/lang.php +++ /dev/null @@ -1,46 +0,0 @@ - - * @author Peter van Diest - */ -$lang['menu'] = 'Wiki Upgrade'; -$lang['vs_php'] = 'New Dokuwiki releases hebben minstens PHP %s nodig, maar je gebruikt %s. Je moet eerst je PHP-versie vernieuwen voor je Dokuwiki vernieuwt.'; -$lang['vs_tgzno'] = 'Kon niet de laatste versie van Dokuwiki bepalen.'; -$lang['vs_tgz'] = 'DokuWiki %s is beschikbaar voor download.'; -$lang['vs_local'] = 'Je gebruikt nu DokuWiki %s.'; -$lang['vs_localno'] = 'Het is niet duidelijk hoe oud de versie is die je nu gebruikt, handmatige upgrade is aan te raden.'; -$lang['vs_newer'] = 'Het lijkt erop dat je huidige Dokuwiki nog nieuwer is dan de laatste stabiele release. Een upgrade is niet aan te raden.'; -$lang['vs_same'] = 'Je huidige Dokuwiki is al up-to-date. Een upgrade is niet nodig.'; -$lang['vs_plugin'] = 'Er is een nieuwere upgrade plugin beschikbaar (%s), je kunt de plugin beter vernieuwen voor je verder gaat.'; -$lang['vs_ssl'] = 'Je PHP lijkt SSL-streams niet te ondersteunen, het downloaden van de benodigde data zal waarschijnlijk misgaan. Voer een handmatige upgrade uit.'; -$lang['dl_from'] = 'Archief wordt van %s gedownload...'; -$lang['dl_fail'] = 'Download is mislukt.'; -$lang['dl_done'] = 'Download is compleet (%s)'; -$lang['pk_extract'] = 'Archief uitpakken...'; -$lang['pk_fail'] = 'Uitpakken mislukt.'; -$lang['pk_done'] = 'Uitpakken voltooid.'; -$lang['pk_version'] = 'DokuWiki %s is klaar om geïnstalleerd te worden. (Op dit moment gebnruik je %s.)'; -$lang['ck_start'] = 'Bestandspermissies controleren...'; -$lang['ck_done'] = 'Alle bestanden zijn beschrijfbaar. Klaar om te upgraden.'; -$lang['ck_fail'] = 'Sommige bestanden zijn niet beschrijfbaar. Automatische upgrade is niet mogelijk.'; -$lang['cp_start'] = 'Bestanden updaten...'; -$lang['cp_done'] = 'Alle bestanden zijn geüpdatet.'; -$lang['cp_fail'] = 'Uh-Oh. Er ging iets fout. Het is beter om het handmatig te controleren.'; -$lang['tv_noperm'] = '%s is niet beschrijfbaar!'; -$lang['tv_upd'] = '%s zal worden geüpdatet.'; -$lang['tv_nocopy'] = 'Kon het bestand %s niet kopiëren!'; -$lang['tv_nodir'] = 'De map %s kan niet aangemaakt worden!'; -$lang['tv_done'] = '%s is geüpdatet.'; -$lang['rm_done'] = 'Verouderde %s verwijderd.'; -$lang['rm_fail'] = 'Verouderde %s kan niet worden verwijderd. Verwijder alsjeblieft handmatig!'; -$lang['finish'] = 'Upgrade is compleet. Geniet van je nieuwe DokuWiki'; -$lang['btn_continue'] = 'Doorgaan'; -$lang['btn_abort'] = 'Afbreken'; -$lang['step_version'] = 'Controleer'; -$lang['step_download'] = 'Download'; -$lang['step_unpack'] = 'Pak uit'; -$lang['step_check'] = 'Verifiëer'; -$lang['step_upgrade'] = 'Installleer'; diff --git a/sources/lib/plugins/upgrade/lang/nl/safemode.txt b/sources/lib/plugins/upgrade/lang/nl/safemode.txt deleted file mode 100644 index a3f440b..0000000 --- a/sources/lib/plugins/upgrade/lang/nl/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Deze wiki is geconfigureerd om de safemode hack te gebruiken. Helaas kunnen we onder die omstandigheden de wiki niet automatisch upgraden. [[doku>install:upgrade|Upgrade je wiki alsjeblieft handmatig]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/nl/step0.txt b/sources/lib/plugins/upgrade/lang/nl/step0.txt deleted file mode 100644 index ef5bd32..0000000 --- a/sources/lib/plugins/upgrade/lang/nl/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Deze plugin vernieuwt je wiki automatisch naar de nieuwste beschikbare Dokuwiki-versie. Lees voor je verder gaat de [[doku>changes|Changelog]] om te zien of je voor of na de upgrade nog extra stappen moet doen. - -Voor een automatische upgrade heeft het PHP-proces schrijfrechten op de Dokuwikibestanden nodig. De plugin checkt de benodigde bestandsrechten alvorens de upgrade te starten. - -De plugin vernieuwt geen geïnstalleerde plugins of templates - -We raden aan vóór je verder gaat een backup van je wiki te maken. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/no/lang.php b/sources/lib/plugins/upgrade/lang/no/lang.php deleted file mode 100644 index 777ca71..0000000 --- a/sources/lib/plugins/upgrade/lang/no/lang.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -$lang['menu'] = 'Wiki-oppgradering'; -$lang['vs_php'] = 'Nye DokuWiki-utgaver trenger minst PHP %s, men du kjører %s. -Du bør oppgradere PHP-versjonen din før du oppgraderer!'; -$lang['vs_tgzno'] = 'Kan ikke fastslÃ¥ den nyeste versjonen av DokuWiki.'; -$lang['vs_tgz'] = 'DokuWiki %s er tilgjengelig for nedlastning.'; -$lang['vs_local'] = 'Du kjører for øyeblikket DokuWiki %s.'; -$lang['vs_localno'] = 'Det er ikke mulig Ã¥ fastslÃ¥ hvor gammel din nÃ¥værende versjon er. Manuell oppgradering anbefales.'; -$lang['vs_newer'] = 'Det ser ut til at nÃ¥værende Dokuwiki er nyere enn siste stabile utgave. Oppdatering anbefales ikke.'; -$lang['vs_same'] = 'Din nÃ¥værende DokuWiki er allerede nyeste utgave. Ingen behov for oppgradering.'; -$lang['vs_plugin'] = 'Det fins en nyere oppgraderings-plugin (%s). Du bør oppdatere plugin-en før du fortsetter.'; -$lang['vs_ssl'] = 'Din PHP synes Ã¥ ikke støtte SSL-strømming. Nedlastingen vil derfor trolig feile. Oppgrader manuelt i stedet.'; -$lang['dl_from'] = 'Laster ned filarkiv fra %s...'; -$lang['dl_fail'] = 'Nedlastningen mislyktes.'; -$lang['dl_done'] = 'Nedlastningen er fullført (%s).'; -$lang['pk_extract'] = 'Pakker ut filarkivet...'; -$lang['pk_fail'] = 'Utpakkingen mislyktes.'; -$lang['pk_done'] = 'Utpakkingen er fullført.'; -$lang['pk_version'] = 'DokuWiki %s er klar til Ã¥ installere (Du kjører for øyeblikket %s).'; -$lang['ck_start'] = 'Kontrollerer filtillatelser...'; -$lang['ck_done'] = 'Alle filer har skrivetillatelse. Klar til oppgradering.'; -$lang['ck_fail'] = 'Noen filer har ikke skrivetillatelse. Automatisk oppgradering er ikke mulig.'; -$lang['cp_start'] = 'Oppdaterer filer...'; -$lang['cp_done'] = 'Alle filene er oppdatert.'; -$lang['cp_fail'] = 'Huff. Noe gikk galt. Sjekk feilen manuelt.'; -$lang['tv_noperm'] = ' %s har ikke skrivetillatelse!'; -$lang['tv_upd'] = '%s vil oppdateres.'; -$lang['tv_nocopy'] = 'Kunne ikke kopiere filen %s!'; -$lang['tv_nodir'] = 'Kunne ikke opprette katalogen %s!'; -$lang['tv_done'] = 'oppdatert %s'; -$lang['rm_done'] = 'UtgÃ¥tt %s slettet.'; -$lang['rm_fail'] = 'Kunne ikke slette utgÃ¥tt %s. Vennligst slett manuelt!'; -$lang['finish'] = 'Oppgraderingen er fullført. Nyt din nye DokuWiki'; -$lang['btn_continue'] = 'Fortsett'; -$lang['btn_abort'] = 'Avbryt'; -$lang['step_version'] = 'Kontrollér'; -$lang['step_download'] = 'Last ned'; -$lang['step_unpack'] = 'Pakk ut'; -$lang['step_check'] = 'Verifisér'; -$lang['step_upgrade'] = 'Installér'; -$lang['careful'] = 'Feil over! Du bør ikke fortsette!'; diff --git a/sources/lib/plugins/upgrade/lang/no/safemode.txt b/sources/lib/plugins/upgrade/lang/no/safemode.txt deleted file mode 100644 index 4d7d9ae..0000000 --- a/sources/lib/plugins/upgrade/lang/no/safemode.txt +++ /dev/null @@ -1,2 +0,0 @@ -Wikien er konfigurert for Ã¥ bruke safemode hack. Uheldigvis kan vi ikke sikkert oppgradere wikien automatisk under slike forhold. -Vennligst [[doku>install:upgrade|oppgrader wikien manuelt]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/no/step0.txt b/sources/lib/plugins/upgrade/lang/no/step0.txt deleted file mode 100644 index 1e5e797..0000000 --- a/sources/lib/plugins/upgrade/lang/no/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Denne plugin-en vil automatisk oppgradere wikien til den nyeste stabile versjonen av DokuWiki. Før du fortsetter bør du lese [[doku>changes|Changelog]] for Ã¥ sjekke om det er noen tilleggstiltak som du mÃ¥ gjøre etter oppdateringen. - -For Ã¥ tilltate automatisk oppgradering krever PHP-prosessen skrivetillatelse for DokuWiki-filer. Plugin-en vil sjekker om de nødvendige filtillatelsene er pÃ¥ plass før oppgraderingen starter. - -Plugin-en vil ikke oppgradere installerte plugin-er eller maler. - -Vi anbefaler at du tar en sikkerhetskopi av wikien før du fortsetter. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/ru/lang.php b/sources/lib/plugins/upgrade/lang/ru/lang.php deleted file mode 100644 index 6785970..0000000 --- a/sources/lib/plugins/upgrade/lang/ru/lang.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @author Aleksandr Selivanov - * @author Vladimir Rozhkov - * @author Vitaly Filatenko - */ -$lang['menu'] = 'Обновление вики'; -$lang['vs_php'] = 'Ðовые верÑии «Докувики» требуют PHP верÑии не менее %s, но у Ð²Ð°Ñ ÑƒÑтановлена %s. Ð’Ñ‹ должны обновить PHP до новой верÑии перед обновлением.'; -$lang['vs_tgzno'] = 'Ðет возможноÑти определить новую верÑию «Докувики».'; -$lang['vs_tgz'] = '«Докувики» %s доÑтупна Ð´Ð»Ñ ÑкачиваниÑ.'; -$lang['vs_local'] = 'У Ð²Ð°Ñ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð° «Докувики» %s.'; -$lang['vs_localno'] = 'Ðевозможно определить поÑледнюю уÑтановленную верÑию, рекомендуетÑÑ Ñ€ÑƒÑ‡Ð½Ð¾Ðµ обновление. '; -$lang['vs_newer'] = 'Похоже, Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð²Ð°ÑˆÐµÐ¹ «Докувики» новее поÑледней Ñтабильной Ñборки. Обновление не рекомендовано.'; -$lang['vs_same'] = 'Ваша «Докувики» уже обновлена до поÑледней верÑии. Обновление не нужно.'; -$lang['vs_plugin'] = 'ДоÑтупна Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð° Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ (%s). Ð’Ñ‹ должны переуÑтановить плагин Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Â«Ð”Ð¾ÐºÑƒÐ²Ð¸ÐºÐ¸Â».'; -$lang['vs_ssl'] = 'Похоже, что ваш PHP не поддерживает SSL, процеÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ может завершитьÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡ÐµÐ¹. РекомендуетÑÑ Ñ€ÑƒÑ‡Ð½Ð¾Ðµ обновление.'; -$lang['dl_from'] = 'Загрузка архива из %s...'; -$lang['dl_fail'] = 'Ошибка загрузки.'; -$lang['dl_done'] = 'Загрузка завершена (%s).'; -$lang['pk_extract'] = 'РаÑпаковка архива...'; -$lang['pk_fail'] = 'Ошибка раÑпаковки.'; -$lang['pk_done'] = 'РаÑпаковка завершена'; -$lang['pk_version'] = '«Докувики» %s уже уÑтановлена (Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ ÑƒÑтановка %s).'; -$lang['ck_start'] = 'Проверка прав доÑтупа к файлам...'; -$lang['ck_done'] = 'Ð’Ñе файлы доÑтупны Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Готово к обновлению.'; -$lang['ck_fail'] = 'Ðекоторые файлы недоÑтупны Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Ðвтообновление невозможно.'; -$lang['cp_start'] = 'Обновление файлов...'; -$lang['cp_done'] = 'Ð’Ñе файлы обновлены.'; -$lang['cp_fail'] = 'Ой... Что-то пошло не так. Лучше проверить вручную.'; -$lang['tv_noperm'] = 'Ðе могу запиÑать %s!'; -$lang['tv_upd'] = '%s будет обновлён.'; -$lang['tv_nocopy'] = 'Ðевозможно Ñкопировать файл %s!'; -$lang['tv_nodir'] = 'Ðевозможно Ñоздать папку %s!'; -$lang['tv_done'] = 'обновление %s'; -$lang['rm_done'] = 'УÑтаревший %s удалён.'; -$lang['rm_fail'] = 'Ðевозможно удалить уÑтаревший %s. ПожалуйÑта, удалите вручную!'; -$lang['finish'] = 'Обновление завершено. ÐаÑлаждайтеÑÑŒ Ñвоей новой «Докувики»'; -$lang['btn_continue'] = 'Продолжить'; -$lang['btn_abort'] = 'Отменить'; -$lang['step_version'] = 'Отменить'; -$lang['step_download'] = 'Загрузить'; -$lang['step_unpack'] = 'РаÑпаковать'; -$lang['step_check'] = 'Проверить'; -$lang['step_upgrade'] = 'УÑтановить'; diff --git a/sources/lib/plugins/upgrade/lang/ru/safemode.txt b/sources/lib/plugins/upgrade/lang/ru/safemode.txt deleted file mode 100644 index 8faeb7f..0000000 --- a/sources/lib/plugins/upgrade/lang/ru/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Ваша вики наÑтроена Ñ Ð¸Ñпользованием safemode, поÑтому не может быть обновлена в автоматичеÑком режиме. ПожалуйÑта, ознакомьтеÑÑŒ Ñ Ñ€Ð°Ð·Ð´ÐµÐ»Ð¾Ð¼ [[doku>ru:install:upgrade|Обновление]]. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/ru/step0.txt b/sources/lib/plugins/upgrade/lang/ru/step0.txt deleted file mode 100644 index 0e81d27..0000000 --- a/sources/lib/plugins/upgrade/lang/ru/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Плагин будет автоматичеÑки обновлÑÑ‚ÑŒ вашу вики до поÑледней доÑтупной верÑии «Докувики». Перед продолжением вы должны прочеÑÑ‚ÑŒ [[doku>changes|журнал изменений]] (англ.), чтобы узнать о дополнительных шагах, которые нужно будет выполнить до или поÑле обновлениÑ. - -Чтобы Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки уÑтанавливалиÑÑŒ, PHP-процеÑÑу требуютÑÑ Ð¿Ñ€Ð°Ð²Ð° Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи файлов «Докувики». Плагин Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ налиие прав перед началом процеÑÑа обновлениÑ. - -Плагин не будет обновлÑÑ‚ÑŒ уже уÑтановленные плагины или шаблоны (темы оформлениÑ). - -Рекомендуем вам Ñоздать резервную копию вашей вики **до** обновлениÑ. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/tr/lang.php b/sources/lib/plugins/upgrade/lang/tr/lang.php deleted file mode 100644 index 01a6f77..0000000 --- a/sources/lib/plugins/upgrade/lang/tr/lang.php +++ /dev/null @@ -1,45 +0,0 @@ - - */ -$lang['menu'] = 'Wiki Yükseltme'; -$lang['vs_php'] = 'Yeni DokuWiki sürümü en azından PHP %s gerektirir, ancak siz %s kullanıyorsunuz. Devam etmeden önce PHP sürümünüzü yükseltmelisiniz.'; -$lang['vs_tgzno'] = 'DokuWiki\'nin en yeni sürümü tespit edilemedi.'; -$lang['vs_tgz'] = 'DokuWiki %s indirilmek için hazır.'; -$lang['vs_local'] = 'Kullanmakta olduÄŸunuz DokuWiki %s.'; -$lang['vs_localno'] = 'Kullandığınız sürümün tarihi tespit edilemedi. Elle yükseltme yapmanız tavsiye edilir.'; -$lang['vs_newer'] = 'Görünüşe göre en güncel kararlı sürümden daha yeni bir DokuWiki kullanıyorsunuz. Yükseltme yapmanız önerilmez.'; -$lang['vs_same'] = 'DokuWiki\'niz güncel. Yükseltmeye gerek yok.'; -$lang['vs_plugin'] = 'Yükseltme eklentisinin daha güncel bir sürümü mevcut (%s) Devam etmeden önce eklentiyi güncellemelisiniz.'; -$lang['vs_ssl'] = 'Görünüşe göre PHP oturumunuz SSL yayınlarını desteklemiyor. Gerekli dosyaların indirilmesi yüksek ihtimalle baÅŸarısız olacak. Elle güncelleme yapmanız önerilir.'; -$lang['dl_from'] = 'ArÅŸiv, %s adresinden indiriliyor...'; -$lang['dl_fail'] = 'Ä°ndirme baÅŸarısız oldu.'; -$lang['dl_done'] = 'Ä°ndirme tamamlandı (%s).'; -$lang['pk_extract'] = 'ArÅŸiv açılıyor...'; -$lang['pk_fail'] = 'ArÅŸivin açılması baÅŸarısız oldu.'; -$lang['pk_done'] = 'ArÅŸivin açıklası tamamlandı.'; -$lang['pk_version'] = 'DokuWiki %s , kurulmaya hazır (Åžu an kullanmakta olduÄŸunuz sürüm %s).'; -$lang['ck_start'] = 'Dosya izinleri kontrol ediliyor...'; -$lang['ck_done'] = 'Tüm dosyalar yazılabilir. Yükseltme için hazır.'; -$lang['ck_fail'] = 'Bazı dosyalar yazılabilir deÄŸil. Otomatik yükseltme mümkün deÄŸil.'; -$lang['cp_start'] = 'Dosyalar güncelleniyor...'; -$lang['cp_done'] = 'Tüm dosyalar güncellendi.'; -$lang['cp_fail'] = 'Offf! BirÅŸey yanlış gitti. En iyisi elle kontrol edin.'; -$lang['tv_noperm'] = '%s yazılabilir deÄŸil!'; -$lang['tv_upd'] = '%s güncellenecek.'; -$lang['tv_nocopy'] = '%s dosyası kopyalanamıyor!'; -$lang['tv_nodir'] = '%s klasörü oluÅŸturulamıyor!'; -$lang['tv_done'] = '%s güncellendi'; -$lang['rm_done'] = 'Çakışan %s silindi.'; -$lang['rm_fail'] = 'Çakışan %s silinemiyor. Lütfen elle silin!'; -$lang['finish'] = 'Yükseltme tamamlandı. Yeni DokuWiki\'nizin keyfini çıkarın'; -$lang['btn_continue'] = 'Devam et'; -$lang['btn_abort'] = 'Ä°ptal'; -$lang['step_version'] = 'Kontrol et'; -$lang['step_download'] = 'Ä°ndir'; -$lang['step_unpack'] = 'Doayaları çıkar'; -$lang['step_check'] = 'DoÄŸrula'; -$lang['step_upgrade'] = 'Kur'; diff --git a/sources/lib/plugins/upgrade/lang/tr/safemode.txt b/sources/lib/plugins/upgrade/lang/tr/safemode.txt deleted file mode 100644 index b589751..0000000 --- a/sources/lib/plugins/upgrade/lang/tr/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -Bu wiki safemod hack kullanacak ÅŸekilde yapılandırılmış. Ne yazık ki bu ÅŸartlar altında wikiyi otomatik olarak güvenli bir ÅŸekilde yükseltemeyiz. Lütfen [[doku>install:upgrade|wikinizin elle yükseltilmesi (Ä°ngilizce)]] sayfasındaki talimatları okuyun. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/tr/step0.txt b/sources/lib/plugins/upgrade/lang/tr/step0.txt deleted file mode 100644 index 9debf31..0000000 --- a/sources/lib/plugins/upgrade/lang/tr/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -Bu eklenti wikinizi otomatik olarak mecut olan en yeni DokuWiki sürümüne yükseltecek. Devam etmeden önce yapmanız gereken ek basamaklar olup olmadığını [[doku>changes|Changelog]] adresinden kontrol etmeniz önerilir. - -Otomatik yükseltmenin yapılabilmesi için PHP sürecinin DokuWiki dosyalarına yazma hakkı olmalıdır. Eklenti, yükseltme sürecine baÅŸlamadan önce gerekli dosya izinlerini kontrol edecektir. - -Bu eklenti, yüklü olan ÅŸablon ve eklentileri yükseltmeyecektir. - -Devam etmeden önce wikinizin bir yedeÄŸini oluÅŸturmanızı öneririz. \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/zh-tw/lang.php b/sources/lib/plugins/upgrade/lang/zh-tw/lang.php deleted file mode 100644 index 2116eaf..0000000 --- a/sources/lib/plugins/upgrade/lang/zh-tw/lang.php +++ /dev/null @@ -1,45 +0,0 @@ - - */ -$lang['menu'] = 'å‡ç´šWiki'; -$lang['vs_php'] = '新版的DokuWiki需è¦è‡³å°‘PHP %s，但你目å‰é‹è¡Œçš„是 %s。你應該è¦åœ¨å‡ç´šWikiå‰å…ˆå‡ç´šä½ çš„PHP。'; -$lang['vs_tgzno'] = '無法決定最新的DokuWiki版本。'; -$lang['vs_tgz'] = 'DokuWiki %s ç¾å·²å¯ä¾›ä¸‹è¼‰ã€‚'; -$lang['vs_local'] = 'ä½ ç›®å‰é‹è¡Œ DokuWiki %s'; -$lang['vs_localno'] = '沒辦法清楚知é“ä½ ç›®å‰é‹è¡Œçš„版本有多舊，建議手動å‡ç´šã€‚'; -$lang['vs_newer'] = '看起來你目å‰çš„ DokuWiki 版本比最新穩定版本還è¦æ–°ã€‚ä¸å»ºè­°å‡ç´šã€‚'; -$lang['vs_same'] = 'ä½ ç›®å‰çš„ DokuWiki 已經是最新的。沒必è¦å‡ç´šã€‚'; -$lang['vs_plugin'] = '有一個新的套件å‡ç´šç‰ˆæœ¬ (%s) å¯ä¾›ä½¿ç”¨ã€‚你應該在繼續å‰å…ˆå‡ç´šè©²å¤–掛。'; -$lang['vs_ssl'] = 'ä½ çš„ PHP 看起來ä¸æ”¯æ´ SSL 串æµåŠ å¯†ï¼Œä¸‹è¼‰è³‡æ–™å¾ˆæœ‰å¯èƒ½æœƒå¤±æ•—。請以手動å‡ç´šæ–¹å¼æ›¿ä»£ã€‚'; -$lang['dl_from'] = '從 %s 下載檔案中...'; -$lang['dl_fail'] = '下載失敗'; -$lang['dl_done'] = 'ä¸‹è¼‰å®Œæˆ (%s)'; -$lang['pk_extract'] = '解開檔案中...'; -$lang['pk_fail'] = '解開檔案失敗。'; -$lang['pk_done'] = '解開檔案完æˆã€‚'; -$lang['pk_version'] = 'DokuWiki版本 %s å·²æº–å‚™å¥½é€²è¡Œå®‰è£ (ä½ ç›®å‰é‹è¡Œçš„是 %s).'; -$lang['ck_start'] = '檢查權é™'; -$lang['ck_done'] = '所有檔案皆有寫入權é™ã€‚已準備好å‡ç´š'; -$lang['ck_fail'] = '部分檔案沒有寫入權é™ã€‚自動å‡ç´šæ˜¯ä¸å¯èƒ½çš„'; -$lang['cp_start'] = '更新檔案中...'; -$lang['cp_done'] = '所有檔案已更新完æˆ'; -$lang['cp_fail'] = '哦。有æ±è¥¿å‡ºéŒ¯äº†ã€‚最好手動檢查。'; -$lang['tv_noperm'] = '%s 沒有寫入權é™'; -$lang['tv_upd'] = '%s 將進行更新'; -$lang['tv_nocopy'] = '無法複製檔案 %sï¼'; -$lang['tv_nodir'] = '無法建立資料夾 %sï¼'; -$lang['tv_done'] = '%s 已更新'; -$lang['rm_done'] = '%sä¸å»ºè­°ä½¿ç”¨ä¸¦å·²åˆªé™¤'; -$lang['rm_fail'] = '沒辦法刪除該éºæ£„之 %s。請手動刪除之。'; -$lang['finish'] = 'å‡ç´šå®Œæˆã€‚開始享å—你全新的DokuWiki。'; -$lang['btn_continue'] = '繼續'; -$lang['btn_abort'] = '中止'; -$lang['step_version'] = '檢查'; -$lang['step_download'] = '下載'; -$lang['step_unpack'] = '解開'; -$lang['step_check'] = 'é©—è­‰'; -$lang['step_upgrade'] = '安è£'; diff --git a/sources/lib/plugins/upgrade/lang/zh-tw/safemode.txt b/sources/lib/plugins/upgrade/lang/zh-tw/safemode.txt deleted file mode 100644 index 847bdbd..0000000 --- a/sources/lib/plugins/upgrade/lang/zh-tw/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -這個Wiki被設定æˆä½¿ç”¨ safemode hack。在這個情æ³ä¸‹ï¼Œå¾ˆä¸å¹¸çš„我們沒辦法安全且自動的å‡ç´šwiki。請[[doku>install:upgrade|手動å‡ç´šä½ çš„wiki]]。 \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/zh-tw/step0.txt b/sources/lib/plugins/upgrade/lang/zh-tw/step0.txt deleted file mode 100644 index 385af37..0000000 --- a/sources/lib/plugins/upgrade/lang/zh-tw/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -這個套件會自動å‡ç´šä½ çš„DokuWiki至最新版本。在繼續進行之å‰ï¼Œä½ æ‡‰è©²å…ˆé–±è®€[[doku>changes|更新紀錄]]以確èªåœ¨æ›´æ–°ä¹‹å‰æ˜¯ä¸æ˜¯æœ‰ç”šéº¼é¡å¤–的步驟è¦é€²è¡Œã€‚ - -為了å…許自動更新，PHP程åºéœ€è¦Dokuwiki檔案的寫入權é™ã€‚該套件在å‡ç´šä¹‹å‰æœƒè‡ªå‹•æª¢æŸ¥å¿…è¦çš„檔案權é™ã€‚ - -這個套件ä¸æœƒå‡ç´šå…¶ä»–已安è£çš„套件或模æ¿ã€‚ - -我們建議你在你的wiki進行å‡ç´šä¹‹å‰å…ˆå‚™ä»½ã€‚ \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/zh/lang.php b/sources/lib/plugins/upgrade/lang/zh/lang.php deleted file mode 100644 index 621e742..0000000 --- a/sources/lib/plugins/upgrade/lang/zh/lang.php +++ /dev/null @@ -1,47 +0,0 @@ - - * @author Mike Gao <1524747399@qq.com> - */ -$lang['menu'] = 'å‡çº§Wiki'; -$lang['vs_php'] = 'æ–°çš„DokuWikiå‘行版è¦æ±‚PHP版本至少为 %s，但是您的PHP版本为 %s。å‡çº§æœ¬å‘行版之å‰æ‚¨åº”当先å‡çº§PHP版本ï¼'; -$lang['vs_tgzno'] = '无法确定DokuWiki的最新版本。'; -$lang['vs_tgz'] = 'DokuWiki %s å·²å¯ä¸‹è½½ã€‚'; -$lang['vs_local'] = '您正è¿è¡Œçš„是 DokuWiki %s。'; -$lang['vs_localno'] = '无法确定您所è¿è¡Œçš„版本，推è手动å‡çº§ã€‚'; -$lang['vs_newer'] = '看起æ¥æ‚¨æ­£è¿è¡Œçš„版本比最新稳定版更新。ä¸å»ºè®®å‡çº§ã€‚'; -$lang['vs_same'] = '您的DokuWiki已是最新版本。无需å‡çº§ã€‚'; -$lang['vs_plugin'] = '有æ’件需è¦æ›´æ–°(%s)，您应在继续之å‰å…ˆæ›´æ–°æ’件。'; -$lang['vs_ssl'] = '您的PHP看起æ¥ä¸æ”¯æŒSSLæµï¼Œå¿…需数æ®çš„下载å¯èƒ½ä¼šå¤±è´¥ã€‚请手动å‡çº§ã€‚'; -$lang['dl_from'] = '从 %s 下载压缩包...'; -$lang['dl_fail'] = '下载失败。'; -$lang['dl_done'] = 'ä¸‹è½½å®Œæˆ (%s)。'; -$lang['pk_extract'] = '解压中...'; -$lang['pk_fail'] = '解压失败。'; -$lang['pk_done'] = '解压完æˆã€‚'; -$lang['pk_version'] = 'DokuWiki %s å¯å®‰è£… (您正在è¿è¡Œ %s)。'; -$lang['ck_start'] = '检查文件æƒé™...'; -$lang['ck_done'] = '所有文件å¯å†™ã€‚å¯å‡çº§ã€‚'; -$lang['ck_fail'] = '一些文件ä¸å¯å†™ã€‚无法自动å‡çº§ã€‚'; -$lang['cp_start'] = '更新文件中...'; -$lang['cp_done'] = '所有文件已更新。'; -$lang['cp_fail'] = '啊哦。有些地方出了些问题。请手动检查。'; -$lang['tv_noperm'] = '%sä¸å¯å†™ï¼'; -$lang['tv_upd'] = '%s 将被更新。'; -$lang['tv_nocopy'] = '无法å¤åˆ¶%s文件ï¼'; -$lang['tv_nodir'] = '无法创建文件夹%sï¼'; -$lang['tv_done'] = 'æ›´æ–°%s'; -$lang['rm_done'] = '旧版%s已删除。'; -$lang['rm_fail'] = '无法删除旧版%s。请手动删除ï¼'; -$lang['finish'] = 'å‡çº§å®Œæˆã€‚请享å—新版DokuWikiï¼'; -$lang['btn_continue'] = '继续'; -$lang['btn_abort'] = '中止'; -$lang['step_version'] = '检查'; -$lang['step_download'] = '下载'; -$lang['step_unpack'] = '解压'; -$lang['step_check'] = '检验'; -$lang['step_upgrade'] = '安装'; -$lang['careful'] = '产生了错误ï¼ä½ ä¸åº”该继续ï¼'; diff --git a/sources/lib/plugins/upgrade/lang/zh/safemode.txt b/sources/lib/plugins/upgrade/lang/zh/safemode.txt deleted file mode 100644 index 8adf736..0000000 --- a/sources/lib/plugins/upgrade/lang/zh/safemode.txt +++ /dev/null @@ -1 +0,0 @@ -本Wiki被设为使用安全模å¼ã€‚在此状æ€ä¸‹æˆ‘们无法安全å‡çº§Wiki。请 [[doku>install:upgrade|手动å‡çº§æ‚¨çš„Wiki]]。 \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/lang/zh/step0.txt b/sources/lib/plugins/upgrade/lang/zh/step0.txt deleted file mode 100644 index f26ecf4..0000000 --- a/sources/lib/plugins/upgrade/lang/zh/step0.txt +++ /dev/null @@ -1,7 +0,0 @@ -本æ’件会自动å‡çº§æ‚¨çš„Wiki到最新DokuWiki版本。在继续之å‰ï¼Œæ‚¨åº”当阅读[[doku>changes|更新说明]]æ¥äº†è§£æ˜¯å¦æœ‰é¢å¤–的步骤需è¦æ‚¨åœ¨å‡çº§å‰åŽè¿›è¡Œã€‚ - -为了能够自动å‡çº§ï¼ŒPHP进程需è¦æŸäº›DokuWiki文件的写入æƒé™ã€‚æ’件将在开始å‡çº§ä¹‹å‰æ£€æŸ¥å¿…需文件的æƒé™ã€‚ - -本æ’件ä¸ä¼šå‡çº§ä»»ä½•å·²å®‰è£…çš„æ’件或模æ¿ã€‚ - -我们建议您在继续之å‰å…ˆå¤‡ä»½Wikiæ•°æ®ã€‚ \ No newline at end of file diff --git a/sources/lib/plugins/upgrade/plugin.info.txt b/sources/lib/plugins/upgrade/plugin.info.txt deleted file mode 100644 index 7b7c334..0000000 --- a/sources/lib/plugins/upgrade/plugin.info.txt +++ /dev/null @@ -1,7 +0,0 @@ -base upgrade -author Andreas Gohr -email andi@splitbrain.org -date 2015-08-24 -name DokuWiki Upgrade Plugin -desc Automatically upgrade your DokuWiki install to the most recent stable release -url http://www.dokuwiki.org/plugin:upgrade diff --git a/sources/lib/plugins/upgrade/style.css b/sources/lib/plugins/upgrade/style.css deleted file mode 100644 index 731b11c..0000000 --- a/sources/lib/plugins/upgrade/style.css +++ /dev/null @@ -1,97 +0,0 @@ -#plugin__upgrade { - margin: 0 auto; - height: 20em; - overflow: auto; -} - -#plugin__upgrade_form { - display: block; - overflow: auto; - margin: 1em; - font-size: 120%; -} - -#plugin__upgrade_careful { - float: right; - text-align: right; - margin-right: 1em; - color: red; -} - -#plugin__upgrade_form { - clear: right; -} - -#plugin__upgrade_form button { - float: right; - margin-left: 0.5em; -} - -#plugin__upgrade_form button.careful { - opacity: 0.5; -} - -/* based on http://cssdeck.com/labs/progress-bar */ - -#plugin__upgrade_meter { - height: 20px; - position: relative; - margin: 3em 1em 1em 1em; -} - -#plugin__upgrade_meter ol { - margin: 0; - padding: 0; - display: block; - height: 100%; - border-radius: 10px; - background-color: #ddd; - position: relative; - list-style: none; -} -#plugin__upgrade_meter ol li { - float: left; - margin: 0; - padding: 0; - text-align: right; - width: 19%; - position: relative; - border-radius: 10px; -} - -#plugin__upgrade_meter ol li span{ - right:-0.5em; - display: block; - text-align: center; -} -#plugin__upgrade_meter ol li .step { - top: -0.4em; - padding: .2em 0; - border: 3px solid #ddd; - z-index: 99; - font-size: 1.25em; - color: #ddd; - width: 1.5em; - font-weight: 700; - position: absolute; - background-color: #fff; - border-radius: 50%; -} -#plugin__upgrade_meter ol li .stage { - color: #fff; - font-weight: 700; -} - -#plugin__upgrade_meter ol li.active { - height: 20px; - background: #aaa; -} - -#plugin__upgrade_meter ol li.active span.stage { - color: #000; -} - -#plugin__upgrade_meter ol li.active span.step{ - color: #000; - border: 3px solid __link__; -} diff --git a/sources/lib/plugins/usermanager/admin.php b/sources/lib/plugins/usermanager/admin.php index 86823ee..6d9bf3b 100644 --- a/sources/lib/plugins/usermanager/admin.php +++ b/sources/lib/plugins/usermanager/admin.php @@ -242,7 +242,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" "); ptln(" "); ptln(" "); - ptln(" "); + ptln(" "); ptln(" "); ptln(" "); ptln(" "); @@ -329,12 +329,12 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { ptln(" ",$indent); ptln(" ",$indent); - $this->_htmlInputField($cmd."_userid", "userid", $this->lang["user_id"], $user, $this->_auth->canDo("modLogin"), $indent+6); - $this->_htmlInputField($cmd."_userpass", "userpass", $this->lang["user_pass"], "", $this->_auth->canDo("modPass"), $indent+6); - $this->_htmlInputField($cmd."_userpass2", "userpass2", $lang["passchk"], "", $this->_auth->canDo("modPass"), $indent+6); - $this->_htmlInputField($cmd."_username", "username", $this->lang["user_name"], $name, $this->_auth->canDo("modName"), $indent+6); - $this->_htmlInputField($cmd."_usermail", "usermail", $this->lang["user_mail"], $mail, $this->_auth->canDo("modMail"), $indent+6); - $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6); + $this->_htmlInputField($cmd."_userid", "userid", $this->lang["user_id"], $user, $this->_auth->canDo("modLogin"), true, $indent+6); + $this->_htmlInputField($cmd."_userpass", "userpass", $this->lang["user_pass"], "", $this->_auth->canDo("modPass"), false, $indent+6); + $this->_htmlInputField($cmd."_userpass2", "userpass2", $lang["passchk"], "", $this->_auth->canDo("modPass"), false, $indent+6); + $this->_htmlInputField($cmd."_username", "username", $this->lang["user_name"], $name, $this->_auth->canDo("modName"), true, $indent+6); + $this->_htmlInputField($cmd."_usermail", "usermail", $this->lang["user_mail"], $mail, $this->_auth->canDo("modMail"), true, $indent+6); + $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"), false, $indent+6); if ($this->_auth->canDo("modPass")) { if ($cmd == 'add') { @@ -385,9 +385,10 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { * @param string $label * @param string $value * @param bool $cando whether auth backend is capable to do this action + * @param bool $required is this field required? * @param int $indent */ - protected function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) { + protected function _htmlInputField($id, $name, $label, $value, $cando, $required, $indent=0) { $class = $cando ? '' : ' class="disabled"'; echo str_pad('',$indent); @@ -407,7 +408,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { echo ""; echo ""; if($cando){ - echo ""; + $req = ''; + if($required) $req = 'required="required"'; + echo ""; }else{ echo ""; echo ""; @@ -518,16 +521,20 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { $pass = auth_pwgen($user); } else { msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_missing_pass'], -1); return false; } } else { if (!$this->_verifyPassword($pass,$passconfirm)) { + msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_pass_not_identical'], -1); return false; } } } else { if (!empty($pass)){ msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_modPass_disabled'], -1); return false; } } @@ -535,10 +542,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($this->_auth->canDo('modName')){ if (empty($name)){ msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_name_missing'], -1); return false; } } else { if (!empty($name)){ + msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_modName_disabled'], -1); return false; } } @@ -546,10 +556,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if ($this->_auth->canDo('modMail')){ if (empty($mail)){ msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_mail_missing'], -1); return false; } } else { if (!empty($mail)){ + msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_modMail_disabled'], -1); return false; } } @@ -563,6 +576,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { } } else { msg($this->lang['add_fail'], -1); + msg($this->lang['addUser_error_create_event_failed'], -1); } return $ok; @@ -928,7 +942,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { if (!utf8_check($csv)) { $csv = utf8_encode($csv); } - $raw = $this->_getcsv($csv); + $raw = str_getcsv($csv); $error = ''; // clean out any errors from the previous line // data checks... if (1 == ++$line) { @@ -1066,37 +1080,4 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin { protected function _isUploadedFile($file) { return is_uploaded_file($file); } - - /** - * wrapper for str_getcsv() to simplify maintaining compatibility with php 5.2 - * - * @deprecated remove when dokuwiki php requirement increases to 5.3+ - * also associated unit test & mock access method - * - * @param string $csv string to parse - * @return array - */ - protected function _getcsv($csv) { - return function_exists('str_getcsv') ? str_getcsv($csv) : $this->str_getcsv($csv); - } - - /** - * replacement str_getcsv() function for php < 5.3 - * loosely based on www.php.net/str_getcsv#88311 - * - * @deprecated remove when dokuwiki php requirement increases to 5.3+ - * - * @param string $str string to parse - * @return array - */ - protected function str_getcsv($str) { - $fp = fopen("php://temp/maxmemory:1048576", 'r+'); // 1MiB - fputs($fp, $str); - rewind($fp); - - $data = fgetcsv($fp); - - fclose($fp); - return $data; - } } diff --git a/sources/lib/plugins/usermanager/lang/cs/lang.php b/sources/lib/plugins/usermanager/lang/cs/lang.php index 6130fcc..3cd42ef 100644 --- a/sources/lib/plugins/usermanager/lang/cs/lang.php +++ b/sources/lib/plugins/usermanager/lang/cs/lang.php @@ -76,3 +76,11 @@ $lang['import_error_readfail'] = 'Import selhal. Nelze Äíst nahraný soubor.'; $lang['import_error_create'] = 'Nelze vytvoÅ™it uživatele'; $lang['import_notify_fail'] = 'Importovanému uživateli %s s e-mailem %s nemohlo být zasláno upozornÄ›ní.'; $lang['import_downloadfailures'] = 'Stáhnout chyby pro nápravu jako CVS'; +$lang['addUser_error_missing_pass'] = 'BuÄ prosím nastavte heslo nebo aktivujte upozorňování uživatel aby fungovalo vytváření hesel.'; +$lang['addUser_error_pass_not_identical'] = 'Zadaná hesla nebyla shodná.'; +$lang['addUser_error_modPass_disabled'] = 'ZmÄ›na hesel je momentálnÄ› zákázána.'; +$lang['addUser_error_name_missing'] = 'Zadejte prosím jméno nového uživatele.'; +$lang['addUser_error_modName_disabled'] = 'ZmÄ›na jmen je momentálnÄ› zákázána.'; +$lang['addUser_error_mail_missing'] = 'Zadejte prosím emailovou adresu nového uživatele.'; +$lang['addUser_error_modMail_disabled'] = 'ZmÄ›na emailové adresy je momentálnÄ› zákázána.'; +$lang['addUser_error_create_event_failed'] = 'Zásuvný modul zabránil pÅ™idání nového uživatele. Pro více informací si prohlédnÄ›te další možné zprávy.'; diff --git a/sources/lib/plugins/usermanager/lang/cy/add.txt b/sources/lib/plugins/usermanager/lang/cy/add.txt new file mode 100644 index 0000000..c804e53 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/add.txt @@ -0,0 +1 @@ +===== Ychwanegu defnyddiwr ===== diff --git a/sources/lib/plugins/usermanager/lang/cy/delete.txt b/sources/lib/plugins/usermanager/lang/cy/delete.txt new file mode 100644 index 0000000..a81f3a9 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/delete.txt @@ -0,0 +1 @@ +===== Dileu defnyddiwr ===== diff --git a/sources/lib/plugins/usermanager/lang/cy/edit.txt b/sources/lib/plugins/usermanager/lang/cy/edit.txt new file mode 100644 index 0000000..3fcb6d1 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/edit.txt @@ -0,0 +1 @@ +===== Golygu defnyddiwr ===== diff --git a/sources/lib/plugins/usermanager/lang/cy/import.txt b/sources/lib/plugins/usermanager/lang/cy/import.txt new file mode 100644 index 0000000..211e8cf --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/import.txt @@ -0,0 +1,9 @@ +===== Swmp Mewnforio Defnyddwyr ===== + +Mae hwn angen ffeil CSV o ddefnyddwyr gydag o leiaf pedair colofn. +Mae'n rhaid i'r colofnau gynnwys, mewn trefn: id-defnyddiwr, enw llawn, cyfeiriad ebost a grwpiau. +Dylai'r meysydd CSV gael eu gwahanu gan goma (,) a llinynnau eu hamffinio gan ddyfynodau (%%""%%). Gall ôl-slaes (\) ei ddefnyddio ar gyfer glanhau (escaping). +Am enghraifft o ffeil addas, ceisiwch y swyddogaeth "Allforio Defnyddwyr" uchod. +Caiff id-defnyddiwr dyblygiedig eu hanwybyddu. + +Generadwyd cyfrinair a'i ebostio i bob defnyddiwr sydd wedi'i fewnforio'n llwyddiannus. diff --git a/sources/lib/plugins/usermanager/lang/cy/intro.txt b/sources/lib/plugins/usermanager/lang/cy/intro.txt new file mode 100644 index 0000000..a381a30 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/intro.txt @@ -0,0 +1 @@ +====== Rheolwr Defnyddwyr ====== diff --git a/sources/lib/plugins/usermanager/lang/cy/lang.php b/sources/lib/plugins/usermanager/lang/cy/lang.php new file mode 100644 index 0000000..5120d39 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/lang.php @@ -0,0 +1,87 @@ + + * @author Alan Davies + */ + +$lang['menu'] = 'Rheolwr Defnyddwyr'; + +// custom language strings for the plugin +$lang['noauth'] = '(dilysiad defnddwyr ddim ar gael)'; +$lang['nosupport'] = '(rheolaeth defnyddwyr heb ei chynnal)'; + +$lang['badauth'] = 'mecanwaith dilysu annilys'; // should never be displayed! + +$lang['user_id'] = 'Defnyddiwr'; +$lang['user_pass'] = 'Cyfrinair'; +$lang['user_name'] = 'Enw Cywir'; +$lang['user_mail'] = 'Ebost'; +$lang['user_groups'] = 'Grwpiau'; + +$lang['field'] = 'Maes'; +$lang['value'] = 'Gwerth'; +$lang['add'] = 'Ychwanegu'; +$lang['delete'] = 'Dileu'; +$lang['delete_selected'] = 'Dileu\'r Dewisiadau'; +$lang['edit'] = 'Golygu'; +$lang['edit_prompt'] = 'Golygu\'r defnyddiwr hwn'; +$lang['modify'] = 'Cadw Newidiadau'; +$lang['search'] = 'Chwilio'; +$lang['search_prompt'] = 'Perfformio chwiliad'; +$lang['clear'] = 'Ailosod Hidlydd Chwilio'; +$lang['filter'] = 'Hidlo'; +$lang['export_all'] = 'Allforio Pob Defnyddiwr (CSV)'; +$lang['export_filtered'] = 'Allforio Rhestr Defnyddwyr wedi\'u Hidlo (CSV)'; +$lang['import'] = 'Mewnforio Defnyddwyr Newydd'; +$lang['line'] = 'Llinell rhif'; +$lang['error'] = 'Gwallneges'; + +$lang['summary'] = 'Yn dangos %1$d-%2$d defnyddiwr allan o %3$d wedi\'u darganfod. %4$d defnyddiwr yn gyfan gwbl.'; +$lang['nonefound'] = 'Dim defnyddwyr wedi\'u darganfod. %d defnyddiwr yn gyfan gwbl.'; +$lang['delete_ok'] = 'Dilëwyd %d defnyddiwr'; +$lang['delete_fail'] = 'Dileu %d wedi methu.'; +$lang['update_ok'] = 'Diweddarwyd y defnyddiwr yn llwyddiannus'; +$lang['update_fail'] = 'Methodd diweddariad y defnyddiwr'; +$lang['update_exists'] = 'Methodd newid y defnyddair, mae\'r defnyddair hwnnw (%s) yn bodoli eisoes (caiff pob newid arall ei gyflwyno).'; + +$lang['start'] = 'dechrau'; +$lang['prev'] = 'blaenorol'; +$lang['next'] = 'nesaf'; +$lang['last'] = 'diwethaf'; + +// added after 2006-03-09 release +$lang['edit_usermissing'] = 'Methu darganfod y defnyddiwr hwn. Efallai bod y defnyddair hwn wedi\'i ddileu neu wedi\'i newid mewn man arall.'; +$lang['user_notify'] = 'Hysbysu defnyddiwr'; +$lang['note_notify'] = 'Bydd ebyst hysbysu eu hanfon dim ond os ydy defnyddiwr yn derbyn cyfrinair newydd.'; +$lang['note_group'] = 'Bydd defnyddwyr newydd yn cael eu hychwanegu i\'r grŵp diofyn (%s) os na chaiff grŵp ei enwi.'; +$lang['note_pass'] = 'Caiff y cyfrinair ei generadu\'n awtomatig os caiff y maes ei adael yn wag a bod hysbysu\'r defnyddiwr wedi\'i alluogi.'; +$lang['add_ok'] = 'Ychwanegwyd y defnyddiwr yn llwyddiannus'; +$lang['add_fail'] = 'Methodd ychwanegu defnyddiwr'; +$lang['notify_ok'] = 'Anfonwyd yr ebost hysbysu'; +$lang['notify_fail'] = 'Doedd dim modd anfon yr ebost hysbysu'; + +// import & errors +$lang['import_userlistcsv'] = 'Ffeil rhestr defnyddwyr (CSV): '; +$lang['import_header'] = 'Mewnforiad Diweddaraf - Methiannau'; +$lang['import_success_count'] = 'Mewnforio Defnyddwyr: darganfuwyd %d defnyddiwr, mewnforiwyd %d yn llwyddiannus.'; +$lang['import_failure_count'] = 'Mewnforio Defnyddwyr: methodd %d. Rhestrwyd y methiannau isod.'; +$lang['import_error_fields'] = "Meysydd annigonol, darganfuwyd %d, angen 4."; +$lang['import_error_baduserid'] = "Id-defnyddiwr ar goll"; +$lang['import_error_badname'] = 'Enw gwael'; +$lang['import_error_badmail'] = 'Cyfeiriad ebost gwael'; +$lang['import_error_upload'] = 'Methodd y Mewnforiad. Doedd dim modd lanlwytho\'r ffeil neu roedd yn wag.'; +$lang['import_error_readfail'] = 'Methodd y Mewnforiad. Methu â darllen y ffeil a lanlwythwyd.'; +$lang['import_error_create'] = 'Methu â chreu\'r defnyddiwr'; +$lang['import_notify_fail'] = 'Doedd dim modd anfon neges hysbysu i\'r defyddiwr a fewnforiwyd, %s gydag ebost %s.'; +$lang['import_downloadfailures'] = 'Lawlwytho Methiannau fel CSV er mwyn cywiro'; + +$lang['addUser_error_missing_pass'] = 'Gosodwch gyfrinair neu trowch hysbysu defnyddwyr ymlaen i alluogi generadu cyfrineiriau.'; +$lang['addUser_error_pass_not_identical'] = '\'Dyw\'r cyfrineiriau hyn ddim yn cydweddu.'; +$lang['addUser_error_modPass_disabled'] = 'Mae newid cyfrineiriau wedi\'i analluogi\'n bresennol.'; +$lang['addUser_error_name_missing'] = 'Rhowch enw ar gyfer y defnyddiwr newydd.'; +$lang['addUser_error_modName_disabled'] = 'Mae newid enwau wedi\'i analluogi\'n bresennol.'; +$lang['addUser_error_mail_missing'] = 'Rhowch gyfeiriad ebost ar gyfer y defnyddiwr newydd.'; +$lang['addUser_error_modMail_disabled'] = 'Mae newid cyfeiriadau ebost wedi\'i analluogi\'n bresennol.'; +$lang['addUser_error_create_event_failed'] = 'Mae ategyn wedi atal ychwanegu\'r defnyddiwr newydd. Adolygwch negeseuon ychwanegol bosib am wybodaeth bellach.'; diff --git a/sources/lib/plugins/usermanager/lang/cy/list.txt b/sources/lib/plugins/usermanager/lang/cy/list.txt new file mode 100644 index 0000000..6531774 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/cy/list.txt @@ -0,0 +1 @@ +===== Rhestr Defnyddwyr ===== diff --git a/sources/lib/plugins/usermanager/lang/da/lang.php b/sources/lib/plugins/usermanager/lang/da/lang.php index 795024f..1cb4a90 100644 --- a/sources/lib/plugins/usermanager/lang/da/lang.php +++ b/sources/lib/plugins/usermanager/lang/da/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Lars Næsbye Christensen * @author Kalle Sommer Nielsen * @author Esben Laursen diff --git a/sources/lib/plugins/usermanager/lang/de/lang.php b/sources/lib/plugins/usermanager/lang/de/lang.php index 4b297b0..a388eb5 100644 --- a/sources/lib/plugins/usermanager/lang/de/lang.php +++ b/sources/lib/plugins/usermanager/lang/de/lang.php @@ -22,6 +22,8 @@ * @author christian studer * @author Ben Fey * @author Jonas Gröger + * @author Uwe Benzelrath + * @author ms */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; @@ -82,3 +84,10 @@ $lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei $lang['import_error_create'] = 'User konnte nicht angelegt werden'; $lang['import_notify_fail'] = 'Notifikation konnte nicht an den importierten Benutzer %s (E-Mail: %s) gesendet werden.'; $lang['import_downloadfailures'] = 'Fehler als CSV-Datei zur Korrektur herunterladen'; +$lang['addUser_error_pass_not_identical'] = 'Die eingegebenen Passwörter stimmen nicht überein.'; +$lang['addUser_error_modPass_disabled'] = 'Das bearbeiten von Passwörtern ist momentan deaktiviert'; +$lang['addUser_error_name_missing'] = 'Bitte geben sie den Namen des neuen Benutzer ein.'; +$lang['addUser_error_modName_disabled'] = 'Das bearbeiten von Namen ist momentan deaktiviert.'; +$lang['addUser_error_mail_missing'] = 'Bitte geben sie die E-Mail-Adresse des neuen Benutzer ein.'; +$lang['addUser_error_modMail_disabled'] = 'Das bearbeiten von E-Mailadressen ist momentan deaktiviert.'; +$lang['addUser_error_create_event_failed'] = 'Ein Plug-in hat das hinzufügen des neuen Benutzers verhindert. Für weitere Informationen, sehen Sie sich mögliche andere Meldungen an.'; diff --git a/sources/lib/plugins/usermanager/lang/en/lang.php b/sources/lib/plugins/usermanager/lang/en/lang.php index b55ecc9..5f47673 100644 --- a/sources/lib/plugins/usermanager/lang/en/lang.php +++ b/sources/lib/plugins/usermanager/lang/en/lang.php @@ -76,3 +76,11 @@ $lang['import_error_create'] = 'Unable to create the user'; $lang['import_notify_fail'] = 'Notification message could not be sent for imported user, %s with email %s.'; $lang['import_downloadfailures'] = 'Download Failures as CSV for correction'; +$lang['addUser_error_missing_pass'] = 'Please either set a password or activate user notification to enable password generation.'; +$lang['addUser_error_pass_not_identical'] = 'The entered passwords were not identical.'; +$lang['addUser_error_modPass_disabled'] = 'Modifing passwords is currently disabled'; +$lang['addUser_error_name_missing'] = 'Please enter a name for the new user.'; +$lang['addUser_error_modName_disabled'] = 'Modifing names is currently disabled.'; +$lang['addUser_error_mail_missing'] = 'Please enter an Email-Adress for the new user.'; +$lang['addUser_error_modMail_disabled'] = 'Modifing Email-Adresses is currently disabled.'; +$lang['addUser_error_create_event_failed'] = 'A plugin prevented the new user being added. Review possible other messages for more information.'; diff --git a/sources/lib/plugins/usermanager/lang/es/lang.php b/sources/lib/plugins/usermanager/lang/es/lang.php index 284d50f..6f7bb93 100644 --- a/sources/lib/plugins/usermanager/lang/es/lang.php +++ b/sources/lib/plugins/usermanager/lang/es/lang.php @@ -28,6 +28,8 @@ * @author Antonio Castilla * @author Jonathan Hernández * @author Domingo Redal + * @author solohazlo + * @author David Roy */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; @@ -88,3 +90,10 @@ $lang['import_error_readfail'] = 'Error al importar. No se puede leer el archivo $lang['import_error_create'] = 'No se puede crear el usuario'; $lang['import_notify_fail'] = 'Mensaje de notificación no se ha podido enviar por el usuario importado,%s con el email %s.'; $lang['import_downloadfailures'] = 'Descarga errores en archivo CSV para la corrección'; +$lang['addUser_error_pass_not_identical'] = 'Las contraseñas no coinciden'; +$lang['addUser_error_modPass_disabled'] = 'Está desactivado por ahora modificar contraseñas.'; +$lang['addUser_error_name_missing'] = 'Por favor teclea el nombre del nuevo usuario.'; +$lang['addUser_error_modName_disabled'] = 'La modificación de nombres está desactivada.'; +$lang['addUser_error_mail_missing'] = 'Por favor indica el email del nuevo usuario.'; +$lang['addUser_error_modMail_disabled'] = 'La modificación de email está desactivada.'; +$lang['addUser_error_create_event_failed'] = 'Un plugin impidió que se añadiera el nuevo usuario. Revisa los otros mensajes para obtener más detalles.'; diff --git a/sources/lib/plugins/usermanager/lang/fa/import.txt b/sources/lib/plugins/usermanager/lang/fa/import.txt new file mode 100644 index 0000000..562a28a --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/fa/import.txt @@ -0,0 +1,6 @@ + ===== اضاÙÙ‡ کردن کاربر ===== + +برای اینکار یک Ùایل CSV با حداقل چهار ستون لازم است. ستون‌ها به ترتیب باید شامل id کاربر، نام کامل کاربر، آدرس ایمیل Ùˆ گروه‌های کاربری او باشند. +خانه‌های جدول CSV باید به وسیلهٔ کاما (,) Ùˆ رشته‌ها با علامت نقل قول (%%""%%) از هم جدا شوند. علامت واکج‌خط (\) می‌تواند برای غیرÙعال کردن معنای کاراکترها استÙاده شود. برای دیدن یک نمونه از Ùایل مناسب، از گزینهٔ "خروجی کاربران" در بالا استÙاده کنید. id های تکراری در جدول در نظر گرÙته نمی‌شوند. + +به ازای هر کاربری Ú©Ù‡ با موÙقیت اضاÙÙ‡ شود یک رمز تولید Ùˆ ایمیل می‌شود. \ No newline at end of file diff --git a/sources/lib/plugins/usermanager/lang/fa/lang.php b/sources/lib/plugins/usermanager/lang/fa/lang.php index bb2505a..cfa14f2 100644 --- a/sources/lib/plugins/usermanager/lang/fa/lang.php +++ b/sources/lib/plugins/usermanager/lang/fa/lang.php @@ -12,6 +12,7 @@ * @author AmirH Hassaneini * @author Hamid * @author Mohamad Mehdi Habibi + * @author Masoud Sadrnezhaad */ $lang['menu'] = 'مدیریت کاربر'; $lang['noauth'] = '(معتبرسازی کاربر ممکن نیست)'; @@ -34,7 +35,10 @@ $lang['search'] = 'جستجو'; $lang['search_prompt'] = 'انجام جستجو'; $lang['clear'] = 'بازنویسی Ùیلترهای جستجو'; $lang['filter'] = 'Ùیلتر'; +$lang['export_all'] = 'خروجی گرÙتن از تمام کاربران (CSV):'; +$lang['export_filtered'] = 'خروجی لیست Ùیلتر شده کاربران (CSV):'; $lang['import'] = 'ورود کاربران جدید'; +$lang['line'] = 'شماره خط.'; $lang['error'] = 'متن خطا'; $lang['summary'] = 'نمایش کاربر %1$d-%2$d از %3$d. در Ú©Ù„ %4$d کاربر.'; $lang['nonefound'] = 'هیچ کاربری یاÙت نشد. در Ú©Ù„ %d کاربر.'; @@ -56,3 +60,24 @@ $lang['add_ok'] = 'کاربر با موÙقیت اÙزوده شد $lang['add_fail'] = 'اÙزودن کاربر با مشکل مواجه شد'; $lang['notify_ok'] = 'ایمیل آگاهی‌دهنده ارسال شد'; $lang['notify_fail'] = 'ارسال ایمیل آگاهی‌دهنده با مشکل مواجه شد'; +$lang['import_userlistcsv'] = 'Ùایل لیست کاربران (CSV):'; +$lang['import_header'] = 'آخرین ایمپورت - خطا'; +$lang['import_success_count'] = 'ایمپورت کاربران: %d کاربر پیدا شد، %d با موÙقیت وارد شد.'; +$lang['import_failure_count'] = 'ایمپورت کاربران: %d ناموÙÙ‚. موارد ناموÙÙ‚ در پایین Ùهرست شده.'; +$lang['import_error_fields'] = 'Ùیلدهای ناکاÙÛŒ. %d تا پیدا شد ولی Û´ تا لازم است.'; +$lang['import_error_baduserid'] = 'id کاربر وارد نشده'; +$lang['import_error_badname'] = 'نام نامناسب'; +$lang['import_error_badmail'] = 'ایمیل نامناسب'; +$lang['import_error_upload'] = 'ایمپورت ناموÙÙ‚. امکان ایمپورت Ùایل csv وجود ندارد یا خالی است.'; +$lang['import_error_readfail'] = 'ایمپورت ناموÙÙ‚. امکان خواندن Ùایل آپلود شده وجود ندارد.'; +$lang['import_error_create'] = 'امکان ساخت کاربر وجود ندارد.'; +$lang['import_notify_fail'] = 'امکان ارسال پیغام آگاهی‌رسان برای کاربر ایمپورت شده وجود ندارد، %s با ایمیل %s.'; +$lang['import_downloadfailures'] = 'دانلود خطاها به صورت CSV برای اصلاح'; +$lang['addUser_error_missing_pass'] = 'لطÙا یک پسورد وارد کنید یا آگاهی‌رسان کاربر را Ùعال کنید تا امکان تولید پسورد ایجاد شود'; +$lang['addUser_error_pass_not_identical'] = 'پسورد وارد شده معتبر نیست.'; +$lang['addUser_error_modPass_disabled'] = 'پسوردهای تغییریاÙتنی غیرÙعال است.'; +$lang['addUser_error_name_missing'] = 'لطÙا یک نام برای کاربر جدید وارد کنید.'; +$lang['addUser_error_modName_disabled'] = 'نام‌های تغییریاÙتنی غیر Ùعال است.'; +$lang['addUser_error_mail_missing'] = 'لطÙا یک نشانی ایمیل برای کاربر جدید وارد نمایید.'; +$lang['addUser_error_modMail_disabled'] = 'ایمیل‌های تغییریاÙتنی غیر Ùعال است.'; +$lang['addUser_error_create_event_failed'] = 'اÙزونه از اضاÙÙ‡ شدن کاربر جدید جلوگیری کرد. برای اطلاعات بیشتر پیغام‌های احتمالی دیگر را مطالعه کنید.'; diff --git a/sources/lib/plugins/usermanager/lang/fr/lang.php b/sources/lib/plugins/usermanager/lang/fr/lang.php index dd0e64f..eef81c6 100644 --- a/sources/lib/plugins/usermanager/lang/fr/lang.php +++ b/sources/lib/plugins/usermanager/lang/fr/lang.php @@ -15,15 +15,15 @@ * @author Florian Gaub * @author Samuel Dorsaz samuel.dorsaz@novelion.net * @author Johan Guilbaud - * @author schplurtz@laposte.net * @author skimpax@gmail.com * @author Yannick Aure * @author Olivier DUVAL * @author Anael Mobilia * @author Bruno Veilleux * @author Antoine Turmel - * @author schplurtz * @author Jérôme Brandt + * @author Schplurtz le Déboulonné + * @author Olivier Humbert */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification de l\'utilisateur non disponible)'; @@ -84,3 +84,11 @@ $lang['import_error_readfail'] = 'L\'import a échoué. Impossible de lire le fi $lang['import_error_create'] = 'Impossible de créer l\'utilisateur'; $lang['import_notify_fail'] = 'Impossible d\'expédier une notification à l\'utilisateur importé %s, adresse %s.'; $lang['import_downloadfailures'] = 'Télécharger les erreurs au format CSV pour correction'; +$lang['addUser_error_missing_pass'] = 'Veuillez saisir un mot de passe ou activer la notification à l\'utilisateur pour permettre la génération d\'un mot de passe.'; +$lang['addUser_error_pass_not_identical'] = 'Les mots de passe saisis diffèrent.'; +$lang['addUser_error_modPass_disabled'] = 'La modification des mots de passe est actuellement désactivée.'; +$lang['addUser_error_name_missing'] = 'Veuillez saisir un nom pour le nouvel utilisateur.'; +$lang['addUser_error_modName_disabled'] = 'La modification des noms est actuellement désactivée.'; +$lang['addUser_error_mail_missing'] = 'Veuillez saisir une adressse de courriel pour le nouvel utilisateur.'; +$lang['addUser_error_modMail_disabled'] = 'La modification des adresses de courriel est actuellement désactivée.'; +$lang['addUser_error_create_event_failed'] = 'Un greffon a empêché l\'ajout du nouvel utilisateur. Examinez les autres messages potentiels pour obtenir de plus amples informations.'; diff --git a/sources/lib/plugins/usermanager/lang/hr/lang.php b/sources/lib/plugins/usermanager/lang/hr/lang.php index a71afb6..280c5b2 100644 --- a/sources/lib/plugins/usermanager/lang/hr/lang.php +++ b/sources/lib/plugins/usermanager/lang/hr/lang.php @@ -64,3 +64,11 @@ $lang['import_error_readfail'] = 'Uvoz neuspjeÅ¡an. Ne mogu proÄitati uÄitanu $lang['import_error_create'] = 'Ne mogu kreirati korisnika'; $lang['import_notify_fail'] = 'Obavijest uvezenom korisniku %s nije moguće poslati na adresu e-poÅ¡te %s.'; $lang['import_downloadfailures'] = 'Preuzmi greÅ¡ke kao CSV za ispravak'; +$lang['addUser_error_missing_pass'] = 'Molim ili postavite lozinku ili aktivirajte obavijest korisniku za omogućavanje generiranje lozinke.'; +$lang['addUser_error_pass_not_identical'] = 'Unesene lozinke nisu identiÄne.'; +$lang['addUser_error_modPass_disabled'] = 'Izmjena lozinke je trenutno onemogućena.'; +$lang['addUser_error_name_missing'] = 'Molim unesite ime novog korisnika.'; +$lang['addUser_error_modName_disabled'] = 'Izmjena imena je trenutno onemogućena.'; +$lang['addUser_error_mail_missing'] = 'Molim unesite adresu epoÅ¡te za novog korisnika.'; +$lang['addUser_error_modMail_disabled'] = 'Izmjena adrese epoÅ¡te je trenutno onemogućena.'; +$lang['addUser_error_create_event_failed'] = 'Dodatak je sprijeÄio dodavanje novog korisnika. Pogledajte eventualne ostale poruke za viÅ¡e informacija.'; diff --git a/sources/lib/plugins/usermanager/lang/it/import.txt b/sources/lib/plugins/usermanager/lang/it/import.txt new file mode 100644 index 0000000..ed7b000 --- /dev/null +++ b/sources/lib/plugins/usermanager/lang/it/import.txt @@ -0,0 +1,9 @@ +===== Importazione Bulk di utente ===== + +Richiesto un file CSV di utenti con almeno quattro colonne. +Le colonne devono contenere, in ordine: ID utente, nome completo, indirizzo e-mail e gruppi. +I campi CSV devono essere separati da una virgola (,) e le stringhe delimitate con apici (%%""%%). Il backslash (\) può essere usato come carattere di escape, cioè per indicare che il carattere successivo deve essere trattato in maniera speciale. +Per un esempio di file tipo, prova la funzione "Esporta Utenti" che trovi qui sopra. +Verranno ignorati gli ID utenti duplicati. + +Verrà generata una password ed inviata via e-mail ad ogni utente correttamente importato. \ No newline at end of file diff --git a/sources/lib/plugins/usermanager/lang/it/lang.php b/sources/lib/plugins/usermanager/lang/it/lang.php index ffded34..fe52d5e 100644 --- a/sources/lib/plugins/usermanager/lang/it/lang.php +++ b/sources/lib/plugins/usermanager/lang/it/lang.php @@ -18,6 +18,7 @@ * @author Claudio Lanconelli * @author Francesco * @author Fabio + * @author Torpedo */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; @@ -65,6 +66,8 @@ $lang['add_ok'] = 'Utente aggiunto correttamente'; $lang['add_fail'] = 'Aggiunta utente fallita'; $lang['notify_ok'] = 'Email di notifica inviata'; $lang['notify_fail'] = 'L\'email di notifica non può essere inviata'; +$lang['import_userlistcsv'] = 'File lista utente (CSV):'; +$lang['import_header'] = 'Importazioni più recenti - Non riuscite'; $lang['import_success_count'] = 'Importazione utenti: %d utenti trovati, %d utenti importati con successo.'; $lang['import_failure_count'] = 'Importazione utenti: %d falliti. Errori riportati qui sotto.'; $lang['import_error_fields'] = 'Campi insufficienti, trovati %d, richiesti 4.'; @@ -74,3 +77,13 @@ $lang['import_error_badmail'] = 'Indirizzo email errato'; $lang['import_error_upload'] = 'Importazione fallita. Il file CSV non può essere caricato, o è vuoto.'; $lang['import_error_readfail'] = 'Importazione in errore. Impossibile leggere i file caricati.'; $lang['import_error_create'] = 'Impossibile creare l\'utente'; +$lang['import_notify_fail'] = 'Non è stato possibile inviare un messaggio di notifica per l\'utente importato %s con e-mail %s.'; +$lang['import_downloadfailures'] = 'Scarica operazioni non riuscite come CSV per correzione'; +$lang['addUser_error_missing_pass'] = 'Imposta una password oppure attiva la notifica utente per abilitare la generazione password.'; +$lang['addUser_error_pass_not_identical'] = 'Le password inserite non sono identiche.'; +$lang['addUser_error_modPass_disabled'] = 'La modifica delle password è al momento disabilitata.'; +$lang['addUser_error_name_missing'] = 'Inserire un nome per il nuovo utente.'; +$lang['addUser_error_modName_disabled'] = 'La modifica dei nomi è al momento disabilitata.'; +$lang['addUser_error_mail_missing'] = 'Inserire un indirizzo e-mail per il nuovo utente.'; +$lang['addUser_error_modMail_disabled'] = 'La modifica degli indirizzi e-mail è al momento disabilitata.'; +$lang['addUser_error_create_event_failed'] = 'Un plugin ha impedito che il nuovo utente venisse aggiunto. Rivedere gli altri messaggi per maggiori informazioni.'; diff --git a/sources/lib/plugins/usermanager/lang/ja/lang.php b/sources/lib/plugins/usermanager/lang/ja/lang.php index c7952d8..5c252bb 100644 --- a/sources/lib/plugins/usermanager/lang/ja/lang.php +++ b/sources/lib/plugins/usermanager/lang/ja/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuji Takenaka * @author Chris Smith * @author Ikuo Obataya @@ -72,3 +72,11 @@ $lang['import_error_readfail'] = 'インãƒãƒ¼ãƒˆãŒå¤±æ•—ã—ã¾ã—ãŸã€‚アッ $lang['import_error_create'] = 'ユーザーãŒä½œæˆã§ãã¾ã›ã‚“。'; $lang['import_notify_fail'] = '通知メッセージãŒã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ï¼ˆ%s）・電å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ï¼ˆ%s）ã«é€ä¿¡ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚'; $lang['import_downloadfailures'] = '修正用ã«å¤±æ•—ã‚’ CSVファイルã¨ã—ã¦ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã™ã‚‹ã€‚'; +$lang['addUser_error_missing_pass'] = 'パスワードを設定ã™ã‚‹ã‹ãƒ‘スワードã®è‡ªå‹•ç”Ÿæˆã§ãるよã†ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¸ã®é€šçŸ¥ã‚’有効ã«ã—ã¦ä¸‹ã•ã„。'; +$lang['addUser_error_pass_not_identical'] = '入力ã•ã‚ŒãŸãƒ‘スワードã¯åŒä¸€ã§ã¯ã‚ã‚Šã¾ã›ã‚“。'; +$lang['addUser_error_modPass_disabled'] = 'パスワードã®å¤‰æ›´ã¯ç¾åœ¨ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚'; +$lang['addUser_error_name_missing'] = 'æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ•ãƒ«ãƒãƒ¼ãƒ ã‚’入力ã—ã¦ãã ã•ã„。'; +$lang['addUser_error_modName_disabled'] = 'フルãƒãƒ¼ãƒ ã®å¤‰æ›´ã¯ç¾åœ¨ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚'; +$lang['addUser_error_mail_missing'] = 'æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’入力ã—ã¦ãã ã•ã„。'; +$lang['addUser_error_modMail_disabled'] = 'メールアドレスã®å¤‰æ›´ã¯ç¾åœ¨ç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚'; +$lang['addUser_error_create_event_failed'] = 'プラグインãŒæ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®è¿½åŠ ã‚’抑止ã—ã¾ã—ãŸã€‚詳細ã«ã¤ã„ã¦ã¯ã€ä»–ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ç¢ºèªã§ãã¾ã™ã€‚'; diff --git a/sources/lib/plugins/usermanager/lang/ko/import.txt b/sources/lib/plugins/usermanager/lang/ko/import.txt index 6d077df..b5801e6 100644 --- a/sources/lib/plugins/usermanager/lang/ko/import.txt +++ b/sources/lib/plugins/usermanager/lang/ko/import.txt @@ -1,9 +1,9 @@ ===== 대량 ì‚¬ìš©ìž ê°€ì ¸ì˜¤ê¸° ===== ì ì–´ë„ ì—´ 네 개가 있는 사용ìžì˜ CSV 파ì¼ì´ 필요합니다. -ì—´ì€ ë‹¤ìŒê³¼ ê°™ì´ í¬í•¨í•´ì•¼ 합니다: ì‚¬ìš©ìž id, 실명, ì´ë©”ì¼ ì£¼ì†Œì™€ 그룹. +ì—´ì€ ë‹¤ìŒê³¼ ê°™ì´ í¬í•¨í•´ì•¼ 합니다: ì‚¬ìš©ìž ID, 실명, ì´ë©”ì¼ ì£¼ì†Œì™€ 그룹. CSV 필드는 ì¸ìš© 부호(%%""%%)ë¡œ 쉼표(,)와 êµ¬ë¶„ëœ ë¬¸ìžì—´ë¡œ 구분해야 합니다. 백슬래시(\)는 íƒˆì¶œì— ì‚¬ìš©í•  수 있습니다. ì ì ˆí•œ 파ì¼ì˜ 예를 들어, ìœ„ì˜ "ì‚¬ìš©ìž ëª©ë¡ ë‚´ë³´ë‚´ê¸°"를 ì‹œë„하세요. -ì¤‘ë³µëœ ì‚¬ìš©ìž id는 무시ë©ë‹ˆë‹¤. +ì¤‘ë³µëœ ì‚¬ìš©ìž ID는 무시ë©ë‹ˆë‹¤. 비밀번호는 ìƒì„±ë˜ê³  ê° ì„±ê³µì ìœ¼ë¡œ 가져온 사용ìžì—게 ì´ë©”ì¼ë¡œ 보내집니다. \ No newline at end of file diff --git a/sources/lib/plugins/usermanager/lang/ko/lang.php b/sources/lib/plugins/usermanager/lang/ko/lang.php index ec55d55..805fda5 100644 --- a/sources/lib/plugins/usermanager/lang/ko/lang.php +++ b/sources/lib/plugins/usermanager/lang/ko/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author jk Lee * @author dongnak@gmail.com * @author Song Younghwan @@ -11,6 +11,7 @@ * @author Myeongjin * @author Gerrit Uitslag * @author Garam + * @author Erial */ $lang['menu'] = 'ì‚¬ìš©ìž ê´€ë¦¬ìž'; $lang['noauth'] = '(ì‚¬ìš©ìž ì¸ì¦ì„ 사용할 수 없습니다)'; @@ -49,7 +50,7 @@ $lang['start'] = '시작'; $lang['prev'] = 'ì´ì „'; $lang['next'] = '다ìŒ'; $lang['last'] = '마지막'; -$lang['edit_usermissing'] = 'ì„ íƒëœ 사용ìžë¥¼ ì°¾ì„ ìˆ˜ 없습니다. ì‚¬ìš©ìž ì´ë¦„ì´ ì‚­ì œë˜ê±°ë‚˜ ë°”ë€Œì—ˆì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.'; +$lang['edit_usermissing'] = 'ì„ íƒëœ 사용ìžë¥¼ ì°¾ì„ ìˆ˜ 없습니다, ì‚¬ìš©ìž ì´ë¦„ì´ ì‚­ì œë˜ê±°ë‚˜ ë°”ë€Œì—ˆì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.'; $lang['user_notify'] = '사용ìžì—게 알림'; $lang['note_notify'] = '사용ìžì—게 새로운 비밀번호를 준 경우ì—만 알림 ì´ë©”ì¼ì´ 보내집니다.'; $lang['note_group'] = '새로운 사용ìžëŠ” ì–´ë–¤ ê·¸ë£¹ë„ ì„¤ì •í•˜ì§€ ì•Šì€ ê²½ìš°ì— ê¸°ë³¸ 그룹(%s)ì— ì¶”ê°€ë©ë‹ˆë‹¤.'; @@ -63,11 +64,19 @@ $lang['import_header'] = '가장 최근 가져오기 - 실패'; $lang['import_success_count'] = 'ì‚¬ìš©ìž ê°€ì ¸ì˜¤ê¸°: ì‚¬ìš©ìž %dëª…ì„ ì°¾ì•˜ê³ , %dëª…ì„ ì„±ê³µì ìœ¼ë¡œ 가져왔습니다.'; $lang['import_failure_count'] = 'ì‚¬ìš©ìž ê°€ì ¸ì˜¤ê¸°: %dëª…ì„ ê°€ì ¸ì˜¤ì§€ 못했습니다. 실패는 ì•„ëž˜ì— ë‚˜íƒ€ë‚˜ 있습니다.'; $lang['import_error_fields'] = '충분하지 ì•Šì€ í•„ë“œë¡œ, %d개를 찾았고, 4개가 필요합니다.'; -$lang['import_error_baduserid'] = 'ì‚¬ìš©ìž id ì—†ìŒ'; +$lang['import_error_baduserid'] = 'ì‚¬ìš©ìž ID ì—†ìŒ'; $lang['import_error_badname'] = 'ìž˜ëª»ëœ ì´ë¦„'; $lang['import_error_badmail'] = 'ìž˜ëª»ëœ ì´ë©”ì¼ ì£¼ì†Œ'; -$lang['import_error_upload'] = '가져오기를 실패했습니다. csv 파ì¼ì„ 올릴 수 없거나 비어 있습니다.'; +$lang['import_error_upload'] = '가져오기를 실패했습니다. CSV 파ì¼ì„ 올릴 수 없거나 비어 있습니다.'; $lang['import_error_readfail'] = '가져오기를 실패했습니다. 올린 파ì¼ì„ ì½ì„ 수 없습니다.'; $lang['import_error_create'] = '사용ìžë¥¼ 만들 수 없습니다'; $lang['import_notify_fail'] = '알림 메시지를 가져온 %s (ì´ë©”ì¼: %s) 사용ìžì—게 보낼 수 없습니다.'; $lang['import_downloadfailures'] = 'êµì •ì„ 위한 CSVë¡œ 다운로드 실패'; +$lang['addUser_error_missing_pass'] = '비밀번호를 설정하거나 비밀번호 ìƒì„±ì„ 활성화하려면 ì‚¬ìš©ìž ì•Œë¦¼ì„ í™œì„±í™”í•´ì£¼ì‹œê¸° ë°”ëžë‹ˆë‹¤.'; +$lang['addUser_error_pass_not_identical'] = 'ìž…ë ¥ëœ ë¹„ë°€ë²ˆí˜¸ê°€ ì¼ì¹˜í•˜ì§€ 않습니다.'; +$lang['addUser_error_modPass_disabled'] = '비밀번호를 수정하는 ê²ƒì€ í˜„ìž¬ 비활성화ë˜ì–´ 있습니다.'; +$lang['addUser_error_name_missing'] = '새 사용ìžì˜ ì´ë¦„ì„ ìž…ë ¥í•˜ì„¸ìš”.'; +$lang['addUser_error_modName_disabled'] = 'ì´ë¦„ì„ ìˆ˜ì •í•˜ëŠ” ê²ƒì€ í˜„ìž¬ 비활성화ë˜ì–´ 있습니다.'; +$lang['addUser_error_mail_missing'] = '새 사용ìžì˜ ì´ë©”ì¼ ì£¼ì†Œë¥¼ 입력하세요.'; +$lang['addUser_error_modMail_disabled'] = 'ì´ë©”ì¼ ì£¼ì†Œë¥¼ 수정하는 ê²ƒì€ í˜„ìž¬ 비활성화ë˜ì–´ 있습니다.'; +$lang['addUser_error_create_event_failed'] = '플러그ì¸ì´ 새 사용ìžê°€ 추가ë˜ëŠ” ê²ƒì„ ë§‰ì•˜ìŠµë‹ˆë‹¤. ìžì„¸í•œ ì •ë³´ì— ëŒ€í•´ì„œëŠ” 가능한 다른 메시지를 검토하세요.'; diff --git a/sources/lib/plugins/usermanager/lang/nl/lang.php b/sources/lib/plugins/usermanager/lang/nl/lang.php index 3f9902e..ea85d0f 100644 --- a/sources/lib/plugins/usermanager/lang/nl/lang.php +++ b/sources/lib/plugins/usermanager/lang/nl/lang.php @@ -16,6 +16,7 @@ * @author Ricardo Guijt * @author Gerrit Uitslag * @author Rene + * @author Wesley de Weerd */ $lang['menu'] = 'Gebruikersbeheer'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; @@ -76,3 +77,11 @@ $lang['import_error_readfail'] = 'Importeren mislukt. Lezen van het geüploade b $lang['import_error_create'] = 'Aanmaken van de gebruiker was niet mogelijk.'; $lang['import_notify_fail'] = 'Notificatiebericht kon niet naar de geïmporteerde gebruiker worden verstuurd, %s met e-mail %s.'; $lang['import_downloadfailures'] = 'Download de gevonden fouten als CSV voor correctie'; +$lang['addUser_error_missing_pass'] = 'Vul een wachtwoord in of activeer de gebruikers notificatie om een wachtwoord te genereren.'; +$lang['addUser_error_pass_not_identical'] = 'De ingevulde wachtwoorden komen niet overeen'; +$lang['addUser_error_modPass_disabled'] = 'Het aanpassen van wachtwoorden is momenteel uitgeschakeld'; +$lang['addUser_error_name_missing'] = 'Vul een naam in voor de nieuwe gebruiker'; +$lang['addUser_error_modName_disabled'] = 'Het aanpassen van namen is momenteel uitgeschakeld'; +$lang['addUser_error_mail_missing'] = 'Vul een email adres in voor de nieuwe gebruiker'; +$lang['addUser_error_modMail_disabled'] = 'Het aanpassen van uw email adres is momenteel uitgeschakeld'; +$lang['addUser_error_create_event_failed'] = 'Een plugin heeft voorkomen dat de nieuwe gebruiker wordt toegevoegd . Bekijk mogelijke andere berichten voor meer informatie.'; diff --git a/sources/lib/plugins/usermanager/lang/pt-br/lang.php b/sources/lib/plugins/usermanager/lang/pt-br/lang.php index 356d139..ec116e7 100644 --- a/sources/lib/plugins/usermanager/lang/pt-br/lang.php +++ b/sources/lib/plugins/usermanager/lang/pt-br/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Frederico Gonçalves Guimarães * @author Felipe Castro * @author Lucien Raven @@ -21,6 +21,8 @@ * @author Leone Lisboa Magevski * @author Dário Estevão * @author Juliano Marconi Lanigra + * @author Guilherme Cardoso + * @author Viliam Dias */ $lang['menu'] = 'Gerenciamento de Usuários'; $lang['noauth'] = '(o gerenciamento de usuários não está disponível)'; @@ -81,3 +83,11 @@ $lang['import_error_readfail'] = 'Falha na Importação: Habilitar para ler o ar $lang['import_error_create'] = 'Habilitar para criar o usuário.'; $lang['import_notify_fail'] = 'Mensagem de notificação não pode ser enviada para o usuário importado, %s com email %s.'; $lang['import_downloadfailures'] = 'Falhas no Download como CSV para correção'; +$lang['addUser_error_missing_pass'] = 'Por favor coloque uma senha ou ative as notificações do usuário para habilitar a geração de senhas.'; +$lang['addUser_error_pass_not_identical'] = 'As senhas fornecidas não são idênticas.'; +$lang['addUser_error_modPass_disabled'] = 'A alteração de senhas está atualmente desabilitada.'; +$lang['addUser_error_name_missing'] = 'Por favor entre com um nome para o novo usuário.'; +$lang['addUser_error_modName_disabled'] = 'Alteração de nomes está desabilitada no momento.'; +$lang['addUser_error_mail_missing'] = 'Por favor entre com um endereço de e-mail para o novo usuário.'; +$lang['addUser_error_modMail_disabled'] = 'Alteração de endereço de e-mail está desabilitada no momento.'; +$lang['addUser_error_create_event_failed'] = 'Uma extensão impediu que um novo usuário seja adicionado. Reveja outras mensagens para mais informações.'; diff --git a/sources/lib/plugins/usermanager/lang/pt/lang.php b/sources/lib/plugins/usermanager/lang/pt/lang.php index a0b70d2..86885e4 100644 --- a/sources/lib/plugins/usermanager/lang/pt/lang.php +++ b/sources/lib/plugins/usermanager/lang/pt/lang.php @@ -11,6 +11,7 @@ * @author Guido Salatino * @author Romulo Pereira * @author Paulo Carmino + * @author Alfredo Silva */ $lang['menu'] = 'Gestor de Perfis'; $lang['noauth'] = '(autenticação indisponível)'; diff --git a/sources/lib/plugins/usermanager/lang/ru/lang.php b/sources/lib/plugins/usermanager/lang/ru/lang.php index de650d6..ca39b87 100644 --- a/sources/lib/plugins/usermanager/lang/ru/lang.php +++ b/sources/lib/plugins/usermanager/lang/ru/lang.php @@ -22,6 +22,7 @@ * @author Aleksandr Selivanov * @author Igor Degraf * @author Vitaly Filatenko + * @author dimsharav */ $lang['menu'] = 'Управление пользователÑми'; $lang['noauth'] = '(Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ недоÑтупна)'; @@ -45,8 +46,8 @@ $lang['search_prompt'] = 'ИÑкать'; $lang['clear'] = 'Ð¡Ð±Ñ€Ð¾Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð° поиÑка'; $lang['filter'] = 'Фильтр'; $lang['export_all'] = 'ЭкÑпорт вÑех пользователей (CSV)'; -$lang['export_filtered'] = 'ЭкÑпорт пользователей Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸ÐµÐ¹ ÑпиÑка (CSV)'; -$lang['import'] = 'Импорт новых пользователей'; +$lang['export_filtered'] = 'ЭкÑпорт отфильтрованного ÑпиÑка пользователей (CSV)'; +$lang['import'] = 'импортировать новых пользователей'; $lang['line'] = 'Строка â„–'; $lang['error'] = 'Ошибка'; $lang['summary'] = 'Показаны пользователи %1$d–%2$d из %3$d найденных. Ð’Ñего пользователей: %4$d.'; @@ -60,11 +61,11 @@ $lang['start'] = 'в начало'; $lang['prev'] = 'назад'; $lang['next'] = 'вперёд'; $lang['last'] = 'в конец'; -$lang['edit_usermissing'] = 'Выбранный пользователь не найден. Возможно, указанный логин был удалён или изменён извне.'; -$lang['user_notify'] = 'Сообщить пользователю'; -$lang['note_notify'] = 'ПиÑьма Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ выÑылаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ñлучае Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ паролÑ.'; -$lang['note_group'] = 'ЕÑли группа не указана, новые пользователи будут добавлены в группу по умолчанию (%s).'; -$lang['note_pass'] = 'Пароль будет Ñгенерирован автоматичеÑки, еÑли поле оÑтавлено пуÑтым и включено уведомление пользователÑ.'; +$lang['edit_usermissing'] = 'Выбранный пользователь не найден. Возможно, указанный логин был удалён или изменён извне.'; +$lang['user_notify'] = 'ОповеÑтить пользователÑ'; +$lang['note_notify'] = 'ПиÑьма Ñ уведомлением выÑылаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ñлучае Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ паролÑ.'; +$lang['note_group'] = 'ЕÑли группа не указана, новые пользователи будут добавлены в группу по умолчанию (%s).'; +$lang['note_pass'] = 'Пароль будет Ñгенерирован автоматичеÑки, еÑли поле оÑтавлено пуÑтым и включено уведомление пользователÑ.'; $lang['add_ok'] = 'Пользователь уÑпешно добавлен'; $lang['add_fail'] = 'Ðе удалоÑÑŒ добавить пользователÑ'; $lang['notify_ok'] = 'ПиÑьмо Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ отправлено'; @@ -72,7 +73,7 @@ $lang['notify_fail'] = 'Ðе удалоÑÑŒ отправить Ð¿Ð¸Ñ $lang['import_userlistcsv'] = 'Файл Ñо ÑпиÑком пользователей (CSV):'; $lang['import_header'] = 'ПоÑледний импорт — ÑпиÑок ошибок'; $lang['import_success_count'] = 'Импорт пользователей: %d пользователей найдено, %d импортировано уÑпешно.'; -$lang['import_failure_count'] = 'Импорт пользователей: %d не удалоÑÑŒ. СпиÑок ошибок прочтите ниже.'; +$lang['import_failure_count'] = 'Импорт пользователей: %d не удалоÑÑŒ. Ошибки перечиÑлены ниже.'; $lang['import_error_fields'] = 'Ðе вÑе Ð¿Ð¾Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ñ‹. Ðайдено %d, а нужно: 4.'; $lang['import_error_baduserid'] = 'ОтÑутÑтвует идентификатор пользователÑ'; $lang['import_error_badname'] = 'Ð˜Ð¼Ñ Ð½Ðµ годитÑÑ'; @@ -82,3 +83,10 @@ $lang['import_error_readfail'] = 'Импорт не удалÑÑ. Ðевозмо $lang['import_error_create'] = 'Ðевозможно Ñоздать пользователÑ'; $lang['import_notify_fail'] = 'Оповещение не может быть отправлено импортированному пользователю %s по Ñлектронной почте %s.'; $lang['import_downloadfailures'] = 'Скачать ошибки в формате CSV Ð´Ð»Ñ Ð¸ÑправлениÑ'; +$lang['addUser_error_missing_pass'] = 'Ð”Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти генерации паролÑ, пожалуйÑта, уÑтановите пароль или активируйте оповещениÑ.'; +$lang['addUser_error_pass_not_identical'] = 'Введённые ппароли не Ñовпадают.'; +$lang['addUser_error_modPass_disabled'] = 'Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð² наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.'; +$lang['addUser_error_name_missing'] = 'Укажите Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ пользователÑ.'; +$lang['addUser_error_modName_disabled'] = 'Изменение имени в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.'; +$lang['addUser_error_mail_missing'] = 'Укажите Ð°Ð´Ñ€ÐµÑ Ñл. почты нового пользователÑ.'; +$lang['addUser_error_modMail_disabled'] = 'Изменение e-mail в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾.'; diff --git a/sources/lib/plugins/usermanager/lang/sk/lang.php b/sources/lib/plugins/usermanager/lang/sk/lang.php index 535f779..2c466c9 100644 --- a/sources/lib/plugins/usermanager/lang/sk/lang.php +++ b/sources/lib/plugins/usermanager/lang/sk/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Ondrej Végh * @author Michal Mesko * @author exusik@gmail.com @@ -40,7 +40,7 @@ $lang['delete_ok'] = '%d užívateľov zmazaných'; $lang['delete_fail'] = '%d chýb vymazania.'; $lang['update_ok'] = 'Užívateľ úspeÅ¡ne zmenený'; $lang['update_fail'] = 'Chyba zmeny užívateľa'; -$lang['update_exists'] = 'Chyba zmeny užívateľa, užívateľské meno (%s) už existuje (iné zmeny budú zaznamenané).'; +$lang['update_exists'] = 'Chyba zmeny mena používateľa, používateľské meno (%s) už existuje (iné zmeny budú zaznamenané).'; $lang['start'] = 'prvé'; $lang['prev'] = 'predoÅ¡lé'; $lang['next'] = 'ÄalÅ¡ie'; diff --git a/sources/lib/plugins/usermanager/lang/zh/lang.php b/sources/lib/plugins/usermanager/lang/zh/lang.php index b833c6c..8f7e4fe 100644 --- a/sources/lib/plugins/usermanager/lang/zh/lang.php +++ b/sources/lib/plugins/usermanager/lang/zh/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com @@ -18,6 +18,7 @@ * @author Rachel * @author Yangyu Huang * @author oott123 + * @author Garfield */ $lang['menu'] = '用户管ç†å™¨'; $lang['noauth'] = '（用户认è¯ä¸å¯ç”¨ï¼‰'; @@ -78,3 +79,11 @@ $lang['import_error_readfail'] = '导入失败。无法读å–上传的文件。' $lang['import_error_create'] = 'ä¸èƒ½åˆ›å»ºæ–°ç”¨æˆ·'; $lang['import_notify_fail'] = '通知消æ¯æ— æ³•å‘é€åˆ°å¯¼å…¥çš„用户 %s，电å­é‚®ä»¶åœ°å€æ˜¯ %s。'; $lang['import_downloadfailures'] = '下载CSV的错误信æ¯ä»¥ä¿®æ­£ã€‚'; +$lang['addUser_error_missing_pass'] = '请设置一个密ç æˆ–者激活用户通知æ¥å¯ç”¨å¯†ç ç”Ÿæˆã€‚'; +$lang['addUser_error_pass_not_identical'] = '输入的密ç ä¸ç›¸åŒã€‚'; +$lang['addUser_error_modPass_disabled'] = '修改密ç å·²ç¦ç”¨'; +$lang['addUser_error_name_missing'] = '请为新用户输入一个å字。'; +$lang['addUser_error_modName_disabled'] = '修改åå­—å·²ç¦ç”¨'; +$lang['addUser_error_mail_missing'] = '请为新用户输入一个电å­é‚®ä»¶åœ°å€ã€‚'; +$lang['addUser_error_modMail_disabled'] = '修改邮件地å€å·²ç¦ç”¨'; +$lang['addUser_error_create_event_failed'] = '一个æ’件阻止了添加新用户。请查看其它å¯èƒ½çš„消æ¯æ¥èŽ·å–更多信æ¯ã€‚'; diff --git a/sources/lib/plugins/vshare/README b/sources/lib/plugins/vshare/README deleted file mode 100644 index 8859d5b..0000000 --- a/sources/lib/plugins/vshare/README +++ /dev/null @@ -1,25 +0,0 @@ -vshare Plugin for DokuWiki - -All documentation for this plugin can be found at -http://www.dokuwiki.org/plugin:vshare - -If you install this plugin manually, make sure it is installed in -lib/plugins/vshare/ - if the folder is called different it -will not work! - -Please refer to http://www.dokuwiki.org/plugins for additional info -on how to install plugins in DokuWiki. - ----- -Copyright (C) Andreas Gohr - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -See the COPYING file in your DokuWiki folder for details diff --git a/sources/lib/plugins/vshare/all.css b/sources/lib/plugins/vshare/all.css deleted file mode 100644 index 4e296d5..0000000 --- a/sources/lib/plugins/vshare/all.css +++ /dev/null @@ -1,24 +0,0 @@ -iframe.vshare__left, -div.vshare__left { - float: left; - margin-right: 1em; -} - -iframe.vshare__right, -div.vshare__right { - float: right; - margin-left: 1em; -} - -iframe.vshare__center, -div.vshare__center { - text-align: center; - margin-left: auto; - margin-right: auto; - display: block; -} - -iframe.vshare__none, -div.vshare__none { -margin: 1px 3px 1px 3px; -} diff --git a/sources/lib/plugins/vshare/button.png b/sources/lib/plugins/vshare/button.png deleted file mode 100644 index d050afa..0000000 Binary files a/sources/lib/plugins/vshare/button.png and /dev/null differ diff --git a/sources/lib/plugins/vshare/lang/en/lang.php b/sources/lib/plugins/vshare/lang/en/lang.php deleted file mode 100644 index 2b968c6..0000000 --- a/sources/lib/plugins/vshare/lang/en/lang.php +++ /dev/null @@ -1,6 +0,0 @@ - - */ - -$lang['js']['button'] = 'Insère une vidéo depuis des sites de partage vidéo'; -$lang['js']['prompt'] = 'Copiez/collez le lien complet de la page contenant la vidéo ici :'; -$lang['js']['notfound'] = "Désolé, cette URL n'a pas été reconnue. Consultez la documentation sur la syntaxe pour insérer une vidéo manuellement."; \ No newline at end of file diff --git a/sources/lib/plugins/vshare/lang/ja/lang.php b/sources/lib/plugins/vshare/lang/ja/lang.php deleted file mode 100644 index 9c93296..0000000 --- a/sources/lib/plugins/vshare/lang/ja/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ - -$lang['js']['button'] = 'ë™ì˜ìƒ 공유 사ì´íŠ¸ì—ì„œ ë™ì˜ìƒ 넣기'; -$lang['js']['prompt'] = 'ì—¬ê¸°ì— ë™ì˜ìƒ 페ì´ì§€ì˜ ì „ì²´ URLì„ ë¶™ì—¬ë„£ìœ¼ì„¸ìš”:'; -$lang['js']['notfound'] = "죄송하지만 ì´ URLì„ ì¸ì‹í•  수 없습니다.\n수ë™ìœ¼ë¡œ 올바른 ë¬¸ë²•ì„ ë„£ëŠ” ë°©ë²•ì— ëŒ€í•´ì„œëŠ” 설명서를 참고하세요."; diff --git a/sources/lib/plugins/vshare/lang/nl/lang.php b/sources/lib/plugins/vshare/lang/nl/lang.php deleted file mode 100644 index d855df4..0000000 --- a/sources/lib/plugins/vshare/lang/nl/lang.php +++ /dev/null @@ -1,10 +0,0 @@ - - */ -$lang['js']['button'] = 'Voeg een video van een video-delen website in'; -$lang['js']['prompt'] = 'Plak hier de volledige URL voor de video pagina:'; -$lang['js']['notfound'] = "Sorry, deze URL werd niet herkend.\nRaadpleeg de documentatie over de juiste syntax om een URL handmatig in te voegen."; diff --git a/sources/lib/plugins/vshare/pdf.css b/sources/lib/plugins/vshare/pdf.css deleted file mode 100644 index 6238a90..0000000 --- a/sources/lib/plugins/vshare/pdf.css +++ /dev/null @@ -1,16 +0,0 @@ - -div.vshare__left, -div.vshare__right, -div.vshare__center { - border: 1px solid #ccc; - text-align: center; - padding: 2em; -} - -a.vshare { - color: #aaa; - font-size: 2em; - font-weight: bold; - text-decoration: none; -} - diff --git a/sources/lib/plugins/vshare/plugin.info.txt b/sources/lib/plugins/vshare/plugin.info.txt deleted file mode 100644 index 4de9997..0000000 --- a/sources/lib/plugins/vshare/plugin.info.txt +++ /dev/null @@ -1,8 +0,0 @@ -base vshare -author Andreas Gohr -email andi@splitbrain.org -date 2016-01-24 -name Video Sharing Site Plugin -desc Easily embed videos from various Video Sharing sites. Example: {{youtube>XXXXXX}} -url https://www.dokuwiki.org/plugin:vshare - diff --git a/sources/lib/plugins/vshare/redir.php b/sources/lib/plugins/vshare/redir.php deleted file mode 100644 index 5c84e4b..0000000 --- a/sources/lib/plugins/vshare/redir.php +++ /dev/null @@ -1,22 +0,0 @@ - - * - * Simple redirector script to avoid security warnings when embedding HTTP in SSL secured sites - * - * To avoid open redirects, a secret hash has to be provided - */ -if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/../../../'); -define('NOSESSION', true); -require_once(DOKU_INC . 'inc/init.php'); -global $INPUT; - -$url = $INPUT->str('url'); -$hash = $INPUT->str('hash'); - -if(!$url) die('sorry. no url'); -if(!$hash) die('sorry. no hash'); -if($hash != md5(auth_cookiesalt() . 'vshare' . $url)) die('sorry. wrong hash'); - -send_redirect($url); \ No newline at end of file diff --git a/sources/lib/plugins/vshare/script.js b/sources/lib/plugins/vshare/script.js deleted file mode 100644 index 3c83426..0000000 --- a/sources/lib/plugins/vshare/script.js +++ /dev/null @@ -1,116 +0,0 @@ - -/** - * Append a toolbar button - */ -if(window.toolbar != undefined){ - toolbar[toolbar.length] = {"type": "pluginvshare", - "title": LANG['plugins']['vshare']['button'], - "icon": "../../plugins/vshare/button.png", - "key": ""}; -} - -/** - * Try to determine the video service, extract the ID and insert - * the correct syntax - */ -function tb_pluginvshare(btn, props, edid) { - PluginVShare.edid = edid; - - PluginVShare.buildSyntax(); -} - -var PluginVShare = { - edid: null, - - buildSyntax: function () { - - var text = prompt(LANG['plugins']['vshare']['prompt']); - if (!text) return; - - // This includes the site patterns: - /* DOKUWIKI:include sites.js */ - - for (var key in sites) { - - if(sites.hasOwnProperty(key)) { - var RE = new RegExp(sites[key], 'i'); - var match = text.match(RE); - if (match) { - var urlparam = ''; - var videoid = match[1]; - - switch (key) { - case 'slideshare': - //provided video url? - if(match[2]) { - - jQuery.ajax({ - url: '//www.slideshare.net/api/oembed/2', - dataType: 'jsonp', - data: { - url: match[2], - format: 'jsonp' - } - }).done(function (response, status, error) { - var videoid = response.slideshow_id; - PluginVShare.insert(key, videoid, urlparam); - }).fail(function (data, status, error) { - /* http://www.slideshare.net/developers/oembed - * If not found, an status 200 with response {error:true} is returned, - * but "Content-Type:application/javascript; charset=utf-8" is then - * wrongly changed to "Content-Type:application/json; charset=utf-8" - * so it throws a parseerror - */ - alert(LANG['plugins']['vshare']['notfound']); - }); - return; - } - break; - case 'bliptv': - //provided video url? - if(match[2]) { - - jQuery.ajax({ - url: '//blip.tv/oembed/', - dataType: 'jsonp', - data: { - url: match[2], - format: 'json' - }, - timeout: 2000 - }).done(function (response, status, error) { - var videoidmatch = response.html.match(RE); - PluginVShare.insert(key, videoidmatch[1], urlparam); - }).fail(function (data, status, error) { - /* - * If url is not found(=wrong numerical number on end), blip.tv returns a 404 - * because jsonp is not a xmlhttprequest, there is no 404 catched - * errors are detected by waiting at the timeout - */ - alert(LANG['plugins']['vshare']['notfound']); - }); - return; - } - break; - case 'twitchtv': - if (match[2]) { - urlparam = '&chapter_id=' + match[2]; - } - break; - } - - PluginVShare.insert(key, videoid, urlparam); - return; - } - } - } - - alert(LANG['plugins']['vshare']['notfound']); - }, - - insert: function(key, videoid, urlparam, edid) { - var code = '{{' + key + '>' + videoid + '?medium' + urlparam + '}}'; - insertAtCarret(PluginVShare.edid, code); - } -}; - diff --git a/sources/lib/plugins/vshare/sites.conf b/sources/lib/plugins/vshare/sites.conf deleted file mode 100644 index 2e8af06..0000000 --- a/sources/lib/plugins/vshare/sites.conf +++ /dev/null @@ -1,26 +0,0 @@ -# configure video site flash or iframe URLs here, @VIDEO@ is the ID placeholder - -vimeo iframe //player.vimeo.com/video/@VIDEO@ -ustream iframe http://www.ustream.tv/embed/recorded/@VIDEO@ -youtube iframe //www.youtube.com/embed/@VIDEO@ -viddler iframe //www.viddler.com/embed/@VIDEO@/?f=1&autoplay=0&player=mini&hideablecontrolbar=1&smooth=0&disablebranding=0&loop=0&nologo=0&hd=0 -slideshare iframe //www.slideshare.net/slideshow/embed_code/@VIDEO@ -dailymotion iframe //www.dailymotion.com/embed/video/@VIDEO@ -bambuser iframe http://embed.bambuser.com/broadcast/@VIDEO@ -metacafe iframe http://www.metacafe.com/embed/@VIDEO@/ -bliptv iframe //blip.tv/play/@VIDEO@.x?p=1 -break iframe //www.break.com/embed/@VIDEO@?embed=1 -msoffice iframe http://hub.video.msn.com/embed/@VIDEO@/ - -5min flash http://www.5min.com/Embeded/@VIDEO@/ -clipfish flash //www.clipfish.de/cfng/flash/clipfish_player_3.swf?as=0&vid=@VIDEO@&r=1&angebot=extern& -gtrailers flash http://www.gametrailers.com/remote_wrap.php?mid=@VIDEO@ -myspacetv flash http://lads.myspace.com/videos/vplayer.swf?m=@VIDEO@&v=2&type=video -rcmovie flash http://www.rcmovie.de/embed/@VIDEO@ -scivee flash //www.scivee.tv/flash/embedPlayer.swf?id=@VIDEO@&type=3 -twitchtv flash http://www.twitch.tv/widgets/live_embed_player.swf?channel=@VIDEO@&auto_play=false&start_volume=25 -veoh flash //www.veoh.com/videodetails2.swf?player=videodetailsembedded&type=v&permalinkId=@VIDEO@&id=anonymous - - - - diff --git a/sources/lib/plugins/vshare/sites.js b/sources/lib/plugins/vshare/sites.js deleted file mode 100644 index 83f64ed..0000000 --- a/sources/lib/plugins/vshare/sites.js +++ /dev/null @@ -1,31 +0,0 @@ -/** - * video URL recognition patterns - * - * The first match group is used as video ID - * - * You need to touch conf/local.php to refresh the cache after changing - * this file - */ - -var sites = { - 'youtube': 'youtube\\.com/.*[&?]v=([a-z0-9_\\-]+)', - 'vimeo': 'vimeo\\.com\\/(\\d+)', - 'ustream': 'ustream\\.tv\\/recorded\\/(\\d+)\\/', - '5min': '5min\\.com\\/Video/.*-([0-9]+)([&?]|$)', - 'clipfish': 'clipfishi\\.de\\/.*\\/video\\/([0-9])+\\/', - 'dailymotion': 'dailymotion\\.com\\/video\\/([a-z0-9]+)_', - 'gtrailers': 'gametrailers\\.com\\/.*\\/(\\d+)', - 'metacafe': 'metacafe\\.com\\/watch\\/(\\d+)\\/', - 'myspacetv': 'vids\\.myspace\\.com\\/.*videoid=(\\d+)', - 'rcmovie': 'rcmovie\\.de\\/video\\/([a-f0-9]+)\\/', - 'scivee': 'scivee\\.tv\\/node\\/(\\d+)', - 'twitchtv': 'twitch\\.tv\\/([a-z0-9_\\-]+)(?:\\/c\\/(\\d+))?', - 'veoh': 'veoh\\.com\\/.*watch[^v]*(v[a-z0-9]+)', - 'bambuser': 'bambuser\\.com\\/v\\/(\\d+)', - 'bliptv': '(?:blip\\.tv\\/play\\/([a-zA-Z0-9]+\\.(?:html|x))\\?p=1|(http?\\:\\/\\/blip\\.tv\\/(?!play)(?:[a-zA-Z0-9_\\-]+)\\/(?:[a-zA-Z0-9_\\-]+)))', - 'break': 'break\\.com\\/video\\/(?:(?:[a-z]+)\\/)?(?:[a-z\\-]+)-([0-9]+)', - 'viddler': 'viddler\\.com\\/(?:embed|v)\\/([a-z0-9]{8})', - 'msoffice': '(?:office\\.com.*[&?]videoid=([a-z0-9\\-]+))', - 'slideshare': '(?:(?:slideshare\\.net\\/slideshow\\/embed_code\\/|id=)([0-9]+)|(https?\\:\\/\\/www\\.slideshare\\.net\\/(?:[a-zA-Z0-9_\\-]+)\\/(?:[a-zA-Z0-9_\\-]+)))' -}; - diff --git a/sources/lib/plugins/vshare/syntax.php b/sources/lib/plugins/vshare/syntax.php deleted file mode 100644 index 826846f..0000000 --- a/sources/lib/plugins/vshare/syntax.php +++ /dev/null @@ -1,209 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) die(); -require_once(DOKU_PLUGIN.'syntax.php'); - -class syntax_plugin_vshare extends DokuWiki_Syntax_Plugin { - var $sites; - - /** - * Constructor. - * Intitalizes the supported video sites - */ - function syntax_plugin_vshare(){ - $this->sites = confToHash(dirname(__FILE__).'/sites.conf'); - } - - function getType(){ - return 'substition'; - } - - function getPType(){ - return 'block'; - } - - function getSort(){ - return 159; - } - - - /** - * Connect to the parser - */ - function connectTo($mode) { - $pattern = join('|',array_keys($this->sites)); - $this->Lexer->addSpecialPattern('\{\{\s?(?:'.$pattern.')>[^}]*\}\}',$mode,'plugin_vshare'); - } - - /** - * Parse the parameters - */ - function handle($match, $state, $pos, Doku_Handler $handler){ - $command = substr($match,2,-2); - - // title - list($command,$title) = explode('|',$command); - $title = trim($title); - - // alignment - $align = 0; - if(substr($command,0,1) == ' ') $align += 1; - if(substr($command,-1) == ' ') $align += 2; - $command = trim($command); - - // get site and video - list($site,$vid) = explode('>',$command); - if(!$this->sites[$site]) return null; // unknown site - if(!$vid) return null; // no video!? - - // what size? - list($vid,$param) = explode('?',$vid,2); - if(preg_match('/(\d+)x(\d+)/i',$param,$m)){ // custom - $width = $m[1]; - $height = $m[2]; - }elseif(strpos($param,'small') !== false){ // small - $width = 255; - $height = 210; - }elseif(strpos($param,'large') !== false){ // large - $width = 520; - $height = 406; - }else{ // medium - $width = 425; - $height = 350; - } - - $paramm = array(); - parse_str($param, $paramm); - $urlparam = array(); - foreach($paramm as $key => $value) { - switch($key) { - case 'rel': - case 'autoplay': - case 'ap': - if($paramm[$key] === '1' || $paramm[$key] === '0') { - $urlparam[] = $key . '=' . $paramm[$key]; - } - break; - case 'start': - case 'end': - case 'chapter_id': //for twitch.tv - case 'initial_time': - case 'offsetTime': - case 'startSlide': - $number = (int) $paramm[$key]; - if($number > 0) { - $urlparam[] = $key . '=' . $number; - } - break; - case 'auto_start': - if($paramm[$key] === 'true' || $paramm[$key] === 'false') { - $urlparam[] = $key . '=' . $paramm[$key]; - } - break; - } - } - - list($type, $url) = explode(' ', $this->sites[$site], 2); - $url = trim($url); - $type = trim($type); - $url = str_replace('@VIDEO@',rawurlencode($vid),$url); - $url = str_replace('@WIDTH@',$width,$url); - $url = str_replace('@HEIGHT@',$height,$url); - if(count($urlparam)) { - if(strpos($url, '?') !== false) { - $sepchar = '&'; - } else { - $sepchar = '?'; - } - $url .= $sepchar . implode('&', $urlparam); - } - - list(,$vars) = explode('?',$url,2); - $varr = array(); - parse_str($vars,$varr); - - return array( - 'site' => $site, - 'video' => $vid, - 'url' => $url, - 'vars' => $varr, - 'align' => $align, - 'width' => $width, - 'height' => $height, - 'title' => $title, - 'type' => $type - ); - } - - /** - * Render the flash player - */ - function render($mode, Doku_Renderer $R, $data){ - if($mode != 'xhtml') return false; - if(is_null($data)) return false; - - if($data['align'] == 0) $align = 'none'; - if($data['align'] == 1) $align = 'right'; - if($data['align'] == 2) $align = 'left'; - if($data['align'] == 3) $align = 'center'; - if($data['title']) $title = ' title="'.hsc($data['title']).'"'; - - if(is_a($R,'renderer_plugin_dw2pdf')){ - // Output for PDF renderer - $R->doc .= '
    '; - - $R->doc .= ''; - $R->doc .= ''; - $R->doc .= ''; - - $R->doc .= '
    '; - - $R->doc .= ''; - $R->doc .= ($data['title'] ? hsc($data['title']) : 'Video'); - $R->doc .= ''; - - $R->doc .= '
    '; - }else{ - // use redirector for HTTP embeds on SSL sites - if(is_ssl() && substr($data['url'], 0, 7) == 'http://') { - $data['url'] = DOKU_BASE.'lib/plugins/vshare/redir.php'. - '?url='.rawurlencode($data['url']). - '&hash='.md5(auth_cookiesalt().'vshare'.$data['url']); - } - - // Normal output - if($data['type'] == 'flash') { - // embed flash - $R->doc .= '
    '; - $R->doc .= html_flashobject( - $data['url'], - $data['width'], - $data['height'], - $data['vars'], - $data['vars']); - $R->doc .= '
    '; - }else{ - // embed iframe - $R->doc .= ''; - } - } - } -} diff --git a/sources/lib/plugins/vshare/video.png b/sources/lib/plugins/vshare/video.png deleted file mode 100644 index 8bb325e..0000000 Binary files a/sources/lib/plugins/vshare/video.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/.travis.yml b/sources/lib/plugins/wrap/.travis.yml deleted file mode 100644 index ed124b2..0000000 --- a/sources/lib/plugins/wrap/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: php -php: - - "5.6" - - "5.5" - - "5.4" - - "5.3" -env: - - DOKUWIKI=master - - DOKUWIKI=stable - - DOKUWIKI=old-stable -before_install: wget https://raw.github.com/splitbrain/dokuwiki-travis/master/travis.sh -install: sh travis.sh -script: cd _test && phpunit --stderr --group plugin_wrap diff --git a/sources/lib/plugins/wrap/COPYING b/sources/lib/plugins/wrap/COPYING deleted file mode 100644 index d60c31a..0000000 --- a/sources/lib/plugins/wrap/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/sources/lib/plugins/wrap/README b/sources/lib/plugins/wrap/README deleted file mode 100644 index c0a1118..0000000 --- a/sources/lib/plugins/wrap/README +++ /dev/null @@ -1 +0,0 @@ -see plugin.info.txt \ No newline at end of file diff --git a/sources/lib/plugins/wrap/action.php b/sources/lib/plugins/wrap/action.php deleted file mode 100644 index 2a47fca..0000000 --- a/sources/lib/plugins/wrap/action.php +++ /dev/null @@ -1,152 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'action.php'); - -class action_plugin_wrap extends DokuWiki_Action_Plugin { - - /** - * register the eventhandlers - * - * @author Andreas Gohr - */ - function register(Doku_Event_Handler $controller){ - $controller->register_hook('TOOLBAR_DEFINE', 'AFTER', $this, 'handle_toolbar', array ()); - $controller->register_hook('HTML_SECEDIT_BUTTON', 'BEFORE', $this, 'handle_secedit_button'); - } - - function handle_toolbar(Doku_Event $event, $param) { - $syntaxDiv = $this->getConf('syntaxDiv'); - $syntaxSpan = $this->getConf('syntaxSpan'); - - $event->data[] = array ( - 'type' => 'picker', - 'title' => $this->getLang('picker'), - 'icon' => '../../plugins/wrap/images/toolbar/picker.png', - 'list' => array( - array( - 'type' => 'format', - 'title' => $this->getLang('column'), - 'icon' => '../../plugins/wrap/images/toolbar/column.png', - 'open' => '<'.$syntaxDiv.' group>\n<'.$syntaxDiv.' half column>\n', - 'close' => '\n\n\n<'.$syntaxDiv.' half column>\n\n\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('box'), - 'icon' => '../../plugins/wrap/images/toolbar/box.png', - 'open' => '<'.$syntaxDiv.' center round box 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('info'), - 'icon' => '../../plugins/wrap/images/note/16/info.png', - 'open' => '<'.$syntaxDiv.' center round info 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('tip'), - 'icon' => '../../plugins/wrap/images/note/16/tip.png', - 'open' => '<'.$syntaxDiv.' center round tip 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('important'), - 'icon' => '../../plugins/wrap/images/note/16/important.png', - 'open' => '<'.$syntaxDiv.' center round important 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('alert'), - 'icon' => '../../plugins/wrap/images/note/16/alert.png', - 'open' => '<'.$syntaxDiv.' center round alert 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('help'), - 'icon' => '../../plugins/wrap/images/note/16/help.png', - 'open' => '<'.$syntaxDiv.' center round help 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('download'), - 'icon' => '../../plugins/wrap/images/note/16/download.png', - 'open' => '<'.$syntaxDiv.' center round download 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('todo'), - 'icon' => '../../plugins/wrap/images/note/16/todo.png', - 'open' => '<'.$syntaxDiv.' center round todo 60%>\n', - 'close' => '\n\n', - ), - array( - 'type' => 'insert', - 'title' => $this->getLang('clear'), - 'icon' => '../../plugins/wrap/images/toolbar/clear.png', - 'insert' => '<'.$syntaxDiv.' clear/>\n', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('em'), - 'icon' => '../../plugins/wrap/images/toolbar/em.png', - 'open' => '<'.$syntaxSpan.' em>', - 'close' => '', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('hi'), - 'icon' => '../../plugins/wrap/images/toolbar/hi.png', - 'open' => '<'.$syntaxSpan.' hi>', - 'close' => '', - ), - array( - 'type' => 'format', - 'title' => $this->getLang('lo'), - 'icon' => '../../plugins/wrap/images/toolbar/lo.png', - 'open' => '<'.$syntaxSpan.' lo>', - 'close' => '', - ), - ) - ); - } - - /** - * Handle section edit buttons, prevents section buttons inside the wrap plugin from being rendered - * - * @param Doku_Event $event The event object - * @param array $param Parameters for the event - */ - public function handle_secedit_button(Doku_Event $event, $param) { - // counter of the number of currently opened wraps - static $wraps = 0; - $data = $event->data; - - if ($data['target'] == 'plugin_wrap_start') { - ++$wraps; - } elseif ($data['target'] == 'plugin_wrap_end') { - --$wraps; - } elseif ($wraps > 0 && $data['target'] == 'section') { - $event->preventDefault(); - $event->stopPropagation(); - $event->result = ''; - } - } -} - diff --git a/sources/lib/plugins/wrap/all.css b/sources/lib/plugins/wrap/all.css deleted file mode 100644 index b987c40..0000000 --- a/sources/lib/plugins/wrap/all.css +++ /dev/null @@ -1,321 +0,0 @@ -/******************************************************************** -Screen and Print Styles for the Wrap Plugin -********************************************************************/ - -/* resetting the box model to something more sane makes life a whole lot easier */ -.dokuwiki .plugin_wrap { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} - -/* tables in columns and boxes should span the whole width */ -.dokuwiki .plugin_wrap table { - width: 100%; -} -/* emulate a headline */ -.dokuwiki .plugin_wrap em strong { - font-size: 130%; - font-weight: bold; - font-style: normal; - display: block; -} -/* emulate a bigger headline with a bottom border */ -.dokuwiki .plugin_wrap em strong em.u { - font-size: 115%; - border-bottom: 1px solid __border__; - font-style: normal; - text-decoration: none; - display: block; -} -/* different bigger headline for safety notes */ -.dokuwiki .wrap_danger em strong em.u, -.dokuwiki .wrap_warning em strong em.u, -.dokuwiki .wrap_caution em strong em.u, -.dokuwiki .wrap_notice em strong em.u, -.dokuwiki .wrap_safety em strong em.u { - text-transform: uppercase; - border-bottom-width: 0; -} -/* change border colour of emulated headlines inside boxes to something more neutral - (to match all the different background colours) */ -.dokuwiki .wrap_box em strong em.u, -.dokuwiki .wrap_info em strong em.u, -.dokuwiki .wrap_important em strong em.u, -.dokuwiki .wrap_alert em strong em.u, -.dokuwiki .wrap_tip em strong em.u, -.dokuwiki .wrap_help em strong em.u, -.dokuwiki .wrap_todo em strong em.u, -.dokuwiki .wrap_download em strong em.u { - border-bottom-color: #999; -} - -/* real headlines should not be indented inside a wrap */ -.dokuwiki .plugin_wrap h1, -.dokuwiki .plugin_wrap h2, -.dokuwiki .plugin_wrap h3, -.dokuwiki .plugin_wrap h4, -.dokuwiki .plugin_wrap h5 { - margin-left: 0; - margin-right: 0; -} - -/* columns -********************************************************************/ - -.dokuwiki .wrap_left, -.dokuwiki .wrap_column { - float: left; - margin-right: 1.5em; -} -[dir=rtl] .dokuwiki .wrap_column { - float: right; - margin-left: 1.5em; - margin-right: 0; -} -.dokuwiki .wrap_right { - float: right; - margin-left: 1.5em; -} -.dokuwiki .wrap_center { - display: block; - margin-left: auto; - margin-right: auto; -} - -/*____________ CSS3 columns ____________*/ - -.dokuwiki .wrap_col2, .dokuwiki .wrap_col3, .dokuwiki .wrap_col4, .dokuwiki .wrap_col5 { - -moz-column-gap: 1.5em; - -webkit-column-gap: 1.5em; - column-gap: 1.5em; - -moz-column-rule: 1px dotted #666; - -webkit-column-rule: 1px dotted #666; - column-rule: 1px dotted #666; -} -.dokuwiki .wrap_col2 { - -moz-column-count: 2; - -webkit-column-count: 2; - column-count: 2; -} -.dokuwiki .wrap_col3 { - -moz-column-count: 3; - -webkit-column-count: 3; - column-count: 3; -} -.dokuwiki .wrap_col4 { - -moz-column-count: 4; - -webkit-column-count: 4; - column-count: 4; -} -.dokuwiki .wrap_col5 { - -moz-column-count: 5; - -webkit-column-count: 5; - column-count: 5; -} - - -/* widths -********************************************************************/ - -.dokuwiki .wrap_half { - width: 48%; - margin-right: 4%; -} - -.dokuwiki .wrap_third { - width: 30%; - margin-right: 5%; -} - -.dokuwiki .wrap_quarter { - width: 22%; - margin-right: 4%; -} - -[dir=rtl] .dokuwiki .wrap_half, -[dir=rtl] .dokuwiki .wrap_third, -[dir=rtl] .dokuwiki .wrap_quarter { - margin-right: 0; - margin-left: 4%; -} -[dir=rtl] .dokuwiki .wrap_third { - margin-left: 5%; -} - -.dokuwiki .wrap_half:nth-of-type(2n), -.dokuwiki .wrap_third:nth-of-type(3n), -.dokuwiki .wrap_quarter:nth-of-type(4n) { - margin-right: 0; -} -[dir=rtl] .dokuwiki .wrap_half:nth-of-type(2n), -[dir=rtl] .dokuwiki .wrap_third:nth-of-type(3n), -[dir=rtl] .dokuwiki .wrap_quarter:nth-of-type(4n) { - margin-left: 0; -} - -.dokuwiki .wrap_half:nth-of-type(2n+1), -.dokuwiki .wrap_third:nth-of-type(3n+1), -.dokuwiki .wrap_quarter:nth-of-type(4n+1) { - clear: left; -} -[dir=rtl] .dokuwiki .wrap_half:nth-of-type(2n+1), -[dir=rtl] .dokuwiki .wrap_third:nth-of-type(3n+1), -[dir=rtl] .dokuwiki .wrap_quarter:nth-of-type(4n+1) { - clear: right; -} - -/* show 2 instead 4 columns on medium sized screens (mobile, etc) */ -@media only screen and (max-width: 950px) { - -.dokuwiki .wrap_quarter { - width: 48%; -} -.dokuwiki .wrap_quarter:nth-of-type(2n) { - margin-right: 0; -} -[dir=rtl] .dokuwiki .wrap_quarter:nth-of-type(2n) { - margin-left: 0; -} -.dokuwiki .wrap_quarter:nth-of-type(2n+1) { - clear: left; -} -[dir=rtl] .dokuwiki .wrap_quarter:nth-of-type(2n) { - clear: right; -} - -} /* /@media */ - -/* show full width on smaller screens (mobile, etc) */ -@media only screen and (max-width: 600px) { - -.dokuwiki .wrap_half, -.dokuwiki .wrap_third, -.dokuwiki .wrap_quarter { - width: auto; - margin-right: 0; - margin-left: 0; - float: none; -} - -} /* /@media */ - - -/* alignments -********************************************************************/ - -.dokuwiki .wrap_leftalign { - text-align: left; -} -.dokuwiki .wrap_centeralign { - text-align: center; -} -.dokuwiki .wrap_rightalign { - text-align: right; -} -.dokuwiki .wrap_justify { - text-align: justify; -} - - -/* box -********************************************************************/ - -/* see styles for boxes and notes with icons in style.css */ - -/*____________ rounded corners ____________*/ -/* (only for modern browsers) */ - -.dokuwiki div.wrap_round { - border-radius: 1.4em; -} -.dokuwiki span.wrap_round { - border-radius: .14em; -} - - -/* mark -********************************************************************/ - -.dokuwiki .wrap_lo { - color: __text_neu__; - font-size: 85%; -} -.dokuwiki .wrap_em { - color: #c00; - font-weight: bold; -} -.dokuwiki .wrap__dark.wrap_em { - color: #f66; -} - -/* see styles for highlighted text in style.css */ - - -/* miscellaneous -********************************************************************/ - -/*____________ indent ____________*/ - -.dokuwiki .wrap_indent { - padding-left: 1.5em; -} -[dir=rtl] .dokuwiki .wrap_indent { - padding-right: 1.5em; - padding-left: 0; -} - - -/*____________ outdent ____________*/ - -.dokuwiki .wrap_outdent { - margin-left: -1.5em; -} -[dir=rtl] .dokuwiki .wrap_outdent { - margin-right: -1.5em; - margin-left: 0; -} - -/*____________ word wrapping in pre ____________*/ - -.dokuwiki div.wrap_prewrap pre { - white-space: pre-wrap; - word-wrap: break-word;/* for IE < 8 */ -} - -/*____________ spoiler ____________*/ - -.dokuwiki div.wrap_spoiler { - margin-bottom: 1.5em; -} -/* see rest of spoiler styles in style.css */ - -/*____________ clear float ____________*/ - -.dokuwiki .wrap_clear { - clear: both; - line-height: 0; - height: 0; - font-size: 1px; - visibility: hidden; - overflow: hidden; -} - -/*____________ hide ____________*/ - -.dokuwiki .wrap_hide { - display: none; -} - - -/*____________ button-style link ____________*/ - -.dokuwiki .wrap_button a:link, -.dokuwiki .wrap_button a:visited { - background-image: none; - border: 1px solid __border__; - border-radius: .3em; - padding: .5em .7em; - text-decoration: none; -} -/* see rest of button link styles in style.css */ diff --git a/sources/lib/plugins/wrap/conf/default.php b/sources/lib/plugins/wrap/conf/default.php deleted file mode 100644 index 9a622dd..0000000 --- a/sources/lib/plugins/wrap/conf/default.php +++ /dev/null @@ -1,12 +0,0 @@ - array(0,1)); -$meta['syntaxDiv'] = array('multichoice','_choices' => array('WRAP','block', 'div')); -$meta['syntaxSpan'] = array('multichoice','_choices' => array('wrap', 'inline', 'span')); -$meta['darkTpl'] = array('onoff'); diff --git a/sources/lib/plugins/wrap/example.txt b/sources/lib/plugins/wrap/example.txt deleted file mode 100644 index 5914d3f..0000000 --- a/sources/lib/plugins/wrap/example.txt +++ /dev/null @@ -1,437 +0,0 @@ -====== Examples for the Wrap Plugin ====== - -===== Basic syntax ===== - -An uppercase **%%%%** (or alternatively **%%%%** or **%%
    %%**) creates a **''div''** and should be used for **"big"** containers, **surrounding** paragraphs, lists, tables, etc. - - - -"big" content - - -or - -"big" content - - -or -
    -"big" content -
    -     - -A lowercase **%%%%** (or alternatively **%%%%** or **%%%%**) creates a **''span''** and should be used for **"small"** containers, **inside** paragraphs, lists, tables, etc. - - -"small" content - -or -"small" content - -or -"small" content - - -:!: Please note, some things **won't work with lowercase spans**: - * **alignments** (including alignments generated by changing the text direction) - * **multi-columns** - * and **widths** -if the according wrap isn't floated as well. - -A shorthand of uppercase **%%%%** and lowercase **%%%%** are available if the container is empty or unnecessary. - - - -or - -or -
    - - -and - - -or - -or - - - -===== Classes and Styles ===== - - -==== Columns and Floats ==== - -You can have columns easily by adding the class ''column'' and a width, e.g. - ...content... - -The example below uses the following structure: - - - - -...content... -...content... -...content... - - - - - - - -=== Floating Options === - -Normally you would only need the class ''column'', but for more sophisticated uses (not only for columns, but for any other classes, like [[#boxes and notes]] as well) you can have several kinds of "floats": - - * **''column''** is the same as ''left'' in LTR languages and the same as ''right'' in RTL languages - * **''left''** will let you float your wrap on the left - * **''right''** will let the wrap float right - * **''center''** will position the wrap in the horizontal center of the page - -A **table** inside a column or box will always be **100% wide**. This makes positioning and sizing tables possible. - - - - -=== Widths === - -You can set any valid widths (but only on divs): ''%, px, em, ex, pt, pc, cm, mm, in'', but most of the time you'd only want either - -^type^e.g.^note^ -^''%''|''30%''|makes sense in most cases| -^''px''|''420px''|makes sense if your container contains images with a certain width| -^''em''|''20em''|makes sense if you like your wrap container to grow and shrink with the font size| - - - -=== Width Keywords === - -With certain width keywords you can fit your columns automatically to fill the available horizontal space. Those columns will also react to the screen size, so will be responsive and wrap underneath each other on mobile devices. - -There are three width keywords. These should not be combined with any other width. - - * **''half''** fits two columns in a row - * **''third''** fits three columns in a row - * **''quarter''** fits four columns in a row - -:!: Attention: In order to work properly, wraps with width keywords need an **additional ''%%%%'' around a set** of them. - - - - - -You can use the same options with spans (as each element that floats is automatically a block level element), but it probably doesn't make too much sense. :!: Widths on spans normally do not work (by design), but can make sense, when it is floating. - -:!: Attention: What is the difference between widths and width keywords and when is it best to use which? **Widths** can cause problems and will never fully add up, therefore will break the layout under some circumstances. (See [[http://en.wikipedia.org/wiki/Internet_Explorer_box_model_bug|box model]] for a technical explanation.) So, getting widths right will need some fiddling around and testing in various browsers. **Width keywords** on the other hand fit automatically and work better on mobile devices. But the drawback is that they need an extra wrap around them and don't work properly in older browsers (IE8 and under). - -All of those options will also work in the [[#boxes and notes]] wraps (see below). - -=== Old Emulated Headlines === - -Every ''%%//**__text like this__**//%%'' or ''%%//**like that**//%%'' will create an "emulated headline" when used within a box or a column. Now that headlines within wraps are supported, they are not needed anymore, but are still supported for backwards-compatibility. - -If you need text that is bold and italic, simply use it the other way around: ''%%**//No Headline//**%%'' - - -=== Multi-columns === - - -For modern browsers (Firefox, Chrome and Safari, IE10+) you can use multi-columns. Just use **''%%col2%%''** for 2 columns, **''%%col3%%''** for 3 columns, **''%%col4%%''** for 4 columns and **''%%col5%%''** for 5 columns. - -:!: Note: Multi-columns don't make sense for spans. - - -Don't use this for bigger columns containing more than just text. Use the [[#columns and floats]] mentioned above instead. - - -==== Alignments ==== - -You can use these different text alignments: - - * ''leftalign'' - * ''rightalign'' - * ''centeralign'' - * ''justify'' - - -Center aligned text ... - - - -... and right aligned. - - - - -Center aligned text ... - - - -... and right aligned. - - - -:!: You cannot add alignments to spans. - - -==== Boxes and Notes ==== - - -=== round box 500px center === - - * ''box'' creates a box around the container and uses the colours from the template's ''style.ini'' as default colours (''%%__background_alt__%%'' and ''%%__text__%%'') - * any of the classes ''info'', ''tip'', ''important'', ''alert'', ''help'', ''download'', ''todo'' will add a special note container with a corresponding icon - * the classes ''danger'', ''warning'', ''caution'', ''notice'', ''safety'' use safety colours (and no icons) - * ''round'' can be added to anything with a background colour or a border and will only work in modern browsers (no IE8 and under) - - - - -=== Info === - - - - - -=== Tip === - - - - - -=== Important === - - - - - -=== Alert === - - - - - -=== Help === - - - - - -=== Download === - - - - - -=== Todo === - - - - - - - -**Safety Notes:** - - -=== Danger === - - - - -=== Warning === - - - - -=== Caution === - - - - -=== Notice === - - - - -=== Safety === - - - - - - -You can use notes and boxes also inside text with spans like this: -info, help, alert, important, tip, download, todo and round box and danger, warning, caution, notice, safety. - info, help, ... - -==== Marks ==== - -You can mark text as highlighted, less significant and especially emphasised. - - You can mark text as highlighted, less significant and especially emphasised. - -:!: This might look ugly in some templates and should be adjusted accordingly. - -==== Tabs ==== - -You can create a row of tabs by simply wrapping a list of links in ''%%%%''. - - - * [[Some page]] - * [[example|This page]] - * [[Another page]] - - - - * [[Some page]] - * [[example|This page]] - * [[Another page]] - - -:!: Please note, the styling of these tabs depend on the template you are using and not on the wrap plugin. If you only see a list of links and no tabs, please make sure to add "tabs" to the ''noPrefix'' config option and that your template supports at least the 2012-01-25 "Angua" DokuWiki release. - -==== Miscellaneous ==== - -=== Clear float === - -After using any of the float classes, you might come across following text protruding into the space where only the floating containers should be. To prevent that, you should simply add this after your last column: - - - -=== Indent === - -This text will appear indented. - - This text will appear indented. - -=== Outdent === - -This text will appear "outdented". - - This text will appear "outdented". - -=== Prewrap === - - - -Inside this code block the words will wrap to a new line although they are all in one line. - - - - - - Inside this code block the words will wrap to a new line although they are all in one line. - - - -=== Spoiler === - -Here follows a spoiler: Darth Vader is Luke's father. - - Here follows a spoiler: Darth Vader is Luke's father. - -Just select the text in the spoiler box to be able to read its content. - -=== Button links === - -A link that looks like a button: [[wiki:Syntax]] - - A link that looks like a button: [[wiki:Syntax]] - -=== Hide === - -The following text is hidden: John, please revise that sentence. - - The following text is hidden: John, please revise that sentence. - -:!: Warning: The text will still appear in the source code, in non-modern browsers and is searchable. Do not hide any security risky secrets with it! - -=== Pagebreak === - -The following will add a pagebreak: - - The following will add a pagebreak: - -This has no effect on the browser screen. A [[http://reference.sitepoint.com/css/page-break-after|pagebreak]] will force a new page in printouts. - -=== Nopagebreak === - -The following will try to avoid a pagebreak: much content, belonging together (like a long table) - - The following will try to avoid a pagebreak: much content, belonging together (like a long table) - -This also has no effect on the browser screen. It will try to [[http://reference.sitepoint.com/css/page-break-inside|avoid a page break]] in printouts. - -=== Noprint === - -This text appears on the screen, but not in print. - - This text appears on the screen, but not in print. - -=== Onlyprint === - -This text does not appear on the screen, but only in print. - - This text does not appear on the screen, but only in print. - - -==== Combining and Nesting ==== - -You can combine and nest all classes and types of boxes, e.g. - - -===Outer box floats right === - - -Inner nested box floats left and is partly __em__phasized and __hi__ghlighted with a nested __notice__ inside. - - -Text inside outer right box, but beneath inner left box. - - - - -Round tip box underneath, after a ''clear''. - - - - - - - -=== Outer box floats right === - - -Inner nested box floats left and is partly __em__phasized and __hi__ghlighted with a nested __notice__ inside. - - -Text inside outer right box, but beneath inner left box. - - - - -Round tip box underneath, after a ''clear''. - - - - - - -===== Language and Text Direction ===== - -You can change the language and the reading direction of a wrap container by simply adding a colon followed by the language code, like this: - - - -×–×” עברית. ((This means "This is Hebrew.", at least according to [[http://translate.google.com/|Google Translate]].)) - - - - -×–×” עברית. ((This means "This is Hebrew.", at least according to [[http://translate.google.com/|Google Translate]].)) - - -The text direction (''rtl'', right to left or ''ltr'', left to right) will get inserted automatically and is solely dependent on the language. The list of currently supported languages is taken from: http://meta.wikimedia.org/wiki/Template:List_of_language_names_ordered_by_code -(If you specify a language not listed there, it simply won't do anything.) diff --git a/sources/lib/plugins/wrap/helper.php b/sources/lib/plugins/wrap/helper.php deleted file mode 100644 index 85a81b0..0000000 --- a/sources/lib/plugins/wrap/helper.php +++ /dev/null @@ -1,489 +0,0 @@ - - */ - -// must be run within Dokuwiki -if(!defined('DOKU_INC')) die(); - -class helper_plugin_wrap extends DokuWiki_Plugin { - static protected $boxes = array ('wrap_box', 'wrap_danger', 'wrap_warning', 'wrap_caution', 'wrap_notice', 'wrap_safety', - 'wrap_info', 'wrap_important', 'wrap_alert', 'wrap_tip', 'wrap_help', 'wrap_todo', - 'wrap_download', 'wrap_hi', 'wrap_spoiler'); - static protected $paragraphs = array ('wrap_leftalign', 'wrap_rightalign', 'wrap_centeralign', 'wrap_justify'); - static protected $column_count = 0; - - /** - * get attributes (pull apart the string between '') - * and identify classes, width, lang and dir - * - * @author Anika Henke - * @author Christopher Smith - * (parts taken from http://www.dokuwiki.org/plugin:box) - */ - function getAttributes($data) { - - $attr = array(); - $tokens = preg_split('/\s+/', $data, 9); - $noPrefix = array_map('trim', explode(',', $this->getConf('noPrefix'))); - $restrictedClasses = $this->getConf('restrictedClasses'); - if ($restrictedClasses) { - $restrictedClasses = array_map('trim', explode(',', $this->getConf('restrictedClasses'))); - } - $restrictionType = $this->getConf('restrictionType'); - - foreach ($tokens as $token) { - - //get width - if (preg_match('/^\d*\.?\d+(%|px|em|ex|pt|pc|cm|mm|in)$/', $token)) { - $attr['width'] = $token; - continue; - } - - //get lang - if (preg_match('/\:([a-z\-]+)/', $token)) { - $attr['lang'] = trim($token,':'); - continue; - } - - //get id - if (preg_match('/#([A-Za-z0-9_-]+)/', $token)) { - $attr['id'] = trim($token,'#'); - continue; - } - - //get classes - //restrict token (class names) characters to prevent any malicious data - if (preg_match('/[^A-Za-z0-9_-]/',$token)) continue; - if ($restrictedClasses) { - $classIsInList = in_array(trim($token), $restrictedClasses); - // either allow only certain classes - if ($restrictionType) { - if (!$classIsInList) continue; - // or disallow certain classes - } else { - if ($classIsInList) continue; - } - } - $prefix = in_array($token, $noPrefix) ? '' : 'wrap_'; - $attr['class'] = (isset($attr['class']) ? $attr['class'].' ' : '').$prefix.$token; - } - if ($this->getConf('darkTpl')) { - $attr['class'] = (isset($attr['class']) ? $attr['class'].' ' : '').'wrap__dark'; - } - - //get dir - if($attr['lang']) { - $lang2dirFile = dirname(__FILE__).'/conf/lang2dir.conf'; - if (@file_exists($lang2dirFile)) { - $lang2dir = confToHash($lang2dirFile); - $attr['dir'] = strtr($attr['lang'],$lang2dir); - } - } - - return $attr; - } - - /** - * build attributes (write out classes, width, lang and dir) - */ - function buildAttributes($data, $addClass='', $mode='xhtml') { - - $attr = $this->getAttributes($data); - $out = ''; - - if ($mode=='xhtml') { - if($attr['class']) $out .= ' class="'.hsc($attr['class']).' '.$addClass.'"'; - // if used in other plugins, they might want to add their own class(es) - elseif($addClass) $out .= ' class="'.$addClass.'"'; - if($attr['id']) $out .= ' id="'.hsc($attr['id']).'"'; - // width on spans normally doesn't make much sense, but in the case of floating elements it could be used - if($attr['width']) { - if (strpos($attr['width'],'%') !== false) { - $out .= ' style="width: '.hsc($attr['width']).';"'; - } else { - // anything but % should be 100% when the screen gets smaller - $out .= ' style="width: '.hsc($attr['width']).'; max-width: 100%;"'; - } - } - // only write lang if it's a language in lang2dir.conf - if($attr['dir']) $out .= ' lang="'.$attr['lang'].'" xml:lang="'.$attr['lang'].'" dir="'.$attr['dir'].'"'; - } - - return $out; - } - - /** - * render ODT element, Open - * (get Attributes, select ODT element that fits, render it, return element name) - */ - function renderODTElementOpen($renderer, $HTMLelement, $data) { - - $attr = $this->getAttributes($data); - $classes = explode (' ', $attr['class']); - - // Get language - $language = $attr['lang']; - - $is_indent = in_array ('wrap_indent', $classes); - $is_outdent = in_array ('wrap_outdent', $classes); - $is_column = in_array ('wrap_column', $classes); - $is_group = in_array ('group', $classes); - $is_pagebreak = in_array ('wrap_pagebreak', $classes); - - // Check for multicolumns - $columns = 0; - preg_match ('/wrap_col\d/', $attr ['class'], $matches); - if ( empty ($matches [0]) === false ) { - $columns = $matches [0] [strlen($matches [0])-1]; - } - - // Check for boxes - $is_box = false; - foreach (self::$boxes as $box) { - if ( strpos ($attr ['class'], $box) !== false ) { - $is_box = true; - break; - } - } - - // Check for paragraphs - $is_paragraph = false; - if ( empty($language) === false ) { - $is_paragraph = true; - } else { - foreach (self::$paragraphs as $paragraph) { - if ( strpos ($attr ['class'], $paragraph) !== false ) { - $is_paragraph = true; - break; - } - } - } - - $style = NULL; - if ( empty($attr['width']) === false ) { - $style = 'width: '.$attr['width'].';'; - } - $attr ['class'] = 'dokuwiki '.$attr ['class']; - - // Call corresponding functions for current wrap class - if ( $HTMLelement == 'span' ) { - if ( $is_indent === false && $is_outdent === false ) { - $this->renderODTOpenSpan ($renderer, $attr ['class'], $style, $language); - return 'span'; - } else { - $this->renderODTOpenParagraph ($renderer, $attr ['class'], $style, $language, $is_indent, $is_outdent, true); - return 'paragraph'; - } - } else if ( $HTMLelement == 'div' ) { - if ( $is_box === true ) { - $this->renderODTOpenBox ($renderer, $attr ['class'], $style); - return 'box'; - } else if ( $columns > 0 ) { - $this->renderODTOpenColumns ($renderer, $attr ['class'], $style); - return 'multicolumn'; - } else if ( $is_paragraph === true || $is_indent === true || $is_outdent === true ) { - $this->renderODTOpenParagraph ($renderer, $attr ['class'], $style, $language, $is_indent, $is_outdent, false); - return 'paragraph'; - } else if ( $is_pagebreak === true ) { - $renderer->pagebreak (); - // Pagebreak hasn't got a closing stack so we return/push 'other' on the stack - return 'other'; - } else if ( $is_column === true ) { - $this->renderODTOpenColumn ($renderer, $attr ['class'], $style); - return 'column'; - } else if ( $is_group === true ) { - $this->renderODTOpenGroup ($renderer, $attr ['class'], $style); - return 'group'; - } - } - return 'other'; - } - - /** - * render ODT element, Close - */ - function renderODTElementClose($renderer, $element) { - switch ($element) { - case 'box': - $this->renderODTCloseBox ($renderer); - break; - case 'multicolumn': - $this->renderODTCloseColumns($renderer); - break; - case 'paragraph': - $this->renderODTCloseParagraph($renderer); - break; - case 'column': - $this->renderODTCloseColumn($renderer); - break; - case 'group': - $this->renderODTCloseGroup($renderer); - break; - case 'span': - $this->renderODTCloseSpan($renderer); - break; - // No default by intention. - } - } - - function renderODTOpenBox ($renderer, $class, $style) { - $properties = array (); - - if ( method_exists ($renderer, 'getODTProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - // Get CSS properties for ODT export. - $renderer->getODTProperties ($properties, 'div', $class, $style); - - if ( empty($properties ['background-image']) === false ) { - $properties ['background-image'] = - $renderer->replaceURLPrefix ($properties ['background-image'], DOKU_INC); - } - - if ( empty($properties ['float']) === true ) { - // If the float property is not set, set it to 'left' becuase the ODT plugin - // would default to 'center' which is diffeent to the XHTML behaviour. - if ( strpos ($class, 'wrap_center') === false ) { - $properties ['float'] = 'left'; - } else { - $properties ['float'] = 'center'; - } - } - - // The display property has differing usage in CSS. So we better overwrite it. - $properties ['display'] = 'always'; - if ( stripos ($class, 'wrap_noprint') !== false ) { - $properties ['display'] = 'screen'; - } - if ( stripos ($class, 'wrap_onlyprint') !== false ) { - $properties ['display'] = 'printer'; - } - - $renderer->_odtDivOpenAsFrameUseProperties ($properties); - } - - function renderODTCloseBox ($renderer) { - if ( method_exists ($renderer, '_odtDivCloseAsFrame') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - $renderer->_odtDivCloseAsFrame (); - } - - function renderODTOpenColumns ($renderer, $class, $style) { - $properties = array (); - - if ( method_exists ($renderer, 'getODTProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - // Get CSS properties for ODT export. - $renderer->getODTProperties ($properties, 'div', $class, $style); - - $renderer->_odtOpenMultiColumnFrame($properties); - } - - function renderODTCloseColumns ($renderer) { - if ( method_exists ($renderer, '_odtCloseMultiColumnFrame') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - $renderer->_odtCloseMultiColumnFrame(); - } - - function renderODTOpenParagraph ($renderer, $class, $style, $language, $is_indent, $is_outdent, $indent_first) { - $properties = array (); - - if ( method_exists ($renderer, 'getODTProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - // Get CSS properties for ODT export. - $renderer->getODTProperties ($properties, 'p', $class, $style); - - if ( empty($properties ['background-image']) === false ) { - $properties ['background-image'] = - $renderer->replaceURLPrefix ($properties ['background-image'], DOKU_INC); - } - - if ( empty($language) === false ) { - $properties ['lang'] = $language; - } - - if ( $indent_first === true ) { - // Eventually indent or outdent first line only... - if ( $is_indent === true ) { - // FIXME: Has to be adjusted if test direction will be supported. - // See all.css - $properties ['text-indent'] = $properties ['padding-left']; - $properties ['padding-left'] = 0; - } - if ( $is_outdent === true ) { - // FIXME: Has to be adjusted if text (RTL, LTR) direction will be supported. - // See all.css - $properties ['text-indent'] = $properties ['margin-left']; - $properties ['margin-left'] = 0; - } - } else { - // Eventually indent or outdent the whole paragraph... - if ( $is_indent === true ) { - // FIXME: Has to be adjusted if test direction will be supported. - // See all.css - $properties ['margin-left'] = $properties ['padding-left']; - $properties ['padding-left'] = 0; - } - if ( $is_outdent === true ) { - // Nothing to change: keep left margin property. - // FIXME: Has to be adjusted if text (RTL, LTR) direction will be supported. - // See all.css - } - } - - $renderer->p_close(); - $renderer->_odtParagraphOpenUseProperties($properties); - } - - function renderODTCloseParagraph ($renderer) { - if ( method_exists ($renderer, 'p_close') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - $renderer->p_close(); - } - - function renderODTOpenColumn ($renderer, $class, $style) { - $properties = array (); - - if ( method_exists ($renderer, 'getODTProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - // Get CSS properties for ODT export. - $renderer->getODTProperties ($properties, NULL, $class, $style); - - - // Frames/Textboxes still have some issues with formatting (at least in LibreOffice) - // So as a workaround we implement columns as a table. - // This is why we now use the margin of the div as the padding for the ODT table. - $properties ['padding-left'] = $properties ['margin-left']; - $properties ['padding-right'] = $properties ['margin-right']; - $properties ['padding-top'] = $properties ['margin-top']; - $properties ['padding-bottom'] = $properties ['margin-bottom']; - $properties ['margin-left'] = NULL; - $properties ['margin-right'] = NULL; - $properties ['margin-top'] = NULL; - $properties ['margin-bottom'] = NULL; - - // Percentage values are not supported for the padding. Convert to absolute values. - $length = strlen ($properties ['padding-left']); - if ( $length > 0 && $properties ['padding-left'] [$length-1] == '%' ) { - $properties ['padding-left'] = trim ($properties ['padding-left'], '%'); - $properties ['padding-left'] = $renderer->_getAbsWidthMindMargins ($properties ['padding-left']).'cm'; - } - $length = strlen ($properties ['padding-right']); - if ( $length > 0 && $properties ['padding-right'] [$length-1] == '%' ) { - $properties ['padding-right'] = trim ($properties ['padding-right'], '%'); - $properties ['padding-right'] = $renderer->_getAbsWidthMindMargins ($properties ['padding-right']).'cm'; - } - $length = strlen ($properties ['padding-top']); - if ( $length > 0 && $properties ['padding-top'] [$length-1] == '%' ) { - $properties ['padding-top'] = trim ($properties ['padding-top'], '%'); - $properties ['padding-top'] = $renderer->_getAbsWidthMindMargins ($properties ['padding-top']).'cm'; - } - $length = strlen ($properties ['padding-bottom']); - if ( $length > 0 && $properties ['padding-bottom'] [$length-1] == '%' ) { - $properties ['padding-bottom'] = trim ($properties ['padding-bottom'], '%'); - $properties ['padding-bottom'] = $renderer->_getAbsWidthMindMargins ($properties ['padding-bottom']).'cm'; - } - - $this->column_count++; - if ( $this->column_count == 1 ) { - // If this is the first column opened since the group was opened - // then we have to open the table and a (single) row first. - $column_width = $properties ['width']; - $properties ['width'] = '100%'; - $renderer->_odtTableOpenUseProperties($properties); - $renderer->_odtTableRowOpenUseProperties($properties); - $properties ['width'] = $column_width; - } - - // Convert rel-width to absolute width. - // The width in percentage works strange in LibreOffice, this is a workaround. - $length = strlen ($properties ['width']); - if ( $length > 0 && $properties ['width'] [$length-1] == '%' ) { - $properties ['width'] = trim ($properties ['width'], '%'); - $properties ['width'] = $renderer->_getAbsWidthMindMargins ($properties ['width']).'cm'; - } - - // We did not specify any max column value when we opened the table. - // So we have to tell the renderer to add a column just now. - $renderer->_odtTableAddColumnUseProperties($properties); - - // Open the cell. - $renderer->_odtTableCellOpenUseProperties($properties); - } - - function renderODTCloseColumn ($renderer) { - if ( method_exists ($renderer, '_odtTableAddColumnUseProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - $renderer->tablecell_close(); - } - - function renderODTOpenGroup ($renderer, $class, $style) { - // Nothing to do for now. - } - - function renderODTCloseGroup ($renderer) { - // If a table has been opened in the group we close it now. - if ( $this->column_count > 0 ) { - // At last we need to close the row and the table! - $renderer->tablerow_close(); - //$renderer->table_close(); - $renderer->_odtTableClose(); - } - $this->column_count = 0; - } - - function renderODTOpenSpan ($renderer, $class, $style, $language) { - $properties = array (); - - if ( method_exists ($renderer, 'getODTProperties') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - - // Get CSS properties for ODT export. - $renderer->getODTProperties ($properties, 'span', $class, $style); - - if ( empty($properties ['background-image']) === false ) { - $properties ['background-image'] = - $renderer->replaceURLPrefix ($properties ['background-image'], DOKU_INC); - } - - if ( empty($language) === false ) { - $properties ['lang'] = $language; - } - - $renderer->_odtSpanOpenUseProperties($properties); - } - - function renderODTCloseSpan ($renderer) { - if ( method_exists ($renderer, '_odtSpanClose') === false ) { - // Function is not supported by installed ODT plugin version, return. - return; - } - $renderer->_odtSpanClose(); - } -} diff --git a/sources/lib/plugins/wrap/images/README b/sources/lib/plugins/wrap/images/README deleted file mode 100644 index a44a9f4..0000000 --- a/sources/lib/plugins/wrap/images/README +++ /dev/null @@ -1,18 +0,0 @@ -_NOTE_ - -Icon set: Human-O2 -Designer: Oliver Scholtz (and others) [~schollidesign] -License: GPL (http://www.gnu.org/copyleft/gpl.html) -URL: http://schollidesign.deviantart.com/art/Human-O2-Iconset-105344123 - -_TOOLBAR_ - -Icon set: Silk -Designer: Mark James -License: Creative Commons Attribution 2.5 License (http://creativecommons.org/licenses/by/2.5/) -URL: http://www.famfamfam.com/lab/icons/silk/ - -Icon set: Silk Companion -Designer: Damien Guard -License: Creative Commons Attribution 2.5 License (http://creativecommons.org/licenses/by/2.5/) -URL: http://www.damieng.com/icons/silkcompanion diff --git a/sources/lib/plugins/wrap/images/note/16/alert.png b/sources/lib/plugins/wrap/images/note/16/alert.png deleted file mode 100644 index f051b1d..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/alert.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/download.png b/sources/lib/plugins/wrap/images/note/16/download.png deleted file mode 100644 index e8c7221..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/download.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/help.png b/sources/lib/plugins/wrap/images/note/16/help.png deleted file mode 100644 index 2e923a2..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/help.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/important.png b/sources/lib/plugins/wrap/images/note/16/important.png deleted file mode 100644 index 0d7f1f0..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/important.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/info.png b/sources/lib/plugins/wrap/images/note/16/info.png deleted file mode 100644 index 9b38f8e..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/info.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/tip.png b/sources/lib/plugins/wrap/images/note/16/tip.png deleted file mode 100644 index 23824bb..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/tip.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/16/todo.png b/sources/lib/plugins/wrap/images/note/16/todo.png deleted file mode 100644 index ebaf17a..0000000 Binary files a/sources/lib/plugins/wrap/images/note/16/todo.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/alert.png b/sources/lib/plugins/wrap/images/note/48/alert.png deleted file mode 100644 index e6f090f..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/alert.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/download.png b/sources/lib/plugins/wrap/images/note/48/download.png deleted file mode 100644 index 8f7def1..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/download.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/help.png b/sources/lib/plugins/wrap/images/note/48/help.png deleted file mode 100644 index e39a09d..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/help.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/important.png b/sources/lib/plugins/wrap/images/note/48/important.png deleted file mode 100644 index 6910ef6..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/important.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/info.png b/sources/lib/plugins/wrap/images/note/48/info.png deleted file mode 100644 index ccb25e8..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/info.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/tip.png b/sources/lib/plugins/wrap/images/note/48/tip.png deleted file mode 100644 index 7bd8951..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/tip.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/note/48/todo.png b/sources/lib/plugins/wrap/images/note/48/todo.png deleted file mode 100644 index cfbc272..0000000 Binary files a/sources/lib/plugins/wrap/images/note/48/todo.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/box.png b/sources/lib/plugins/wrap/images/toolbar/box.png deleted file mode 100644 index 33af046..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/box.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/clear.png b/sources/lib/plugins/wrap/images/toolbar/clear.png deleted file mode 100644 index 1cdcb48..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/clear.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/column.png b/sources/lib/plugins/wrap/images/toolbar/column.png deleted file mode 100644 index 97b2e03..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/column.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/em.png b/sources/lib/plugins/wrap/images/toolbar/em.png deleted file mode 100644 index 8940131..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/em.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/hi.png b/sources/lib/plugins/wrap/images/toolbar/hi.png deleted file mode 100644 index c57aa15..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/hi.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/lo.png b/sources/lib/plugins/wrap/images/toolbar/lo.png deleted file mode 100644 index cb64e86..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/lo.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/images/toolbar/picker.png b/sources/lib/plugins/wrap/images/toolbar/picker.png deleted file mode 100644 index 4b5b847..0000000 Binary files a/sources/lib/plugins/wrap/images/toolbar/picker.png and /dev/null differ diff --git a/sources/lib/plugins/wrap/lang/ar/lang.php b/sources/lib/plugins/wrap/lang/ar/lang.php deleted file mode 100644 index 0b2fc57..0000000 --- a/sources/lib/plugins/wrap/lang/ar/lang.php +++ /dev/null @@ -1,16 +0,0 @@ - - */ -$lang['column'] = 'عمود'; -$lang['box'] = 'مربع متوسط بسيط'; -$lang['info'] = 'مربع معلومات'; -$lang['tip'] = 'مربع تلميح'; -$lang['important'] = 'مربع هام'; -$lang['alert'] = 'مربع التنبيه'; -$lang['help'] = 'مربع تعليمات'; -$lang['download'] = 'مربع التحميل'; -$lang['lo'] = 'أقل أهمية'; diff --git a/sources/lib/plugins/wrap/lang/ar/settings.php b/sources/lib/plugins/wrap/lang/ar/settings.php deleted file mode 100644 index 808b843..0000000 --- a/sources/lib/plugins/wrap/lang/ar/settings.php +++ /dev/null @@ -1,11 +0,0 @@ - - */ -$lang['restrictedClasses'] = 'تقييد استخدام البرنامج المساعد لهذه الÙئات (Ù…Ùصولة بÙاصلة)'; -$lang['restrictionType'] = 'تعين نوع القيد، إذا كانت الÙئات المذكورة أعلاه يجب تضمينها أو استبعادها'; -$lang['restrictionType_o_0'] = 'السماح لجميع الÙئات باستثناء تلك المذكورة أعلاه'; -$lang['restrictionType_o_1'] = 'تقييد للÙئات المذكورة أعلاه Ùقط وليس غيرها'; diff --git a/sources/lib/plugins/wrap/lang/bn/lang.php b/sources/lib/plugins/wrap/lang/bn/lang.php deleted file mode 100644 index 301d270..0000000 --- a/sources/lib/plugins/wrap/lang/bn/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'মোড়ানো পà§à¦²à¦¾à¦—ইন'; -$lang['column'] = 'সà§à¦¤à¦®à§à¦­'; -$lang['box'] = 'সহজ কেনà§à¦¦à§à¦°à¦¿à¦• বাকà§à¦¸'; -$lang['info'] = 'তথà§à¦¯ বাকà§à¦¸'; -$lang['tip'] = 'টিপ বাকà§à¦¸'; -$lang['important'] = 'গà§à¦°à§à¦¤à§à¦¬à¦ªà§‚রà§à¦£ বাকà§à¦¸'; -$lang['alert'] = 'সতরà§à¦•à¦¤à¦¾ বাকà§à¦¸'; -$lang['help'] = 'সাহাযà§à¦¯ বাকà§à¦¸'; -$lang['download'] = 'ডাউনলোডের বাকà§à¦¸'; -$lang['todo'] = 'করণীয় বাকà§à¦¸'; -$lang['clear'] = 'সà§à¦ªà¦·à§à¦Ÿ floats'; -$lang['em'] = 'বিশেষ করে জোর'; -$lang['hi'] = 'হাইলাইট'; -$lang['lo'] = 'কম গà§à¦°à§à¦¤à§à¦¬à¦ªà§‚রà§à¦£'; diff --git a/sources/lib/plugins/wrap/lang/bn/settings.php b/sources/lib/plugins/wrap/lang/bn/settings.php deleted file mode 100644 index baeca82..0000000 --- a/sources/lib/plugins/wrap/lang/bn/settings.php +++ /dev/null @@ -1,14 +0,0 @@ - - */ -$lang['noPrefix'] = 'যা (কমা দিয়ে পৃথক) শà§à¦°à§‡à¦£à§€à¦° নাম "wrap_" সঙà§à¦—ে অগà§à¦°à§‡ যà§à¦•à§à¦¤ হওয়া থেকে বাদ দেওয়া হবে?'; -$lang['restrictedClasses'] = 'à¦à¦‡à¦¸à¦¬ করতে পà§à¦²à¦¾à¦—িন বà§à¦¯à¦¬à¦¹à¦¾à¦° সীমিত (কমা দিয়ে পৃথক করা) কà§à¦²à¦¾à¦¸'; -$lang['restrictionType'] = 'কà§à¦²à¦¾à¦¸ উপরে অনà§à¦¤à¦°à§à¦­à§à¦•à§à¦¤ বা বাদ দেওয়া হইবে যদি সীমাবদà§à¦§à¦¤à¦¾ ধরন, নিরà§à¦¦à¦¿à¦·à§à¦Ÿ করে'; -$lang['restrictionType_o_0'] = 'উপরোকà§à¦¤ জনকে ছাড়া সব শà§à¦°à§‡à¦£à§€à¦° অনà§à¦®à¦¤à¦¿'; -$lang['restrictionType_o_1'] = 'শà§à¦§à§à¦®à¦¾à¦¤à§à¦° উপরোকà§à¦¤ শà§à¦°à§‡à¦£à§€à¦° à¦à¦¬à¦‚ কোন অনà§à¦¯à¦¦à§‡à¦° সীমিত'; -$lang['syntaxDiv'] = 'কোন বাকà§à¦¯ গঠন বà§à¦²à¦• গোপন জনà§à¦¯ টà§à¦²à¦¬à¦¾à¦° জà§à¦¤à§‹ বà§à¦¯à¦¬à¦¹à¦¾à¦° করা উচিত?'; -$lang['syntaxSpan'] = 'কোন বাকà§à¦¯ গঠন ইনলাইন গোপন জনà§à¦¯ টà§à¦²à¦¬à¦¾à¦° জà§à¦¤à§‹ বà§à¦¯à¦¬à¦¹à¦¾à¦° করা উচিত?'; diff --git a/sources/lib/plugins/wrap/lang/cs/lang.php b/sources/lib/plugins/wrap/lang/cs/lang.php deleted file mode 100644 index 7c3d7dc..0000000 --- a/sources/lib/plugins/wrap/lang/cs/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Zásuvný modul Wrap'; -$lang['column'] = 'sloupce'; -$lang['box'] = 'jednoduchý vystÅ™edÄ›ný rámeÄek'; -$lang['info'] = 'informaÄní rámeÄek'; -$lang['tip'] = 'rámeÄek s radou'; -$lang['important'] = 'důležitý rámeÄek'; -$lang['alert'] = 'výstražný rámeÄek'; -$lang['help'] = 'pomocný rámeÄek'; -$lang['download'] = 'rámeÄek s odkazem ke stažení'; -$lang['todo'] = 'rámeÄek úkolu'; -$lang['clear'] = 'clear floats'; -$lang['em'] = 'zvláštnÄ› zdůraznÄ›né'; -$lang['hi'] = 'zvýraznÄ›né'; -$lang['lo'] = 'ménÄ› důležité'; diff --git a/sources/lib/plugins/wrap/lang/cs/settings.php b/sources/lib/plugins/wrap/lang/cs/settings.php deleted file mode 100644 index 6d19249..0000000 --- a/sources/lib/plugins/wrap/lang/cs/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['noPrefix'] = 'Která (Äárkou oddÄ›lená) jména tříd nemají být oznaÄována pÅ™edponou "wrap_"?'; -$lang['restrictedClasses'] = 'omezit použití zásuvného modulu na tyto (Äárkou oddÄ›lené) třídy'; -$lang['restrictionType'] = 'typ omezení, rozhoduje jestli mají být výše uvedené třídy zahrnuty nebo vyÅ™azeny'; -$lang['restrictionType_o_0'] = 'povolit vÅ¡echny třídy kromÄ› tÄ›ch výše'; -$lang['restrictionType_o_1'] = 'omezit pouze na třídy výše a žádné jiné'; -$lang['syntaxDiv'] = 'Jaká syntax má být použita ve výbÄ›ru pro zarovnání bloku? '; -$lang['syntaxSpan'] = 'Jaká syntax má být použita ve výbÄ›ru pro zarovnání v řádku? '; -$lang['darkTpl'] = 'Optimalizovat barvy pro tmavý vzhled?'; diff --git a/sources/lib/plugins/wrap/lang/da/lang.php b/sources/lib/plugins/wrap/lang/da/lang.php deleted file mode 100644 index d300095..0000000 --- a/sources/lib/plugins/wrap/lang/da/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap Plugin'; -$lang['column'] = 'række'; -$lang['box'] = 'simpel centreret boks'; -$lang['info'] = 'info boks'; -$lang['tip'] = 'tip boks'; -$lang['important'] = 'vigtig boks'; -$lang['alert'] = 'alarm boks'; -$lang['help'] = 'hjælp boks'; -$lang['download'] = 'download boks'; -$lang['todo'] = 'todo boks'; -$lang['clear'] = 'ryd flydere'; -$lang['em'] = 'specielt fremhævet'; -$lang['hi'] = 'fremhævet'; -$lang['lo'] = 'mindre vigtigt'; diff --git a/sources/lib/plugins/wrap/lang/da/settings.php b/sources/lib/plugins/wrap/lang/da/settings.php deleted file mode 100644 index 25b0962..0000000 --- a/sources/lib/plugins/wrap/lang/da/settings.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['noPrefix'] = 'Hvilke (kommaseparerede) klassenavne skal udelukkes fra at fÃ¥ præfikset "wrap_"?'; -$lang['restrictedClasses'] = 'begræns brugen af plugin til følgende (kommaseparerede) klasser'; -$lang['restrictionType'] = 'begrænsningstype, specificerer om ovenstÃ¥ende klasser skal inkluderes eller ekskluderes'; -$lang['restrictionType_o_0'] = 'tillad alle klasser pÃ¥ nær de ovenstÃ¥ende'; -$lang['restrictionType_o_1'] = 'begræns til ovenstÃ¥ende klasser og ingen andre'; diff --git a/sources/lib/plugins/wrap/lang/de-informal/lang.php b/sources/lib/plugins/wrap/lang/de-informal/lang.php deleted file mode 100644 index 0e83e08..0000000 --- a/sources/lib/plugins/wrap/lang/de-informal/lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - */ -$lang['picker'] = 'Wrap-kromaĵo'; -$lang['column'] = 'kolumnoj'; -$lang['box'] = 'simpla centrita skatolo'; -$lang['info'] = 'inform-skatolo'; -$lang['tip'] = 'konsil-skatolo'; -$lang['important'] = 'grava skatolo'; -$lang['alert'] = 'avert-skatolo'; -$lang['help'] = 'help-skatolo'; -$lang['download'] = 'elÅut-skatolo'; -$lang['todo'] = 'farendaĵ-skatolo'; -$lang['clear'] = 'liberigi la randojn'; -$lang['em'] = 'aparte emfazita'; -$lang['hi'] = 'markita'; -$lang['lo'] = 'malpli grava'; diff --git a/sources/lib/plugins/wrap/lang/eo/settings.php b/sources/lib/plugins/wrap/lang/eo/settings.php deleted file mode 100644 index 89d037a..0000000 --- a/sources/lib/plugins/wrap/lang/eo/settings.php +++ /dev/null @@ -1,14 +0,0 @@ - - */ -$lang['noPrefix'] = 'Kiuj (komo-disigitaj) klasnomoj estu ekskludataj de la prefikso "wrap_"?'; -$lang['restrictedClasses'] = 'limigi la uzon de la kromaĵo al tiuj klasoj (komo-disigitaj)'; -$lang['restrictionType'] = 'tipo de limigo (ĉu la supre menciitaj klasoj estu inkludataj aÅ­ ekskludataj?)'; -$lang['restrictionType_o_0'] = 'permesi ĉiujn klasojn krom la menciitaj'; -$lang['restrictionType_o_1'] = 'limigi al nur tiuj grupoj, neniuj aliaj'; -$lang['syntaxDiv'] = 'Kiun sintakson uzi por blok-volvoj en la ilaro-elektilo?'; -$lang['syntaxSpan'] = 'Kiun sintakson uzi por enliniaj volvoj en la ilaro-elektilo?'; diff --git a/sources/lib/plugins/wrap/lang/es/lang.php b/sources/lib/plugins/wrap/lang/es/lang.php deleted file mode 100644 index 432cd05..0000000 --- a/sources/lib/plugins/wrap/lang/es/lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - * @author Óscar M. Lage - * @author Domingo Redal - */ -$lang['noPrefix'] = '¿Qué nombres de clase (separados por comas) no deberían ser precedidos de "wrap_"?'; -$lang['restrictedClasses'] = 'restringir el uso de este plugin a estas clases (separadas por comas)'; -$lang['restrictionType'] = 'tipo de restricción, especifica si las clases anteriores serán incluidas o excluidas'; -$lang['restrictionType_o_0'] = 'permitir todas las clases excepto las anteriores'; -$lang['restrictionType_o_1'] = 'restringir a sólo las clases anteriores y no otras'; -$lang['syntaxDiv'] = '¿Qué sintaxis debería ser usada en el selector de la barra de herramientas para los bloques "wrap"?'; -$lang['syntaxSpan'] = '¿Qué sintaxis debería ser usada en el selector de la barra de herramientas para los "wrap" en linea?'; -$lang['darkTpl'] = '¿Optimizar colores para plantillas oscuras?'; diff --git a/sources/lib/plugins/wrap/lang/fa/lang.php b/sources/lib/plugins/wrap/lang/fa/lang.php deleted file mode 100644 index 14d04e7..0000000 --- a/sources/lib/plugins/wrap/lang/fa/lang.php +++ /dev/null @@ -1,20 +0,0 @@ - - */ -$lang['column'] = 'ستون'; -$lang['box'] = 'کادر ساده'; -$lang['info'] = 'کادر اطلاعات'; -$lang['tip'] = 'کادر نکته'; -$lang['important'] = 'کادر مهم'; -$lang['alert'] = 'کادر هشدار'; -$lang['help'] = 'کادر Ú©Ù…Ú©'; -$lang['download'] = 'کادر دانلود'; -$lang['todo'] = 'کادر کاربردی'; -$lang['clear'] = 'کادر شناور Ùعال'; -$lang['em'] = 'تاکید'; -$lang['hi'] = 'هایلایت'; -$lang['lo'] = 'Ú©Ù… اهمیت'; diff --git a/sources/lib/plugins/wrap/lang/fr/lang.php b/sources/lib/plugins/wrap/lang/fr/lang.php deleted file mode 100644 index 0a94a1b..0000000 --- a/sources/lib/plugins/wrap/lang/fr/lang.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author schplurtz - * @author Schplurtz le Déboulonné - */ -$lang['picker'] = 'Extension Wrap'; -$lang['column'] = 'colonnes'; -$lang['box'] = 'bloc simple'; -$lang['info'] = 'bloc information'; -$lang['tip'] = 'bloc astuce'; -$lang['important'] = 'bloc important'; -$lang['alert'] = 'bloc alerte'; -$lang['help'] = 'bloc aide'; -$lang['download'] = 'bloc téléchargement'; -$lang['todo'] = 'bloc à faire'; -$lang['clear'] = 'rétablir le flux après un élément flottant'; -$lang['em'] = 'particulièrement important'; -$lang['hi'] = 'important'; -$lang['lo'] = 'peu important'; diff --git a/sources/lib/plugins/wrap/lang/fr/settings.php b/sources/lib/plugins/wrap/lang/fr/settings.php deleted file mode 100644 index 91c520b..0000000 --- a/sources/lib/plugins/wrap/lang/fr/settings.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @author schplurtz - * @author Schplurtz le Déboulonné - * @author Pietroni - */ -$lang['noPrefix'] = 'Quelles classes (séparées par une virgule) ne devraient pas être préfixées d\'un "wrap_" ?'; -$lang['restrictedClasses'] = 'Restreindre l\'utilisation de cette extension à ces classes. (liste séparée par des virgules)'; -$lang['restrictionType'] = 'Type de restriction. Indique s\'il faut inclure ou exclure les classes ci-dessus.'; -$lang['restrictionType_o_0'] = 'Autoriser toutes les classes sauf celles ci-dessus.'; -$lang['restrictionType_o_1'] = 'N\'autoriser que les classes ci dessus.'; -$lang['syntaxDiv'] = 'Quelle syntaxe les boutons de la barre d\'outil doivent-ils générer pour les éléments blocs ?'; -$lang['syntaxSpan'] = 'Quelle syntaxe les boutons de la barre d\'outil doivent-ils générer pour les éléments en ligne ?'; -$lang['darkTpl'] = 'Optimiser les couleurs pour les thèmes sombres?'; diff --git a/sources/lib/plugins/wrap/lang/hr/lang.php b/sources/lib/plugins/wrap/lang/hr/lang.php deleted file mode 100644 index 3923ceb..0000000 --- a/sources/lib/plugins/wrap/lang/hr/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap dodatak'; -$lang['column'] = 'kolone'; -$lang['box'] = 'obiÄan centrirani okvir'; -$lang['info'] = 'info okvir'; -$lang['tip'] = 'okvir savjet'; -$lang['important'] = 'okvir važno'; -$lang['alert'] = 'okvir upozorenja'; -$lang['help'] = 'okvir pomoći'; -$lang['download'] = 'okvir uÄitavanja'; -$lang['todo'] = 'okvir preostalo'; -$lang['clear'] = 'prazan okvir'; -$lang['em'] = 'posebno naglaÅ¡eni'; -$lang['hi'] = 'istaknuti'; -$lang['lo'] = 'manje bitan'; diff --git a/sources/lib/plugins/wrap/lang/hr/settings.php b/sources/lib/plugins/wrap/lang/hr/settings.php deleted file mode 100644 index 46f6f0a..0000000 --- a/sources/lib/plugins/wrap/lang/hr/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['noPrefix'] = 'Koja (zarezom odvojene) imena klasa trebaju ne trebaju biti s prefiksom "wrap_"? '; -$lang['restrictedClasses'] = 'ograniÄi koriÅ¡tenje ovog dodatka na ove klase (zarezom odvojena lista)'; -$lang['restrictionType'] = 'vrsta ograniÄenja, odreÄ‘uje da li gore navedene klase trebaju biti ukljuÄene ili iskljuÄene'; -$lang['restrictionType_o_0'] = 'dozvoli sve klase osim gore navedenih'; -$lang['restrictionType_o_1'] = 'dozvoli samo gore navedene klase'; -$lang['syntaxDiv'] = 'Koja sintaksa treba biti koriÅ¡tena u alatnoj traci za omeÄ‘ivanje bloka?'; -$lang['syntaxSpan'] = 'Koja sintaksa treba biti koriÅ¡tena u alatnoj traci za omeÄ‘ivanje teksta u liniji?'; -$lang['darkTpl'] = 'Prilagoditi boje za tamne predloÅ¡ke?'; diff --git a/sources/lib/plugins/wrap/lang/hu/lang.php b/sources/lib/plugins/wrap/lang/hu/lang.php deleted file mode 100644 index 4dbfc99..0000000 --- a/sources/lib/plugins/wrap/lang/hu/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap-csatoló'; -$lang['column'] = 'oszlopok'; -$lang['box'] = 'egyszerű, középre igazított doboz'; -$lang['info'] = 'információs doboz'; -$lang['tip'] = 'tippdoboz'; -$lang['important'] = 'fontos doboz'; -$lang['alert'] = 'figyelmeztetÅ‘ doboz'; -$lang['help'] = 'súgódoboz'; -$lang['download'] = 'letöltéshez doboz'; -$lang['todo'] = 'teendÅ‘höz doboz'; -$lang['clear'] = 'float tiltása'; -$lang['em'] = 'különösen hangsúlyos'; -$lang['hi'] = 'kiemelt'; -$lang['lo'] = 'kevésbé fontos'; diff --git a/sources/lib/plugins/wrap/lang/hu/settings.php b/sources/lib/plugins/wrap/lang/hu/settings.php deleted file mode 100644 index 6f3c9da..0000000 --- a/sources/lib/plugins/wrap/lang/hu/settings.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @author DelD - */ -$lang['noPrefix'] = 'Mely (vesszÅ‘vel elválasztott) osztályneveknek ne legyen "wrap_" elÅ‘tagja?'; -$lang['restrictedClasses'] = 'csatoló korlátozása ezekre a (vesszÅ‘vel elválasztott) osztályokra'; -$lang['restrictionType'] = 'korlátozás típusa, megadja, hogy a fenti osztályokat figyelembe vegye vagy se a csatoló'; -$lang['restrictionType_o_0'] = 'minden osztály engedélyezése, kivéve a fentieket'; -$lang['restrictionType_o_1'] = 'csak a fenti osztályok engedélyezése'; -$lang['syntaxDiv'] = 'Milyen szintaxist használjunk a blokktípusú dobozokhoz az eszközsorban?'; -$lang['syntaxSpan'] = 'Milyen szintaxist használjunk a soron belüli (inline) dobozokhoz az eszközsorban?'; -$lang['darkTpl'] = 'Optimalizáljam a színeket sötét sablonokhoz?'; diff --git a/sources/lib/plugins/wrap/lang/it/lang.php b/sources/lib/plugins/wrap/lang/it/lang.php deleted file mode 100644 index 19e1b68..0000000 --- a/sources/lib/plugins/wrap/lang/it/lang.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author Giovanni - * @author Torpedo - */ -$lang['picker'] = 'Plugin Wrap'; -$lang['column'] = 'colonne'; -$lang['box'] = 'box semplice centrato'; -$lang['info'] = 'box informazione'; -$lang['tip'] = 'box suggerimento'; -$lang['important'] = 'box importante'; -$lang['alert'] = 'box attenzione'; -$lang['help'] = 'box aiuto'; -$lang['download'] = 'box download'; -$lang['todo'] = 'box cose da fare'; -$lang['clear'] = 'elimina elementi flottanti'; -$lang['em'] = 'enfatizzato speciale'; -$lang['hi'] = 'evidenziato'; -$lang['lo'] = 'meno importante'; diff --git a/sources/lib/plugins/wrap/lang/it/settings.php b/sources/lib/plugins/wrap/lang/it/settings.php deleted file mode 100644 index cbdd2c0..0000000 --- a/sources/lib/plugins/wrap/lang/it/settings.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @author Torpedo - */ -$lang['noPrefix'] = 'quali nomi di classi (elenco separato da virgole) non devono avere il prefisso "wrap_"?'; -$lang['restrictedClasses'] = 'restringi l\'uso del plugin a queste classi (elenco separato da virgole)'; -$lang['restrictionType'] = 'tipo di restrizione, specifica se le classi sopra devono essere incluse o escluse'; -$lang['restrictionType_o_0'] = 'permetti tutte le classi tranne quelle sopra'; -$lang['restrictionType_o_1'] = 'restringi solo alle classi sopra e a nessun\'altra'; -$lang['syntaxDiv'] = 'Quale sintassi usare nella paletta degli strumenti per riquadri a blocchi?'; -$lang['syntaxSpan'] = 'Quale sintassi usare nella paletta degli strumenti per riquadri in linea?'; -$lang['darkTpl'] = 'Ottimizzare i colori per tema scuro?'; diff --git a/sources/lib/plugins/wrap/lang/ja/lang.php b/sources/lib/plugins/wrap/lang/ja/lang.php deleted file mode 100644 index 598b481..0000000 --- a/sources/lib/plugins/wrap/lang/ja/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap プラグイン'; -$lang['column'] = '多段組ã¿'; -$lang['box'] = '中央é…置枠'; -$lang['info'] = '情報枠'; -$lang['tip'] = 'ヒント枠'; -$lang['important'] = 'é‡è¦æž '; -$lang['alert'] = '警告枠'; -$lang['help'] = 'ヘルプ枠'; -$lang['download'] = 'ダウンロード枠'; -$lang['todo'] = 'TODOæž '; -$lang['clear'] = '回り込ã¿è§£é™¤'; -$lang['em'] = '特ã«å¼·èª¿'; -$lang['hi'] = 'ãƒã‚¤ãƒ©ã‚¤ãƒˆè¡¨ç¤º'; -$lang['lo'] = 'éžå¼·èª¿ï¼ˆè–„色表示）'; diff --git a/sources/lib/plugins/wrap/lang/ja/settings.php b/sources/lib/plugins/wrap/lang/ja/settings.php deleted file mode 100644 index ec880ac..0000000 --- a/sources/lib/plugins/wrap/lang/ja/settings.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @author Hideaki SAWADA - */ -$lang['noPrefix'] = 'プレフィックス"wrap_" ãªã—ã®CSSセレクタを例外的ã«é©ç”¨ã™ã‚‹ã‚¯ãƒ©ã‚¹å（カンマ区切り）'; -$lang['restrictedClasses'] = '有効性をãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚¯ãƒ©ã‚¹å（カンマ区切り）'; -$lang['restrictionType'] = '指定ã—ãŸã‚¯ãƒ©ã‚¹ã®æ‰±ã„æ–¹'; -$lang['restrictionType_o_0'] = '指定クラスを無効ã¨ã—ã€ä»–ã¯æœ‰åŠ¹ã¨ã™ã‚‹'; -$lang['restrictionType_o_1'] = '指定クラスã®ã¿ã‚’有効ã¨ã™ã‚‹'; -$lang['syntaxDiv'] = 'ツールãƒãƒ¼ä½¿ç”¨æ™‚：ブロック型構文ã«ä½¿ç”¨ã™ã‚‹ã‚¿ã‚°å'; -$lang['syntaxSpan'] = 'ツールãƒãƒ¼ä½¿ç”¨æ™‚：インライン型構文ã«ä½¿ç”¨ã™ã‚‹ã‚¿ã‚°å'; -$lang['darkTpl'] = '色ã®æ¿ƒã„テンプレート用ã«æœ€é©åŒ–ã—ã¾ã™ã‹ï¼Ÿ'; diff --git a/sources/lib/plugins/wrap/lang/ko/lang.php b/sources/lib/plugins/wrap/lang/ko/lang.php deleted file mode 100644 index 6dce54e..0000000 --- a/sources/lib/plugins/wrap/lang/ko/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap 플러그ì¸'; -$lang['column'] = '단'; -$lang['box'] = '간단한 ê°€ìš´ë° ìƒìž'; -$lang['info'] = 'ì •ë³´ ìƒìž'; -$lang['tip'] = 'íŒ ìƒìž'; -$lang['important'] = '중요 ìƒìž'; -$lang['alert'] = '경고 ìƒìž'; -$lang['help'] = 'ë„ì›€ë§ ìƒìž'; -$lang['download'] = '다운로드 ìƒìž'; -$lang['todo'] = 'í•  ì¼ ìƒìž'; -$lang['clear'] = '플로트 지우기'; -$lang['em'] = '특히 ê°•ì¡°'; -$lang['hi'] = 'ê°•ì¡°'; -$lang['lo'] = 'ëœ ì¤‘ìš”í•¨'; diff --git a/sources/lib/plugins/wrap/lang/ko/settings.php b/sources/lib/plugins/wrap/lang/ko/settings.php deleted file mode 100644 index 2ac0e01..0000000 --- a/sources/lib/plugins/wrap/lang/ko/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['noPrefix'] = 'ì–´ë–¤ (쉼표로 구분ëœ) í´ëž˜ìŠ¤ ì´ë¦„ì´ "wrap_" ì ‘ë‘ì–´ê°€ 필요가 없습니까?'; -$lang['restrictedClasses'] = 'ë‹¤ìŒ (쉼표로 구분ëœ) í´ëž˜ìŠ¤ì— 플러그ì¸ì˜ ì‚¬ìš©ì„ ì œí•œ'; -$lang['restrictionType'] = '제한 ìœ í˜•ì€ ìœ„ì˜ í´ëž˜ìŠ¤ê°€ í¬í•¨ë˜ê±°ë‚˜ 제외ë˜ì–´ì•¼ 하는지 지정'; -$lang['restrictionType_o_0'] = 'ìœ„ì˜ í´ëž˜ìŠ¤ë¥¼ 제외하고 모든 í´ëž˜ìŠ¤ë¥¼ 허용'; -$lang['restrictionType_o_1'] = 'ìœ„ì˜ í´ëž˜ìŠ¤ë§Œ 허용하고 다른 í´ëž˜ìŠ¤ë¥¼ 제한'; -$lang['syntaxDiv'] = 'ì–´ë–¤ ë¬¸ë²•ì´ ë¸”ë¡ í¬ìž¥ì„ 위해 ë„구 ëª¨ìŒ ì„ íƒê¸°ì—ì„œ 사용ë˜ì–´ì•¼ 합니까?'; -$lang['syntaxSpan'] = 'ì–´ë–¤ ë¬¸ë²•ì´ ì¸ë¼ì¸ í¬ìž¥ì„ 위해 ë„구 ëª¨ìŒ ì„ íƒê¸°ì—ì„œ 사용ë˜ì–´ì•¼ 합니까?'; -$lang['darkTpl'] = 'ì–´ë‘ìš´ í…œí”Œë¦¿ì„ ìœ„í•´ ìƒ‰ì„ ìµœì í™”하겠습니까?'; diff --git a/sources/lib/plugins/wrap/lang/nl/lang.php b/sources/lib/plugins/wrap/lang/nl/lang.php deleted file mode 100644 index f771b9d..0000000 --- a/sources/lib/plugins/wrap/lang/nl/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Wrap Plugin'; -$lang['column'] = 'kolommen'; -$lang['box'] = 'simpele gecentreerde blok'; -$lang['info'] = 'informatie blok'; -$lang['tip'] = 'tip blok'; -$lang['important'] = 'belangrijk blok'; -$lang['alert'] = 'waarschuwingsblok'; -$lang['help'] = 'helpblok'; -$lang['download'] = 'downloadblok'; -$lang['todo'] = 'tedoen blok'; -$lang['clear'] = 'reset drijvende blokken (clear floats)'; -$lang['em'] = 'bijzonder benadrukken'; -$lang['hi'] = 'gemarkeerd'; -$lang['lo'] = 'minder belangrijk'; diff --git a/sources/lib/plugins/wrap/lang/nl/settings.php b/sources/lib/plugins/wrap/lang/nl/settings.php deleted file mode 100644 index 8fb33ae..0000000 --- a/sources/lib/plugins/wrap/lang/nl/settings.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @author Johan Wijnker - */ -$lang['noPrefix'] = 'Welke (komma gescheiden) klassennamen moeten niet het voorvoegsel "wrap_" krijgen?'; -$lang['restrictedClasses'] = 'Beperk het gebruik van de plugin tot deze (komma gescheiden) klassen'; -$lang['restrictionType'] = 'beperkingstype, specificeer of de klassen hierboven wel of niet gebruikt mogen worden'; -$lang['restrictionType_o_0'] = 'alle klassen zijn toegestaan, behalve de bovenstaande'; -$lang['restrictionType_o_1'] = 'beperk de toegestane klassen tot de bovenstaande, en geen anderen'; -$lang['syntaxDiv'] = 'Welke syntax moet worden gebruikt in het werkbalk-keuzemenu voor blok-wraps?'; -$lang['syntaxSpan'] = 'Welke syntax moet worden gebruikt in het werkbalk-keuzemenu voor inline-wraps?'; -$lang['darkTpl'] = 'Optimaliseer de kleuren voor donkere templates?'; diff --git a/sources/lib/plugins/wrap/lang/no/lang.php b/sources/lib/plugins/wrap/lang/no/lang.php deleted file mode 100644 index a1734b8..0000000 --- a/sources/lib/plugins/wrap/lang/no/lang.php +++ /dev/null @@ -1,24 +0,0 @@ - - */ -$lang['picker'] = 'Omhylningsplugin -Omkransningsplugin'; -$lang['column'] = 'kolonner'; -$lang['box'] = 'enkel sentrert boks'; -$lang['info'] = 'infoboks'; -$lang['tip'] = 'tipsboks'; -$lang['important'] = 'viktig boks'; -$lang['alert'] = 'alarmboks'; -$lang['help'] = 'hjelpeboks'; -$lang['download'] = 'nedlastningsboks'; -$lang['todo'] = 'gjøremÃ¥lsboks'; -$lang['clear'] = 'tøm floats'; -$lang['em'] = 'spesielt fremhevet (singular) -spesielt fremhevede (plural)'; -$lang['hi'] = 'markert (singular) -markerte (plural)'; -$lang['lo'] = 'mindre viktig'; diff --git a/sources/lib/plugins/wrap/lang/no/settings.php b/sources/lib/plugins/wrap/lang/no/settings.php deleted file mode 100644 index 1bdc762..0000000 --- a/sources/lib/plugins/wrap/lang/no/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['noPrefix'] = 'Hvilke klasser (adskilt med komma) bør eksluderes fra Ã¥ ha prefiks "wrap_"?'; -$lang['restrictedClasses'] = 'begrens bruk av plugin til klasser adskilt med komma'; -$lang['restrictionType'] = 'restriksjonstype, spesifiserer om de ovenforstÃ¥ende klassene skal inkluderes eller ekskluderes'; -$lang['restrictionType_o_0'] = 'vis alle klasser bortsett fra de ovenforstÃ¥ende'; -$lang['restrictionType_o_1'] = 'begrens til kun ovenforstÃ¥ende klasser og ingen fler'; -$lang['syntaxDiv'] = 'Hvilken syntaks bør brukes i verktøylinjen valg for blokkomkransning?'; -$lang['syntaxSpan'] = 'Hvilken syntaks bør brukes i verktøylinjen valg for omkransning pÃ¥ en linje?'; -$lang['darkTpl'] = 'Optimer farger for mørke maler?'; diff --git a/sources/lib/plugins/wrap/lang/pt-br/lang.php b/sources/lib/plugins/wrap/lang/pt-br/lang.php deleted file mode 100644 index d1d20f5..0000000 --- a/sources/lib/plugins/wrap/lang/pt-br/lang.php +++ /dev/null @@ -1,21 +0,0 @@ - - */ -$lang['picker'] = 'Plugin Wrap'; -$lang['column'] = 'coluna'; -$lang['box'] = 'caixa centralizada simples'; -$lang['info'] = 'caixa de informação'; -$lang['tip'] = 'caixa de sugestão'; -$lang['important'] = 'caixa importante'; -$lang['alert'] = 'caixa de alerta'; -$lang['help'] = 'caixa de ajuda'; -$lang['download'] = 'caixa de download'; -$lang['todo'] = 'caixa de tarefas a fazer'; -$lang['clear'] = 'limpar'; -$lang['em'] = 'especialmente enfatizado'; -$lang['hi'] = 'enfatizado'; -$lang['lo'] = 'menos significativo'; diff --git a/sources/lib/plugins/wrap/lang/pt-br/settings.php b/sources/lib/plugins/wrap/lang/pt-br/settings.php deleted file mode 100644 index 52191c8..0000000 --- a/sources/lib/plugins/wrap/lang/pt-br/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - * @author Juliano Marconi Lanigra - * @author Flaudísio Tolentino - */ -$lang['noPrefix'] = 'Quais classes (separadas por vírgula) deverão ser excluídas de receber o prefixo "wrap_"?'; -$lang['restrictedClasses'] = 'uso restrito do plugin para essas classes (separadas por vírgula)'; -$lang['restrictionType'] = 'tipo de restrição, especifica se as classes acima deveriam ser incluídas ou excluídas'; -$lang['restrictionType_o_0'] = 'permite todas as classes exceto as acima'; -$lang['restrictionType_o_1'] = 'restrita somente às classes acima e nenhuma outra'; -$lang['darkTpl'] = 'Otimizar cores para templates escuros?'; diff --git a/sources/lib/plugins/wrap/lang/ru/lang.php b/sources/lib/plugins/wrap/lang/ru/lang.php deleted file mode 100644 index f2891dc..0000000 --- a/sources/lib/plugins/wrap/lang/ru/lang.php +++ /dev/null @@ -1,23 +0,0 @@ - - * @author Ilya Rozhkov - * @author Aleksandr Selivanov - */ -$lang['picker'] = 'Wrap'; -$lang['column'] = 'колонки'; -$lang['box'] = 'проÑтой центрированный блок'; -$lang['info'] = 'блок «ИнформациÑ»'; -$lang['tip'] = 'блок «ПодÑказка»'; -$lang['important'] = 'блок «Важно»'; -$lang['alert'] = 'блок «Тревога»'; -$lang['help'] = 'блок «Справка»'; -$lang['download'] = 'блок «Скачивание»'; -$lang['todo'] = 'блок «СпиÑок задач»'; -$lang['clear'] = 'очиÑтить float’ы'; -$lang['em'] = 'пометить важным'; -$lang['hi'] = 'выделить (маркер)'; -$lang['lo'] = 'пометить неважным'; diff --git a/sources/lib/plugins/wrap/lang/ru/settings.php b/sources/lib/plugins/wrap/lang/ru/settings.php deleted file mode 100644 index ddfff9f..0000000 --- a/sources/lib/plugins/wrap/lang/ru/settings.php +++ /dev/null @@ -1,17 +0,0 @@ - - * @author Aleksandr Selivanov - * @author Rouslan - */ -$lang['noPrefix'] = 'Имена каких клаÑÑов не должны начинатьÑÑ Ñ префикÑа wrap_? (перечиÑлите через запÑтую)'; -$lang['restrictedClasses'] = 'КлаÑÑÑ‹ плагина, которые Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать (перечиÑлите через запÑтую)'; -$lang['restrictionType'] = 'Тип ограничениÑ, указывающий, должны ли быть включены или иÑключены клаÑÑÑ‹ выше'; -$lang['restrictionType_o_0'] = 'разрешить вÑе, за иÑключением клаÑÑов, указанных выше'; -$lang['restrictionType_o_1'] = 'ограничить только клаÑÑами, указанными выше'; -$lang['syntaxDiv'] = 'Какой ÑинтакÑÐ¸Ñ Ð¸Ñпользовать Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¾Ð² и примечаний?'; -$lang['syntaxSpan'] = 'Какой ÑинтакÑÐ¸Ñ Ð¸Ñпользовать Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¾Ð² Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ текÑта?'; -$lang['darkTpl'] = 'Оптимизировать цвета Ð´Ð»Ñ Ñ‚Ñ‘Ð¼Ð½Ñ‹Ñ… тем Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ (шаблонов)?'; diff --git a/sources/lib/plugins/wrap/lang/sk/lang.php b/sources/lib/plugins/wrap/lang/sk/lang.php deleted file mode 100644 index af572f7..0000000 --- a/sources/lib/plugins/wrap/lang/sk/lang.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['picker'] = 'Wrap Plugin'; -$lang['column'] = 'stĺpec'; -$lang['em'] = 'zvlášť zdôraznený'; -$lang['hi'] = 'zvýraznený'; -$lang['lo'] = 'menej významný'; diff --git a/sources/lib/plugins/wrap/lang/sk/settings.php b/sources/lib/plugins/wrap/lang/sk/settings.php deleted file mode 100644 index 4e79e94..0000000 --- a/sources/lib/plugins/wrap/lang/sk/settings.php +++ /dev/null @@ -1,12 +0,0 @@ - - */ -$lang['noPrefix'] = 'Ktoré (Äiarkou oddelené) mená tried by mali byÅ¥ vynechané pri použití predpony "wrap_"?'; -$lang['restrictedClasses'] = 'Obmedzenie použitia pluginu na tieto (Äiarkou oddelené) triedy'; -$lang['restrictionType'] = 'Typ obmedzenia, Å¡pecifikuje, Äi triedy uvedené vyÅ¡Å¡ie maju byÅ¥ zahrnuté alebo vynechané'; -$lang['restrictionType_o_0'] = 'povolenie pre vÅ¡etky triedy okrem uvedených vyÅ¡Å¡ie'; -$lang['restrictionType_o_1'] = 'obmedzenie len na triedy uvedené vyÅ¡Å¡ie a žiadne iné'; diff --git a/sources/lib/plugins/wrap/lang/tr/lang.php b/sources/lib/plugins/wrap/lang/tr/lang.php deleted file mode 100644 index ba55922..0000000 --- a/sources/lib/plugins/wrap/lang/tr/lang.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @author Ä°lker R. Kapaç - */ -$lang['picker'] = 'Paket Eklentisi'; -$lang['column'] = 'sütunlar'; -$lang['box'] = 'ortalanmış basit kutu'; -$lang['info'] = 'bilgi kutusu'; -$lang['tip'] = 'ipucu kutusu'; -$lang['important'] = 'önemli kutusu'; -$lang['alert'] = 'ikaz kutusu'; -$lang['help'] = 'yardım kutusu'; -$lang['download'] = 'indirme kutusu'; -$lang['todo'] = 'yapılacaklar kutusu'; -$lang['clear'] = 'boÅŸlukları temizle'; -$lang['em'] = 'özellikle vurgulanmış'; -$lang['hi'] = 'vurgulanmış'; -$lang['lo'] = 'daha az önemli'; diff --git a/sources/lib/plugins/wrap/lang/tr/settings.php b/sources/lib/plugins/wrap/lang/tr/settings.php deleted file mode 100644 index a4f7cd5..0000000 --- a/sources/lib/plugins/wrap/lang/tr/settings.php +++ /dev/null @@ -1,15 +0,0 @@ - - */ -$lang['noPrefix'] = 'Hangi sınıf isimleri, (virgülle ayrılmış) önüne "wrap_" öneki almaktan hariç tutulsun?'; -$lang['restrictedClasses'] = 'eklentinin kullanımını bu sınıflarla (virgülle ayrılmış) sınırla'; -$lang['restrictionType'] = 'kısıtlama tipi, üstteki sınıfların dalil mi edileceklerini yoksa hariç mi tutulacaklarını belirler.'; -$lang['restrictionType_o_0'] = 'üsttekiler hariç tüm sınıflara izin ver'; -$lang['restrictionType_o_1'] = 'sadece üstteki sınıflarla sınırla, baÅŸkasına izin verme'; -$lang['syntaxDiv'] = 'Blok paketi için araç çubuÄŸunda hangi sözdizimi kullanılsın?'; -$lang['syntaxSpan'] = 'Satır içi paketi için araç çubuÄŸunda hangi sözdizimi kullanılsın?'; -$lang['darkTpl'] = 'Karanlık ÅŸablonlar için renkler iyileÅŸtirilsin mi?'; diff --git a/sources/lib/plugins/wrap/lang/zh-tw/lang.php b/sources/lib/plugins/wrap/lang/zh-tw/lang.php deleted file mode 100644 index fe60272..0000000 --- a/sources/lib/plugins/wrap/lang/zh-tw/lang.php +++ /dev/null @@ -1,19 +0,0 @@ - - * @author maie - */ -$lang['noPrefix'] = '哪些CSSç±»ä¸éœ€è¦åŠ ä¸Šâ€œwrap_"å‰ç¼€ï¼Ÿ(逗å·åˆ†éš”)'; -$lang['restrictedClasses'] = 'å°†æ’件的使用é™åˆ¶åº”用到这些类(逗å·åˆ†éš”)'; -$lang['restrictionType'] = 'é™åˆ¶ç±»åž‹ï¼ŒæŒ‡å®šä¸Šè¿°ç±»åº”该被包å«æˆ–排除'; -$lang['restrictionType_o_0'] = 'å…许除上述类之外的所有类'; -$lang['restrictionType_o_1'] = 'ä»…å…许上述类'; -$lang['syntaxDiv'] = '在编辑工具æ çš„选择器中应对å—级元素使用何ç§è¯­æ³•ï¼Ÿ'; -$lang['syntaxSpan'] = '在编辑工具æ çš„选择器中应对行内元素使用何ç§è¯­æ³•ï¼Ÿ'; -$lang['darkTpl'] = '优化黑模æ¿çš„颜色？'; diff --git a/sources/lib/plugins/wrap/plugin.info.txt b/sources/lib/plugins/wrap/plugin.info.txt deleted file mode 100644 index a8553eb..0000000 --- a/sources/lib/plugins/wrap/plugin.info.txt +++ /dev/null @@ -1,8 +0,0 @@ -base wrap -author Anika Henke -email anika@selfthinker.org -date 2015-07-19 -name Wrap Plugin -desc Universal plugin which combines functionalities of many other plugins. Wrap wiki text inside containers (divs or spans) and give them a class (choose from a variety of preset classes), a width and/or a language with its associated text direction. -url https://www.dokuwiki.org/plugin:wrap -#syntax See example.txt diff --git a/sources/lib/plugins/wrap/print.css b/sources/lib/plugins/wrap/print.css deleted file mode 100644 index bae4705..0000000 --- a/sources/lib/plugins/wrap/print.css +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************** -Print Styles for the Wrap Plugin (additional to all.css) -********************************************************************/ - -/* boxes and notes with icons -********************************************************************/ - -.dokuwiki div.wrap_box, -.dokuwiki div.wrap_danger, .dokuwiki div.wrap_warning, .dokuwiki div.wrap_caution, .dokuwiki div.wrap_notice, .dokuwiki div.wrap_safety, -.dokuwiki div.wrap_info, .dokuwiki div.wrap_important, .dokuwiki div.wrap_alert, .dokuwiki div.wrap_tip, .dokuwiki div.wrap_help, .dokuwiki div.wrap_todo, .dokuwiki div.wrap_download { - border: 2px solid #999; - padding: 1em 1em .5em; - margin-bottom: 1.5em; -} -.dokuwiki span.wrap_box, -.dokuwiki span.wrap_danger, .dokuwiki span.wrap_warning, .dokuwiki span.wrap_caution, .dokuwiki span.wrap_notice, .dokuwiki span.wrap_safety, -.dokuwiki span.wrap_info, .dokuwiki span.wrap_important, .dokuwiki span.wrap_alert, .dokuwiki span.wrap_tip, .dokuwiki span.wrap_help, .dokuwiki span.wrap_todo, .dokuwiki span.wrap_download { - border: 1px solid #999; - padding: 0 .3em; -} - - -/* mark -********************************************************************/ - -.dokuwiki .wrap_hi { - border: 1px solid #999; -} - - -/* miscellaneous -********************************************************************/ - -/*____________ spoiler ____________*/ - -.dokuwiki .wrap_spoiler { - visibility: hidden; -} - -/*____________ pagebreak ____________*/ - -.dokuwiki .wrap_pagebreak { - page-break-after: always; -} - -/*____________ avoid page break ____________*/ -/* not yet supported by most browsers */ - -.dokuwiki .wrap_nopagebreak { - page-break-inside: avoid; -} - -/*____________ no print ____________*/ - -.dokuwiki .wrap_noprint { - display: none; -} diff --git a/sources/lib/plugins/wrap/style.css b/sources/lib/plugins/wrap/style.css deleted file mode 100644 index fa6bc16..0000000 --- a/sources/lib/plugins/wrap/style.css +++ /dev/null @@ -1,203 +0,0 @@ -/******************************************************************** -Screen Styles for the Wrap Plugin (additional to all.css) -********************************************************************/ - -/* box -********************************************************************/ - -.dokuwiki .wrap_box { - background: __background_alt__; - color: __text__; -} -.dokuwiki div.wrap_box, -.dokuwiki div.wrap_danger, -.dokuwiki div.wrap_warning, -.dokuwiki div.wrap_caution, -.dokuwiki div.wrap_notice, -.dokuwiki div.wrap_safety { - padding: 1em 1em .5em; - margin-bottom: 1.5em; - overflow: hidden; -} -.dokuwiki span.wrap_box, -.dokuwiki span.wrap_danger, -.dokuwiki span.wrap_warning, -.dokuwiki span.wrap_caution, -.dokuwiki span.wrap_notice, -.dokuwiki span.wrap_safety { - padding: 0 .3em; -} - -/*____________ notes with icons ____________*/ - -/* general styles for all note divs */ -.dokuwiki div.wrap_info, -.dokuwiki div.wrap_important, -.dokuwiki div.wrap_alert, -.dokuwiki div.wrap_tip, -.dokuwiki div.wrap_help, -.dokuwiki div.wrap_todo, -.dokuwiki div.wrap_download { - padding: 1em 1em .5em 70px; - margin-bottom: 1.5em; - min-height: 68px; - background-position: 10px 50%; - background-repeat: no-repeat; - color: inherit; - overflow: hidden; -} -/* general styles for all note spans */ -.dokuwiki span.wrap_info, -.dokuwiki span.wrap_important, -.dokuwiki span.wrap_alert, -.dokuwiki span.wrap_tip, -.dokuwiki span.wrap_help, -.dokuwiki span.wrap_todo, -.dokuwiki span.wrap_download { - padding: 0 2px 0 20px; - min-height: 20px; - background-position: 2px 50%; - background-repeat: no-repeat; - color: inherit; -} - -/* sorry for icons glued to the right side, but there is currently no way - to make this look good without adjusting the images themselves */ -[dir=rtl] .dokuwiki div.wrap_info, -[dir=rtl] .dokuwiki div.wrap_important, -[dir=rtl] .dokuwiki div.wrap_alert, -[dir=rtl] .dokuwiki div.wrap_tip, -[dir=rtl] .dokuwiki div.wrap_help, -[dir=rtl] .dokuwiki div.wrap_todo, -[dir=rtl] .dokuwiki div.wrap_download { - padding: 1em 60px .5em 1em; - background-position: right 50%; -} -[dir=rtl] .dokuwiki span.wrap_info, -[dir=rtl] .dokuwiki span.wrap_important, -[dir=rtl] .dokuwiki span.wrap_alert, -[dir=rtl] .dokuwiki span.wrap_tip, -[dir=rtl] .dokuwiki span.wrap_help, -[dir=rtl] .dokuwiki span.wrap_todo, -[dir=rtl] .dokuwiki span.wrap_download { - padding: 0 18px 0 2px; - background-position: right 50%; -} - -/*____________ info ____________*/ -.dokuwiki .wrap_info { background-color: #d1d7df; } -.dokuwiki .wrap__dark.wrap_info { background-color: #343e4a; } -.dokuwiki div.wrap_info { background-image: url(images/note/48/info.png); } -.dokuwiki span.wrap_info { background-image: url(images/note/16/info.png); } - -/*____________ important ____________*/ -.dokuwiki .wrap_important { background-color: #ffd39f; } -.dokuwiki .wrap__dark.wrap_important { background-color: #6c3b00; } -.dokuwiki div.wrap_important { background-image: url(images/note/48/important.png); } -.dokuwiki span.wrap_important { background-image: url(images/note/16/important.png); } - -/*____________ alert ____________*/ -.dokuwiki .wrap_alert { background-color: #ffbcaf; } -.dokuwiki .wrap__dark.wrap_alert { background-color: #6b1100; } -.dokuwiki div.wrap_alert { background-image: url(images/note/48/alert.png); } -.dokuwiki span.wrap_alert { background-image: url(images/note/16/alert.png); } - -/*____________ tip ____________*/ -.dokuwiki .wrap_tip { background-color: #fff79f; } -.dokuwiki .wrap__dark.wrap_tip { background-color: #4a4400; } -.dokuwiki div.wrap_tip { background-image: url(images/note/48/tip.png); } -.dokuwiki span.wrap_tip { background-image: url(images/note/16/tip.png); } - -/*____________ help ____________*/ -.dokuwiki .wrap_help { background-color: #dcc2ef; } -.dokuwiki .wrap__dark.wrap_help { background-color: #3c1757; } -.dokuwiki div.wrap_help { background-image: url(images/note/48/help.png); } -.dokuwiki span.wrap_help { background-image: url(images/note/16/help.png); } - -/*____________ todo ____________*/ -.dokuwiki .wrap_todo { background-color: #c2efdd; } -.dokuwiki .wrap__dark.wrap_todo { background-color: #17573e; } -.dokuwiki div.wrap_todo { background-image: url(images/note/48/todo.png); } -.dokuwiki span.wrap_todo { background-image: url(images/note/16/todo.png); } - -/*____________ download ____________*/ -.dokuwiki .wrap_download { background-color: #d6efc2; } -.dokuwiki .wrap__dark.wrap_download { background-color: #345717; } -.dokuwiki div.wrap_download { background-image: url(images/note/48/download.png); } -.dokuwiki span.wrap_download { background-image: url(images/note/16/download.png); } - - -/*____________ safety notes ____________*/ - -.dokuwiki .wrap_danger { - background-color: #c00; - color: #fff; -} -.dokuwiki .wrap_warning { - background-color: #f60; - color: #000; -} -.dokuwiki .wrap_caution { - background-color: #ff0; - color: #000; -} -.dokuwiki .wrap_notice { - background-color: #06f; - color: #fff; -} -.dokuwiki .wrap_safety { - background-color: #090; - color: #fff; -} - - -/* mark -********************************************************************/ - -.dokuwiki .wrap_hi { - background-color: #ff9; - overflow: hidden; -} -.dokuwiki .wrap__dark.wrap_hi { - background-color: #4e4e0d; -} - - -/* miscellaneous -********************************************************************/ - -/*____________ spoiler ____________*/ - -.dokuwiki .wrap_spoiler { - background-color: __background__ !important; - color: __background__ !important; - border: 1px dotted red; -} - -/*____________ only print ____________*/ - -.dokuwiki .wrap_onlyprint { - display: none; -} - -/*____________ tabs ____________*/ -/* in addition to template styles */ - -.dokuwiki .plugin_wrap.tabs { - margin-bottom: 1.4em; -} - -/*____________ button-style link ____________*/ - -.dokuwiki .wrap_button a:link, -.dokuwiki .wrap_button a:visited { - background-color: __background_alt__; -} -.dokuwiki .wrap_button a:link:hover, -.dokuwiki .wrap_button a:visited:hover, -.dokuwiki .wrap_button a:link:focus, -.dokuwiki .wrap_button a:visited:focus, -.dokuwiki .wrap_button a:link:active, -.dokuwiki .wrap_button a:visited:active { - background-color: __background_neu__; -} diff --git a/sources/lib/plugins/wrap/syntax/closesection.php b/sources/lib/plugins/wrap/syntax/closesection.php deleted file mode 100644 index 4bb4837..0000000 --- a/sources/lib/plugins/wrap/syntax/closesection.php +++ /dev/null @@ -1,40 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) die(); - -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'syntax.php'); - -class syntax_plugin_wrap_closesection extends DokuWiki_Syntax_Plugin { - - function getType(){ return 'substition';} - function getPType(){ return 'block';} - function getSort(){ return 195; } - - /** - * Dummy handler, this syntax part has no syntax but is directly added to the instructions by the div syntax - */ - function handle($match, $state, $pos, Doku_Handler $handler){ - } - - /** - * Create output - */ - function render($mode, Doku_Renderer $renderer, $indata) { - if($mode == 'xhtml'){ - /** @var Doku_Renderer_xhtml $renderer */ - $renderer->finishSectionEdit(); - return true; - } - return false; - } - - -} - diff --git a/sources/lib/plugins/wrap/syntax/div.php b/sources/lib/plugins/wrap/syntax/div.php deleted file mode 100644 index 2e84c2b..0000000 --- a/sources/lib/plugins/wrap/syntax/div.php +++ /dev/null @@ -1,132 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) die(); - -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'syntax.php'); - -class syntax_plugin_wrap_div extends DokuWiki_Syntax_Plugin { - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?
    )'; - protected $exit_pattern = '
    '; - - function getType(){ return 'formatting';} - function getAllowedTypes() { return array('container', 'formatting', 'substition', 'protected', 'disabled', 'paragraphs'); } - function getPType(){ return 'stack';} - function getSort(){ return 195; } - // override default accepts() method to allow nesting - ie, to get the plugin accepts its own entry syntax - function accepts($mode) { - if ($mode == substr(get_class($this), 7)) return true; - return parent::accepts($mode); - } - - /** - * Connect pattern to lexer - */ - function connectTo($mode) { - $this->Lexer->addSpecialPattern($this->special_pattern,$mode,'plugin_wrap_'.$this->getPluginComponent()); - $this->Lexer->addEntryPattern($this->entry_pattern,$mode,'plugin_wrap_'.$this->getPluginComponent()); - } - - function postConnect() { - $this->Lexer->addExitPattern($this->exit_pattern, 'plugin_wrap_'.$this->getPluginComponent()); - $this->Lexer->addPattern('[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)', 'plugin_wrap_'.$this->getPluginComponent()); - } - - /** - * Handle the match - */ - function handle($match, $state, $pos, Doku_Handler $handler){ - global $conf; - switch ($state) { - case DOKU_LEXER_ENTER: - case DOKU_LEXER_SPECIAL: - $data = strtolower(trim(substr($match,strpos($match,' '),-1)," \t\n/")); - return array($state, $data); - - case DOKU_LEXER_UNMATCHED: - $handler->_addCall('cdata', array($match), $pos); - break; - - case DOKU_LEXER_MATCHED: - // we have a == header ==, use the core header() renderer - // (copied from core header() in inc/parser/handler.php) - $title = trim($match); - $level = 7 - strspn($title,'='); - if($level < 1) $level = 1; - $title = trim($title,'='); - $title = trim($title); - - $handler->_addCall('header',array($title,$level,$pos), $pos); - // close the section edit the header could open - if ($title && $level <= $conf['maxseclevel']) { - $handler->addPluginCall('wrap_closesection', array(), DOKU_LEXER_SPECIAL, $pos, ''); - } - break; - - case DOKU_LEXER_EXIT: - return array($state, ''); - } - return false; - } - - /** - * Create output - */ - function render($mode, Doku_Renderer $renderer, $indata) { - static $type_stack = array (); - - if (empty($indata)) return false; - list($state, $data) = $indata; - - if($mode == 'xhtml'){ - /** @var Doku_Renderer_xhtml $renderer */ - switch ($state) { - case DOKU_LEXER_ENTER: - // add a section edit right at the beginning of the wrap output - $renderer->startSectionEdit(0, 'plugin_wrap_start'); - $renderer->finishSectionEdit(); - // add a section edit for the end of the wrap output. This prevents the renderer - // from closing the last section edit so the next section button after the wrap syntax will - // include the whole wrap syntax - $renderer->startSectionEdit(0, 'plugin_wrap_end'); - - case DOKU_LEXER_SPECIAL: - $wrap = $this->loadHelper('wrap'); - $attr = $wrap->buildAttributes($data, 'plugin_wrap'); - - $renderer->doc .= ''; - if ($state == DOKU_LEXER_SPECIAL) $renderer->doc .= ''; - break; - - case DOKU_LEXER_EXIT: - $renderer->doc .= ''; - $renderer->finishSectionEdit(); - break; - } - return true; - } - if($mode == 'odt'){ - switch ($state) { - case DOKU_LEXER_ENTER: - $wrap = plugin_load('helper', 'wrap'); - array_push ($type_stack, $wrap->renderODTElementOpen($renderer, 'div', $data)); - break; - - case DOKU_LEXER_EXIT: - $element = array_pop ($type_stack); - $wrap = plugin_load('helper', 'wrap'); - $wrap->renderODTElementClose ($renderer, $element); - break; - } - return true; - } - return false; - } -} diff --git a/sources/lib/plugins/wrap/syntax/divblock.php b/sources/lib/plugins/wrap/syntax/divblock.php deleted file mode 100644 index 9bac053..0000000 --- a/sources/lib/plugins/wrap/syntax/divblock.php +++ /dev/null @@ -1,21 +0,0 @@ - ...     syntax - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Anika Henke - */ - -require_once(dirname(__FILE__).'/div.php'); - -class syntax_plugin_wrap_divblock extends syntax_plugin_wrap_div { - - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?)'; - protected $exit_pattern = ''; - - -} - diff --git a/sources/lib/plugins/wrap/syntax/divwrap.php b/sources/lib/plugins/wrap/syntax/divwrap.php deleted file mode 100644 index 386c5ff..0000000 --- a/sources/lib/plugins/wrap/syntax/divwrap.php +++ /dev/null @@ -1,20 +0,0 @@ - ...     syntax - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Anika Henke - */ - -require_once(dirname(__FILE__).'/div.php'); - -class syntax_plugin_wrap_divwrap extends syntax_plugin_wrap_div { - - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?)'; - protected $exit_pattern = ''; - -} - diff --git a/sources/lib/plugins/wrap/syntax/span.php b/sources/lib/plugins/wrap/syntax/span.php deleted file mode 100644 index 2611c5a..0000000 --- a/sources/lib/plugins/wrap/syntax/span.php +++ /dev/null @@ -1,105 +0,0 @@ - - */ - -if(!defined('DOKU_INC')) die(); - -if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); -require_once(DOKU_PLUGIN.'syntax.php'); - -class syntax_plugin_wrap_span extends DokuWiki_Syntax_Plugin { - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?    )'; - protected $exit_pattern = ''; - - function getType(){ return 'formatting';} - function getAllowedTypes() { return array('formatting', 'substition', 'disabled'); } - function getPType(){ return 'normal';} - function getSort(){ return 195; } - // override default accepts() method to allow nesting - ie, to get the plugin accepts its own entry syntax - function accepts($mode) { - if ($mode == substr(get_class($this), 7)) return true; - return parent::accepts($mode); - } - - /** - * Connect pattern to lexer - */ - function connectTo($mode) { - $this->Lexer->addSpecialPattern($this->special_pattern,$mode,'plugin_wrap_'.$this->getPluginComponent()); - $this->Lexer->addEntryPattern($this->entry_pattern,$mode,'plugin_wrap_'.$this->getPluginComponent()); - } - - function postConnect() { - $this->Lexer->addExitPattern($this->exit_pattern, 'plugin_wrap_'.$this->getPluginComponent()); - } - - /** - * Handle the match - */ - function handle($match, $state, $pos, Doku_Handler $handler){ - switch ($state) { - case DOKU_LEXER_ENTER: - case DOKU_LEXER_SPECIAL: - $data = strtolower(trim(substr($match,strpos($match,' '),-1)," \t\n/")); - return array($state, $data); - - case DOKU_LEXER_UNMATCHED : - $handler->_addCall('cdata', array($match), $pos); - return false; - - case DOKU_LEXER_EXIT : - return array($state, ''); - - } - return false; - } - - /** - * Create output - */ - function render($mode, Doku_Renderer $renderer, $indata) { - static $type_stack = array (); - - if (empty($indata)) return false; - list($state, $data) = $indata; - - if($mode == 'xhtml'){ - switch ($state) { - case DOKU_LEXER_ENTER: - case DOKU_LEXER_SPECIAL: - $wrap = $this->loadHelper('wrap'); - $attr = $wrap->buildAttributes($data); - - $renderer->doc .= ''; - if ($state == DOKU_LEXER_SPECIAL) $renderer->doc .= ''; - break; - - case DOKU_LEXER_EXIT: - $renderer->doc .= ''; - break; - } - return true; - } - if($mode == 'odt'){ - switch ($state) { - case DOKU_LEXER_ENTER: - $wrap = plugin_load('helper', 'wrap'); - array_push ($type_stack, $wrap->renderODTElementOpen($renderer, 'span', $data)); - break; - - case DOKU_LEXER_EXIT: - $element = array_pop ($type_stack); - $wrap = plugin_load('helper', 'wrap'); - $wrap->renderODTElementClose ($renderer, $element); - break; - } - return true; - } - return false; - } -} diff --git a/sources/lib/plugins/wrap/syntax/spaninline.php b/sources/lib/plugins/wrap/syntax/spaninline.php deleted file mode 100644 index cc7a669..0000000 --- a/sources/lib/plugins/wrap/syntax/spaninline.php +++ /dev/null @@ -1,20 +0,0 @@ - ... syntax - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Anika Henke - */ - -require_once(dirname(__FILE__).'/span.php'); - -class syntax_plugin_wrap_spaninline extends syntax_plugin_wrap_span { - - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?)'; - protected $exit_pattern = ''; - -} - diff --git a/sources/lib/plugins/wrap/syntax/spanwrap.php b/sources/lib/plugins/wrap/syntax/spanwrap.php deleted file mode 100644 index 9c3d921..0000000 --- a/sources/lib/plugins/wrap/syntax/spanwrap.php +++ /dev/null @@ -1,21 +0,0 @@ - ... syntax - * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Anika Henke - */ - -require_once(dirname(__FILE__).'/span.php'); - -class syntax_plugin_wrap_spanwrap extends syntax_plugin_wrap_span { - - protected $special_pattern = '\r\n]*?/>'; - protected $entry_pattern = '(?=.*?)'; - protected $exit_pattern = ''; - - -} - diff --git a/sources/lib/scripts/edit.js b/sources/lib/scripts/edit.js index c07b8f9..579afd8 100644 --- a/sources/lib/scripts/edit.js +++ b/sources/lib/scripts/edit.js @@ -7,9 +7,16 @@ /** * Creates a toolbar button through the DOM + * Called for each entry of toolbar definition array (built by inc/toolbar.php and extended via js) * * Style the buttons through the toolbutton class * + * @param {string} icon image filename, relative to folder lib/images/toolbar/ + * @param {string} label title of button, show on mouseover + * @param {string} key hint in title of button for access key + * @param {string} id id of button, and '_ico' of icon + * @param {string} classname for styling buttons + * * @author Andreas Gohr * @author Michal Rezler */ @@ -57,10 +64,10 @@ function createToolButton(icon,label,key,id,classname){ * class or the picker buttons with the pickerbutton class. Picker * windows are appended to the body and created invisible. * - * @param string id the ID to assign to the picker - * @param array props the properties for the picker - * @param string edid the ID of the textarea - * @rteurn DOMobject the created picker + * @param {string} id the ID to assign to the picker + * @param {Array} props the properties for the picker + * @param {string} edid the ID of the textarea + * @return DOMobject the created picker * @author Andreas Gohr */ function createPicker(id,props,edid){ @@ -126,10 +133,10 @@ function pickerInsert(text,edid){ /** * Add button action for signature button * - * @param DOMElement btn Button element to add the action to - * @param array props Associative array of button properties - * @param string edid ID of the editor textarea - * @return boolean If button should be appended + * @param {jQuery} $btn Button element to add the action to + * @param {Array} props Associative array of button properties + * @param {string} edid ID of the editor textarea + * @return {string} picker id for aria-controls attribute * @author Gabriel Birke */ function addBtnActionSignature($btn, props, edid) { @@ -146,6 +153,8 @@ function addBtnActionSignature($btn, props, edid) { /** * Determine the current section level while editing * + * @param {string} textboxId ID of the text field + * * @author Andreas Gohr */ function currentHeadlineLevel(textboxId){ @@ -178,6 +187,10 @@ function currentHeadlineLevel(textboxId){ */ window.textChanged = false; +/** + * global var which stores original editor content + */ +window.doku_edit_text_content = ''; /** * Delete the draft before leaving the page */ @@ -204,6 +217,7 @@ function deleteDraft() { /** * Activate "not saved" dialog, add draft deletion to page unload, * add handlers to monitor changes + * Note: textChanged could be set by e.g. html_edit() as well * * Sets focus to the editbox as well */ @@ -225,15 +239,18 @@ jQuery(function () { sel.end = 0; DWsetSelection(sel); $edit_text.focus(); + + doku_edit_text_content = $edit_text.val(); } - var checkfunc = function() { - textChanged = true; //global var - summaryCheck(); + var changeHandler = function() { + doku_hasTextBeenModified(); + + doku_summaryCheck(); }; - $editform.change(checkfunc); - $editform.keydown(checkfunc); + $editform.change(changeHandler); + $editform.keydown(changeHandler); window.onbeforeunload = function(){ if(window.textChanged) { @@ -258,18 +275,33 @@ jQuery(function () { ); var $summary = jQuery('#edit__summary'); - $summary.change(summaryCheck); - $summary.keyup(summaryCheck); + $summary.change(doku_summaryCheck); + $summary.keyup(doku_summaryCheck); - if (textChanged) summaryCheck(); + if (textChanged) doku_summaryCheck(); }); +/** + * Updates textChanged variable if content of the editor has been modified + */ +function doku_hasTextBeenModified() { + if (!textChanged) { + var $edit_text = jQuery('#wiki__text'); + + if ($edit_text.length > 0) { + textChanged = doku_edit_text_content != $edit_text.val(); + } else { + textChanged = true; + } + } +} + /** * Checks if a summary was entered - if not the style is changed * * @author Andreas Gohr */ -function summaryCheck(){ +function doku_summaryCheck(){ var $sum = jQuery('#edit__summary'), missing = $sum.val() === ''; $sum.toggleClass('missing', missing).toggleClass('edit', !missing); diff --git a/sources/lib/scripts/jquery/jquery-migrate.js b/sources/lib/scripts/jquery/jquery-migrate.js index 25b6c81..a7b1281 100644 --- a/sources/lib/scripts/jquery/jquery-migrate.js +++ b/sources/lib/scripts/jquery/jquery-migrate.js @@ -1,13 +1,15 @@ /*! - * jQuery Migrate - v1.2.1 - 2013-05-08 - * https://github.com/jquery/jquery-migrate - * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT + * jQuery Migrate - v1.3.0 - 2016-01-13 + * Copyright jQuery Foundation and other contributors */ (function( jQuery, window, undefined ) { // See http://bugs.jquery.com/ticket/13335 // "use strict"; +jQuery.migrateVersion = "1.3.0"; + + var warnedAbout = {}; // List of warnings already given; public read only @@ -18,504 +20,683 @@ jQuery.migrateWarnings = []; // Show a message on the console so devs know we're active if ( !jQuery.migrateMute && window.console && window.console.log ) { - window.console.log("JQMIGRATE: Logging is active"); + window.console.log("JQMIGRATE: Logging is active"); } // Set to false to disable traces that appear with warnings if ( jQuery.migrateTrace === undefined ) { - jQuery.migrateTrace = true; + jQuery.migrateTrace = true; } // Forget any warnings we've already given; public jQuery.migrateReset = function() { - warnedAbout = {}; - jQuery.migrateWarnings.length = 0; + warnedAbout = {}; + jQuery.migrateWarnings.length = 0; }; function migrateWarn( msg) { - var console = window.console; - if ( !warnedAbout[ msg ] ) { - warnedAbout[ msg ] = true; - jQuery.migrateWarnings.push( msg ); - if ( console && console.warn && !jQuery.migrateMute ) { - console.warn( "JQMIGRATE: " + msg ); - if ( jQuery.migrateTrace && console.trace ) { - console.trace(); - } - } - } + var console = window.console; + if ( !warnedAbout[ msg ] ) { + warnedAbout[ msg ] = true; + jQuery.migrateWarnings.push( msg ); + if ( console && console.warn && !jQuery.migrateMute ) { + console.warn( "JQMIGRATE: " + msg ); + if ( jQuery.migrateTrace && console.trace ) { + console.trace(); + } + } + } } function migrateWarnProp( obj, prop, value, msg ) { - if ( Object.defineProperty ) { - // On ES5 browsers (non-oldIE), warn if the code tries to get prop; - // allow property to be overwritten in case some other plugin wants it - try { - Object.defineProperty( obj, prop, { - configurable: true, - enumerable: true, - get: function() { - migrateWarn( msg ); - return value; - }, - set: function( newValue ) { - migrateWarn( msg ); - value = newValue; - } - }); - return; - } catch( err ) { - // IE8 is a dope about Object.defineProperty, can't warn there - } - } + if ( Object.defineProperty ) { + // On ES5 browsers (non-oldIE), warn if the code tries to get prop; + // allow property to be overwritten in case some other plugin wants it + try { + Object.defineProperty( obj, prop, { + configurable: true, + enumerable: true, + get: function() { + migrateWarn( msg ); + return value; + }, + set: function( newValue ) { + migrateWarn( msg ); + value = newValue; + } + }); + return; + } catch( err ) { + // IE8 is a dope about Object.defineProperty, can't warn there + } + } - // Non-ES5 (or broken) browser; just set the property - jQuery._definePropertyBroken = true; - obj[ prop ] = value; + // Non-ES5 (or broken) browser; just set the property + jQuery._definePropertyBroken = true; + obj[ prop ] = value; } if ( document.compatMode === "BackCompat" ) { - // jQuery has never supported or tested Quirks Mode - migrateWarn( "jQuery is not compatible with Quirks Mode" ); + // jQuery has never supported or tested Quirks Mode + migrateWarn( "jQuery is not compatible with Quirks Mode" ); } var attrFn = jQuery( "", { size: 1 } ).attr("size") && jQuery.attrFn, - oldAttr = jQuery.attr, - valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || - function() { return null; }, - valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set || - function() { return undefined; }, - rnoType = /^(?:input|button)$/i, - rnoAttrNodeType = /^[238]$/, - rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - ruseDefault = /^(?:checked|selected)$/i; + oldAttr = jQuery.attr, + valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get || + function() { return null; }, + valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set || + function() { return undefined; }, + rnoType = /^(?:input|button)$/i, + rnoAttrNodeType = /^[238]$/, + rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, + ruseDefault = /^(?:checked|selected)$/i; // jQuery.attrFn migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" ); jQuery.attr = function( elem, name, value, pass ) { - var lowerName = name.toLowerCase(), - nType = elem && elem.nodeType; + var lowerName = name.toLowerCase(), + nType = elem && elem.nodeType; - if ( pass ) { - // Since pass is used internally, we only warn for new jQuery - // versions where there isn't a pass arg in the formal params - if ( oldAttr.length < 4 ) { - migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); - } - if ( elem && !rnoAttrNodeType.test( nType ) && - (attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) { - return jQuery( elem )[ name ]( value ); - } - } + if ( pass ) { + // Since pass is used internally, we only warn for new jQuery + // versions where there isn't a pass arg in the formal params + if ( oldAttr.length < 4 ) { + migrateWarn("jQuery.fn.attr( props, pass ) is deprecated"); + } + if ( elem && !rnoAttrNodeType.test( nType ) && + (attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) { + return jQuery( elem )[ name ]( value ); + } + } - // Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking - // for disconnected elements we don't warn on $( "