diff -Naur dokuwiki-2009-02-14/bin/dwpage.php dokuwiki-rc2009-12-02/bin/dwpage.php --- dokuwiki-2009-02-14/bin/dwpage.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/bin/dwpage.php 2009-12-02 19:50:11.000000000 +0100 @@ -1,8 +1,9 @@ -#!/usr/bin/php -d short_open_tag=on +#!/usr/bin/php : get help -f: force obtaining a lock for the page (generally bad idea) + -t, trivial: minor change -m (required): Summary message describing the change "; break; @@ -189,11 +191,12 @@ #------------------------------------------------------------------------------ $OPTS = Doku_Cli_Opts::getOptions( __FILE__, - 'h::fm:u:s:', + 'h::fm:u:s:t', array( 'help==', 'user=', 'system=', + 'trivial', ) ); @@ -313,7 +316,7 @@ obtainLock($WIKI_ID); - saveWikiText($WIKI_ID, file_get_contents($TARGET_FN), $OPTS->get('m')); + saveWikiText($WIKI_ID, file_get_contents($TARGET_FN), $OPTS->get('m'), $OPTS->has('t')); clearLock($WIKI_ID); diff -Naur dokuwiki-2009-02-14/bin/indexer.php dokuwiki-rc2009-12-02/bin/indexer.php --- dokuwiki-2009-02-14/bin/indexer.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/bin/indexer.php 2009-12-02 19:50:11.000000000 +0100 @@ -2,6 +2,7 @@ true)); _quietecho(count($data)." pages found.\n"); foreach($data as $val){ diff -Naur dokuwiki-2009-02-14/bin/wantedpages.php dokuwiki-rc2009-12-02/bin/wantedpages.php --- dokuwiki-2009-02-14/bin/wantedpages.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/bin/wantedpages.php 2009-12-02 19:50:11.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/php -d short_open_tag=on +#!/usr/bin/php tags // 'htmldiff' - diff as HTML table // 'html' - the full page rendered in XHTML -$conf['rss_update'] = 5*60; //Update the RSS feed every n minutes (defaults to 5 minutes) +$conf['rss_update'] = 5*60; //Update the RSS feed every n seconds (defaults to 5 minutes) $conf['recent_days'] = 7; //How many days of recent changes to keep. (days) $conf['rss_show_summary'] = 1; //Add revision summary to title? 0|1 $conf['broken_iua'] = 0; //Platform with broken ignore_user_abort (IIS+CGI) 0|1 $conf['xsendfile'] = 0; //Use X-Sendfile (1 = lighttpd, 2 = standard) -$conf['xmlrpc'] = 0; //Enable/disable XML-RPC interface $conf['renderer_xhtml'] = 'xhtml'; //renderer to use for main page generation $conf['rememberme'] = 1; //Enable/disable remember me on login diff -Naur dokuwiki-2009-02-14/conf/interwiki.conf dokuwiki-rc2009-12-02/conf/interwiki.conf --- dokuwiki-2009-02-14/conf/interwiki.conf 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/conf/interwiki.conf 2009-12-02 19:50:11.000000000 +0100 @@ -8,22 +8,25 @@ # You can add more InterWiki shortcuts here. wp http://en.wikipedia.org/wiki/{NAME} +wpfr http://fr.wikipedia.org/wiki/{NAME} wpde http://de.wikipedia.org/wiki/{NAME} +wpes http://es.wikipedia.org/wiki/{NAME} +wppl http://pl.wikipedia.org/wiki/{NAME} +wpjp http://jp.wikipedia.org/wiki/{NAME} wpmeta http://meta.wikipedia.org/wiki/{NAME} -schoki http://www.schokilade.de/doku.php?id= doku http://www.dokuwiki.org/ -freecache http://freecache.org/{NAME} +dokubug http://bugs.splitbrain.org/index.php?do=details&task_id= rfc http://www.cs.ccu.edu.tw/~chm91u/rfc2html.php?in= -sb http://www.splitbrain.org/go/ -amazon http://www.amazon.com/exec/obidos/ASIN/ -amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/ballermannsyndic/ -amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/ -google.de http://www.google.de/search?q= man http://man.cx/ +amazon http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/ +amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/ +amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/ phpfn http://www.php.net/{NAME} -go http://www.google.com/search?q={URL}&btnI=lucky -dokubug http://bugs.splitbrain.org/index.php?do=details&task_id= coral http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY} +freecache http://freecache.org/{NAME} +sb http://www.splitbrain.org/go/ +google.de http://www.google.de/search?q= +go http://www.google.com/search?q={URL}&btnI=lucky # Standards from http://usemod.com/intermap.txt follow diff -Naur dokuwiki-2009-02-14/conf/local.php.dist dokuwiki-rc2009-12-02/conf/local.php.dist --- dokuwiki-2009-02-14/conf/local.php.dist 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/conf/local.php.dist 2009-12-02 19:50:11.000000000 +0100 @@ -1,8 +1,11 @@ mailinglist|Join the mailing list]] :!: + * [[doku>newsletter|Subscribe to the newsletter]] :!: + * [[doku>mailinglist|Join the mailing list]] * [[http://forum.dokuwiki.org|Check out the user forum]] * [[doku>irc|Talk to other users in the IRC channel]] * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]] @@ -60,8 +61,4 @@ The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-). -The content published in the DokuWiki at http://www.dokuwiki.org/ is licensed under the [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0. - -An exception is made for the content which distributed in the download tarball((files inside the ''data'' directory -- eg: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')) which is, for compatibility reasons, licensed under the GNU General Public License Version 2 as well. - Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]]. diff -Naur dokuwiki-2009-02-14/data/pages/wiki/syntax.txt dokuwiki-rc2009-12-02/data/pages/wiki/syntax.txt --- dokuwiki-2009-02-14/data/pages/wiki/syntax.txt 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/data/pages/wiki/syntax.txt 2009-12-02 19:50:11.000000000 +0100 @@ -2,7 +2,7 @@ [[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing the //Edit this page// button at the top or bottom of the page. If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too. -===== Basic text formatting ===== +===== Basic Text Formatting ===== DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these. @@ -49,7 +49,7 @@ Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]]. -[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed. +[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed. You can use [[some:namespaces]] by using a colon in the pagename. @@ -84,8 +84,8 @@ Notes: * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone"). - * For Mozilla and Firefox it can be enabled through the config option [[http://www.mozilla.org/quality/networking/docs/netprefs.html#file|security.checkloaduri]] but this is not recommended. - * See [[dokubug>151]] for more info. + * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_don't_work|Mozilla Knowledge Base]]. + ==== Image Links ==== @@ -121,7 +121,7 @@ ---- -===== Images and other files ===== +===== Images and Other Files ===== You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them. @@ -187,15 +187,22 @@ - That's it -===== Smileys ===== +Also take a look at the [[doku>faq:lists|FAQ on list items]]. + +===== Text Conversions ===== + +DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML. + +The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well. -DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. More smileys can be placed in the ''smiley'' directory and configured in the ''conf/smileys.conf'' file. Here is an overview of Smileys included in DokuWiki. +==== Text to Image Conversions ==== + +DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki: * 8-) %% 8-) %% * 8-O %% 8-O %% * :-( %% :-( %% * :-) %% :-) %% - * =) %% =) %% * :-/ %% :-/ %% * :-\ %% :-\ %% @@ -213,9 +220,9 @@ * FIXME %% FIXME %% * DELETEME %% DELETEME %% -===== Typography ===== +==== Text to HTML Conversions ==== -[[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters. +Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters. -> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) "He thought 'It's a man's world'..." @@ -225,7 +232,9 @@ "He thought 'It's a man's world'..." -Please note: These conversions can be turned off through a [[doku>config:typography|config option]] and a [[doku>entities|pattern file]]. +The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]]. + +There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]]. ===== Quoting ===== @@ -257,19 +266,19 @@ ===== Tables ===== -DokuWiki supports a simple syntax to create tables. +DokuWiki supports a simple syntax to create tables. ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | | Row 2 Col 1 | some colspan (note the double pipe) || -| Row 3 Col 1 | Row 2 Col 2 | Row 2 Col 3 | +| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 | Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers. ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ | Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 | | Row 2 Col 1 | some colspan (note the double pipe) || - | Row 3 Col 1 | Row 2 Col 2 | Row 2 Col 3 | + | Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 | To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators! @@ -287,7 +296,19 @@ ^ Heading 4 | no colspan this time | | ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | -Note: Vertical spans (rowspan) are not possible. +You can have rowspans (vertically connected cells) by adding '':::'' into the cells below the one to which they should connect. + +^ Heading 1 ^ Heading 2 ^ Heading 3 ^ +| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 | +| Row 2 Col 1 | ::: | Row 2 Col 3 | +| Row 3 Col 1 | ::: | Row 2 Col 3 | + +Apart from the rowspan syntax those cells should not contain anything else. + + ^ Heading 1 ^ Heading 2 ^ Heading 3 ^ + | Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 | + | Row 2 Col 1 | ::: | Row 2 Col 3 | + | Row 3 Col 1 | ::: | Row 2 Col 3 | You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text. @@ -303,32 +324,54 @@ |left | right| center | | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | -===== Non-parsed Blocks ===== +Note: Vertical alignment is not supported. + +===== No Formatting ===== + +If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%%%'' tags or even simpler, with double percent signs ''%%''. + + +This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. + +The same is true for %%//__this__ text// with a smiley ;-)%%. + + + This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. + + The same is true for %%//__this__ text// with a smiley ;-)%%. + +===== Code Blocks ===== -You can include non-parsed blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''code'' or ''file''. +You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%%%'' or ''%%%%''. + + This is text is indented by two spaces. This is preformatted code all spaces are preserved: like <-this -This is pretty much the same, but you could use it to show that you quoted a file. +This is pretty much the same, but you could use it to show that you quoted a file. -To let the parser ignore an area completely (ie. do no formatting on it), enclose the area either with ''nowiki'' tags or even simpler, with double percent signs ''%%''. +Those blocks were created by this source: - -This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it. - + This is text is indented by two spaces. -See the source of this page to see how to use these blocks. + + This is preformatted code all spaces are preserved: like <-this + -===== Syntax Highlighting ===== + + This is pretty much the same, but you could use it to show that you quoted a file. + -[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code block in the previous section, but this time the name of the used language is inserted inside the tag. Eg. ''''. +==== Syntax Highlighting ==== + +[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code and file blocks in the previous section, but this time the name of the used language is inserted inside the tag. Eg. '''' or ''''. -/** +/** * The HelloWorldApp class implements an application that * simply displays "Hello World!" to the standard output. */ @@ -339,32 +382,31 @@ } -The following language strings are currently recognized: //abap, actionscript-french, actionscript, actionscript3, ada, apache, applescript, asm, asp, autoit, bash, basic4gl, blitzbasic, bnf, boo, c, c_mac, caddcl, cadlisp, cfdg, cfm, cil, cobol, cpp, cpp-qt, csharp, css, delphi, diff, div, dos, dot, d, eiffel, fortran, freebasic, genero, glsl, gml, gnuplot, groovy, gettext, haskell, html, idl, ini, inno, io, java5, java, javascript, kixtart, klonec, klonecpp, latex, lisp, lotusformulas, lotusscript, lua, m68k, matlab, mirc, mpasm, mxml, mysql, nsis, objc, ocaml-brief, ocaml, oobas, oracle8, pascal, perl, per, php-brief, php, pic16, plsql, povray, powershell, progress, python, qbasic, rails, reg, robots, ruby, sas, scala, scheme, sdlbasic, smalltalk, smarty, sql, tcl, text, thinbasic, tsql, typoscript, vbnet, vb, verilog, vhdl, visualfoxpro, winbatch, xml, xorg_conf, xpp, z80// +The following language strings are currently recognized: //abap, actionscript-french, actionscript, actionscript3, ada, apache, applescript, asm, asp, autoit, avisynth, bash, basic4gl, bf, bibtex, blitzbasic, bnf, boo, c, c_mac, caddcl, cadlisp, cfdg, cfm, cil, cmake, cobol, cpp, cpp-qt, csharp, css, d, dcs, delphi, diff, div, dos, dot, eiffel, email, erlang, fo, fortran, freebasic, genero, glsl, gml, gnuplot, groovy, gettext, haskell, hq9plus, html, idl, ini, inno, intercal, io, java5, java, javascript, kixtart, klonec, klonecpp, latex, lisp, locobasic, lolcode, lotusformulas, lotusscript, lscript, lsl2, lua, m68k, make, matlab, mirc, modula3, mpasm, mxml, mysql, nsis, oberon2, objc, ocaml-brief, ocaml, oobas, oracle8, oracle11, pascal, perl, per, php-brief, php, pic16, pixelbender, plsql, povray, powershell, progress, prolog, properties, providex, python, qbasic, rails, rebol, reg, robots, ruby, sas, scala, scheme, scilab, sdlbasic, smalltalk, smarty, sql, tcl, teraterm, text, thinbasic, tsql, typoscript, vbnet, vb, verilog, vhdl, vim, visualfoxpro, visualprolog, whitespace, winbatch, whois, xml, xorg_conf, xpp, z80// +==== Downloadable Code Blocks ==== -===== RSS/ATOM Feed Aggregation ===== -[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters: +When you use the ''%%%%'' or ''%%%%'' syntax as above, you might want to make the shown code available for download as well. You can to this by specifying a file name after language code like this: -^ Parameter ^ Description ^ -| any number | will be used as maximum number items to show, defaults to 8 | -| reverse | display the last items in the feed first | -| author | show item authors names | -| date | show item dates | -| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped | -| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). | + + + + + -The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. + + + -**Example:** +If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%%%''. - {{rss>http://slashdot.org/index.rss 5 author date 1h }} -{{rss>http://slashdot.org/index.rss 5 author date 1h }} +===== Embedding HTML and PHP ===== +You can embed raw HTML or PHP code into your documents by using the ''%%%%'' or ''%%%%'' tags. (Use uppercase tags if you need to enclose block level elements.) -===== Embedding HTML and PHP ===== +HTML example: -You can embed raw HTML or PHP code into your documents by using the ''html'' or ''php'' tags like this: This is some inline HTML @@ -381,6 +423,8 @@

And this is some block HTML

+PHP example: + echo 'A logo generated by PHP:'; @@ -407,6 +451,26 @@ **Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed. +===== RSS/ATOM Feed Aggregation ===== +[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters: + +^ Parameter ^ Description ^ +| any number | will be used as maximum number items to show, defaults to 8 | +| reverse | display the last items in the feed first | +| author | show item authors names | +| date | show item dates | +| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped | +| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). | + +The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered. + +**Example:** + + {{rss>http://slashdot.org/index.rss 5 author date 1h }} + +{{rss>http://slashdot.org/index.rss 5 author date 1h }} + + ===== Control Macros ===== Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble: diff -Naur dokuwiki-2009-02-14/doku.php dokuwiki-rc2009-12-02/doku.php --- dokuwiki-2009-02-14/doku.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/doku.php 2009-12-02 19:50:11.000000000 +0100 @@ -8,75 +8,82 @@ // xdebug_start_profiling(); - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); - require_once(DOKU_INC.'inc/init.php'); - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/events.php'); - require_once(DOKU_INC.'inc/pageutils.php'); - require_once(DOKU_INC.'inc/html.php'); - require_once(DOKU_INC.'inc/auth.php'); - require_once(DOKU_INC.'inc/actions.php'); - - //import variables - $QUERY = trim($_REQUEST['id']); - $ID = getID(); - $NS = getNS($ID); - $REV = $_REQUEST['rev']; - $ACT = $_REQUEST['do']; - $IDX = $_REQUEST['idx']; - $DATE = $_REQUEST['date']; - $RANGE = $_REQUEST['lines']; - $HIGH = $_REQUEST['s']; - if(empty($HIGH)) $HIGH = getGoogleQuery(); - - $TEXT = cleanText($_POST['wikitext']); - $PRE = cleanText($_POST['prefix']); - $SUF = cleanText($_POST['suffix']); - $SUM = $_REQUEST['summary']; +if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); - //sanitize revision - $REV = preg_replace('/[^0-9]/','',$REV); - - //we accept the do param as HTTP header, too: - if(!empty($_SERVER['HTTP_X_DOKUWIKI_DO'])){ +if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO'])); - } - - if(!empty($IDX)) $ACT='index'; - //set default #FIXME not needed here? done in actions? - if(empty($ACT)) $ACT = 'show'; +} elseif (!empty($IDX)) { + $ACT = 'index'; +} elseif (isset($_REQUEST['do'])) { + $ACT = $_REQUEST['do']; +} else { + $ACT = 'show'; +} + +require_once(DOKU_INC.'inc/init.php'); +require_once(DOKU_INC.'inc/common.php'); +require_once(DOKU_INC.'inc/events.php'); +require_once(DOKU_INC.'inc/pageutils.php'); +require_once(DOKU_INC.'inc/html.php'); +require_once(DOKU_INC.'inc/auth.php'); +require_once(DOKU_INC.'inc/actions.php'); + +//import variables +$QUERY = trim($_REQUEST['id']); +$ID = getID(); +$NS = getNS($ID); +$REV = $_REQUEST['rev']; +$IDX = $_REQUEST['idx']; +$DATE = $_REQUEST['date']; +$RANGE = $_REQUEST['lines']; +$HIGH = $_REQUEST['s']; +if(empty($HIGH)) $HIGH = getGoogleQuery(); + +$TEXT = cleanText($_POST['wikitext']); +$PRE = cleanText($_POST['prefix']); +$SUF = cleanText($_POST['suffix']); +$SUM = $_REQUEST['summary']; + +//sanitize revision +$REV = preg_replace('/[^0-9]/','',$REV); + +//make infos about the selected page available +$INFO = pageinfo(); + +//export minimal infos to JS, plugins can add more +$JSINFO['id'] = $ID; +$JSINFO['namespace'] = (string) $INFO['namespace']; - //make infos about the selected page available - $INFO = pageinfo(); - // handle debugging - if($conf['allowdebug'] && $ACT == 'debug'){ +// handle debugging +if($conf['allowdebug'] && $ACT == 'debug'){ html_debug(); exit; - } +} - //send 404 for missing pages if configured or ID has special meaning to bots - if(!$INFO['exists'] && - ($conf['send404'] || preg_match('/^(robots\.txt|sitemap\.xml(\.gz)?|favicon\.ico|crossdomain\.xml)$/',$ID)) && - ($ACT == 'show' || substr($ACT,0,7) == 'export_') ){ +//send 404 for missing pages if configured or ID has special meaning to bots +if(!$INFO['exists'] && + ($conf['send404'] || preg_match('/^(robots\.txt|sitemap\.xml(\.gz)?|favicon\.ico|crossdomain\.xml)$/',$ID)) && + ($ACT == 'show' || substr($ACT,0,7) == 'export_') ){ header('HTTP/1.0 404 Not Found'); - } +} - //prepare breadcrumbs (initialize a static var) - breadcrumbs(); +//prepare breadcrumbs (initialize a static var) +if ($conf['breadcrumbs']) breadcrumbs(); - // check upstream - checkUpdateMessages(); +// check upstream +checkUpdateMessages(); - trigger_event('DOKUWIKI_STARTED',$tmp=array()); +$tmp = array(); // No event data +trigger_event('DOKUWIKI_STARTED',$tmp); - //close session - session_write_close(); +//close session +session_write_close(); - //do the work - act_dispatch($ACT); +//do the work +act_dispatch($ACT); - trigger_event('DOKUWIKI_DONE', $tmp=array()); +$tmp = array(); // No event data +trigger_event('DOKUWIKI_DONE', $tmp); // xdebug_dump_function_profile(1); -?> diff -Naur dokuwiki-2009-02-14/feed.php dokuwiki-rc2009-12-02/feed.php --- dokuwiki-2009-02-14/feed.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/feed.php 2009-12-02 19:50:11.000000000 +0100 @@ -6,73 +6,86 @@ * @author Andreas Gohr */ - if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); - require_once(DOKU_INC.'inc/init.php'); - require_once(DOKU_INC.'inc/common.php'); - require_once(DOKU_INC.'inc/events.php'); - require_once(DOKU_INC.'inc/parserutils.php'); - require_once(DOKU_INC.'inc/feedcreator.class.php'); - require_once(DOKU_INC.'inc/auth.php'); - require_once(DOKU_INC.'inc/pageutils.php'); - - //close session - session_write_close(); - - // get params - $opt = rss_parseOptions(); - - // the feed is dynamic - we need a cache for each combo - // (but most people just use the default feed so it's still effective) - $cache = getCacheName(join('',array_values($opt)).$_SERVER['REMOTE_USER'],'.feed'); - $cmod = @filemtime($cache); // 0 if not exists - if ($cmod && (@filemtime(DOKU_CONF.'local.php')>$cmod || @filemtime(DOKU_CONF.'dokuwiki.php')>$cmod)) { - // ignore cache if feed prefs may have changed - $cmod = 0; - } - - // check cacheage and deliver if nothing has changed since last - // time or the update interval has not passed, also handles conditional requests - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); - header('Content-Type: application/xml; charset=utf-8'); - header('X-Robots-Tag: noindex'); - if($cmod && (($cmod+$conf['rss_update']>time()) || ($cmod>@filemtime($conf['changelog'])))){ - http_conditionalRequest($cmod); - if($conf['allowdebug']) header("X-CacheUsed: $cache"); - print io_readFile($cache); +if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); +require_once(DOKU_INC.'inc/init.php'); +require_once(DOKU_INC.'inc/common.php'); +require_once(DOKU_INC.'inc/events.php'); +require_once(DOKU_INC.'inc/parserutils.php'); +require_once(DOKU_INC.'inc/feedcreator.class.php'); +require_once(DOKU_INC.'inc/auth.php'); +require_once(DOKU_INC.'inc/pageutils.php'); +require_once(DOKU_INC.'inc/httputils.php'); + +//close session +session_write_close(); + +// get params +$opt = rss_parseOptions(); + +// the feed is dynamic - we need a cache for each combo +// (but most people just use the default feed so it's still effective) +$cache = getCacheName(join('',array_values($opt)).$_SERVER['REMOTE_USER'],'.feed'); +$key = join('', array_values($opt)) . $_SERVER['REMOTE_USER']; +$cache = new cache($key, '.feed'); + +// prepare cache depends +$depends['files'] = getConfigFiles('main'); +$depends['age'] = $conf['rss_update']; +$depends['purge'] = ($_REQUEST['purge']) ? true : false; + +// check cacheage and deliver if nothing has changed since last +// time or the update interval has not passed, also handles conditional requests +header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); +header('Pragma: public'); +header('Content-Type: application/xml; charset=utf-8'); +header('X-Robots-Tag: noindex'); +if($cache->useCache($depends)) { + http_conditionalRequest($cache->_time); + if($conf['allowdebug']) header("X-CacheUsed: $cache->cache"); + print $cache->retrieveCache(); exit; - } else { +} else { http_conditionalRequest(time()); - } + } - // create new feed - $rss = new DokuWikiFeedCreator(); - $rss->title = $conf['title'].(($opt['namespace']) ? ' '.$opt['namespace'] : ''); - $rss->link = DOKU_URL; - $rss->syndicationURL = DOKU_URL.'feed.php'; - $rss->cssStyleSheet = DOKU_URL.'lib/exe/css.php?s=feed'; - - $image = new FeedImage(); - $image->title = $conf['title']; - $image->url = DOKU_URL."lib/images/favicon.ico"; - $image->link = DOKU_URL; - $rss->image = $image; - - if($opt['feed_mode'] == 'list'){ - rssListNamespace($rss,$opt); - }elseif($opt['feed_mode'] == 'search'){ - rssSearch($rss,$opt); - }else{ - rssRecentChanges($rss,$opt); - } +// create new feed +$rss = new DokuWikiFeedCreator(); +$rss->title = $conf['title'].(($opt['namespace']) ? ' '.$opt['namespace'] : ''); +$rss->link = DOKU_URL; +$rss->syndicationURL = DOKU_URL.'feed.php'; +$rss->cssStyleSheet = DOKU_URL.'lib/exe/css.php?s=feed'; + +$image = new FeedImage(); +$image->title = $conf['title']; +$image->url = DOKU_URL."lib/images/favicon.ico"; +$image->link = DOKU_URL; +$rss->image = $image; + +$data = null; +if($opt['feed_mode'] == 'list'){ + $data = rssListNamespace($opt); +}elseif($opt['feed_mode'] == 'search'){ + $data = rssSearch($opt); +}else{ + $eventData = array( + 'opt' => &$opt, + 'data' => &$data, + ); + $event = new Doku_Event('FEED_MODE_UNKNOWN', $eventData); + if ($event->advise_before(true)) { + $data = rssRecentChanges($opt); + } + $event->advise_after(); +} - $feed = $rss->createFeed($opt['feed_type'],'utf-8'); +rss_buildItems($rss, $data, $opt); +$feed = $rss->createFeed($opt['feed_type'],'utf-8'); - // save cachefile - io_saveFile($cache,$feed); +// save cachefile +$cache->storeCache($feed); - // finally deliver - print $feed; +// finally deliver +print $feed; // ---------------------------------------------------------------- // @@ -100,26 +113,31 @@ $opt['guardmail'] = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none'); switch ($opt['feed_type']){ - case 'rss': - $opt['feed_type'] = 'RSS0.91'; - $opt['mime_type'] = 'text/xml'; - break; - case 'rss2': - $opt['feed_type'] = 'RSS2.0'; - $opt['mime_type'] = 'text/xml'; - break; - case 'atom': - $opt['feed_type'] = 'ATOM0.3'; - $opt['mime_type'] = 'application/xml'; - break; - case 'atom1': - $opt['feed_type'] = 'ATOM1.0'; - $opt['mime_type'] = 'application/atom+xml'; - break; - default: - $opt['feed_type'] = 'RSS1.0'; - $opt['mime_type'] = 'application/xml'; + case 'rss': + $opt['feed_type'] = 'RSS0.91'; + $opt['mime_type'] = 'text/xml'; + break; + case 'rss2': + $opt['feed_type'] = 'RSS2.0'; + $opt['mime_type'] = 'text/xml'; + break; + case 'atom': + $opt['feed_type'] = 'ATOM0.3'; + $opt['mime_type'] = 'application/xml'; + break; + case 'atom1': + $opt['feed_type'] = 'ATOM1.0'; + $opt['mime_type'] = 'application/atom+xml'; + break; + default: + $opt['feed_type'] = 'RSS1.0'; + $opt['mime_type'] = 'application/xml'; } + + $eventData = array( + 'opt' => &$opt, + ); + trigger_event('FEED_OPTS_POSTPROCESS', $eventData); return $opt; } @@ -136,140 +154,148 @@ global $lang; global $auth; - foreach($data as $ditem){ - if(!is_array($ditem)){ - // not an array? then only a list of IDs was given - $ditem = array( 'id' => $ditem ); - } + $eventData = array( + 'rss' => &$rss, + 'data' => &$data, + 'opt' => &$opt, + ); + $event = new Doku_Event('FEED_DATA_PROCESS', $eventData); + if ($event->advise_before(false)){ + foreach($data as $ditem){ + if(!is_array($ditem)){ + // not an array? then only a list of IDs was given + $ditem = array( 'id' => $ditem ); + } - $item = new FeedItem(); - $id = $ditem['id']; - $meta = p_get_metadata($id); - - // add date - if($ditem['date']){ - $date = $ditem['date']; - }elseif($meta['date']['modified']){ - $date = $meta['date']['modified']; - }else{ - $date = @filemtime(wikiFN($id)); - } - if($date) $item->date = date('r',$date); + $item = new FeedItem(); + $id = $ditem['id']; + $meta = p_get_metadata($id); + + // add date + if($ditem['date']){ + $date = $ditem['date']; + }elseif($meta['date']['modified']){ + $date = $meta['date']['modified']; + }else{ + $date = @filemtime(wikiFN($id)); + } + if($date) $item->date = date('r',$date); - // add title - if($conf['useheading'] && $meta['title']){ - $item->title = $meta['title']; - }else{ - $item->title = $ditem['id']; - } - if($conf['rss_show_summary'] && !empty($ditem['sum'])){ - $item->title .= ' - '.strip_tags($ditem['sum']); - } + // add title + if($conf['useheading'] && $meta['title']){ + $item->title = $meta['title']; + }else{ + $item->title = $ditem['id']; + } + if($conf['rss_show_summary'] && !empty($ditem['sum'])){ + $item->title .= ' - '.strip_tags($ditem['sum']); + } - // add item link - switch ($opt['link_to']){ - case 'page': - $item->link = wl($id,'rev='.$date,true,'&'); - break; - case 'rev': - $item->link = wl($id,'do=revisions&rev='.$date,true,'&'); - break; - case 'current': - $item->link = wl($id, '', true,'&'); - break; - case 'diff': - default: - $item->link = wl($id,'rev='.$date.'&do=diff',true,'&'); - } + // add item link + switch ($opt['link_to']){ + case 'page': + $item->link = wl($id,'rev='.$date,true,'&'); + break; + case 'rev': + $item->link = wl($id,'do=revisions&rev='.$date,true,'&'); + break; + case 'current': + $item->link = wl($id, '', true,'&'); + break; + case 'diff': + default: + $item->link = wl($id,'rev='.$date.'&do=diff',true,'&'); + } - // add item content - switch ($opt['item_content']){ - case 'diff': - case 'htmldiff': - require_once(DOKU_INC.'inc/DifferenceEngine.php'); - $revs = getRevisions($id, 0, 1); - $rev = $revs[0]; - - if($rev){ - $df = new Diff(explode("\n",htmlspecialchars(rawWiki($id,$rev))), - explode("\n",htmlspecialchars(rawWiki($id,'')))); - }else{ - $df = new Diff(array(''), - explode("\n",htmlspecialchars(rawWiki($id,'')))); - } + // add item content + switch ($opt['item_content']){ + case 'diff': + case 'htmldiff': + require_once(DOKU_INC.'inc/DifferenceEngine.php'); + $revs = getRevisions($id, 0, 1); + $rev = $revs[0]; + + if($rev){ + $df = new Diff(explode("\n",htmlspecialchars(rawWiki($id,$rev))), + explode("\n",htmlspecialchars(rawWiki($id,'')))); + }else{ + $df = new Diff(array(''), + explode("\n",htmlspecialchars(rawWiki($id,'')))); + } + + if($opt['item_content'] == 'htmldiff'){ + $tdf = new TableDiffFormatter(); + $content = ''; + $content .= ''; + $content .= ''; + $content .= $tdf->format($df); + $content .= '
'.$rev.''.$lang['current'].'
'; + }else{ + $udf = new UnifiedDiffFormatter(); + $content = "
\n".$udf->format($df)."\n
"; + } + break; + case 'html': + $content = p_wiki_xhtml($id,$date,false); + // no TOC in feeds + $content = preg_replace('/().*()/s','',$content); + + // make URLs work when canonical is not set, regexp instead of rerendering! + if(!$conf['canonical']){ + $base = preg_quote(DOKU_REL,'/'); + $content = preg_replace('/(description = $content; //FIXME a plugin hook here could be senseful - if($opt['item_content'] == 'htmldiff'){ - $tdf = new TableDiffFormatter(); - $content = ''; - $content .= ''; - $content .= ''; - $content .= $tdf->format($df); - $content .= '
'.$rev.''.$lang['current'].'
'; + // add user + # FIXME should the user be pulled from metadata as well? + $user = null; + $user = @$ditem['user']; // the @ spares time repeating lookup + $item->author = ''; + if($user && $conf['useacl'] && $auth){ + $userInfo = $auth->getUserData($user); + $item->author = $userInfo['name']; + if($userInfo && !$opt['guardmail']){ + $item->authorEmail = $userInfo['mail']; }else{ - $udf = new UnifiedDiffFormatter(); - $content = "
\n".$udf->format($df)."\n
"; + //cannot obfuscate because some RSS readers may check validity + $item->authorEmail = $user.'@'.$recent['ip']; } - break; - case 'html': - $content = p_wiki_xhtml($id,$date,false); - // no TOC in feeds - $content = preg_replace('/().*()/s','',$content); - - // make URLs work when canonical is not set, regexp instead of rerendering! - if(!$conf['canonical']){ - $base = preg_quote(DOKU_REL,'/'); - $content = preg_replace('/(description = $content; //FIXME a plugin hook here could be senseful - - - // add user - # FIXME should the user be pulled from metadata as well? - $user = null; - $user = @$ditem['user']; // the @ spares time repeating lookup - $item->author = ''; - if($user && $conf['useacl'] && $auth){ - $userInfo = $auth->getUserData($user); - $item->author = $userInfo['name']; - if($userInfo && !$opt['guardmail']){ - $item->authorEmail = $userInfo['mail']; - }else{ - //cannot obfuscate because some RSS readers may check validity + }elseif($user){ + // this happens when no ACL but some Apache auth is used + $item->author = $user; $item->authorEmail = $user.'@'.$recent['ip']; + }else{ + $item->authorEmail = 'anonymous@'.$recent['ip']; } - }elseif($user){ - // this happens when no ACL but some Apache auth is used - $item->author = $user; - $item->authorEmail = $user.'@'.$recent['ip']; - }else{ - $item->authorEmail = 'anonymous@'.$recent['ip']; - } - // add category - if($meta['subject']){ - $item->category = $meta['subject']; - }else{ - $cat = getNS($id); - if($cat) $item->category = $cat; - } + // add category + if($meta['subject']){ + $item->category = $meta['subject']; + }else{ + $cat = getNS($id); + if($cat) $item->category = $cat; + } - // finally add the item to the feed object, after handing it to registered plugins - $evdata = array('item' => &$item, - 'opt' => &$opt, - 'ditem' => &$ditem, - 'rss' => &$rss); - $evt = new Doku_Event('FEED_ITEM_ADD', $evdata); - if ($evt->advise_before()){ - $rss->addItem($item); + // finally add the item to the feed object, after handing it to registered plugins + $evdata = array('item' => &$item, + 'opt' => &$opt, + 'ditem' => &$ditem, + 'rss' => &$rss); + $evt = new Doku_Event('FEED_ITEM_ADD', $evdata); + if ($evt->advise_before()){ + $rss->addItem($item); + } + $evt->advise_after(); // for completeness } - $evt->advise_after(); // for completeness } + $event->advise_after(); } @@ -278,7 +304,7 @@ * * @author Andreas Gohr */ -function rssRecentChanges(&$rss,$opt){ +function rssRecentChanges($opt){ global $conf; global $auth; @@ -286,8 +312,7 @@ if(!$opt['show_minor']) $flags += RECENTS_SKIP_MINORS; $recents = getRecents(0,$opt['items'],$opt['namespace'],$flags); - - rss_buildItems($rss,$recents,$opt); + return $recents; } /** @@ -295,7 +320,7 @@ * * @author Andreas Gohr */ -function rssListNamespace(&$rss,$opt){ +function rssListNamespace($opt){ require_once(DOKU_INC.'inc/search.php'); global $conf; @@ -306,7 +331,7 @@ sort($data); search($data,$conf['datadir'],'search_list','',$ns); - rss_buildItems($rss,$data,$opt); + return $data; } /** @@ -314,15 +339,15 @@ * * @author Andreas Gohr */ -function rssSearch(&$rss,$opt){ +function rssSearch($opt){ if(!$opt['search_query']) return; require_once(DOKU_INC.'inc/fulltext.php'); $data = array(); $data = ft_pageSearch($opt['search_query'],$poswords); $data = array_keys($data); - rss_buildItems($rss,$data,$opt); + + return $data; } //Setup VIM: ex: et ts=4 enc=utf-8 : -?> diff -Naur dokuwiki-2009-02-14/inc/actions.php dokuwiki-rc2009-12-02/inc/actions.php --- dokuwiki-2009-02-14/inc/actions.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/actions.php 2009-12-02 19:50:11.000000000 +0100 @@ -79,6 +79,15 @@ } } + //revert + if($ACT == 'revert'){ + if(checkSecurityToken()){ + $ACT = act_revert($ACT); + }else{ + $ACT = 'show'; + } + } + //save if($ACT == 'save'){ if(checkSecurityToken()){ @@ -185,7 +194,7 @@ //disable all acl related commands if ACL is disabled if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin', - 'subscribe','unsubscribe','profile', + 'subscribe','unsubscribe','profile','revert', 'resendpwd','subscribens','unsubscribens',))){ msg('Command unavailable: '.htmlspecialchars($act),-1); return 'show'; @@ -193,7 +202,7 @@ if(!in_array($act,array('login','logout','register','save','cancel','edit','draft', 'preview','search','show','check','index','revisions', - 'diff','recent','backlink','admin','subscribe', + 'diff','recent','backlink','admin','subscribe','revert', 'unsubscribe','profile','resendpwd','recover','wordblock', 'draftdel','subscribens','unsubscribens',)) && substr($act,0,7) != 'export_' ) { msg('Command unknown: '.htmlspecialchars($act),-1); @@ -225,6 +234,9 @@ } }elseif(in_array($act,array('login','search','recent','profile'))){ $permneed = AUTH_NONE; + }elseif($act == 'revert'){ + $permneed = AUTH_ADMIN; + if($INFO['ismanager']) $permneed = AUTH_EDIT; }elseif($act == 'register'){ $permneed = AUTH_NONE; }elseif($act == 'resendpwd'){ @@ -320,6 +332,43 @@ } /** + * Revert to a certain revision + * + * @author Andreas Gohr + */ +function act_revert($act){ + global $ID; + global $REV; + global $lang; + + // when no revision is given, delete current one + // FIXME this feature is not exposed in the GUI currently + $text = ''; + $sum = $lang['deleted']; + if($REV){ + $text = rawWiki($ID,$REV); + if(!$text) return 'show'; //something went wrong + $sum = $lang['restored']; + } + + // spam check + if(checkwordblock($Text)) + return 'wordblock'; + + saveWikiText($ID,$text,$sum,false); + msg($sum,1); + + //delete any draft + act_draftdel($act); + session_write_close(); + + // when done, show current page + $_SERVER['REQUEST_METHOD'] = 'post'; //should force a redirect + $REV = ''; + return 'show'; +} + +/** * Do a redirect after receiving post data * * Tries to add the section id as hash mark after section editing @@ -338,23 +387,22 @@ session_write_close(); } - //get section name when coming from section edit - if($PRE && preg_match('/^\s*==+([^=\n]+)/',$TEXT,$match)){ - $check = false; - $title = sectionID($match[0],$check); - } - $opts = array( 'id' => $id, - 'fragment' => $title, 'preact' => $preact ); + //get section name when coming from section edit + if($PRE && preg_match('/^\s*==+([^=\n]+)/',$TEXT,$match)){ + $check = false; //Byref + $opts['fragment'] = sectionID($match[0], $check); + } + trigger_event('ACTION_SHOW_REDIRECT',$opts,'act_redirect_execute'); } function act_redirect_execute($opts){ $go = wl($opts['id'],'',true); - if($opts['fragment']) $go .= '#'.$opts['fragment']; + if(isset($opts['fragment'])) $go .= '#'.$opts['fragment']; //show it send_redirect($go); @@ -370,7 +418,7 @@ global $INFO; //already logged in? - if($_SERVER['REMOTE_USER'] && $act=='login'){ + if(isset($_SERVER['REMOTE_USER']) && $act=='login'){ return 'show'; } @@ -413,7 +461,7 @@ * Export a wiki page for various formats * * Triggers ACTION_EXPORT_POSTPROCESS - * + * * Event data: * data['id'] -- page id * data['mode'] -- requested export mode @@ -441,6 +489,7 @@ switch($mode) { case 'raw': $headers['Content-Type'] = 'text/plain; charset=utf-8'; + $headers['Content-Disposition'] = 'attachment; filename='.noNS($ID).'.txt'; $output = rawWiki($ID,$REV); break; case 'xhtml': diff -Naur dokuwiki-2009-02-14/inc/adLDAP.php dokuwiki-rc2009-12-02/inc/adLDAP.php --- dokuwiki-2009-02-14/inc/adLDAP.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/adLDAP.php 2009-12-02 19:50:11.000000000 +0100 @@ -0,0 +1,1596 @@ +0){ + if (array_key_exists("account_suffix",$options)){ $this->_account_suffix=$options["account_suffix"]; } + if (array_key_exists("base_dn",$options)){ $this->_base_dn=$options["base_dn"]; } + if (array_key_exists("domain_controllers",$options)){ $this->_domain_controllers=$options["domain_controllers"]; } + if (array_key_exists("ad_username",$options)){ $this->_ad_username=$options["ad_username"]; } + if (array_key_exists("ad_password",$options)){ $this->_ad_password=$options["ad_password"]; } + if (array_key_exists("real_primarygroup",$options)){ $this->_real_primarygroup=$options["real_primarygroup"]; } + if (array_key_exists("use_ssl",$options)){ $this->_use_ssl=$options["use_ssl"]; } + if (array_key_exists("recursive_groups",$options)){ $this->_recursive_groups=$options["recursive_groups"]; } + } + + // Connect to the AD/LDAP server as the username/password + $dc=$this->random_controller(); + if ($this->_use_ssl){ + $this->_conn = ldap_connect("ldaps://".$dc, 636); + } else { + $this->_conn = ldap_connect($dc); + } + + // Set some ldap options for talking to AD + ldap_set_option($this->_conn, LDAP_OPT_PROTOCOL_VERSION, 3); + ldap_set_option($this->_conn, LDAP_OPT_REFERRALS, 0); + + // Bind as a domain admin if they've set it up + if ($this->_ad_username!=NULL && $this->_ad_password!=NULL){ + $this->_bind = @ldap_bind($this->_conn,$this->_ad_username.$this->_account_suffix,$this->_ad_password); + if (!$this->_bind){ + if ($this->_use_ssl){ + // If you have problems troubleshooting, remove the @ character from the ldap_bind command above to get the actual error message + throw new adLDAPException('Bind to Active Directory failed. Either the LDAPs connection failed or the login credentials are incorrect. AD said: ' . $this->get_last_error()); + } else { + throw new adLDAPException('Bind to Active Directory failed. Check the login credentials and/or server details. AD said: ' . $this->get_last_error()); + } + } + } + + return (true); + } + + /** + * Default Destructor + * + * Closes the LDAP connection + * + * @return void + */ + function __destruct(){ ldap_close ($this->_conn); } + + /** + * Validate a user's login credentials + * + * @param string $username A user's AD username + * @param string $password A user's AD password + * @param bool optional $prevent_rebind + * @return bool + */ + public function authenticate($username,$password,$prevent_rebind=false){ + // Prevent null binding + if ($username==NULL || $password==NULL){ return (false); } + + // Bind as the user + $this->_bind = @ldap_bind($this->_conn,$username.$this->_account_suffix,$password); + if (!$this->_bind){ return (false); } + + // Cnce we've checked their details, kick back into admin mode if we have it + if ($this->_ad_username!=NULL && !$prevent_rebind){ + $this->_bind = @ldap_bind($this->_conn,$this->_ad_username.$this->_account_suffix,$this->_ad_password); + if (!$this->_bind){ + // This should never happen in theory + throw new adLDAPException('Rebind to Active Directory failed. AD said: ' . $this->get_last_error()); + } + } + + return (true); + } + + //***************************************************************************************************************** + // GROUP FUNCTIONS + + /** + * Add a group to a group + * + * @param string $parent The parent group name + * @param string $child The child group name + * @return bool + */ + public function group_add_group($parent,$child){ + + // Find the parent group's dn + $parent_group=$this->group_info($parent,array("cn")); + if ($parent_group[0]["dn"]==NULL){ return (false); } + $parent_dn=$parent_group[0]["dn"]; + + // Find the child group's dn + $child_group=$this->group_info($child,array("cn")); + if ($child_group[0]["dn"]==NULL){ return (false); } + $child_dn=$child_group[0]["dn"]; + + $add=array(); + $add["member"] = $child_dn; + + $result=@ldap_mod_add($this->_conn,$parent_dn,$add); + if ($result==false){ return (false); } + return (true); + } + + /** + * Add a user to a group + * + * @param string $group The group to add the user to + * @param string $user The user to add to the group + * @return bool + */ + public function group_add_user($group,$user){ + // Adding a user is a bit fiddly, we need to get the full DN of the user + // and add it using the full DN of the group + + // Find the user's dn + $user_dn=$this->user_dn($user); + if ($user_dn===false){ return (false); } + + // Find the group's dn + $group_info=$this->group_info($group,array("cn")); + if ($group_info[0]["dn"]==NULL){ return (false); } + $group_dn=$group_info[0]["dn"]; + + $add=array(); + $add["member"] = $user_dn; + + $result=@ldap_mod_add($this->_conn,$group_dn,$add); + if ($result==false){ return (false); } + return (true); + } + + /** + * Add a contact to a group + * + * @param string $group The group to add the contact to + * @param string $contact_dn The DN of the contact to add + * @return bool + */ + public function group_add_contact($group,$contact_dn){ + // To add a contact we take the contact's DN + // and add it using the full DN of the group + + // Find the group's dn + $group_info=$this->group_info($group,array("cn")); + if ($group_info[0]["dn"]==NULL){ return (false); } + $group_dn=$group_info[0]["dn"]; + + $add=array(); + $add["member"] = $contact_dn; + + $result=@ldap_mod_add($this->_conn,$group_dn,$add); + if ($result==false){ return (false); } + return (true); + } + + /** + * Create a group + * + * @param array $attributes Default attributes of the group + * @return bool + */ + public function group_create($attributes){ + if (!is_array($attributes)){ return ("Attributes must be an array"); } + if (!array_key_exists("group_name",$attributes)){ return ("Missing compulsory field [group_name]"); } + if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); } + if (!array_key_exists("description",$attributes)){ return ("Missing compulsory field [description]"); } + if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); } + $attributes["container"]=array_reverse($attributes["container"]); + + //$member_array = array(); + //$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com"; + //$member_array[1] = "cn=administrator,cn=Users,dc=yourdomain,dc=com"; + + $add=array(); + $add["cn"] = $attributes["group_name"]; + $add["samaccountname"] = $attributes["group_name"]; + $add["objectClass"] = "Group"; + $add["description"] = $attributes["description"]; + //$add["member"] = $member_array; UNTESTED + + $container="OU=".implode(",OU=",$attributes["container"]); + $result=ldap_add($this->_conn,"CN=".$add["cn"].", ".$container.",".$this->_base_dn,$add); + if ($result!=true){ return (false); } + + return (true); + } + + /** + * Remove a group from a group + * + * @param string $parent The parent group name + * @param string $child The child group name + * @return bool + */ + public function group_del_group($parent,$child){ + + // Find the parent dn + $parent_group=$this->group_info($parent,array("cn")); + if ($parent_group[0]["dn"]==NULL){ return (false); } + $parent_dn=$parent_group[0]["dn"]; + + // Find the child dn + $child_group=$this->group_info($child,array("cn")); + if ($child_group[0]["dn"]==NULL){ return (false); } + $child_dn=$child_group[0]["dn"]; + + $del=array(); + $del["member"] = $child_dn; + + $result=@ldap_mod_del($this->_conn,$parent_dn,$del); + if ($result==false){ return (false); } + return (true); + } + + /** + * Remove a user from a group + * + * @param string $group The group to remove a user from + * @param string $user The AD user to remove from the group + * @return bool + */ + public function group_del_user($group,$user){ + + // Find the parent dn + $group_info=$this->group_info($group,array("cn")); + if ($group_info[0]["dn"]==NULL){ return (false); } + $group_dn=$group_info[0]["dn"]; + + // Find the users dn + $user_dn=$this->user_dn($user); + if ($user_dn===false){ return (false); } + + $del=array(); + $del["member"] = $user_dn; + + $result=@ldap_mod_del($this->_conn,$group_dn,$del); + if ($result==false){ return (false); } + return (true); + } + + /** + * Remove a contact from a group + * + * @param string $group The group to remove a user from + * @param string $contact_dn The DN of a contact to remove from the group + * @return bool + */ + public function group_del_contact($group,$contact_dn){ + + // Find the parent dn + $group_info=$this->group_info($group,array("cn")); + if ($group_info[0]["dn"]==NULL){ return (false); } + $group_dn=$group_info[0]["dn"]; + + $del=array(); + $del["member"] = $contact_dn; + + $result=@ldap_mod_del($this->_conn,$group_dn,$del); + if ($result==false){ return (false); } + return (true); + } + + /** + * Return a list of members in a group + * + * @param string $group The group to query + * @return array + */ + public function group_members($group){ + if (!$this->_bind){ return (false); } + // Search the directory for the members of a group + $info=$this->group_info($group,array("member","cn")); + $users=$info[0]["member"]; + if (!is_array($users)) { + return (false); + } + + $user_array=array(); + + for ($i=0; $i<$users["count"]; $i++){ + $filter="(&(objectCategory=person)(distinguishedName=".$this->ldap_slashes($users[$i])."))"; + $fields = array("samaccountname", "distinguishedname"); + $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields); + $entries = ldap_get_entries($this->_conn, $sr); + if ($entries[0]['samaccountname'][0] == NULL) { + $user_array[$i] = $entries[0]['distinguishedname'][0]; + } + else { + $user_array[$i] = $entries[0]['samaccountname'][0]; + } + } + return ($user_array); + } + + /** + * Group Information. Returns an array of information about a group. + * The group name is case sensitive + * + * @param string $group_name The group name to retrieve info about + * @param array $fields Fields to retrieve + * @return array + */ + public function group_info($group_name,$fields=NULL){ + if ($group_name==NULL){ return (false); } + if (!$this->_bind){ return (false); } + + $filter="(&(objectCategory=group)(name=".$this->ldap_slashes($group_name)."))"; + //echo ($filter."!!!
"); + if ($fields==NULL){ $fields=array("member","memberof","cn","description","distinguishedname","objectcategory","samaccountname"); } + $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields); + $entries = ldap_get_entries($this->_conn, $sr); + //print_r($entries); + return ($entries); + } + + /** + * Return a complete list of "groups in groups" + * + * @param string $group The group to get the list from + * @return array + */ + public function recursive_groups($group){ + if ($group==NULL){ return (false); } + + $ret_groups=array(); + + $groups=$this->group_info($group,array("memberof")); + $groups=$groups[0]["memberof"]; + + if ($groups){ + $group_names=$this->nice_names($groups); + $ret_groups=array_merge($ret_groups,$group_names); //final groups to return + + foreach ($group_names as $id => $group_name){ + $child_groups=$this->recursive_groups($group_name); + $ret_groups=array_merge($ret_groups,$child_groups); + } + } + + return ($ret_groups); + } + + /** + * Returns a complete list of the groups in AD based on a SAM Account Type + * + * @param string $samaccounttype The account type to return + * @param bool $include_desc Whether to return a description + * @param string $search Search parameters + * @param bool $sorted Whether to sort the results + * @return array + */ + public function search_groups($samaccounttype = ADLDAP_SECURITY_GLOBAL_GROUP, $include_desc = false, $search = "*", $sorted = true) { + if (!$this->_bind){ return (false); } + + // Perform the search and grab all their details + $filter = "(&(objectCategory=group)(samaccounttype=". $samaccounttype .")(cn=".$search."))"; + $fields=array("samaccountname","description"); + $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields); + $entries = ldap_get_entries($this->_conn, $sr); + + $groups_array = array(); + for ($i=0; $i<$entries["count"]; $i++){ + if ($include_desc && strlen($entries[$i]["description"][0]) > 0 ){ + $groups_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["description"][0]; + } elseif ($include_desc){ + $groups_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["samaccountname"][0]; + } else { + array_push($groups_array, $entries[$i]["samaccountname"][0]); + } + } + if( $sorted ){ asort($groups_array); } + return ($groups_array); + } + + /** + * Returns a complete list of security groups in AD + * + * @param bool $include_desc Whether to return a description + * @param string $search Search parameters + * @param bool $sorted Whether to sort the results + * @return array + */ + public function all_groups($include_desc = false, $search = "*", $sorted = true){ + $groups_array = $this->search_groups(ADLDAP_SECURITY_GLOBAL_GROUP, $include_desc, $search, $sorted); + return ($groups_array); + } + + /** + * Returns a complete list of distribution lists in AD + * + * @param bool $include_desc Whether to return a description + * @param string $search Search parameters + * @param bool $sorted Whether to sort the results + * @return array + */ + public function all_distribution_groups($include_desc = false, $search = "*", $sorted = true){ + $groups_array = $this->search_groups(ADLDAP_DISTRIBUTION_GROUP, $include_desc, $search, $sorted); + return ($groups_array); + } + + //***************************************************************************************************************** + // USER FUNCTIONS + + /** + * Create a user + * + * If you specify a password here, this can only be performed over SSL + * + * @param array $attributes The attributes to set to the user account + * @return bool + */ + public function user_create($attributes){ + // Check for compulsory fields + if (!array_key_exists("username",$attributes)){ return ("Missing compulsory field [username]"); } + if (!array_key_exists("firstname",$attributes)){ return ("Missing compulsory field [firstname]"); } + if (!array_key_exists("surname",$attributes)){ return ("Missing compulsory field [surname]"); } + if (!array_key_exists("email",$attributes)){ return ("Missing compulsory field [email]"); } + if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); } + if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); } + + if (array_key_exists("password",$attributes) && !$this->_use_ssl){ + throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.'); + } + + if (!array_key_exists("display_name",$attributes)){ $attributes["display_name"]=$attributes["firstname"]." ".$attributes["surname"]; } + + // Translate the schema + $add=$this->adldap_schema($attributes); + + // Additional stuff only used for adding accounts + $add["cn"][0]=$attributes["display_name"]; + $add["samaccountname"][0]=$attributes["username"]; + $add["objectclass"][0]="top"; + $add["objectclass"][1]="person"; + $add["objectclass"][2]="organizationalPerson"; + $add["objectclass"][3]="user"; //person? + //$add["name"][0]=$attributes["firstname"]." ".$attributes["surname"]; + + // Set the account control attribute + $control_options=array("NORMAL_ACCOUNT"); + if (!$attributes["enabled"]){ $control_options[]="ACCOUNTDISABLE"; } + $add["userAccountControl"][0]=$this->account_control($control_options); + //echo ("
"); print_r($add);
+
+        // Determine the container
+        $attributes["container"]=array_reverse($attributes["container"]);
+        $container="OU=".implode(",OU=",$attributes["container"]);
+
+        // Add the entry
+        $result=@ldap_add($this->_conn, "CN=".$add["cn"][0].", ".$container.",".$this->_base_dn, $add);
+        if ($result!=true){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Delete a user account
+    *
+    * @param string $username The username to delete (please be careful here!)
+    * @return array
+    */
+    public function user_delete($username) {
+        $userinfo = $this->user_info($username, array("*"));
+        $dn = $userinfo[0]['distinguishedname'][0];
+        $result=$this->dn_delete($dn);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Groups the user is a member of
+    *
+    * @param string $username The username to query
+    * @param bool $recursive Recursive list of groups
+    * @return array
+    */
+    public function user_groups($username,$recursive=NULL){
+        if ($username==NULL){ return (false); }
+        if ($recursive==NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        // Search the directory for their information
+        $info=@$this->user_info($username,array("memberof","primarygroupid"));
+        $groups=$this->nice_names($info[0]["memberof"]); // Presuming the entry returned is our guy (unique usernames)
+
+        if ($recursive){
+            foreach ($groups as $id => $group_name){
+                $extra_groups=$this->recursive_groups($group_name);
+                $groups=array_merge($groups,$extra_groups);
+            }
+        }
+
+        return ($groups);
+    }
+
+    /**
+    * Find information about the users
+    *
+    * @param string $username The username to query
+    * @param array $fields Array of parameters to query
+    * @return array
+    */
+    public function user_info($username,$fields=NULL){
+        if ($username==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        $filter="samaccountname=".$username;
+        if ($fields==NULL){ $fields=array("samaccountname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        if ($entries[0]['count'] >= 1) {
+            // AD does not return the primary group in the ldap query, we may need to fudge it
+            if ($this->_real_primarygroup && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["objectsid"][0])){
+                //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                $entries[0]["memberof"][]=$this->get_primary_group($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+            } else {
+                $entries[0]["memberof"][]="CN=Domain Users,CN=Users,".$this->_base_dn;
+            }
+        }
+
+        $entries[0]["memberof"]["count"]++;
+        return ($entries);
+    }
+
+    /**
+    * Determine if a user is in a specific group
+    *
+    * @param string $username The username to query
+    * @param string $group The name of the group to check against
+    * @param bool $recursive Check groups recursively
+    * @return bool
+    */
+    public function user_ingroup($username,$group,$recursive=NULL){
+        if ($username==NULL){ return (false); }
+        if ($group==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if ($recursive==NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+
+        // Get a list of the groups
+        $groups=$this->user_groups($username,array("memberof"),$recursive);
+
+        // Return true if the specified group is in the group list
+        if (in_array($group,$groups)){ return (true); }
+
+        return (false);
+    }
+
+    /**
+    * Modify a user
+    *
+    * @param string $username The username to query
+    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+    * @return bool
+    */
+    public function user_modify($username,$attributes){
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        if (array_key_exists("password",$attributes) && !$this->_use_ssl){
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+        //if (array_key_exists("container",$attributes)){
+            //if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); }
+            //$attributes["container"]=array_reverse($attributes["container"]);
+        //}
+
+        // Find the dn of the user
+        $user_dn=$this->user_dn($username);
+        if ($user_dn===false){ return (false); }
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod && !array_key_exists("enabled", $attributes)){ return (false); }
+
+        // Set the account control attribute (only if specified)
+        if (array_key_exists("enabled",$attributes)){
+            if ($attributes["enabled"]){ $control_options=array("NORMAL_ACCOUNT"); }
+            else { $control_options=array("NORMAL_ACCOUNT","ACCOUNTDISABLE"); }
+            $mod["userAccountControl"][0]=$this->account_control($control_options);
+        }
+
+        // Do the update
+        $result=@ldap_modify($this->_conn,$user_dn,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Disable a user account
+    *
+    * @param string $username The username to disable
+    * @return bool
+    */
+    public function user_disable($username){
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        $attributes=array("enabled"=>0);
+        $result = $this->user_modify($username, $attributes);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Enable a user account
+    *
+    * @param string $username The username to enable
+    * @return bool
+    */
+    public function user_enable($username){
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        $attributes=array("enabled"=>1);
+        $result = $this->user_modify($username, $attributes);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Set the password of a user - This must be performed over SSL
+    *
+    * @param string $username The username to modify
+    * @param string $password The new password
+    * @return bool
+    */
+    public function user_password($username,$password){
+        if ($username==NULL){ return (false); }
+        if ($password==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if (!$this->_use_ssl){
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+
+        $user_dn=$this->user_dn($username);
+        if ($user_dn===false){ return (false); }
+
+        $add=array();
+        $add["unicodePwd"][0]=$this->encode_password($password);
+
+        $result=ldap_mod_replace($this->_conn,$user_dn,$add);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Return a list of all users in AD
+    *
+    * @param bool $include_desc Return a description of the user
+    * @param string $search Search parameter
+    * @param bool $sorted Sort the user accounts
+    * @return array
+    */
+    public function all_users($include_desc = false, $search = "*", $sorted = true){
+        if (!$this->_bind){ return (false); }
+
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=user)(samaccounttype=". ADLDAP_NORMAL_ACCOUNT .")(objectCategory=person)(cn=".$search."))";
+        $fields=array("samaccountname","displayname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        $users_array = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($include_desc && strlen($entries[$i]["displayname"][0])>0){
+                $users_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["displayname"][0];
+            } elseif ($include_desc){
+                $users_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["samaccountname"][0];
+            } else {
+                array_push($users_array, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if ($sorted){ asort($users_array); }
+        return ($users_array);
+    }
+
+    //*****************************************************************************************************************
+    // CONTACT FUNCTIONS
+    // * Still work to do in this area, and new functions to write
+
+    /**
+    * Create a contact
+    *
+    * @param array $attributes The attributes to set to the contact
+    * @return bool
+    */
+    public function contact_create($attributes){
+        // Check for compulsory fields
+        if (!array_key_exists("display_name",$attributes)){ return ("Missing compulsory field [display_name]"); }
+        if (!array_key_exists("email",$attributes)){ return ("Missing compulsory field [email]"); }
+        if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); }
+        if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); }
+
+        // Translate the schema
+        $add=$this->adldap_schema($attributes);
+
+        // Additional stuff only used for adding contacts
+        $add["cn"][0]=$attributes["display_name"];
+        $add["objectclass"][0]="top";
+        $add["objectclass"][1]="person";
+        $add["objectclass"][2]="organizationalPerson";
+        $add["objectclass"][3]="contact";
+        if (!isset($attributes['exchange_hidefromlists'])) {
+            $add["msExchHideFromAddressLists"][0]="TRUE";
+        }
+
+        // Determine the container
+        $attributes["container"]=array_reverse($attributes["container"]);
+        $container="OU=".implode(",OU=",$attributes["container"]);
+
+        // Add the entry
+        $result=@ldap_add($this->_conn, "CN=".$add["cn"][0].", ".$container.",".$this->_base_dn, $add);
+        if ($result!=true){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Determine the list of groups a contact is a member of
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param bool $recursive Recursively check groups
+    * @return array
+    */
+    public function contact_groups($distinguishedname,$recursive=NULL){
+        if ($distinguishedname==NULL){ return (false); }
+        if ($recursive==NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        // Search the directory for their information
+        $info=@$this->contact_info($distinguishedname,array("memberof","primarygroupid"));
+        $groups=$this->nice_names($info[0]["memberof"]); //presuming the entry returned is our contact
+
+        if ($recursive){
+            foreach ($groups as $id => $group_name){
+                $extra_groups=$this->recursive_groups($group_name);
+                $groups=array_merge($groups,$extra_groups);
+            }
+        }
+
+        return ($groups);
+    }
+
+    /**
+    * Get contact information
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param array $fields Attributes to be returned
+    * @return array
+    */
+    public function contact_info($distinguishedname,$fields=NULL){
+        if ($distinguishedname==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        $filter="distinguishedName=".$distinguishedname;
+        if ($fields==NULL){ $fields=array("distinguishedname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        if ($entries[0]['count'] >= 1) {
+            // AD does not return the primary group in the ldap query, we may need to fudge it
+            if ($this->_real_primarygroup && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["primarygroupid"][0])){
+                //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                $entries[0]["memberof"][]=$this->get_primary_group($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+            } else {
+                $entries[0]["memberof"][]="CN=Domain Users,CN=Users,".$this->_base_dn;
+            }
+        }
+
+        $entries[0]["memberof"]["count"]++;
+        return ($entries);
+    }
+
+    /**
+    * Determine if a contact is a member of a group
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param string $group The group name to query
+    * @param bool $recursive Recursively check groups
+    * @return bool
+    */
+    public function contact_ingroup($distinguisedname,$group,$recursive=NULL){
+        if ($distinguisedname==NULL){ return (false); }
+        if ($group==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if ($recursive==NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+
+        // Get a list of the groups
+        $groups=$this->contact_groups($distinguisedname,array("memberof"),$recursive);
+
+        // Return true if the specified group is in the group list
+        if (in_array($group,$groups)){ return (true); }
+
+        return (false);
+    }
+
+    /**
+    * Modify a contact
+    *
+    * @param string $distinguishedname The contact to query
+    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+    * @return bool
+    */
+    public function contact_modify($distinguishedname,$attributes){
+        if ($distinguishedname==NULL){ return ("Missing compulsory field [distinguishedname]"); }
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod){ return (false); }
+
+        // Do the update
+        $result=ldap_modify($this->_conn,$distinguishedname,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Delete a contact
+    *
+    * @param string $distinguishedname The contact dn to delete (please be careful here!)
+    * @return array
+    */
+    public function contact_delete($distinguishedname) {
+        $result = $this->dn_delete($distinguishedname);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Return a list of all contacts
+    *
+    * @param bool $include_desc Include a description of a contact
+    * @param string $search The search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all_contacts($include_desc = false, $search = "*", $sorted = true){
+        if (!$this->_bind){ return (false); }
+
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=contact)(cn=".$search."))";
+        $fields=array("displayname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        $users_array = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($include_desc && strlen($entries[$i]["displayname"][0])>0){
+                $users_array[ $entries[$i]["distinguishedname"][0] ] = $entries[$i]["displayname"][0];
+            } elseif ($include_desc){
+                $users_array[ $entries[$i]["distinguishedname"][0] ] = $entries[$i]["distinguishedname"][0];
+            } else {
+                array_push($users_array, $entries[$i]["distinguishedname"][0]);
+            }
+        }
+        if ($sorted){ asort($users_array); }
+        return ($users_array);
+    }
+
+    //*****************************************************************************************************************
+    // COMPUTER FUNCTIONS
+
+    /**
+    * Get information about a specific computer
+    *
+    * @param string $computer_name The name of the computer
+    * @param array $fields Attributes to return
+    * @return array
+    */
+    public function computer_info($computer_name,$fields=NULL){
+        if ($computer_name==NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        $filter="(&(objectClass=computer)(cn=".$computer_name."))";
+        if ($fields==NULL){ $fields=array("memberof","cn","displayname","dnshostname","distinguishedname","objectcategory","operatingsystem","operatingsystemservicepack","operatingsystemversion"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        return ($entries);
+    }
+
+    //************************************************************************************************************
+    // EXCHANGE FUNCTIONS
+
+    /**
+    * Create an Exchange account
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param array $storagegroup The mailbox, Exchange Storage Group, for the user account, this must be a full CN
+    *                            If the storage group has a different base_dn to the adLDAP configuration, set it using $base_dn
+    * @param string $emailaddress The primary email address to add to this user
+    * @param string $mailnickname The mail nick name.  If mail nickname is blank, the username will be used
+    * @param bool $usedefaults Indicates whether the store should use the default quota, rather than the per-mailbox quota.
+    * @param string $base_dn Specify an alternative base_dn for the Exchange storage grop
+    * @return bool
+    */
+    public function exchange_create_mailbox($username, $storagegroup, $emailaddress, $mailnickname=NULL, $usedefaults=TRUE, $base_dn=NULL){
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        if ($storagegroup==NULL){ return ("Missing compulsory array [storagegroup]"); }
+        if (!is_array($storagegroup)){ return ("[storagegroup] must be an array"); }
+        if ($emailaddress==NULL){ return ("Missing compulsory field [emailaddress]"); }
+
+        if ($base_dn==NULL) {
+            $base_dn = $this->_base_dn;
+        }
+
+        $container="CN=".implode(",CN=",$storagegroup);
+
+        if ($mailnickname==NULL) { $mailnickname=$username; }
+        $mdbUseDefaults = $this->bool2str($usedefaults);
+
+        $attributes = array(
+            'exchange_homemdb'=>$container.",".$base_dn,
+            'exchange_proxyaddress'=>'SMTP:' . $emailaddress,
+            'exchange_mailnickname'=>$mailnickname,
+            'exchange_usedefaults'=>$mdbUseDefaults
+        );
+        $result = $this->user_modify($username,$attributes);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Add an address to Exchange
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to add to this user
+    * @param bool $default Make this email address the default address, this is a bit more intensive as we have to demote any existing default addresses
+    * @return bool
+    */
+    public function exchange_add_address($username, $emailaddress, $default=FALSE) {
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress==NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        $proxyvalue = 'smtp:';
+        if ($default === true) {
+            $proxyvalue = 'SMTP:';
+        }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"));
+        if ($user[0]["dn"]==NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        // We need to scan existing proxy addresses and demote the default one
+        if (is_array($user[0]["proxyaddresses"]) && $default===true) {
+            $modaddresses = array();
+            for ($i=0;$i_conn,$user_dn,$modaddresses);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+        else {
+            // We do not have to demote an email address from the default so we can just add the new proxy address
+            $attributes['exchange_proxyaddress'] = $proxyvalue . $emailaddress;
+
+            // Translate the update to the LDAP schema
+            $add=$this->adldap_schema($attributes);
+
+            if (!$add){ return (false); }
+
+            // Do the update
+            // Take out the @ to see any errors, usually this error might occur because the address already
+            // exists in the list of proxyAddresses
+            $result=@ldap_mod_add($this->_conn,$user_dn,$add);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+    }
+
+    /**
+    * Remove an address to Exchange
+    * If you remove a default address the account will no longer have a default,
+    * we recommend changing the default address first
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to add to this user
+    * @return bool
+    */
+    public function exchange_del_address($username, $emailaddress) {
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress==NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"));
+        if ($user[0]["dn"]==NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        if (is_array($user[0]["proxyaddresses"])) {
+            $mod = array();
+            for ($i=0;$i_conn,$user_dn,$mod);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+        else {
+            return (false);
+        }
+    }
+    /**
+    * Change the default address
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to make default
+    * @return bool
+    */
+    public function exchange_primary_address($username, $emailaddress) {
+        if ($username==NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress==NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"));
+        if ($user[0]["dn"]==NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        if (is_array($user[0]["proxyaddresses"])) {
+            $modaddresses = array();
+            for ($i=0;$i_conn,$user_dn,$modaddresses);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+
+    }
+
+    /**
+    * Mail enable a contact
+    * Allows email to be sent to them through Exchange
+    *
+    * @param string $distinguishedname The contact to mail enable
+    * @param string $emailaddress The email address to allow emails to be sent through
+    * @param string $mailnickname The mailnickname for the contact in Exchange.  If NULL this will be set to the display name
+    * @return bool
+    */
+    public function exchange_contact_mailenable($distinguishedname, $emailaddress, $mailnickname=NULL){
+        if ($distinguishedname==NULL){ return ("Missing compulsory field [distinguishedname]"); }
+        if ($emailaddress==NULL){ return ("Missing compulsory field [emailaddress]"); }
+
+        if ($mailnickname != NULL) {
+            // Find the dn of the user
+            $user=$this->contact_info($distinguishedname,array("cn","displayname"));
+            if ($user[0]["displayname"]==NULL){ return (false); }
+            $mailnickname = $user[0]['displayname'][0];
+        }
+
+        $attributes = array("email"=>$emailaddress,"contact_email"=>"SMTP:" . $emailaddress,"exchange_proxyaddress"=>"SMTP:" . $emailaddress,"exchange_mailnickname"=>$mailnickname);
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod){ return (false); }
+
+        // Do the update
+        $result=ldap_modify($this->_conn,$distinguishedname,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    //************************************************************************************************************
+    // UTILITY FUNCTIONS (Many of these functions are protected and can only be called from within the class)
+
+    /**
+    * Get last error from Active Directory
+    *
+    * This function gets the last message from Active Directory
+    * This may indeed be a 'Success' message but if you get an unknown error
+    * it might be worth calling this function to see what errors were raised
+    *
+    * return string
+    */
+    public function get_last_error() {
+        return @ldap_error($this->_conn);
+    }
+
+    /**
+    * Schema
+    *
+    * @param array $attributes Attributes to be queried
+    * @return array
+    */
+    protected function adldap_schema($attributes){
+
+        // LDAP doesn't like NULL attributes, only set them if they have values
+        // If you wish to remove an attribute you should set it to a space
+        // TO DO: Adapt user_modify to use ldap_mod_delete to remove a NULL attribute
+        $mod=array();
+
+        // Check every attribute to see if it contains 8bit characters and then UTF8 encode them
+        array_walk($attributes, array($this, 'encode8bit'));
+
+        if ($attributes["address_city"]){ $mod["l"][0]=$attributes["address_city"]; }
+        if ($attributes["address_code"]){ $mod["postalCode"][0]=$attributes["address_code"]; }
+        //if ($attributes["address_country"]){ $mod["countryCode"][0]=$attributes["address_country"]; } // use country codes?
+        if ($attributes["address_country"]){ $mod["c"][0]=$attributes["address_country"]; }
+        if ($attributes["address_pobox"]){ $mod["postOfficeBox"][0]=$attributes["address_pobox"]; }
+        if ($attributes["address_state"]){ $mod["st"][0]=$attributes["address_state"]; }
+        if ($attributes["address_street"]){ $mod["streetAddress"][0]=$attributes["address_street"]; }
+        if ($attributes["company"]){ $mod["company"][0]=$attributes["company"]; }
+        if ($attributes["change_password"]){ $mod["pwdLastSet"][0]=0; }
+        if ($attributes["department"]){ $mod["department"][0]=$attributes["department"]; }
+        if ($attributes["description"]){ $mod["description"][0]=$attributes["description"]; }
+        if ($attributes["display_name"]){ $mod["displayName"][0]=$attributes["display_name"]; }
+        if ($attributes["email"]){ $mod["mail"][0]=$attributes["email"]; }
+        if ($attributes["expires"]){ $mod["accountExpires"][0]=$attributes["expires"]; } //unix epoch format?
+        if ($attributes["firstname"]){ $mod["givenName"][0]=$attributes["firstname"]; }
+        if ($attributes["home_directory"]){ $mod["homeDirectory"][0]=$attributes["home_directory"]; }
+        if ($attributes["home_drive"]){ $mod["homeDrive"][0]=$attributes["home_drive"]; }
+        if ($attributes["initials"]){ $mod["initials"][0]=$attributes["initials"]; }
+        if ($attributes["logon_name"]){ $mod["userPrincipalName"][0]=$attributes["logon_name"]; }
+        if ($attributes["manager"]){ $mod["manager"][0]=$attributes["manager"]; }  //UNTESTED ***Use DistinguishedName***
+        if ($attributes["office"]){ $mod["physicalDeliveryOfficeName"][0]=$attributes["office"]; }
+        if ($attributes["password"]){ $mod["unicodePwd"][0]=$this->encode_password($attributes["password"]); }
+        if ($attributes["profile_path"]){ $mod["profilepath"][0]=$attributes["profile_path"]; }
+        if ($attributes["script_path"]){ $mod["scriptPath"][0]=$attributes["script_path"]; }
+        if ($attributes["surname"]){ $mod["sn"][0]=$attributes["surname"]; }
+        if ($attributes["title"]){ $mod["title"][0]=$attributes["title"]; }
+        if ($attributes["telephone"]){ $mod["telephoneNumber"][0]=$attributes["telephone"]; }
+        if ($attributes["mobile"]){ $mod["mobile"][0]=$attributes["mobile"]; }
+        if ($attributes["pager"]){ $mod["pager"][0]=$attributes["pager"]; }
+        if ($attributes["ipphone"]){ $mod["ipphone"][0]=$attributes["ipphone"]; }
+        if ($attributes["web_page"]){ $mod["wWWHomePage"][0]=$attributes["web_page"]; }
+        if ($attributes["fax"]){ $mod["facsimileTelephoneNumber"][0]=$attributes["fax"]; }
+        if ($attributes["enabled"]){ $mod["userAccountControl"][0]=$attributes["enabled"]; }
+
+        // Distribution List specific schema
+        if ($attributes["group_sendpermission"]){ $mod["dlMemSubmitPerms"][0]=$attributes["group_sendpermission"]; }
+        if ($attributes["group_rejectpermission"]){ $mod["dlMemRejectPerms"][0]=$attributes["group_rejectpermission"]; }
+
+        // Exchange Schema
+        if ($attributes["exchange_homemdb"]){ $mod["homeMDB"][0]=$attributes["exchange_homemdb"]; }
+        if ($attributes["exchange_mailnickname"]){ $mod["mailNickname"][0]=$attributes["exchange_mailnickname"]; }
+        if ($attributes["exchange_proxyaddress"]){ $mod["proxyAddresses"][0]=$attributes["exchange_proxyaddress"]; }
+        if ($attributes["exchange_usedefaults"]){ $mod["mDBUseDefaults"][0]=$attributes["exchange_usedefaults"]; }
+
+        // This schema is designed for contacts
+        if ($attributes["exchange_hidefromlists"]){ $mod["msExchHideFromAddressLists"][0]=$attributes["exchange_hidefromlists"]; }
+        if ($attributes["contact_email"]){ $mod["targetAddress"][0]=$attributes["contact_email"]; }
+
+        //echo ("
"); print_r($mod);
+        /*
+        // modifying a name is a bit fiddly
+        if ($attributes["firstname"] && $attributes["surname"]){
+            $mod["cn"][0]=$attributes["firstname"]." ".$attributes["surname"];
+            $mod["displayname"][0]=$attributes["firstname"]." ".$attributes["surname"];
+            $mod["name"][0]=$attributes["firstname"]." ".$attributes["surname"];
+        }
+        */
+
+        if (count($mod)==0){ return (false); }
+        return ($mod);
+    }
+
+    /**
+    * Coping with AD not returning the primary group
+    * http://support.microsoft.com/?kbid=321360
+    *
+    * For some reason it's not possible to search on primarygrouptoken=XXX
+    * If someone can show otherwise, I'd like to know about it :)
+    * this way is resource intensive and generally a pain in the @#%^
+    *
+    * @deprecated deprecated since version 3.1, see get get_primary_group
+    * @param string $gid Group ID
+    * @return string
+    */
+    protected function group_cn($gid){
+        if ($gid==NULL){ return (false); }
+        $r=false;
+
+        $filter="(&(objectCategory=group)(samaccounttype=". ADLDAP_SECURITY_GLOBAL_GROUP ."))";
+        $fields=array("primarygrouptoken","samaccountname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($entries[$i]["primarygrouptoken"][0]==$gid){
+                $r=$entries[$i]["distinguishedname"][0];
+                $i=$entries["count"];
+            }
+        }
+
+        return ($r);
+    }
+
+    /**
+    * Coping with AD not returning the primary group
+    * http://support.microsoft.com/?kbid=321360
+    *
+    * This is a re-write based on code submitted by Bruce which prevents the
+    * need to search each security group to find the true primary group
+    *
+    * @param string $gid Group ID
+    * @param string $usersid User's Object SID
+    * @return string
+    */
+    protected function get_primary_group($gid, $usersid){
+        if ($gid==NULL || $usersid==NULL){ return (false); }
+        $r=false;
+
+        $gsid = substr_replace($usersid,pack('V',$gid),strlen($usersid)-4,4);
+        $filter='(objectsid='.$this->getTextSID($gsid).')';
+        $fields=array("samaccountname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        return $entries[0]['distinguishedname'][0];
+     }
+
+    /**
+    * Convert a binary SID to a text SID
+    *
+    * @param string $binsid A Binary SID
+    * @return string
+    */
+     protected function getTextSID($binsid) {
+        $hex_sid = bin2hex($binsid);
+        $rev = hexdec(substr($hex_sid, 0, 2));
+        $subcount = hexdec(substr($hex_sid, 2, 2));
+        $auth = hexdec(substr($hex_sid, 4, 12));
+        $result = "$rev-$auth";
+
+        for ($x=0;$x < $subcount; $x++) {
+            $subauth[$x] =
+                hexdec($this->little_endian(substr($hex_sid, 16 + ($x * 8), 8)));
+                $result .= "-" . $subauth[$x];
+        }
+
+        // Cheat by tacking on the S-
+        return 'S-' . $result;
+     }
+
+    /**
+    * Converts a little-endian hex number to one that hexdec() can convert
+    *
+    * @param string $hex A hex code
+    * @return string
+    */
+     protected function little_endian($hex) {
+        $result = '';
+        for ($x = strlen($hex) - 2; $x >= 0; $x = $x - 2) {
+            $result .= substr($hex, $x, 2);
+        }
+        return $result;
+     }
+
+    /**
+    * Obtain the user's distinguished name based on their userid
+    *
+    *
+    * @param string $username The username
+    * @return string
+    */
+    protected function user_dn($username){
+        $user=$this->user_info($username,array("cn"));
+        if ($user[0]["dn"]==NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+        return ($user_dn);
+    }
+
+    /**
+    * Encode a password for transmission over LDAP
+    *
+    * @param string $password The password to encode
+    * @return string
+    */
+    protected function encode_password($password){
+        $password="\"".$password."\"";
+        $encoded="";
+        for ($i=0; $i 
+    * @param string $str The string to escape
+    * @return string
+    */
+    protected function ldap_slashes($str){
+        return preg_replace('/([\x00-\x1F\*\(\)\\\\])/e',
+                            '"\\\\\".join("",unpack("H2","$1"))',
+                            $string);
+    }
+
+    /**
+    * Select a random domain controller from your domain controller array
+    *
+    * @return string
+    */
+    protected function random_controller(){
+        mt_srand(doubleval(microtime()) * 100000000); // For older PHP versions
+        return ($this->_domain_controllers[array_rand($this->_domain_controllers)]);
+    }
+
+    /**
+    * Account control options
+    *
+    * @param array $options The options to convert to int
+    * @return int
+    */
+    protected function account_control($options){
+        $val=0;
+
+        if (is_array($options)){
+            if (in_array("SCRIPT",$options)){ $val=$val+1; }
+            if (in_array("ACCOUNTDISABLE",$options)){ $val=$val+2; }
+            if (in_array("HOMEDIR_REQUIRED",$options)){ $val=$val+8; }
+            if (in_array("LOCKOUT",$options)){ $val=$val+16; }
+            if (in_array("PASSWD_NOTREQD",$options)){ $val=$val+32; }
+            //PASSWD_CANT_CHANGE Note You cannot assign this permission by directly modifying the UserAccountControl attribute.
+            //For information about how to set the permission programmatically, see the "Property flag descriptions" section.
+            if (in_array("ENCRYPTED_TEXT_PWD_ALLOWED",$options)){ $val=$val+128; }
+            if (in_array("TEMP_DUPLICATE_ACCOUNT",$options)){ $val=$val+256; }
+            if (in_array("NORMAL_ACCOUNT",$options)){ $val=$val+512; }
+            if (in_array("INTERDOMAIN_TRUST_ACCOUNT",$options)){ $val=$val+2048; }
+            if (in_array("WORKSTATION_TRUST_ACCOUNT",$options)){ $val=$val+4096; }
+            if (in_array("SERVER_TRUST_ACCOUNT",$options)){ $val=$val+8192; }
+            if (in_array("DONT_EXPIRE_PASSWORD",$options)){ $val=$val+65536; }
+            if (in_array("MNS_LOGON_ACCOUNT",$options)){ $val=$val+131072; }
+            if (in_array("SMARTCARD_REQUIRED",$options)){ $val=$val+262144; }
+            if (in_array("TRUSTED_FOR_DELEGATION",$options)){ $val=$val+524288; }
+            if (in_array("NOT_DELEGATED",$options)){ $val=$val+1048576; }
+            if (in_array("USE_DES_KEY_ONLY",$options)){ $val=$val+2097152; }
+            if (in_array("DONT_REQ_PREAUTH",$options)){ $val=$val+4194304; }
+            if (in_array("PASSWORD_EXPIRED",$options)){ $val=$val+8388608; }
+            if (in_array("TRUSTED_TO_AUTH_FOR_DELEGATION",$options)){ $val=$val+16777216; }
+        }
+        return ($val);
+    }
+
+    /**
+    * Take an LDAP query and return the nice names, without all the LDAP prefixes (eg. CN, DN)
+    *
+    * @param array $groups
+    * @return array
+    */
+    protected function nice_names($groups){
+
+        $group_array=array();
+        for ($i=0; $i<$groups["count"]; $i++){ // For each group
+            $line=$groups[$i];
+
+            if (strlen($line)>0){
+                // More presumptions, they're all prefixed with CN=
+                // so we ditch the first three characters and the group
+                // name goes up to the first comma
+                $bits=explode(",",$line);
+                $group_array[]=substr($bits[0],3,(strlen($bits[0])-3));
+            }
+        }
+        return ($group_array);
+    }
+
+    /**
+    * Delete a distinguished name from Active Directory
+    * You should never need to call this yourself, just use the wrapper functions user_delete and contact_delete
+    *
+    * @param string $dn The distinguished name to delete
+    * @return bool
+    */
+    protected function dn_delete($dn){
+        $result=ldap_delete($this->_conn, $dn);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Convert a boolean value to a string
+    * You should never need to call this yourself
+    *
+    * @param bool $bool Boolean value
+    * @return string
+    */
+    protected function bool2str($bool) {
+        return ($bool) ? 'TRUE' : 'FALSE';
+    }
+
+    /**
+    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+    */
+    protected function encode8bit(&$item, $key) {
+        $encode = false;
+        if (is_string($item)) {
+            for ($i=0; $i> 7) {
+                    $encode = true;
+                }
+            }
+        }
+        if ($encode === true && $key != 'password') {
+            $item = utf8_encode($item);
+        }
+    }
+}
+
+/**
+* adLDAP Exception Handler
+*
+* Exceptions of this type are thrown on bind failure or when SSL is required but not configured
+* Example:
+* try {
+*   $adldap = new adLDAP();
+* }
+* catch (adLDAPException $e) {
+*   echo $e;
+*   exit();
+* }
+*/
+class adLDAPException extends Exception {}
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/auth/ad.class.php dokuwiki-rc2009-12-02/inc/auth/ad.class.php
--- dokuwiki-2009-02-14/inc/auth/ad.class.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/ad.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,205 @@
+
+ *  @link    http://www.nosq.com/blog/2005/08/ldap-activedirectory-and-dokuwiki/
+ *  @author  Andreas Gohr 
+ */
+
+require_once(DOKU_INC.'inc/adLDAP.php');
+
+class auth_ad extends auth_basic {
+    var $cnf = null;
+    var $opts = null;
+    var $adldap = null;
+
+    /**
+     * Constructor
+     */
+    function auth_ad() {
+        global $conf;
+        $this->cnf = $conf['auth']['ad'];
+
+        // ldap extension is needed
+        if (!function_exists('ldap_connect')) {
+            if ($this->cnf['debug'])
+                msg("LDAP err: PHP LDAP extension not found.",-1);
+            $this->success = false;
+            return;
+        }
+
+        // Prepare SSO
+        if($_SERVER['REMOTE_USER'] && $this->cnf['sso']){
+             // remove possible NTLM domain
+             list($dom,$usr) = explode('\\',$_SERVER['REMOTE_USER'],2);
+             if(!$usr) $usr = $dom;
+
+             // remove possible Kerberos domain
+             list($usr,$dom) = explode('@',$usr);
+
+             $dom = strtolower($dom);
+             $_SERVER['REMOTE_USER'] = $usr;
+
+             // we need to simulate a login
+             if(empty($_COOKIE[DOKU_COOKIE])){
+                 $_REQUEST['u'] = $_SERVER['REMOTE_USER'];
+                 $_REQUEST['p'] = 'sso_only';
+             }
+        }
+
+        // prepare adLDAP standard configuration
+        $this->opts = $this->cnf;
+
+        // add possible domain specific configuration
+        if($dom && is_array($this->cnf[$dom])) foreach($this->cnf[$dom] as $key => $val){
+            $this->opts[$key] = $val;
+        }
+
+        // handle multiple AD servers
+        $this->opts['domain_controllers'] = explode(',',$this->opts['domain_controllers']);
+        $this->opts['domain_controllers'] = array_map('trim',$this->opts['domain_controllers']);
+        $this->opts['domain_controllers'] = array_filter($this->opts['domain_controllers']);
+
+        // we currently just handle authentication, so no capabilities are set
+    }
+
+    /**
+     * Check user+password [required auth function]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct by trying to bind
+     * to the LDAP server
+     *
+     * @author  James Van Lommel 
+     * @return  bool
+     */
+    function checkPass($user, $pass){
+        if($_SERVER['REMOTE_USER'] &&
+           $_SERVER['REMOTE_USER'] == $user &&
+           $this->cnf['sso']) return true;
+
+        if(!$this->_init()) return false;
+        return $this->adldap->authenticate($user, $pass);
+    }
+
+    /**
+     * Return user info [required auth function]
+     *
+     * 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
+     *
+     * This LDAP specific function returns the following
+     * addional fields:
+     *
+     * dn   string  distinguished name (DN)
+     * uid  string  Posix User ID
+     *
+     * @author  James Van Lommel 
+     */
+   function getUserData($user){
+        global $conf;
+        if(!$this->_init()) return false;
+
+        //get info for given user
+        $result = $this->adldap->user_info($user);
+
+        //general user info
+        $info['name'] = $result[0]['displayname'][0];
+        $info['mail'] = $result[0]['mail'][0];
+        $info['uid']  = $result[0]['samaccountname'][0];
+        $info['dn']   = $result[0]['dn'];
+
+        // handle ActiveDirectory memberOf
+        $info['grps'] = $this->adldap->user_groups($user);
+
+        if (is_array($info['grps'])) {
+            foreach ($info['grps'] as $ndx => $group) {
+                $info['grps'][$ndx] = $this->cleanGroup($group);
+            }
+        }
+
+        // always add the default group to the list of groups
+        if(!is_array($info['grps']) || !in_array($conf['defaultgroup'],$info['grps'])){
+            $info['grps'][] = $conf['defaultgroup'];
+        }
+
+        return $info;
+    }
+
+    /**
+     * Make AD group names usable by DokuWiki.
+     *
+     * Removes backslashes ('\'), pound signs ('#'), and converts spaces to underscores.
+     *
+     * @author  James Van Lommel (jamesvl@gmail.com)
+     */
+    function cleanGroup($name) {
+        $sName = str_replace('\\', '', $name);
+        $sName = str_replace('#', '', $sName);
+        $sName = preg_replace('[\s]', '_', $sName);
+        return $sName;
+    }
+
+    /**
+     * Sanitize user names
+     */
+    function cleanUser($name) {
+        return $this->cleanGroup($name);
+    }
+
+    /**
+     * Most values in LDAP are case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
+     * Initialize the AdLDAP library and connect to the server
+     */
+    function _init(){
+        if(!is_null($this->adldap)) return true;
+
+        // connect
+        try {
+            $this->adldap = new adLDAP($this->opts);
+            return true;
+        } catch (adLDAPException $e) {
+            $this->success = false;
+            $this->adldap  = null;
+        }
+        return false;
+    }
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/auth/basic.class.php dokuwiki-rc2009-12-02/inc/auth/basic.class.php
--- dokuwiki-2009-02-14/inc/auth/basic.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/basic.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -128,7 +128,7 @@
    * only be needed when trustExternal is implemented.
    *
    * @see     auth_logoff()
-   * @author  Andreas Gohr
+   * @author  Andreas Gohr 
    */
   function logOff(){
   }
@@ -322,12 +322,58 @@
     return array();
   }
 
+  /**
+   * Return case sensitivity of the backend [OPTIONAL]
+   *
+   * When your backend is caseinsensitive (eg. you can login with USER and
+   * user) then you need to overwrite this method and return false
+   */
+  function isCaseSensitive(){
+    return true;
+  }
+
+  /**
+   * Sanitize a given username [OPTIONAL]
+   *
+   * This function is applied to any user name that is given to
+   * the backend and should also be applied to any user name within
+   * the backend before returning it somewhere.
+   *
+   * This should be used to enforce username restrictions.
+   *
+   * @author Andreas Gohr 
+   * @param string $user - username
+   * @param string - the cleaned username
+   */
+  function cleanUser($user){
+    return $user;
+  }
+
+  /**
+   * Sanitize a given groupname [OPTIONAL]
+   *
+   * This function is applied to any groupname that is given to
+   * the backend and should also be applied to any groupname within
+   * the backend before returning it somewhere.
+   *
+   * This should be used to enforce groupname restrictions.
+   *
+   * Groupnames are to be passed without a leading '@' here.
+   *
+   * @author Andreas Gohr 
+   * @param string $group - groupname
+   * @param string - the cleaned groupname
+   */
+  function cleanGroup($group){
+    return $group;
+  }
+
 
   /**
    * Check Session Cache validity [implement only where required/possible]
    *
    * DokuWiki caches user info in the user's session for the timespan defined
-   * in $conf['securitytimeout'].
+   * in $conf['auth_security_timeout'].
    *
    * This makes sure slow authentication backends do not slow down DokuWiki.
    * This also means that changes to the user database will not be reflected
diff -Naur dokuwiki-2009-02-14/inc/auth/ldap.class.php dokuwiki-rc2009-12-02/inc/auth/ldap.class.php
--- dokuwiki-2009-02-14/inc/auth/ldap.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/ldap.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -29,9 +29,6 @@
 
         if(empty($this->cnf['groupkey'])) $this->cnf['groupkey'] = 'cn';
 
-        // try to connect
-        if(!$this->_openLDAP()) $this->success = false;
-
         // auth_ldap currently just handles authentication, so no
         // capabilities are set
     }
@@ -176,11 +173,13 @@
 
         $sr     = @ldap_search($this->con, $base, $filter);
         $result = @ldap_get_entries($this->con, $sr);
-        if($this->cnf['debug'])
+        if($this->cnf['debug']){
             msg('LDAP user search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+            msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
+        }
 
         // Don't accept more or less than one response
-        if($result['count'] != 1){
+        if(!is_array($result) || $result['count'] != 1){
             return false; //user not found
         }
 
@@ -220,18 +219,19 @@
         if ($this->cnf['grouptree'] && $this->cnf['groupfilter']) {
             $base   = $this->_makeFilter($this->cnf['grouptree'], $user_result);
             $filter = $this->_makeFilter($this->cnf['groupfilter'], $user_result);
-
             $sr = @ldap_search($this->con, $base, $filter, array($this->cnf['groupkey']));
             if(!$sr){
                 msg("LDAP: Reading group memberships failed",-1);
-                if($this->cnf['debug'])
+                if($this->cnf['debug']){
                     msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                    msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
+                }
                 return false;
             }
             $result = ldap_get_entries($this->con, $sr);
             ldap_free_result($sr);
 
-            foreach($result as $grp){
+            if(is_array($result)) foreach($result as $grp){
                 if(!empty($grp[$this->cnf['groupkey']][0])){
                     if($this->cnf['debug'])
                         msg('LDAP usergroup: '.htmlspecialchars($grp[$this->cnf['groupkey']][0]),0,__LINE__,__FILE__);
@@ -248,6 +248,13 @@
     }
 
     /**
+     * Most values in LDAP are case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
      * Make LDAP filter strings.
      *
      * Used by auth_getUserData to make the filter
diff -Naur dokuwiki-2009-02-14/inc/auth/mysql.class.php dokuwiki-rc2009-12-02/inc/auth/mysql.class.php
--- dokuwiki-2009-02-14/inc/auth/mysql.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/mysql.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -401,6 +401,13 @@
     }
 
     /**
+     * MySQL is case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
      * Adds a user to a group.
      *
      * If $force is set to '1' non existing groups would be created.
@@ -772,6 +779,10 @@
      * @author Matthias Grimm 
      */
     function _queryDB($query) {
+      if($this->cnf['debug'] >= 2){
+        msg('MySQL query: '.hsc($query),0,__LINE__,__FILE__);
+      }
+
       $resultarray = array();
       if ($this->dbcon) {
         $result = @mysql_query($query,$this->dbcon);
diff -Naur dokuwiki-2009-02-14/inc/auth/pgsql.class.php dokuwiki-rc2009-12-02/inc/auth/pgsql.class.php
--- dokuwiki-2009-02-14/inc/auth/pgsql.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/pgsql.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -196,7 +196,7 @@
         $sql = $this->cnf['addUserGroup'];
         if(strpos($sql,'%{uid}') !== false){
             $uid = $this->_getUserID($user);
-            $sql = str_replace('%{uid}', $sql);
+            $sql = str_replace('%{uid}', addslashes($uid), $sql);
         }
         $sql = str_replace('%{user}', addslashes($user),$sql);
         $sql = str_replace('%{gid}',  addslashes($gid),$sql);
diff -Naur dokuwiki-2009-02-14/inc/auth/plain.class.php dokuwiki-rc2009-12-02/inc/auth/plain.class.php
--- dokuwiki-2009-02-14/inc/auth/plain.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth/plain.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -12,16 +12,6 @@
 
 define('AUTH_USERFILE',DOKU_CONF.'users.auth.php');
 
-// we only accept page ids for auth_plain
-if(isset($_REQUEST['u']))
-  $_REQUEST['u'] = cleanID($_REQUEST['u']);
-if(isset($_REQUEST['acl_user']))
-  $_REQUEST['acl_user'] = cleanID($_REQUEST['acl_user']);
-// the same goes for password reset requests
-if(isset($_POST['login'])){
-  $_POST['login'] = cleanID($_POST['login']);
-}
-
 class auth_plain extends auth_basic {
 
     var $users = null;
@@ -261,6 +251,22 @@
     }
 
     /**
+     * Only valid pageid's (no namespaces) for usernames
+     */
+    function cleanUser($user){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$user));
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for groupnames
+     */
+    function cleanGroup($group){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$group));
+    }
+
+    /**
      * Load all user data
      *
      * loads the user file into a datastructure
@@ -278,8 +284,8 @@
         $line = trim($line);
         if(empty($line)) continue;
 
-        $row    = split(":",$line,5);
-        $groups = split(",",$row[4]);
+        $row    = explode(":",$line,5);
+        $groups = array_values(array_filter(explode(",",$row[4])));
 
         $this->users[$row[0]]['pass'] = $row[1];
         $this->users[$row[0]]['name'] = urldecode($row[2]);
diff -Naur dokuwiki-2009-02-14/inc/auth.php dokuwiki-rc2009-12-02/inc/auth.php
--- dokuwiki-2009-02-14/inc/auth.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/auth.php	2009-12-02 19:50:11.000000000 +0100
@@ -9,22 +9,22 @@
  * @author     Andreas Gohr 
  */
 
-  if(!defined('DOKU_INC')) die('meh.');
-  require_once(DOKU_INC.'inc/common.php');
-  require_once(DOKU_INC.'inc/io.php');
-
-  // some ACL level defines
-  define('AUTH_NONE',0);
-  define('AUTH_READ',1);
-  define('AUTH_EDIT',2);
-  define('AUTH_CREATE',4);
-  define('AUTH_UPLOAD',8);
-  define('AUTH_DELETE',16);
-  define('AUTH_ADMIN',255);
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/io.php');
+
+// some ACL level defines
+define('AUTH_NONE',0);
+define('AUTH_READ',1);
+define('AUTH_EDIT',2);
+define('AUTH_CREATE',4);
+define('AUTH_UPLOAD',8);
+define('AUTH_DELETE',16);
+define('AUTH_ADMIN',255);
 
-  global $conf;
+global $conf;
 
-  if($conf['useacl']){
+if($conf['useacl']){
     require_once(DOKU_INC.'inc/blowfish.php');
     require_once(DOKU_INC.'inc/mail.php');
 
@@ -32,71 +32,87 @@
 
     // load the the backend auth functions and instantiate the auth object
     if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) {
-      require_once(DOKU_INC.'inc/auth/basic.class.php');
-      require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
+        require_once(DOKU_INC.'inc/auth/basic.class.php');
+        require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
 
-      $auth_class = "auth_".$conf['authtype'];
-      if (class_exists($auth_class)) {
-        $auth = new $auth_class();
-        if ($auth->success == false) {
-          // degrade to unauthenticated user
-          unset($auth);
-          auth_logoff();
-          msg($lang['authtempfail'], -1);
+        $auth_class = "auth_".$conf['authtype'];
+        if (class_exists($auth_class)) {
+            $auth = new $auth_class();
+            if ($auth->success == false) {
+                // degrade to unauthenticated user
+                unset($auth);
+                auth_logoff();
+                msg($lang['authtempfail'], -1);
+            }
+        } else {
+            nice_die($lang['authmodfailed']);
         }
-      } else {
-        nice_die($lang['authmodfailed']);
-      }
     } else {
-      nice_die($lang['authmodfailed']);
+        nice_die($lang['authmodfailed']);
     }
-  }
+}
 
-  // do the login either by cookie or provided credentials
-  if($conf['useacl']){
+// do the login either by cookie or provided credentials
+if($conf['useacl']){
     if($auth){
-      if (!isset($_REQUEST['u'])) $_REQUEST['u'] = '';
-      if (!isset($_REQUEST['p'])) $_REQUEST['p'] = '';
-      if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
-      $_REQUEST['http_credentials'] = false;
-      if (!$conf['rememberme']) $_REQUEST['r'] = false;
-
-      // streamline HTTP auth credentials (IIS/rewrite -> mod_php)
-      if(isset($_SERVER['HTTP_AUTHORIZATION'])){
-        list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) =
-          explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-      }
-
-      // if no credentials were given try to use HTTP auth (for SSO)
-      if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
-        $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
-        $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
-        $_REQUEST['http_credentials'] = true;
-      }
-
-      if($_REQUEST['authtok']){
-        // when an authentication token is given, trust the session
-        auth_validateToken($_REQUEST['authtok']);
-      }elseif(!is_null($auth) && $auth->canDo('external')){
-        // external trust mechanism in place
-        $auth->trustExternal($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']);
-      }else{
-        auth_login($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r'],$_REQUEST['http_credentials']);
-      }
+        if (!isset($_REQUEST['u'])) $_REQUEST['u'] = '';
+        if (!isset($_REQUEST['p'])) $_REQUEST['p'] = '';
+        if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
+        $_REQUEST['http_credentials'] = false;
+        if (!$conf['rememberme']) $_REQUEST['r'] = false;
+
+        // streamline HTTP auth credentials (IIS/rewrite -> mod_php)
+        if(isset($_SERVER['HTTP_AUTHORIZATION'])){
+            list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) =
+                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+        }
+
+        // if no credentials were given try to use HTTP auth (for SSO)
+        if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
+            $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
+            $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
+            $_REQUEST['http_credentials'] = true;
+        }
+
+        // apply cleaning
+        $_REQUEST['u'] = $auth->cleanUser($_REQUEST['u']);
+
+        if(isset($_REQUEST['authtok'])){
+            // when an authentication token is given, trust the session
+            auth_validateToken($_REQUEST['authtok']);
+        }elseif(!is_null($auth) && $auth->canDo('external')){
+            // external trust mechanism in place
+            $auth->trustExternal($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']);
+        }else{
+            $evdata = array(
+                    'user'     => $_REQUEST['u'],
+                    'password' => $_REQUEST['p'],
+                    'sticky'   => $_REQUEST['r'],
+                    'silent'   => $_REQUEST['http_credentials'],
+                    );
+            $evt = new Doku_Event('AUTH_LOGIN_CHECK',$evdata);
+            if($evt->advise_before()){
+                auth_login($evdata['user'],
+                           $evdata['password'],
+                           $evdata['sticky'],
+                           $evdata['silent']);
+            }
+        }
     }
 
     //load ACL into a global array
     global $AUTH_ACL;
     if(is_readable(DOKU_CONF.'acl.auth.php')){
-      $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
-      if(isset($_SERVER['REMOTE_USER'])){
-        $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL);
-        $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy
-      }
+        $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
+        //support user wildcard
+        if(isset($_SERVER['REMOTE_USER'])){
+            $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL);
+            $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy
+        }
     }else{
-      $AUTH_ACL = array();
+        $AUTH_ACL = array();
     }
-  }
+}
 
 /**
  * This tries to login the user based on the sent auth credentials
@@ -126,54 +142,55 @@
  * @param   bool    $sticky  Cookie should not expire
  * @param   bool    $silent  Don't show error on bad auth
  * @return  bool             true on successful auth
-*/
+ */
 function auth_login($user,$pass,$sticky=false,$silent=false){
-  global $USERINFO;
-  global $conf;
-  global $lang;
-  global $auth;
-  $sticky ? $sticky = true : $sticky = false; //sanity check
-
-  if(!empty($user)){
-    //usual login
-    if ($auth->checkPass($user,$pass)){
-      // make logininfo globally available
-      $_SERVER['REMOTE_USER'] = $user;
-      auth_setCookie($user,PMA_blowfish_encrypt($pass,auth_cookiesalt()),$sticky);
-      return true;
+    global $USERINFO;
+    global $conf;
+    global $lang;
+    global $auth;
+    $sticky ? $sticky = true : $sticky = false; //sanity check
+
+    if (!$auth) return false;
+
+    if(!empty($user)){
+        //usual login
+        if ($auth->checkPass($user,$pass)){
+            // make logininfo globally available
+            $_SERVER['REMOTE_USER'] = $user;
+            auth_setCookie($user,PMA_blowfish_encrypt($pass,auth_cookiesalt()),$sticky);
+            return true;
+        }else{
+            //invalid credentials - log off
+            if(!$silent) msg($lang['badlogin'],-1);
+            auth_logoff();
+            return false;
+        }
     }else{
-      //invalid credentials - log off
-      if(!$silent) msg($lang['badlogin'],-1);
-      auth_logoff();
-      return false;
-    }
-  }else{
-    // read cookie information
-    $cookie = base64_decode($_COOKIE[DOKU_COOKIE]);
-    list($user,$sticky,$pass) = split('\|',$cookie,3);
-    // get session info
-    $session = $_SESSION[DOKU_COOKIE]['auth'];
-    if($user && $pass){
-      // we got a cookie - see if we can trust it
-      if(isset($session) &&
-        $auth->useSessionCache($user) &&
-        ($session['time'] >= time()-$conf['auth_security_timeout']) &&
-        ($session['user'] == $user) &&
-        ($session['pass'] == $pass) &&  //still crypted
-        ($session['buid'] == auth_browseruid()) ){
-        // he has session, cookie and browser right - let him in
-        $_SERVER['REMOTE_USER'] = $user;
-        $USERINFO = $session['info']; //FIXME move all references to session
-        return true;
-      }
-      // no we don't trust it yet - recheck pass but silent
-      $pass = PMA_blowfish_decrypt($pass,auth_cookiesalt());
-      return auth_login($user,$pass,$sticky,true);
-    }
-  }
-  //just to be sure
-  auth_logoff(true);
-  return false;
+        // read cookie information
+        list($user,$sticky,$pass) = auth_getCookie();
+        // get session info
+        $session = $_SESSION[DOKU_COOKIE]['auth'];
+        if($user && $pass){
+            // we got a cookie - see if we can trust it
+            if(isset($session) &&
+                    $auth->useSessionCache($user) &&
+                    ($session['time'] >= time()-$conf['auth_security_timeout']) &&
+                    ($session['user'] == $user) &&
+                    ($session['pass'] == $pass) &&  //still crypted
+                    ($session['buid'] == auth_browseruid()) ){
+                // he has session, cookie and browser right - let him in
+                $_SERVER['REMOTE_USER'] = $user;
+                $USERINFO = $session['info']; //FIXME move all references to session
+                return true;
+            }
+            // no we don't trust it yet - recheck pass but silent
+            $pass = PMA_blowfish_decrypt($pass,auth_cookiesalt());
+            return auth_login($user,$pass,$sticky,true);
+        }
+    }
+    //just to be sure
+    auth_logoff(true);
+    return false;
 }
 
 /**
@@ -229,13 +246,14 @@
  * @return  string  a MD5 sum of various browser headers
  */
 function auth_browseruid(){
-  $uid  = '';
-  $uid .= $_SERVER['HTTP_USER_AGENT'];
-  $uid .= $_SERVER['HTTP_ACCEPT_ENCODING'];
-  $uid .= $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-  $uid .= $_SERVER['HTTP_ACCEPT_CHARSET'];
-  $uid .= substr($_SERVER['REMOTE_ADDR'],0,strpos($_SERVER['REMOTE_ADDR'],'.'));
-  return md5($uid);
+    $ip   = clientIP(true);
+    $uid  = '';
+    $uid .= $_SERVER['HTTP_USER_AGENT'];
+    $uid .= $_SERVER['HTTP_ACCEPT_ENCODING'];
+    $uid .= $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+    $uid .= $_SERVER['HTTP_ACCEPT_CHARSET'];
+    $uid .= substr($ip,0,strpos($ip,'.'));
+    return md5($uid);
 }
 
 /**
@@ -251,14 +269,14 @@
  * @return  string
  */
 function auth_cookiesalt(){
-  global $conf;
-  $file = $conf['metadir'].'/_htcookiesalt';
-  $salt = io_readFile($file);
-  if(empty($salt)){
-    $salt = uniqid(rand(),true);
-    io_saveFile($file,$salt);
-  }
-  return $salt;
+    global $conf;
+    $file = $conf['metadir'].'/_htcookiesalt';
+    $salt = io_readFile($file);
+    if(empty($salt)){
+        $salt = uniqid(rand(),true);
+        io_saveFile($file,$salt);
+    }
+    return $salt;
 }
 
 /**
@@ -271,35 +289,35 @@
  * @param bool $keepbc - when true, the breadcrumb data is not cleared
  */
 function auth_logoff($keepbc=false){
-  global $conf;
-  global $USERINFO;
-  global $INFO, $ID;
-  global $auth;
-
-  // make sure the session is writable (it usually is)
-  @session_start();
-
-  if(isset($_SESSION[DOKU_COOKIE]['auth']['user']))
-    unset($_SESSION[DOKU_COOKIE]['auth']['user']);
-  if(isset($_SESSION[DOKU_COOKIE]['auth']['pass']))
-    unset($_SESSION[DOKU_COOKIE]['auth']['pass']);
-  if(isset($_SESSION[DOKU_COOKIE]['auth']['info']))
-    unset($_SESSION[DOKU_COOKIE]['auth']['info']);
-  if(!$keepbc && isset($_SESSION[DOKU_COOKIE]['bc']))
-    unset($_SESSION[DOKU_COOKIE]['bc']);
-  if(isset($_SERVER['REMOTE_USER']))
-    unset($_SERVER['REMOTE_USER']);
-  $USERINFO=null; //FIXME
-
-  if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-    setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
-  }else{
-    setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
-  }
-
-  if($auth && $auth->canDo('logoff')){
-    $auth->logOff();
-  }
+    global $conf;
+    global $USERINFO;
+    global $INFO, $ID;
+    global $auth;
+
+    // make sure the session is writable (it usually is)
+    @session_start();
+
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['user']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['user']);
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['pass']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['pass']);
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['info']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['info']);
+    if(!$keepbc && isset($_SESSION[DOKU_COOKIE]['bc']))
+        unset($_SESSION[DOKU_COOKIE]['bc']);
+    if(isset($_SERVER['REMOTE_USER']))
+        unset($_SERVER['REMOTE_USER']);
+    $USERINFO=null; //FIXME
+
+    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
+        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+    }
+
+    if($auth && $auth->canDo('logoff')){
+        $auth->logOff();
+    }
 }
 
 /**
@@ -317,52 +335,74 @@
  * @param  bool   adminonly - when true checks if user is admin
  */
 function auth_ismanager($user=null,$groups=null,$adminonly=false){
-  global $conf;
-  global $USERINFO;
+    global $conf;
+    global $USERINFO;
+    global $auth;
 
-  if(!$conf['useacl']) return false;
-  if(is_null($user))   $user   = $_SERVER['REMOTE_USER'];
-  if(is_null($groups)) $groups = (array) $USERINFO['grps'];
-  $user   = auth_nameencode($user);
-
-  // check username against superuser and manager
-  $superusers = explode(',', $conf['superuser']);
-  $superusers = array_unique($superusers);
-  $superusers = array_map('trim', $superusers);
-  // prepare an array containing only true values for array_map call
-  $alltrue = array_fill(0, count($superusers), true);
-  $superusers = array_map('auth_nameencode', $superusers, $alltrue);
-  if(in_array($user, $superusers)) return true;
-
-  if(!$adminonly){
-    $managers = explode(',', $conf['manager']);
-    $managers = array_unique($managers);
-    $managers = array_map('trim', $managers);
+    if (!$auth) return false;
+    if(is_null($user)) {
+        if (!isset($_SERVER['REMOTE_USER'])) {
+            return false;
+        } else {
+            $user = $_SERVER['REMOTE_USER'];
+        }
+    }
+    $user = $auth->cleanUser($user);
+    if(is_null($groups)) $groups = (array) $USERINFO['grps'];
+    $groups = array_map(array($auth,'cleanGroup'),$groups);
+    $user   = auth_nameencode($user);
+
+    // check username against superuser and manager
+    $superusers = explode(',', $conf['superuser']);
+    $superusers = array_unique($superusers);
+    $superusers = array_map('trim', $superusers);
     // prepare an array containing only true values for array_map call
-    $alltrue = array_fill(0, count($managers), true);
-    $managers = array_map('auth_nameencode', $managers, $alltrue);
-    if(in_array($user, $managers)) return true;
-  }
-
-  // check user's groups against superuser and manager
-  if (!empty($groups)) {
+    $alltrue = array_fill(0, count($superusers), true);
+    $superusers = array_map('auth_nameencode', $superusers, $alltrue);
 
-    //prepend groups with @ and nameencode
-    $cnt = count($groups);
-    for($i=0; $i<$cnt; $i++){
-      $groups[$i] = '@'.auth_nameencode($groups[$i]);
+    // case insensitive?
+    if(!$auth->isCaseSensitive()){
+        $superusers = array_map('utf8_strtolower',$superusers);
+        $user       = utf8_strtolower($user);
     }
 
-    // check groups against superuser and manager
-    foreach($superusers as $supu)
-      if(in_array($supu, $groups)) return true;
+    // check user match
+    if(in_array($user, $superusers)) return true;
+
+    // check managers
     if(!$adminonly){
-      foreach($managers as $mana)
-        if(in_array($mana, $groups)) return true;
+        $managers = explode(',', $conf['manager']);
+        $managers = array_unique($managers);
+        $managers = array_map('trim', $managers);
+        // prepare an array containing only true values for array_map call
+        $alltrue = array_fill(0, count($managers), true);
+        $managers = array_map('auth_nameencode', $managers, $alltrue);
+        if(!$auth->isCaseSensitive()) $managers = array_map('utf8_strtolower',$managers);
+        if(in_array($user, $managers)) return true;
     }
-  }
 
-  return false;
+    // check user's groups against superuser and manager
+    if (!empty($groups)) {
+
+        //prepend groups with @ and nameencode
+        $cnt = count($groups);
+        for($i=0; $i<$cnt; $i++){
+            $groups[$i] = '@'.auth_nameencode($groups[$i]);
+            if(!$auth->isCaseSensitive()){
+                $groups[$i] = utf8_strtolower($groups[$i]);
+            }
+        }
+
+        // check groups against superuser and manager
+        foreach($superusers as $supu)
+            if(in_array($supu, $groups)) return true;
+        if(!$adminonly){
+            foreach($managers as $mana)
+                if(in_array($mana, $groups)) return true;
+        }
+    }
+
+    return false;
 }
 
 /**
@@ -376,7 +416,7 @@
  * @see auth_ismanager
  */
 function auth_isadmin($user=null,$groups=null){
-  return auth_ismanager($user,$groups,true);
+    return auth_ismanager($user,$groups,true);
 }
 
 /**
@@ -386,15 +426,15 @@
  *
  * @author  Andreas Gohr 
  *
- * @param  string  $id  page ID
+ * @param  string  $id  page ID (needs to be resolved and cleaned)
  * @return int          permission level
  */
 function auth_quickaclcheck($id){
-  global $conf;
-  global $USERINFO;
-  # if no ACL is used always return upload rights
-  if(!$conf['useacl']) return AUTH_UPLOAD;
-  return auth_aclcheck($id,$_SERVER['REMOTE_USER'],$USERINFO['grps']);
+    global $conf;
+    global $USERINFO;
+    # if no ACL is used always return upload rights
+    if(!$conf['useacl']) return AUTH_UPLOAD;
+    return auth_aclcheck($id,$_SERVER['REMOTE_USER'],$USERINFO['grps']);
 }
 
 /**
@@ -403,102 +443,109 @@
  *
  * @author  Andreas Gohr 
  *
- * @param  string  $id     page ID
+ * @param  string  $id     page ID (needs to be resolved and cleaned)
  * @param  string  $user   Username
  * @param  array   $groups Array of groups the user is in
  * @return int             permission level
  */
 function auth_aclcheck($id,$user,$groups){
-  global $conf;
-  global $AUTH_ACL;
+    global $conf;
+    global $AUTH_ACL;
+    global $auth;
 
-  // if no ACL is used always return upload rights
-  if(!$conf['useacl']) return AUTH_UPLOAD;
+    // if no ACL is used always return upload rights
+    if(!$conf['useacl']) return AUTH_UPLOAD;
+    if (!$auth) return AUTH_NONE;
+
+    //make sure groups is an array
+    if(!is_array($groups)) $groups = array();
+
+    //if user is superuser or in superusergroup return 255 (acl_admin)
+    if(auth_isadmin($user,$groups)) { return AUTH_ADMIN; }
+
+    $ci = '';
+    if(!$auth->isCaseSensitive()) $ci = 'ui';
+
+    $user = $auth->cleanUser($user);
+    $groups = array_map(array($auth,'cleanGroup'),(array)$groups);
+    $user = auth_nameencode($user);
 
-  //make sure groups is an array
-  if(!is_array($groups)) $groups = array();
+    //prepend groups with @ and nameencode
+    $cnt = count($groups);
+    for($i=0; $i<$cnt; $i++){
+        $groups[$i] = '@'.auth_nameencode($groups[$i]);
+    }
 
-  //if user is superuser or in superusergroup return 255 (acl_admin)
-  if(auth_isadmin($user,$groups)) { return AUTH_ADMIN; }
-
-  $user = auth_nameencode($user);
-
-  //prepend groups with @ and nameencode
-  $cnt = count($groups);
-  for($i=0; $i<$cnt; $i++){
-    $groups[$i] = '@'.auth_nameencode($groups[$i]);
-  }
-
-  $ns    = getNS($id);
-  $perm  = -1;
-
-  if($user || count($groups)){
-    //add ALL group
-    $groups[] = '@ALL';
-    //add User
-    if($user) $groups[] = $user;
-    //build regexp
-    $regexp   = join('|',$groups);
-  }else{
-    $regexp = '@ALL';
-  }
-
-  //check exact match first
-  $matches = preg_grep('/^'.preg_quote($id,'/').'\s+('.$regexp.')\s+/',$AUTH_ACL);
-  if(count($matches)){
-    foreach($matches as $match){
-      $match = preg_replace('/#.*$/','',$match); //ignore comments
-      $acl   = preg_split('/\s+/',$match);
-      if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
-      if($acl[2] > $perm){
-        $perm = $acl[2];
-      }
-    }
-    if($perm > -1){
-      //we had a match - return it
-      return $perm;
-    }
-  }
-
-  //still here? do the namespace checks
-  if($ns){
-    $path = $ns.':\*';
-  }else{
-    $path = '\*'; //root document
-  }
+    $ns    = getNS($id);
+    $perm  = -1;
 
-  do{
-    $matches = preg_grep('/^'.$path.'\s+('.$regexp.')\s+/',$AUTH_ACL);
+    if($user || count($groups)){
+        //add ALL group
+        $groups[] = '@ALL';
+        //add User
+        if($user) $groups[] = $user;
+        //build regexp
+        $regexp   = join('|',$groups);
+    }else{
+        $regexp = '@ALL';
+    }
+
+    //check exact match first
+    $matches = preg_grep('/^'.preg_quote($id,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
     if(count($matches)){
-      foreach($matches as $match){
-        $match = preg_replace('/#.*$/','',$match); //ignore comments
-        $acl   = preg_split('/\s+/',$match);
-        if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
-        if($acl[2] > $perm){
-          $perm = $acl[2];
-        }
-      }
-      //we had a match - return it
-      return $perm;
-    }
-
-    //get next higher namespace
-    $ns   = getNS($ns);
-
-    if($path != '\*'){
-      $path = $ns.':\*';
-      if($path == ':\*') $path = '\*';
+        foreach($matches as $match){
+            $match = preg_replace('/#.*$/','',$match); //ignore comments
+            $acl   = preg_split('/\s+/',$match);
+            if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
+            if($acl[2] > $perm){
+                $perm = $acl[2];
+            }
+        }
+        if($perm > -1){
+            //we had a match - return it
+            return $perm;
+        }
+    }
+
+    //still here? do the namespace checks
+    if($ns){
+        $path = $ns.':\*';
     }else{
-      //we did this already
-      //looks like there is something wrong with the ACL
-      //break here
-      msg('No ACL setup yet! Denying access to everyone.');
-      return AUTH_NONE;
+        $path = '\*'; //root document
     }
-  }while(1); //this should never loop endless
 
-  //still here? return no permissions
-  return AUTH_NONE;
+    do{
+        $matches = preg_grep('/^'.$path.'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
+        if(count($matches)){
+            foreach($matches as $match){
+                $match = preg_replace('/#.*$/','',$match); //ignore comments
+                $acl   = preg_split('/\s+/',$match);
+                if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
+                if($acl[2] > $perm){
+                    $perm = $acl[2];
+                }
+            }
+            //we had a match - return it
+            return $perm;
+        }
+
+        //get next higher namespace
+        $ns   = getNS($ns);
+
+        if($path != '\*'){
+            $path = $ns.':\*';
+            if($path == ':\*') $path = '\*';
+        }else{
+            //we did this already
+            //looks like there is something wrong with the ACL
+            //break here
+            msg('No ACL setup yet! Denying access to everyone.');
+            return AUTH_NONE;
+        }
+    }while(1); //this should never loop endless
+
+    //still here? return no permissions
+    return AUTH_NONE;
 }
 
 /**
@@ -515,21 +562,21 @@
  * @see rawurldecode()
  */
 function auth_nameencode($name,$skip_group=false){
-  global $cache_authname;
-  $cache =& $cache_authname;
-  $name  = (string) $name;
-
-  if (!isset($cache[$name][$skip_group])) {
-    if($skip_group && $name{0} =='@'){
-      $cache[$name][$skip_group] = '@'.preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
-                                                    "'%'.dechex(ord(substr('\\1',-1)))",substr($name,1));
-    }else{
-      $cache[$name][$skip_group] = preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
-                                                "'%'.dechex(ord(substr('\\1',-1)))",$name);
+    global $cache_authname;
+    $cache =& $cache_authname;
+    $name  = (string) $name;
+
+    if (!isset($cache[$name][$skip_group])) {
+        if($skip_group && $name{0} =='@'){
+            $cache[$name][$skip_group] = '@'.preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
+                    "'%'.dechex(ord(substr('\\1',-1)))",substr($name,1));
+        }else{
+            $cache[$name][$skip_group] = preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
+                    "'%'.dechex(ord(substr('\\1',-1)))",$name);
+        }
     }
-  }
 
-  return $cache[$name][$skip_group];
+    return $cache[$name][$skip_group];
 }
 
 /**
@@ -541,21 +588,21 @@
  * @return string  pronouncable password
  */
 function auth_pwgen(){
-  $pw = '';
-  $c  = 'bcdfghjklmnprstvwz'; //consonants except hard to speak ones
-  $v  = 'aeiou';              //vowels
-  $a  = $c.$v;                //both
-
-  //use two syllables...
-  for($i=0;$i < 2; $i++){
-    $pw .= $c[rand(0, strlen($c)-1)];
-    $pw .= $v[rand(0, strlen($v)-1)];
-    $pw .= $a[rand(0, strlen($a)-1)];
-  }
-  //... and add a nice number
-  $pw .= rand(10,99);
+    $pw = '';
+    $c  = 'bcdfghjklmnprstvwz'; //consonants except hard to speak ones
+    $v  = 'aeiou';              //vowels
+    $a  = $c.$v;                //both
+
+    //use two syllables...
+    for($i=0;$i < 2; $i++){
+        $pw .= $c[rand(0, strlen($c)-1)];
+        $pw .= $v[rand(0, strlen($v)-1)];
+        $pw .= $a[rand(0, strlen($a)-1)];
+    }
+    //... and add a nice number
+    $pw .= rand(10,99);
 
-  return $pw;
+    return $pw;
 }
 
 /**
@@ -566,26 +613,28 @@
  * @return bool  true on success
  */
 function auth_sendPassword($user,$password){
-  global $conf;
-  global $lang;
-  global $auth;
-
-  $hdrs  = '';
-  $userinfo = $auth->getUserData($user);
-
-  if(!$userinfo['mail']) return false;
-
-  $text = rawLocale('password');
-  $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
-  $text = str_replace('@FULLNAME@',$userinfo['name'],$text);
-  $text = str_replace('@LOGIN@',$user,$text);
-  $text = str_replace('@PASSWORD@',$password,$text);
-  $text = str_replace('@TITLE@',$conf['title'],$text);
-
-  return mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
-                   $lang['regpwmail'],
-                   $text,
-                   $conf['mailfrom']);
+    global $conf;
+    global $lang;
+    global $auth;
+    if (!$auth) return false;
+
+    $hdrs  = '';
+    $user     = $auth->cleanUser($user);
+    $userinfo = $auth->getUserData($user);
+
+    if(!$userinfo['mail']) return false;
+
+    $text = rawLocale('password');
+    $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
+    $text = str_replace('@FULLNAME@',$userinfo['name'],$text);
+    $text = str_replace('@LOGIN@',$user,$text);
+    $text = str_replace('@PASSWORD@',$password,$text);
+    $text = str_replace('@TITLE@',$conf['title'],$text);
+
+    return mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
+            $lang['regpwmail'],
+            $text,
+            $conf['mailfrom']);
 }
 
 /**
@@ -598,74 +647,75 @@
  * @return bool  true on success, false on any error
  */
 function register(){
-  global $lang;
-  global $conf;
-  global $auth;
-
-  if(!$_POST['save']) return false;
-  if(!$auth->canDo('addUser')) return false;
-
-  //clean username
-  $_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
-  $_POST['login'] = cleanID($_POST['login']);
-  //clean fullname and email
-  $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
-  $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
-
-  if( empty($_POST['login']) ||
-      empty($_POST['fullname']) ||
-      empty($_POST['email']) ){
-    msg($lang['regmissing'],-1);
-    return false;
-  }
+    global $lang;
+    global $conf;
+    global $auth;
+
+    if (!$auth) return false;
+    if(!$_POST['save']) return false;
+    if(!$auth->canDo('addUser')) return false;
+
+    //clean username
+    $_POST['login'] = trim($auth->cleanUser($_POST['login']));
+
+    //clean fullname and email
+    $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
+    $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
+
+    if( empty($_POST['login']) ||
+        empty($_POST['fullname']) ||
+        empty($_POST['email']) ){
+        msg($lang['regmissing'],-1);
+        return false;
+    }
 
-  if ($conf['autopasswd']) {
-    $pass = auth_pwgen();                // automatically generate password
-  } elseif (empty($_POST['pass']) ||
+    if ($conf['autopasswd']) {
+        $pass = auth_pwgen();                // automatically generate password
+    } elseif (empty($_POST['pass']) ||
             empty($_POST['passchk'])) {
-    msg($lang['regmissing'], -1);        // complain about missing passwords
-    return false;
-  } elseif ($_POST['pass'] != $_POST['passchk']) {
-    msg($lang['regbadpass'], -1);      // complain about misspelled passwords
-    return false;
-  } else {
-    $pass = $_POST['pass'];              // accept checked and valid password
-  }
-
-  //check mail
-  if(!mail_isvalid($_POST['email'])){
-    msg($lang['regbadmail'],-1);
-    return false;
-  }
+        msg($lang['regmissing'], -1);        // complain about missing passwords
+        return false;
+    } elseif ($_POST['pass'] != $_POST['passchk']) {
+        msg($lang['regbadpass'], -1);      // complain about misspelled passwords
+        return false;
+    } else {
+        $pass = $_POST['pass'];              // accept checked and valid password
+    }
 
-  //okay try to create the user
-  if(!$auth->triggerUserMod('create', array($_POST['login'],$pass,$_POST['fullname'],$_POST['email']))){
-    msg($lang['reguexists'],-1);
-    return false;
-  }
+    //check mail
+    if(!mail_isvalid($_POST['email'])){
+        msg($lang['regbadmail'],-1);
+        return false;
+    }
 
-  // create substitutions for use in notification email
-  $substitutions = array(
-    'NEWUSER' => $_POST['login'],
-    'NEWNAME' => $_POST['fullname'],
-    'NEWEMAIL' => $_POST['email'],
-  );
-
-  if (!$conf['autopasswd']) {
-    msg($lang['regsuccess2'],1);
-    notify('', 'register', '', $_POST['login'], false, $substitutions);
-    return true;
-  }
+    //okay try to create the user
+    if(!$auth->triggerUserMod('create', array($_POST['login'],$pass,$_POST['fullname'],$_POST['email']))){
+        msg($lang['reguexists'],-1);
+        return false;
+    }
 
-  // autogenerated password? then send him the password
-  if (auth_sendPassword($_POST['login'],$pass)){
-    msg($lang['regsuccess'],1);
-    notify('', 'register', '', $_POST['login'], false, $substitutions);
-    return true;
-  }else{
-    msg($lang['regmailfail'],-1);
-    return false;
-  }
+    // create substitutions for use in notification email
+    $substitutions = array(
+            'NEWUSER' => $_POST['login'],
+            'NEWNAME' => $_POST['fullname'],
+            'NEWEMAIL' => $_POST['email'],
+            );
+
+    if (!$conf['autopasswd']) {
+        msg($lang['regsuccess2'],1);
+        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        return true;
+    }
+
+    // autogenerated password? then send him the password
+    if (auth_sendPassword($_POST['login'],$pass)){
+        msg($lang['regsuccess'],1);
+        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        return true;
+    }else{
+        msg($lang['regmailfail'],-1);
+        return false;
+    }
 }
 
 /**
@@ -674,65 +724,66 @@
  * @author    Christopher Smith 
  */
 function updateprofile() {
-  global $conf;
-  global $INFO;
-  global $lang;
-  global $auth;
-
-  if(empty($_POST['save'])) return false;
-  if(!checkSecurityToken()) return false;
-
-  // should not be able to get here without Profile being possible...
-  if(!$auth->canDo('Profile')) {
-    msg($lang['profna'],-1);
-    return false;
-  }
+    global $conf;
+    global $INFO;
+    global $lang;
+    global $auth;
 
-  if ($_POST['newpass'] != $_POST['passchk']) {
-    msg($lang['regbadpass'], -1);      // complain about misspelled passwords
-    return false;
-  }
+    if (!$auth) return false;
+    if(empty($_POST['save'])) return false;
+    if(!checkSecurityToken()) return false;
+
+    // should not be able to get here without Profile being possible...
+    if(!$auth->canDo('Profile')) {
+        msg($lang['profna'],-1);
+        return false;
+    }
 
-  //clean fullname and email
-  $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
-  $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
+    if ($_POST['newpass'] != $_POST['passchk']) {
+        msg($lang['regbadpass'], -1);      // complain about misspelled passwords
+        return false;
+    }
 
-  if (empty($_POST['fullname']) || empty($_POST['email'])) {
-    msg($lang['profnoempty'],-1);
-    return false;
-  }
+    //clean fullname and email
+    $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
+    $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
+
+    if ((empty($_POST['fullname']) && $auth->canDo('modName')) ||
+        (empty($_POST['email']) && $auth->canDo('modMail'))) {
+        msg($lang['profnoempty'],-1);
+        return false;
+    }
 
-  if (!mail_isvalid($_POST['email'])){
-    msg($lang['regbadmail'],-1);
-    return false;
-  }
+    if (!mail_isvalid($_POST['email']) && $auth->canDo('modMail')){
+        msg($lang['regbadmail'],-1);
+        return false;
+    }
 
-  if ($_POST['fullname'] != $INFO['userinfo']['name'] && $auth->canDo('modName')) $changes['name'] = $_POST['fullname'];
-  if ($_POST['email'] != $INFO['userinfo']['mail'] && $auth->canDo('modMail')) $changes['mail'] = $_POST['email'];
-  if (!empty($_POST['newpass']) && $auth->canDo('modPass')) $changes['pass'] = $_POST['newpass'];
+    if ($_POST['fullname'] != $INFO['userinfo']['name'] && $auth->canDo('modName')) $changes['name'] = $_POST['fullname'];
+    if ($_POST['email'] != $INFO['userinfo']['mail'] && $auth->canDo('modMail')) $changes['mail'] = $_POST['email'];
+    if (!empty($_POST['newpass']) && $auth->canDo('modPass')) $changes['pass'] = $_POST['newpass'];
 
+    if (!count($changes)) {
+        msg($lang['profnochange'], -1);
+        return false;
+    }
 
-  if (!count($changes)) {
-    msg($lang['profnochange'], -1);
-    return false;
-  }
+    if ($conf['profileconfirm']) {
+        if (!$auth->checkPass($_SERVER['REMOTE_USER'], $_POST['oldpass'])) {
+            msg($lang['badlogin'],-1);
+            return false;
+        }
+    }
 
-  if ($conf['profileconfirm']) {
-    if (!$auth->checkPass($_SERVER['REMOTE_USER'], $_POST['oldpass'])) {
-      msg($lang['badlogin'],-1);
-      return false;
-    }
-  }
-
-  if ($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) {
-    // update cookie and session with the changed data
-    $cookie = base64_decode($_COOKIE[DOKU_COOKIE]);
-    list($user,$sticky,$pass) = split('\|',$cookie,3);
-    if ($changes['pass']) $pass = PMA_blowfish_encrypt($changes['pass'],auth_cookiesalt());
+    if ($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) {
+        // update cookie and session with the changed data
+        $cookie = base64_decode($_COOKIE[DOKU_COOKIE]);
+        list($user,$sticky,$pass) = explode('|',$cookie,3);
+        if ($changes['pass']) $pass = PMA_blowfish_encrypt($changes['pass'],auth_cookiesalt());
 
-    auth_setCookie($_SERVER['REMOTE_USER'],$pass,(bool)$sticky);
-    return true;
-  }
+        auth_setCookie($_SERVER['REMOTE_USER'],$pass,(bool)$sticky);
+        return true;
+    }
 }
 
 /**
@@ -748,13 +799,14 @@
  * @author Andreas Gohr 
  *
  * @return bool true on success, false on any error
-*/
+ */
 function act_resendpwd(){
     global $lang;
     global $conf;
     global $auth;
 
     if(!actionOK('resendpwd')) return false;
+    if (!$auth) return false;
 
     // should not be able to get here without modPass being possible...
     if(!$auth->canDo('modPass')) {
@@ -802,8 +854,7 @@
             msg($lang['resendpwdmissing'], -1);
             return false;
         } else {
-            $_POST['login'] = preg_replace('/.*:/','',$_POST['login']);
-            $user = cleanID($_POST['login']);
+            $user = trim($auth->cleanUser($_POST['login']));
         }
 
         $userinfo = $auth->getUserData($user);
@@ -856,6 +907,7 @@
  *   crypt - Unix crypt
  *   mysql - MySQL password (old method)
  *   my411 - MySQL 4.1.1 password
+ *   kmd5  - Salted MD5 hashing as used by UNB
  *
  * @author  Andreas Gohr 
  * @return  string  The crypted password
@@ -879,8 +931,12 @@
             $len = strlen($clear);
             $text = $clear.'$'.$magic.'$'.$salt;
             $bin = pack("H32", md5($clear.$salt.$clear));
-            for($i = $len; $i > 0; $i -= 16) { $text .= substr($bin, 0, min(16, $i)); }
-            for($i = $len; $i > 0; $i >>= 1) { $text .= ($i & 1) ? chr(0) : $clear{0}; }
+            for($i = $len; $i > 0; $i -= 16) {
+                $text .= substr($bin, 0, min(16, $i));
+            }
+            for($i = $len; $i > 0; $i >>= 1) {
+                $text .= ($i & 1) ? chr(0) : $clear{0};
+            }
             $bin = pack("H32", md5($text));
             for($i = 0; $i < 1000; $i++) {
                 $new = ($i & 1) ? $clear : $bin;
@@ -926,6 +982,11 @@
             return sprintf("%08x%08x", ($nr & 0x7fffffff), ($nr2 & 0x7fffffff));
         case 'my411':
             return '*'.sha1(pack("H*", sha1($clear)));
+        case 'kmd5':
+            $key = substr($salt, 16, 2);
+            $hash1 = strtolower(md5($key . md5($clear)));
+            $hash2 = substr($hash1, 0, 16) . $key . substr($hash1, 16);
+            return $hash2;
         default:
             msg("Unsupported crypt method $method",-1);
     }
@@ -964,6 +1025,9 @@
         $method = 'mysql';
     }elseif($len == 41 && $crypt[0] == '*'){
         $method = 'my411';
+    }elseif($len == 34){
+        $method = 'kmd5';
+        $salt   = $crypt;
     }else{
         $method = 'crypt';
         $salt   = substr($crypt,0,2);
@@ -988,22 +1052,39 @@
     global $auth;
     global $USERINFO;
 
-      $USERINFO = $auth->getUserData($user);
+    if (!$auth) return false;
+    $USERINFO = $auth->getUserData($user);
+
+    // set cookie
+    $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass);
+    $time = $sticky ? (time()+60*60*24*365) : 0; //one year
+    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
+        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+    }
+    // set session
+    $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
+    $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
+    $_SESSION[DOKU_COOKIE]['auth']['buid'] = auth_browseruid();
+    $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+    $_SESSION[DOKU_COOKIE]['auth']['time'] = time();
+}
 
-      // set cookie
-      $cookie = base64_encode("$user|$sticky|$pass");
-      if($sticky) $time = time()+60*60*24*365; //one year
-      if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-          setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
-      }else{
-          setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
-      }
-      // set session
-      $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
-      $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
-      $_SESSION[DOKU_COOKIE]['auth']['buid'] = auth_browseruid();
-      $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
-      $_SESSION[DOKU_COOKIE]['auth']['time'] = time();
+/**
+ * Returns the user, (encrypted) password and sticky bit from cookie
+ *
+ * @returns array
+ */
+function auth_getCookie(){
+    if (!isset($_COOKIE[DOKU_COOKIE])) {
+        return array(null, null, null);
+    }
+    list($user,$sticky,$pass) = explode('|',$_COOKIE[DOKU_COOKIE],3);
+    $sticky = (bool) $sticky;
+    $pass   = base64_decode($pass);
+    $user   = base64_decode($user);
+    return array($user,$sticky,$pass);
 }
 
 //Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/blowfish.php dokuwiki-rc2009-12-02/inc/blowfish.php
--- dokuwiki-2009-02-14/inc/blowfish.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/blowfish.php	2009-12-02 19:50:11.000000000 +0100
@@ -1,8 +1,5 @@
 
- * @version $Revision: 2.4 $
+ * @version $Id: blowfish.php 11081 2008-01-25 09:35:48Z cybot_tm $
  * @since   Horde 2.2
  * @package horde.cipher
  */
 
 // Change for phpMyAdmin by lem9:
 //class Horde_Cipher_blowfish extends Horde_Cipher {
-class Horde_Cipher_blowfish {
-
+class Horde_Cipher_blowfish
+{
     /* Pi Array */
     var $p = array(
             0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
@@ -297,11 +294,6 @@
     /* The number of rounds to do */
     var $_rounds = 16;
 
-    /* Constructor */
-    function Cipher_blowfish($params = null)
-    {
-    }
-
     /**
      * Set the key to be used for en/decryption
      *
@@ -362,16 +354,6 @@
     }
 
     /**
-     * Return the size of the blocks that this cipher needs
-     *
-     * @return Integer  The number of characters per block
-     */
-    function getBlockSize()
-    {
-        return 8;
-    }
-
-    /**
      * Encrypt a block on data.
      *
      * @param String $block         The data to encrypt
@@ -389,7 +371,7 @@
         $parts = $this->_encryptBlock($L, $R);
         return pack("NN", $parts['L'], $parts['R']);
     }
-    
+
     /**
      * Encrypt a block on data.
      *
@@ -441,10 +423,10 @@
         $R = null;
 
         $retarray = array_values(unpack('N*', $block));
-        if(isset($retarray[0])) {
+        if (isset($retarray[0])) {
             $L = $retarray[0];
         }
-        if(isset($retarray[1])) {
+        if (isset($retarray[1])) {
             $R = $retarray[1];
         }
 // end change for phpMyAdmin
@@ -484,38 +466,6 @@
 }
 
 // higher-level functions:
-
-/**
- * String padding
- *
- * @param   string  input string
- * @param   integer length of the result
- * @param   string  the filling string
- * @param   integer padding mode
- *
- * @return  string  the padded string
- *
- * @access  public
- */
-function full_str_pad($input, $pad_length, $pad_string = '', $pad_type = 0) {
-    $str = '';
-    $length = $pad_length - strlen($input);
-    if ($length > 0) { // str_repeat doesn't like negatives
-        if ($pad_type == STR_PAD_RIGHT) { // STR_PAD_RIGHT == 1
-            $str = $input.str_repeat($pad_string, $length);
-        } elseif ($pad_type == STR_PAD_BOTH) { // STR_PAD_BOTH == 2
-            $str = str_repeat($pad_string, floor($length/2));
-            $str .= $input;
-            $str .= str_repeat($pad_string, ceil($length/2));
-        } else { // defaults to STR_PAD_LEFT == 0
-            $str = str_repeat($pad_string, $length).$input;
-        }
-    } else { // if $length is negative or zero we don't need to do anything
-        $str = $input;
-    }
-    return $str;
-}
-
 /**
  * Encryption using blowfish algorithm
  *
@@ -528,15 +478,20 @@
  *
  * @author  lem9
  */
-function PMA_blowfish_encrypt($data, $secret) {
+function PMA_blowfish_encrypt($data, $secret)
+{
     $pma_cipher = new Horde_Cipher_blowfish;
     $encrypt = '';
-    for ($i=0; $iencryptBlock($block, $secret);
+
+    $data .= '_'; // triming fixed for DokuWiki FS#1690 FS#1713
+    $mod = strlen($data) % 8;
+
+    if ($mod > 0) {
+        $data .= str_repeat("\0", 8 - $mod);
+    }
+
+    foreach (str_split($data, 8) as $chunk) {
+        $encrypt .= $pma_cipher->encryptBlock($chunk, $secret);
     }
     return base64_encode($encrypt);
 }
@@ -553,15 +508,14 @@
  *
  * @author  lem9
  */
-function PMA_blowfish_decrypt($encdata, $secret) {
+function PMA_blowfish_decrypt($encdata, $secret)
+{
     $pma_cipher = new Horde_Cipher_blowfish;
     $decrypt = '';
     $data = base64_decode($encdata);
-    for ($i=0; $idecryptBlock(substr($data, $i, 8), $secret);
+
+    foreach (str_split($data, 8) as $chunk) {
+        $decrypt .= $pma_cipher->decryptBlock($chunk, $secret);
     }
-    return trim($decrypt);
+    return substr(rtrim($decrypt, "\0"), 0, -1); // triming fixed for DokuWiki FS#1690 FS#1713
 }
-
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/cache.php dokuwiki-rc2009-12-02/inc/cache.php
--- dokuwiki-2009-02-14/inc/cache.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/cache.php	2009-12-02 19:50:12.000000000 +0100
@@ -29,7 +29,7 @@
   /**
    * public method to determine whether the cache can be used
    *
-   * to assist in cetralisation of event triggering and calculation of cache statistics, 
+   * to assist in cetralisation of event triggering and calculation of cache statistics,
    * don't override this function override _useCache()
    *
    * @param  array   $depends   array of cache dependencies, support dependecies:
@@ -183,7 +183,7 @@
   function _addDependencies() {
     global $conf, $config_cascade;
 
-    $this->depends['age'] = isset($this->depends['age']) ? 
+    $this->depends['age'] = isset($this->depends['age']) ?
                    min($this->depends['age'],$conf['cachetime']) : $conf['cachetime'];
 
     // parser cache file dependencies ...
@@ -217,24 +217,27 @@
 
     if (!parent::_useCache()) return false;
 
+    if (!isset($this->page)) {
+      return true;
+    }
+
+    // check current link existence is consistent with cache version
+    // first check the purgefile
+    // - if the cache is more recent than the purgefile we know no links can have been updated
+    if ($this->_time >= @filemtime($conf['cachedir'].'/purgefile')) {
+      return true;
+    }
+
     // for wiki pages, check metadata dependencies
-    if (isset($this->page)) {
-      $metadata = p_get_metadata($this->page);
+    $metadata = p_get_metadata($this->page);
 
-      // check currnent link existence is consistent with cache version
-      // first check the purgefile
-      // - if the cache is more recent that the purgefile we know no links can have been updated
-      if ($this->_time < @filemtime($conf['cachedir'].'/purgefile')) {
-
-#       $links = p_get_metadata($this->page,"relation references");
-        $links = $metadata['relation']['references'];
-
-        if (!empty($links)) {
-          foreach ($links as $id => $exists) {
-            if ($exists != page_exists($id,'',false)) return false;
-          }
-        }
-      }
+    if (!isset($metadata['relation']['references']) ||
+         empty($metadata['relation']['references'])) {
+      return true;
+    }
+
+    foreach ($metadata['relation']['references'] as $id => $exists) {
+      if ($exists != page_exists($id,'',false)) return false;
     }
 
     return true;
@@ -278,7 +281,7 @@
     parent::cache_parser($id, $file, 'i');
   }
 
-  function retrieveCache() {
+  function retrieveCache($clean=true) {
     $contents = io_readFile($this->cache, false);
     return !empty($contents) ? unserialize($contents) : array();
   }
diff -Naur dokuwiki-2009-02-14/inc/changelog.php dokuwiki-rc2009-12-02/inc/changelog.php
--- dokuwiki-2009-02-14/inc/changelog.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/changelog.php	2009-12-02 19:50:11.000000000 +0100
@@ -55,7 +55,7 @@
   $wasRemoved = ($type===DOKU_CHANGE_TYPE_DELETE);
 
   if(!$date) $date = time(); //use current time if none supplied
-  $remote = (!$flagExternalEdit)?$_SERVER['REMOTE_ADDR']:'127.0.0.1';
+  $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1';
   $user   = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:'';
 
   $strip = array("\t", "\n");
@@ -109,7 +109,7 @@
   $id = cleanid($id);
 
   if(!$date) $date = time(); //use current time if none supplied
-  $remote = $_SERVER['REMOTE_ADDR'];
+  $remote = clientIP(true);
   $user   = $_SERVER['REMOTE_USER'];
 
   $strip = array("\t", "\n");
@@ -382,7 +382,7 @@
  *
  * For efficiency, the log lines are parsed and cached for later
  * calls to getRevisionInfo. Large changelog files are read
- * backwards in chunks untill the requested number of changelog
+ * backwards in chunks until the requested number of changelog
  * lines are recieved.
  *
  * @author Ben Coburn 
diff -Naur dokuwiki-2009-02-14/inc/common.php dokuwiki-rc2009-12-02/inc/common.php
--- dokuwiki-2009-02-14/inc/common.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/common.php	2009-12-02 19:50:12.000000000 +0100
@@ -68,6 +68,8 @@
  * Check the secret CSRF token
  */
 function checkSecurityToken($token=null){
+  if(!$_SERVER['REMOTE_USER']) return true; // no logged in user, no need for a check
+
   if(is_null($token)) $token = $_REQUEST['sectok'];
   if(getSecurityToken() != $token){
     msg('Security Token did not match. Possible CSRF attack.',-1);
@@ -109,16 +111,16 @@
   $info['id'] = $ID;
   $info['rev'] = $REV;
 
-  if($_SERVER['REMOTE_USER']){
+    // set info about manager/admin status.
+    $info['isadmin']   = false;
+    $info['ismanager'] = false;
+  if(isset($_SERVER['REMOTE_USER'])){
     $info['userinfo']     = $USERINFO;
     $info['perm']         = auth_quickaclcheck($ID);
     $info['subscribed']   = is_subscribed($ID,$_SERVER['REMOTE_USER'],false);
     $info['subscribedns'] = is_subscribed($ID,$_SERVER['REMOTE_USER'],true);
     $info['client']       = $_SERVER['REMOTE_USER'];
 
-    // set info about manager/admin status
-    $info['isadmin']   = false;
-    $info['ismanager'] = false;
     if($info['perm'] == AUTH_ADMIN){
       $info['isadmin']   = true;
       $info['ismanager'] = true;
@@ -273,12 +275,9 @@
   global $ID;
   global $ACT;
   global $conf;
-  $crumbs = $_SESSION[DOKU_COOKIE]['bc'];
 
   //first visit?
-  if (!is_array($crumbs)){
-    $crumbs = array();
-  }
+  $crumbs = isset($_SESSION[DOKU_COOKIE]['bc']) ? $_SESSION[DOKU_COOKIE]['bc'] : array();
   //we only save on show and existing wiki documents
   $file = wikiFN($ID);
   if($ACT != 'show' || !@file_exists($file)){
@@ -454,11 +453,13 @@
   // external URLs are always direct without rewriting
   if(preg_match('#^(https?|ftp)://#i',$id)){
     $xlink .= 'lib/exe/fetch.php';
+    // add hash:
+    $xlink .= '?hash='.substr(md5(auth_cookiesalt().$id),0,6);
     if($more){
-      $xlink .= '?'.$more;
+      $xlink .= $sep.$more;
       $xlink .= $sep.'media='.rawurlencode($id);
     }else{
-      $xlink .= '?media='.rawurlencode($id);
+      $xlink .= $sep.'media='.rawurlencode($id);
     }
     return $xlink;
   }
@@ -531,17 +532,23 @@
  *      [name]         - real name (if logged in)
  *
  * @author Andreas Gohr 
- * Michael Klier 
+ * @author Michael Klier 
+ * @param  string $text - optional text to check, if not given the globals are used
+ * @return bool         - true if a spam word was found
  */
-function checkwordblock(){
+function checkwordblock($text=''){
   global $TEXT;
+  global $PRE;
+  global $SUF;
   global $conf;
   global $INFO;
 
   if(!$conf['usewordblock']) return false;
 
+  if(!$text) $text = "$PRE $TEXT $SUF";
+
   // we prepare the text a tiny bit to prevent spammers circumventing URL checks
-  $text = preg_replace('!(\b)(www\.[\w.:?\-;,]+?\.[\w.:?\-;,]+?[\w/\#~:.?+=&%@\!\-.:?\-;,]+?)([.:?\-;,]*[^\w/\#~:.?+=&%@\!\-.:?\-;,])!i','\1http://\2 \2\3',$TEXT);
+  $text = preg_replace('!(\b)(www\.[\w.:?\-;,]+?\.[\w.:?\-;,]+?[\w/\#~:.?+=&%@\!\-.:?\-;,]+?)([.:?\-;,]*[^\w/\#~:.?+=&%@\!\-.:?\-;,])!i','\1http://\2 \2\3',$text);
 
   $wordblocks = getWordblocks();
   //how many lines to read at once (to work around some PCRE limits)
@@ -574,7 +581,7 @@
           $data['userinfo']['mail'] = $INFO['userinfo']['mail'];
       }
       $callback = create_function('', 'return true;');
-      return trigger_event('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true); 
+      return trigger_event('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true);
     }
   }
   return false;
@@ -876,7 +883,7 @@
  * @author Andreas Gohr 
  */
 function rawWikiSlices($range,$id,$rev=''){
-  list($from,$to) = split('-',$range,2);
+  list($from,$to) = explode('-',$range,2);
   $text = io_readWikiPage(wikiFN($id, $rev), $id, $rev);
   if(!$from) $from = 0;
   if(!$to)   $to   = strlen($text)+1;
@@ -1033,10 +1040,10 @@
 }
 
 /**
- * Sends a notify mail on page change
+ * Sends a notify mail on page change or registration
  *
  * @param  string  $id       The changed page
- * @param  string  $who      Who to notify (admin|subscribers)
+ * @param  string  $who      Who to notify (admin|subscribers|register)
  * @param  int     $rev      Old page revision
  * @param  string  $summary  What changed
  * @param  boolean $minor    Is this a minor edit?
@@ -1072,7 +1079,7 @@
   }
 
   $ip   = clientIP();
-  $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
+  $text = str_replace('@DATE@',dformat(),$text);
   $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
   $text = str_replace('@IPADDRESS@',$ip,$text);
   $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
@@ -1093,8 +1100,8 @@
     $subject = $lang['mail_changed'].' '.$id;
     $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
     require_once(DOKU_INC.'inc/DifferenceEngine.php');
-    $df  = new Diff(split("\n",rawWiki($id,$rev)),
-                    split("\n",rawWiki($id)));
+    $df  = new Diff(explode("\n",rawWiki($id,$rev)),
+                    explode("\n",rawWiki($id)));
     $dformat = new UnifiedDiffFormatter();
     $diff    = $dformat->format($df);
   }else{
@@ -1120,11 +1127,20 @@
  * @author Todd Augsburger 
  */
 function getGoogleQuery(){
+  if (!isset($_SERVER['HTTP_REFERER'])) {
+    return '';
+  }
   $url = parse_url($_SERVER['HTTP_REFERER']);
-  if(!$url) return '';
 
   $query = array();
+
+  // temporary workaround against PHP bug #49733
+  // see http://bugs.php.net/bug.php?id=49733
+  if(UTF8_MBSTRING) $enc = mb_internal_encoding();
   parse_str($url['query'],$query);
+  if(UTF8_MBSTRING) mb_internal_encoding($enc);
+
+  $q = '';
   if(isset($query['q']))
     $q = $query['q'];        // google, live/msn, aol, ask, altavista, alltheweb, gigablast
   elseif(isset($query['p']))
@@ -1134,7 +1150,7 @@
   elseif(preg_match("#a9\.com#i",$url['host'])) // a9
     $q = urldecode(ltrim($url['path'],'/'));
 
-  if(!$q) return '';
+  if($q === '') return '';
   $q = preg_split('/[\s\'"\\\\`()\]\[?:!\.{};,#+*<>\\/]+/',$q,-1,PREG_SPLIT_NO_EMPTY);
   return $q;
 }
@@ -1183,6 +1199,57 @@
 }
 
 /**
+ * Return the given timestamp as human readable, fuzzy age
+ *
+ * @author Andreas Gohr 
+ */
+function datetime_h($dt){
+  global $lang;
+
+  $ago = time() - $dt;
+  if($ago > 24*60*60*30*12*2){
+    return sprintf($lang['years'], round($ago/(24*60*60*30*12)));
+  }
+  if($ago > 24*60*60*30*2){
+    return sprintf($lang['months'], round($ago/(24*60*60*30)));
+  }
+  if($ago > 24*60*60*7*2){
+    return sprintf($lang['weeks'], round($ago/(24*60*60*7)));
+  }
+  if($ago > 24*60*60*2){
+    return sprintf($lang['days'], round($ago/(24*60*60)));
+  }
+  if($ago > 60*60*2){
+    return sprintf($lang['hours'], round($ago/(60*60)));
+  }
+  if($ago > 60*2){
+    return sprintf($lang['minutes'], round($ago/(60)));
+  }
+  return sprintf($lang['seconds'], $ago);
+
+}
+
+/**
+ * Wraps around strftime but provides support for fuzzy dates
+ *
+ * The format default to $conf['dformat']. It is passed to
+ * strftime - %f can be used to get the value from datetime_h()
+ *
+ * @see datetime_h
+ * @author Andreas Gohr 
+ */
+function dformat($dt=null,$format=''){
+  global $conf;
+
+  if(is_null($dt)) $dt = time();
+  $dt = (int) $dt;
+  if(!$format) $format = $conf['dformat'];
+
+  $format = str_replace('%f',datetime_h($dt),$format);
+  return strftime($format,$dt);
+}
+
+/**
  * return an obfuscated email address in line with $conf['mailguard'] setting
  *
  * @author Harry Fuecks 
@@ -1342,7 +1409,7 @@
 /**
  * Shorten a given string by removing data from the middle
  *
- * You can give the string in two parts, teh first part $keep
+ * You can give the string in two parts, the first part $keep
  * will never be shortened. The second part $short will be cut
  * in the middle to shorten but only if at least $min chars are
  * left to display it. Otherwise it will be left off.
@@ -1353,7 +1420,7 @@
  * @param int    $min    minimum number of chars to have left for middle shortening
  * @param string $char   the shortening character to use
  */
-function shorten($keep,$short,$max,$min=9,$char='⌇'){
+function shorten($keep,$short,$max,$min=9,$char='…'){
     $max = $max - utf8_strlen($keep);
    if($max < $min) return $keep;
     $len = utf8_strlen($short);
@@ -1376,7 +1443,7 @@
       case 'username':
       case 'email':
       case 'email_link':
-        $info = $auth->getUserData($username);
+        if($auth) $info = $auth->getUserData($username);
         break;
       default:
         return hsc($username);
diff -Naur dokuwiki-2009-02-14/inc/confutils.php dokuwiki-rc2009-12-02/inc/confutils.php
--- dokuwiki-2009-02-14/inc/confutils.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/confutils.php	2009-12-02 19:50:11.000000000 +0100
@@ -10,21 +10,31 @@
 /**
  * Returns the (known) extension and mimetype of a given filename
  *
+ * If $knownonly is true (the default), then only known extensions
+ * are returned.
+ *
  * @author Andreas Gohr 
  */
-function mimetype($file){
+function mimetype($file, $knownonly=true){
   $ret    = array(false,false,false); // return array
   $mtypes = getMimeTypes();     // known mimetypes
   $exts   = join('|',array_keys($mtypes));  // known extensions (regexp)
+  if(!$knownonly){
+    $exts = $exts.'|[_\-A-Za-z0-9]+';  // any extension
+  }
   if(preg_match('#\.('.$exts.')$#i',$file,$matches)){
     $ext = strtolower($matches[1]);
   }
 
-  if($ext && $mtypes[$ext]){
-    if($mtypes[$ext][0] == '!'){
-        $ret = array($ext, substr($mtypes[$ext],1), true);
-    }else{
-        $ret = array($ext, $mtypes[$ext], false);
+  if($ext){
+    if (isset($mtypes[$ext])){
+      if($mtypes[$ext][0] == '!'){
+          $ret = array($ext, substr($mtypes[$ext],1), true);
+      }else{
+          $ret = array($ext, $mtypes[$ext], false);
+      }
+    }elseif(!$knownonly){
+      $ret = array($ext, 'application/octet-stream', true);
     }
   }
 
@@ -123,19 +133,16 @@
 }
 
 /**
- * Builds a hash from a configfile
+ * Builds a hash from an array of lines
  *
  * If $lower is set to true all hash keys are converted to
  * lower case.
  *
  * @author Harry Fuecks 
  * @author Andreas Gohr 
+ * @author Gina Haeussge 
  */
-function confToHash($file,$lower=false) {
-  $conf = array();
-  $lines = @file( $file );
-  if ( !$lines ) return $conf;
-
+function linesToHash($lines, $lower=false) {
   foreach ( $lines as $line ) {
     //ignore comments (except escaped ones)
     $line = preg_replace('/(?
+ * @author Andreas Gohr 
+ * @author Gina Haeussge 
+ */
+function confToHash($file,$lower=false) {
+  $conf = array();
+  $lines = @file( $file );
+  if ( !$lines ) return $conf;
+
+  return linesToHash($lines, $lower);
+}
+
+/**
  * Retrieve the requested configuration information
  *
  * @author Chris Smith 
diff -Naur dokuwiki-2009-02-14/inc/DifferenceEngine.php dokuwiki-rc2009-12-02/inc/DifferenceEngine.php
--- dokuwiki-2009-02-14/inc/DifferenceEngine.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/DifferenceEngine.php	2009-12-02 19:50:11.000000000 +0100
@@ -979,6 +979,7 @@
   function _pre($text){
     $text = htmlspecialchars($text);
     $text = str_replace('  ','  ',$text);
+    if($text{0} == ' ') $text = ' '.substr($text,1);
     return $text;
   }
 
@@ -1002,13 +1003,15 @@
   }
 
   function addedLine( $line ) {
-    $line = str_replace('  ','  ',$line);
+    $line = str_replace('  ','  ',$line);
+    if($line{0} == ' ') $line = ' '.substr($line,1);
     return '+' .
       $line.'';
   }
 
   function deletedLine( $line ) {
-    $line = str_replace('  ','  ',$line);
+    $line = str_replace('  ','  ',$line);
+    if($line{0} == ' ') $line = ' '.substr($line,1);
     return '-' .
       $line.'';
   }
@@ -1019,7 +1022,8 @@
   }
 
   function contextLine( $line ) {
-    $line = str_replace('  ','  ',$line);
+    $line = str_replace('  ','  ',$line);
+    if($line{0} == ' ') $line = ' '.substr($line,1);
     return ' '.$line.'';
   }
 
diff -Naur dokuwiki-2009-02-14/inc/feedcreator.class.php dokuwiki-rc2009-12-02/inc/feedcreator.class.php
--- dokuwiki-2009-02-14/inc/feedcreator.class.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/feedcreator.class.php	2009-12-02 19:50:11.000000000 +0100
@@ -1570,4 +1570,3 @@
 
 
 //Setup VIM: ex: et ts=4 enc=utf-8 :
-?>
diff -Naur dokuwiki-2009-02-14/inc/form.php dokuwiki-rc2009-12-02/inc/form.php
--- dokuwiki-2009-02-14/inc/form.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/form.php	2009-12-02 19:50:11.000000000 +0100
@@ -7,7 +7,6 @@
  */
 
 if(!defined('DOKU_INC')) die('meh.');
-if(!defined('NL')) define('NL',"\n");
 require_once(DOKU_INC.'inc/html.php');
 
 /**
@@ -29,238 +28,260 @@
  */
 class Doku_Form {
 
-  // Usually either DOKU_SCRIPT or wl($ID)
-  var $action = '';
+    // Form id attribute
+    var $params = array();
 
-  // Most likely no need to change this
-  var $method = 'post';
+    // Draw a border around form fields.
+    // Adds 
 around the elements
+    var $_infieldset = false;
+
+    // Hidden form fields.
+    var $_hidden = array();
+
+    // Array of pseudo-tags
+    var $_content = array();
+
+    /**
+     * Constructor
+     *
+     * Sets parameters and autoadds a security token. The old calling convention
+     * with up to four parameters is deprecated, instead the first parameter
+     * should be an array with parameters.
+     *
+     * @param   mixed   $params  Parameters for the HTML form element; Using the
+     *                           deprecated calling convention this is the ID
+     *                           attribute of the form
+     * @param   string  $action  (optional, deprecated) submit URL, defaults to
+     *                                                  current page
+     * @param   string  $method  (optional, deprecated) 'POST' or 'GET', default
+     *                                                  is POST
+     * @param   string  $enctype (optional, deprecated) Encoding type of the
+     *                                                  data
+     * @author  Tom N Harris 
+     */
+    function Doku_Form($params, $action=false, $method=false, $enctype=false) {
+        if(!is_array($params)) {
+            $this->params = array('id' => $params);
+            if ($action !== false) $this->params['action'] = $action;
+            if ($method !== false) $this->params['method'] = strtolower($method);
+            if ($enctype !== false) $this->params['enctype'] = $enctype;
+        } else {
+            $this->params = $params;
+        }
+
+        if (!isset($this->params['method'])) {
+            $this->params['method'] = 'post';
+        } else {
+            $this->params['method'] = strtolower($this->params['method']);
+        }
+
+        if (!isset($this->params['action'])) {
+            $this->params['action'] = '';
+        }
+
+        $this->addHidden('sectok', getSecurityToken());
+    }
+
+    /**
+     * startFieldset
+     *
+     * Add 
 tags around fields.
+     * Usually results in a border drawn around the form.
+     *
+     * @param   string  $legend Label that will be printed with the border.
+     * @author  Tom N Harris 
+     */
+    function startFieldset($legend) {
+        if ($this->_infieldset) {
+            $this->addElement(array('_elem'=>'closefieldset'));
+        }
+        $this->addElement(array('_elem'=>'openfieldset', '_legend'=>$legend));
+        $this->_infieldset = true;
+    }
 
-  // Change for special forms only
-  var $enctype = '';
+    /**
+     * endFieldset
+     *
+     * @author  Tom N Harris 
+     */
+    function endFieldset() {
+        if ($this->_infieldset) {
+            $this->addElement(array('_elem'=>'closefieldset'));
+        }
+        $this->_infieldset = false;
+    }
+
+    /**
+     * addHidden
+     *
+     * Adds a name/value pair as a hidden field.
+     * The value of the field (but not the name) will be passed to
+     * formText() before printing.
+     *
+     * @param   string  $name   Field name.
+     * @param   string  $value  Field value. If null, remove a previously added field.
+     * @author  Tom N Harris 
+     */
+    function addHidden($name, $value) {
+        if (is_null($value))
+            unset($this->_hidden[$name]);
+        else
+            $this->_hidden[$name] = $value;
+    }
+
+    /**
+     * addElement
+     *
+     * Appends a content element to the form.
+     * The element can be either a pseudo-tag or string.
+     * If string, it is printed without escaping special chars.   *
+     *
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris 
+     */
+    function addElement($elem) {
+        $this->_content[] = $elem;
+    }
+
+    /**
+     * insertElement
+     *
+     * Inserts a content element at a position.
+     *
+     * @param   string  $pos    0-based index where the element will be inserted.
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris 
+     */
+    function insertElement($pos, $elem) {
+        array_splice($this->_content, $pos, 0, array($elem));
+    }
+
+    /**
+     * replaceElement
+     *
+     * Replace with NULL to remove an element.
+     *
+     * @param   int     $pos    0-based index the element will be placed at.
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris 
+     */
+    function replaceElement($pos, $elem) {
+        $rep = array();
+        if (!is_null($elem)) $rep[] = $elem;
+        array_splice($this->_content, $pos, 1, $rep);
+    }
+
+    /**
+     * findElementByType
+     *
+     * Gets the position of the first of a type of element.
+     *
+     * @param   string  $type   Element type to look for.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris 
+     */
+    function findElementByType($type) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && $elem['_elem'] == $type)
+                return $pos;
+        }
+        return false;
+    }
 
-  // Form id attribute
-  var $id = '';
-
-  // Draw a border around form fields.
-  // Adds 
 around the elements
-  var $_infieldset = false;
-
-  // Hidden form fields.
-  var $_hidden = array();
-
-  // Array of pseudo-tags
-  var $_content = array();
-
-  /**
-   * Constructor
-   *
-   * Autoadds a security token
-   *
-   * @param   string  $id     ID attribute of the form.
-   * @param   string  $action (optional) submit URL, defaults to DOKU_SCRIPT
-   * @param   string  $method (optional) 'POST' or 'GET', default is post
-   * @author  Tom N Harris 
-   */
-  function Doku_Form($id, $action=false, $method=false, $enctype=false) {
-    $this->id = $id;
-    $this->action = ($action) ? $action : script();
-    if ($method) $this->method = $method;
-    if ($enctype) $this->enctype = $enctype;
-
-    $this->addHidden('sectok', getSecurityToken());
-  }
-
-  /**
-   * startFieldset
-   *
-   * Add 
 tags around fields.
-   * Usually results in a border drawn around the form.
-   *
-   * @param   string  $legend Label that will be printed with the border.
-   * @author  Tom N Harris 
-   */
-  function startFieldset($legend) {
-    if ($this->_infieldset) {
-      $this->addElement(array('_elem'=>'closefieldset'));
-    }
-    $this->addElement(array('_elem'=>'openfieldset', '_legend'=>$legend));
-    $this->_infieldset = true;
-  }
-
-  /**
-   * endFieldset
-   *
-   * @author  Tom N Harris 
-   */
-  function endFieldset() {
-    if ($this->_infieldset) {
-      $this->addElement(array('_elem'=>'closefieldset'));
-    }
-    $this->_infieldset = false;
-  }
-
-  /**
-   * addHidden
-   *
-   * Adds a name/value pair as a hidden field.
-   * The value of the field (but not the name) will be passed to
-   * formText() before printing.
-   *
-   * @param   string  $name   Field name.
-   * @param   string  $value  Field value. If null, remove a previously added field.
-   * @author  Tom N Harris 
-   */
-  function addHidden($name, $value) {
-    if (is_null($value))
-      unset($this->_hidden[$name]);
-    else
-      $this->_hidden[$name] = $value;
-  }
-
-  /**
-   * addElement
-   *
-   * Appends a content element to the form.
-   * The element can be either a pseudo-tag or string.
-   * If string, it is printed without escaping special chars.   *
-   *
-   * @param   string  $elem   Pseudo-tag or string to add to the form.
-   * @author  Tom N Harris 
-   */
-  function addElement($elem) {
-    $this->_content[] = $elem;
-  }
-
-  /**
-   * insertElement
-   *
-   * Inserts a content element at a position.
-   *
-   * @param   string  $pos    0-based index where the element will be inserted.
-   * @param   string  $elem   Pseudo-tag or string to add to the form.
-   * @author  Tom N Harris 
-   */
-  function insertElement($pos, $elem) {
-    array_splice($this->_content, $pos, 0, array($elem));
-  }
-
-  /**
-   * replaceElement
-   *
-   * Replace with NULL to remove an element.
-   *
-   * @param   int     $pos    0-based index the element will be placed at.
-   * @param   string  $elem   Pseudo-tag or string to add to the form.
-   * @author  Tom N Harris 
-   */
-  function replaceElement($pos, $elem) {
-    $rep = array();
-    if (!is_null($elem)) $rep[] = $elem;
-    array_splice($this->_content, $pos, 1, $rep);
-  }
-
-  /**
-   * findElementByType
-   *
-   * Gets the position of the first of a type of element.
-   *
-   * @param   string  $type   Element type to look for.
-   * @return  array   pseudo-element if found, false otherwise
-   * @author  Tom N Harris 
-   */
-  function findElementByType($type) {
-    foreach ($this->_content as $pos=>$elem) {
-      if (is_array($elem) && $elem['_elem'] == $type)
-        return $pos;
-    }
-    return false;
-  }
-
-  /**
-   * findElementById
-   *
-   * Gets the position of the element with an ID attribute.
-   *
-   * @param   string  $id     ID of the element to find.
-   * @return  array   pseudo-element if found, false otherwise
-   * @author  Tom N Harris 
-   */
-  function findElementById($id) {
-    foreach ($this->_content as $pos=>$elem) {
-      if (is_array($elem) && isset($elem['id']) && $elem['id'] == $id)
-        return $pos;
-    }
-    return false;
-  }
-
-  /**
-   * findElementByAttribute
-   *
-   * Gets the position of the first element with a matching attribute value.
-   *
-   * @param   string  $name   Attribute name.
-   * @param   string  $value  Attribute value.
-   * @return  array   pseudo-element if found, false otherwise
-   * @author  Tom N Harris 
-   */
-  function findElementByAttribute($name, $value) {
-    foreach ($this->_content as $pos=>$elem) {
-      if (is_array($elem) && isset($elem[$name]) && $elem[$name] == $value)
-        return $pos;
-    }
-    return false;
-  }
-
-  /**
-   * getElementAt
-   *
-   * Returns a reference to the element at a position.
-   * A position out-of-bounds will return either the
-   * first (underflow) or last (overflow) element.
-   *
-   * @param   int     $pos    0-based index
-   * @return  arrayreference  pseudo-element
-   * @author  Tom N Harris 
-   */
-  function &getElementAt($pos) {
-    if ($pos < 0) $pos = count($this->_content) + $pos;
-    if ($pos < 0) $pos = 0;
-    if ($pos >= count($this->_content)) $pos = count($this->_content) - 1;
-    return $this->_content[$pos];
-  }
-
-  /**
-   * printForm
-   *
-   * Output the form.
-   * Each element in the form will be passed to a function named
-   * 'form_$type'. The function should return the HTML to be printed.
-   *
-   * @author  Tom N Harris 
-   */
-  function printForm() {
-    global $lang;
-    print '
id)) print ' id="'.$this->id.'"';
-    if (!empty($this->enctype)) print ' enctype="'.$this->enctype.'"';
-    print '>
'.NL;
-    if (!empty($this->_hidden)) {
-      foreach ($this->_hidden as $name=>$value)
-        print form_hidden(array('name'=>$name, 'value'=>$value));
-    }
-    foreach ($this->_content as $element) {
-      if (is_array($element)) {
-        $elem_type = $element['_elem'];
-        if (function_exists('form_'.$elem_type)) {
-          print call_user_func('form_'.$elem_type, $element).NL;
-        }
-      } else {
-        print $element;
-      }
-    }
-    if ($this->_infieldset) print form_closefieldset().NL;
-    print '
'.NL;
-  }
+    /**
+     * findElementById
+     *
+     * Gets the position of the element with an ID attribute.
+     *
+     * @param   string  $id     ID of the element to find.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris 
+     */
+    function findElementById($id) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && isset($elem['id']) && $elem['id'] == $id)
+                return $pos;
+        }
+        return false;
+    }
+
+    /**
+     * findElementByAttribute
+     *
+     * Gets the position of the first element with a matching attribute value.
+     *
+     * @param   string  $name   Attribute name.
+     * @param   string  $value  Attribute value.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris 
+     */
+    function findElementByAttribute($name, $value) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && isset($elem[$name]) && $elem[$name] == $value)
+                return $pos;
+        }
+        return false;
+    }
+
+    /**
+     * getElementAt
+     *
+     * Returns a reference to the element at a position.
+     * A position out-of-bounds will return either the
+     * first (underflow) or last (overflow) element.
+     *
+     * @param   int     $pos    0-based index
+     * @return  arrayreference  pseudo-element
+     * @author  Tom N Harris 
+     */
+    function &getElementAt($pos) {
+        if ($pos < 0) $pos = count($this->_content) + $pos;
+        if ($pos < 0) $pos = 0;
+        if ($pos >= count($this->_content)) $pos = count($this->_content) - 1;
+        return $this->_content[$pos];
+    }
+
+    /**
+     * Return the assembled HTML for the form.
+     *
+     * Each element in the form will be passed to a function named
+     * 'form_$type'. The function should return the HTML to be printed.
+     *
+     * @author  Tom N Harris 
+     */
+    function getForm() {
+        global $lang;
+        $form = '';
+        $this->params['accept-charset'] = $lang['encoding'];
+        $form .= '
params) . '>
' . DOKU_LF;
+        if (!empty($this->_hidden)) {
+            foreach ($this->_hidden as $name=>$value)
+                $form .= form_hidden(array('name'=>$name, 'value'=>$value));
+        }
+        foreach ($this->_content as $element) {
+            if (is_array($element)) {
+                $elem_type = $element['_elem'];
+                if (function_exists('form_'.$elem_type)) {
+                    $form .= call_user_func('form_'.$elem_type, $element).DOKU_LF;
+                }
+            } else {
+                $form .= $element;
+            }
+        }
+        if ($this->_infieldset) $form .= form_closefieldset().DOKU_LF;
+        $form .= '
'.DOKU_LF;
+
+        return $form;
+    }
+
+    /**
+     * Print the assembled form
+     *
+     * wraps around getForm()
+     */
+    function printForm(){
+        echo $this->getForm();
+    }
 
 }
 
@@ -275,8 +296,8 @@
  * @author  Tom N Harris 
  */
 function form_makeTag($tag, $attrs=array()) {
-  $elem = array('_elem'=>'tag', '_tag'=>$tag);
-  return array_merge($elem, $attrs);
+    $elem = array('_elem'=>'tag', '_tag'=>$tag);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -291,8 +312,8 @@
  * @author  Tom N Harris 
  */
 function form_makeOpenTag($tag, $attrs=array()) {
-  $elem = array('_elem'=>'opentag', '_tag'=>$tag);
-  return array_merge($elem, $attrs);
+    $elem = array('_elem'=>'opentag', '_tag'=>$tag);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -306,7 +327,7 @@
  * @author  Tom N Harris 
  */
 function form_makeCloseTag($tag) {
-  return array('_elem'=>'closetag', '_tag'=>$tag);
+    return array('_elem'=>'closetag', '_tag'=>$tag);
 }
 
 /**
@@ -323,9 +344,9 @@
  * @author  Tom N Harris 
  */
 function form_makeWikiText($text, $attrs=array()) {
-  $elem = array('_elem'=>'wikitext', '_text'=>$text,
-                'class'=>'edit', 'cols'=>'80', 'rows'=>'10');
-  return array_merge($elem, $attrs);
+    $elem = array('_elem'=>'wikitext', '_text'=>$text,
+                        'class'=>'edit', 'cols'=>'80', 'rows'=>'10');
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -343,14 +364,13 @@
  * @author  Tom N Harris 
  */
 function form_makeButton($type, $act, $value='', $attrs=array()) {
-  if ($value == '') $value = $act;
-  //$name = (!empty($act)) ? 'do[$act]' : null;
-  $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act, 
-                'value'=>$value, 'class'=>'button');
-  if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
-    $attrs['title'] = $value . ' ['.strtoupper($attrs['accesskey']).']';
-  }
-  return array_merge($elem, $attrs);
+    if ($value == '') $value = $act;
+    $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act,
+                        'value'=>$value, 'class'=>'button');
+    if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
+        $attrs['title'] = $value . ' ['.strtoupper($attrs['accesskey']).']';
+    }
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -372,10 +392,10 @@
  * @author  Tom N Harris 
  */
 function form_makeField($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $elem = array('_elem'=>'field', '_text'=>$label, '_class'=>$class,
-                'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'field', '_text'=>$label, '_class'=>$class,
+                        'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -388,10 +408,10 @@
  * @author  Tom N Harris 
  */
 function form_makeFieldRight($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $elem = array('_elem'=>'fieldright', '_text'=>$label, '_class'=>$class,
-                'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'fieldright', '_text'=>$label, '_class'=>$class,
+                        'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -403,10 +423,10 @@
  * @author  Tom N Harris 
  */
 function form_makeTextField($name, $value='', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $elem = array('_elem'=>'textfield', '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name, 'value'=>$value, 'class'=>'edit');
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'textfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value, 'class'=>'edit');
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -419,25 +439,25 @@
  * @author  Tom N Harris 
  */
 function form_makePasswordField($name, $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $elem = array('_elem'=>'passwordfield', '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name, 'class'=>'edit');
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'passwordfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'class'=>'edit');
+    return array_merge($elem, $attrs);
 }
 
 /**
  * form_makeFileField
  *
  * Create a form element for a file input element with label
- * 
+ *
  * @see     form_makeField
  * @author  Michael Klier 
  */
 function form_makeFileField($name, $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $elem = array('_elem'=>'filefield', '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name, 'class'=>'edit');
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'filefield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'class'=>'edit');
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -449,11 +469,11 @@
  * @author  Tom N Harris 
  */
 function form_makeCheckboxField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  if (is_null($value) || $value=='') $value='0';
-  $elem = array('_elem'=>'checkboxfield', '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name, 'value'=>$value);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    if (is_null($value) || $value=='') $value='0';
+    $elem = array('_elem'=>'checkboxfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -465,11 +485,11 @@
  * @author  Tom N Harris 
  */
 function form_makeRadioField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  if (is_null($value) || $value=='') $value='0';
-  $elem = array('_elem'=>'radiofield', '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name, 'value'=>$value);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    if (is_null($value) || $value=='') $value='0';
+    $elem = array('_elem'=>'radiofield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -485,27 +505,27 @@
  * @author  Tom N Harris 
  */
 function form_makeMenuField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $options = array();
-  reset($values);
-  // FIXME: php doesn't know the difference between a string and an integer
-  if (is_string(key($values))) {
-    foreach ($values as $val=>$text) {
-      $options[] = array($val,$text, (!is_null($selected) && $val==$selected));
-    }
-  } else {
-    if (is_integer($selected)) $selected = $values[$selected];
-    foreach ($values as $val) {
-      if (is_array($val))
-        @list($val,$text) = $val;
-      else
-        $text = null;
-      $options[] = array($val,$text,$val===$selected);
-    }
-  }
-  $elem = array('_elem'=>'menufield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $options = array();
+    reset($values);
+    // FIXME: php doesn't know the difference between a string and an integer
+    if (is_string(key($values))) {
+        foreach ($values as $val=>$text) {
+            $options[] = array($val,$text, (!is_null($selected) && $val==$selected));
+        }
+    } else {
+        if (is_integer($selected)) $selected = $values[$selected];
+        foreach ($values as $val) {
+            if (is_array($val))
+                @list($val,$text) = $val;
+            else
+                $text = null;
+            $options[] = array($val,$text,$val===$selected);
+        }
+    }
+    $elem = array('_elem'=>'menufield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -519,30 +539,30 @@
  * @author  Tom N Harris 
  */
 function form_makeListboxField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
-  if (is_null($label)) $label = $name;
-  $options = array();
-  reset($values);
-  if (is_null($selected) || $selected == '')
-    $selected = array();
-  elseif (!is_array($selected))
-    $selected = array($selected);
-  // FIXME: php doesn't know the difference between a string and an integer
-  if (is_string(key($values))) {
-    foreach ($values as $val=>$text) {
-      $options[] = array($val,$text,in_array($val,$selected));
-    }
-  } else {
-    foreach ($values as $val) {
-      if (is_array($val))
-        @list($val,$text) = $val;
-      else
-        $text = null;
-      $options[] = array($val,$text,in_array($val,$selected));
-    }
-  }
-  $elem = array('_elem'=>'listboxfield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
-                'id'=>$id, 'name'=>$name);
-  return array_merge($elem, $attrs);
+    if (is_null($label)) $label = $name;
+    $options = array();
+    reset($values);
+    if (is_null($selected) || $selected == '')
+        $selected = array();
+    elseif (!is_array($selected))
+        $selected = array($selected);
+    // FIXME: php doesn't know the difference between a string and an integer
+    if (is_string(key($values))) {
+        foreach ($values as $val=>$text) {
+            $options[] = array($val,$text,in_array($val,$selected));
+        }
+    } else {
+        foreach ($values as $val) {
+            if (is_array($val))
+                @list($val,$text) = $val;
+            else
+                $text = null;
+            $options[] = array($val,$text,in_array($val,$selected));
+        }
+    }
+    $elem = array('_elem'=>'listboxfield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name);
+    return array_merge($elem, $attrs);
 }
 
 /**
@@ -555,7 +575,7 @@
  * @author  Tom N Harris 
  */
 function form_tag($attrs) {
-  return '<'.$attrs['_tag'].' '.buildAttributes($attrs).'/>';
+    return '<'.$attrs['_tag'].' '.buildAttributes($attrs).'/>';
 }
 
 /**
@@ -568,7 +588,7 @@
  * @author  Tom N Harris 
  */
 function form_opentag($attrs) {
-  return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>';
+    return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>';
 }
 
 /**
@@ -581,7 +601,7 @@
  * @author  Tom N Harris 
  */
 function form_closetag($attrs) {
-  return '';
+    return '';
 }
 
 /**
@@ -594,9 +614,9 @@
  * @author  Tom N Harris 
  */
 function form_openfieldset($attrs) {
-  $s = '
';
-  if (!is_null($attrs['_legend'])) $s .= ''.$attrs['_legend'].'';
-  return $s;
+    $s = '
';
+    if (!is_null($attrs['_legend'])) $s .= ''.$attrs['_legend'].'';
+    return $s;
 }
 
 /**
@@ -608,7 +628,7 @@
  * @author  Tom N Harris 
  */
 function form_closefieldset() {
-  return '
';
+    return '
';
 }
 
 /**
@@ -621,7 +641,7 @@
  * @author  Tom N Harris 
  */
 function form_hidden($attrs) {
-  return '';
+    return '';
 }
 
 /**
@@ -634,13 +654,13 @@
  * @author  Tom N Harris 
  */
 function form_wikitext($attrs) {
-  // mandatory attributes
-  unset($attrs['name']);
-  unset($attrs['id']);
-  return '';
+    // mandatory attributes
+    unset($attrs['name']);
+    unset($attrs['id']);
+    return '';
 }
 
 /**
@@ -653,8 +673,8 @@
  * @author  Tom N Harris 
  */
 function form_button($attrs) {
-  $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
-  return '';
+    $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
+    return '';
 }
 
 /**
@@ -668,14 +688,14 @@
  * @author  Tom N Harris 
  */
 function form_field($attrs) {
-  $s = '';
-  $s .= ' ';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    $s = '';
+    $s .= ' ';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -689,14 +709,14 @@
  * @author  Tom N Harris 
  */
 function form_fieldright($attrs) {
-  $s = '';
-  $s .= ' '.$attrs['_text'].'';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    $s = '';
+    $s .= ' '.$attrs['_text'].'';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -710,16 +730,16 @@
  * @author  Tom N Harris 
  */
 function form_textfield($attrs) {
-  // mandatory attributes
-  unset($attrs['type']);
-  $s = ' ';
-  $s .= '';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = ' ';
+    $s .= '';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -733,16 +753,16 @@
  * @author  Tom N Harris 
  */
 function form_passwordfield($attrs) {
-  // mandatory attributes
-  unset($attrs['type']);
-  $s = ' ';
-  $s .= '';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = ' ';
+    $s .= '';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -758,17 +778,17 @@
  * @author  Michael Klier 
  */
 function form_filefield($attrs) {
-  $s = ' ';
-  $s .= ' ';
+    $s .= '
  */
 function form_checkboxfield($attrs) {
-  // mandatory attributes
-  unset($attrs['type']);
-  $s = '';
-  $s .= ' '.$attrs['_text'].'';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '';
+    $s .= ' '.$attrs['_text'].'';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -805,16 +825,16 @@
  * @author  Tom N Harris 
  */
 function form_radiofield($attrs) {
-  // mandatory attributes
-  unset($attrs['type']);
-  $s = '';
-  $s .= ' '.$attrs['_text'].'';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '';
+    $s .= ' '.$attrs['_text'].'';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -831,34 +851,34 @@
  * @author  Tom N Harris 
  */
 function form_menufield($attrs) {
-  $attrs['size'] = '1';
-  $s = '';
-  $s .= ' ';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    $attrs['size'] = '1';
+    $s = '';
+    $s .= ' ';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
 
 /**
@@ -874,27 +894,25 @@
  * @author  Tom N Harris 
  */
 function form_listboxfield($attrs) {
-  $s = ' ';
-  $s .= '';
-  if (preg_match('/(^| )block($| )/', $attrs['_class']))
-    $s .= '
';
-  return $s;
+    $s = ' ';
+    $s .= '';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '
';
+    return $s;
 }
diff -Naur dokuwiki-2009-02-14/inc/fulltext.php dokuwiki-rc2009-12-02/inc/fulltext.php
--- dokuwiki-2009-02-14/inc/fulltext.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/fulltext.php	2009-12-02 19:50:11.000000000 +0100
@@ -25,95 +25,92 @@
 
   return trigger_event('SEARCH_QUERY_FULLPAGE', $data, '_ft_pageSearch');
 }
-function _ft_pageSearch(&$data){
-    // split out original parameters
-    $query = $data['query'];
-    $highlight =& $data['highlight'];
-
-    $q = ft_queryParser($query);
-
-    $highlight = array();
-
-    // remember for hilighting later
-    foreach($q['words'] as $wrd){
-        $highlight[] =  str_replace('*','',$wrd);
-    }
+
+/**
+ * Returns a list of matching documents for the given query
+ *
+ * @author Andreas Gohr 
+ * @author Kazutaka Miyasaka 
+ */
+function _ft_pageSearch(&$data) {
+    // parse the given query
+    $q = ft_queryParser($data['query']);
+    $data['highlight'] = $q['highlight'];
+
+    if (empty($q['parsed_ary'])) return array();
 
     // lookup all words found in the query
-    $words  = array_merge($q['and'],$q['not']);
-    if(!count($words)) return array();
-    $result = idx_lookup($words);
-    if(!count($result)) return array();
-
-    // merge search results with query
-    foreach($q['and'] as $pos => $w){
-        $q['and'][$pos] = $result[$w];
-    }
-    // create a list of unwanted docs
-    $not = array();
-    foreach($q['not'] as $pos => $w){
-        $not = array_merge($not,array_keys($result[$w]));
-    }
-
-    // combine and-words
-    if(count($q['and']) > 1){
-        $docs = ft_resultCombine($q['and']);
-    }else{
-        $docs = $q['and'][0];
-    }
-    if(!count($docs)) return array();
-
-    // create a list of hidden pages in the result
-    $hidden = array();
-    $hidden = array_filter(array_keys($docs),'isHiddenPage');
-    $not = array_merge($not,$hidden);
-
-    // filter unmatched namespaces
-    if(!empty($q['ns'])) {
-        $pattern = implode('|^',$q['ns']);
-        foreach($docs as $key => $val) {
-            if(!preg_match('/^'.$pattern.'/',$key)) {
-                unset($docs[$key]);
-            }
-        }
-    }
+    $lookup = idx_lookup($q['words']);
 
-    // remove negative matches
-    foreach($not as $n){
-        unset($docs[$n]);
-    }
-
-    if(!count($docs)) return array();
-    // handle phrases
-    if(count($q['phrases'])){
-        $q['phrases'] = array_map('utf8_strtolower',$q['phrases']);
-        // use this for higlighting later:
-        $highlight = array_merge($highlight,$q['phrases']);
-        $q['phrases'] = array_map('preg_quote_cb',$q['phrases']);
-        // check the source of all documents for the exact phrases
-        foreach(array_keys($docs) as $id){
-            $text  = utf8_strtolower(rawWiki($id));
-            foreach($q['phrases'] as $phrase){
-                if(!preg_match('/'.$phrase.'/usi',$text)){
-                    unset($docs[$id]); // no hit - remove
-                    break;
+    // get all pages in this dokuwiki site (!: includes nonexistent pages)
+    $pages_all = array();
+    foreach (idx_getIndex('page', '') as $id) {
+        $pages_all[trim($id)] = 0; // base: 0 hit
+    }
+
+    // process the query
+    $stack = array();
+    foreach ($q['parsed_ary'] as $token) {
+        switch (substr($token, 0, 3)) {
+            case 'W+:':
+            case 'W-:':
+            case 'W_:': // word
+                $word    = substr($token, 3);
+                $stack[] = (array) $lookup[$word];
+                break;
+            case 'P+:':
+            case 'P-:': // phrase
+                $phrase = substr($token, 3);
+                // since phrases are always parsed as ((W1)(W2)...(P)),
+                // the end($stack) always points the pages that contain
+                // all words in this phrase
+                $pages  = end($stack);
+                $pages_matched = array();
+                foreach(array_keys($pages) as $id){
+                    $text = utf8_strtolower(rawWiki($id));
+                    if (strpos($text, $phrase) !== false) {
+                        $pages_matched[$id] = 0; // phrase: always 0 hit
+                    }
                 }
-            }
+                $stack[] = $pages_matched;
+                break;
+            case 'N+:':
+            case 'N-:': // namespace
+                $ns = substr($token, 3);
+                $pages_matched = array();
+                foreach (array_keys($pages_all) as $id) {
+                    if (strpos($id, $ns) === 0) {
+                        $pages_matched[$id] = 0; // namespace: always 0 hit
+                    }
+                }
+                $stack[] = $pages_matched;
+                break;
+            case 'AND': // and operation
+                list($pages1, $pages2) = array_splice($stack, -2);
+                $stack[] = ft_resultCombine(array($pages1, $pages2));
+                break;
+            case 'OR':  // or operation
+                list($pages1, $pages2) = array_splice($stack, -2);
+                $stack[] = ft_resultUnite(array($pages1, $pages2));
+                break;
+            case 'NOT': // not operation (unary)
+                $pages   = array_pop($stack);
+                $stack[] = ft_resultComplement(array($pages_all, $pages));
+                break;
         }
     }
+    $docs = array_pop($stack);
 
-    if(!count($docs)) return array();
+    if (empty($docs)) return array();
 
-    // check ACL permissions
-    foreach(array_keys($docs) as $doc){
-        if(auth_quickaclcheck($doc) < AUTH_READ){
-            unset($docs[$doc]);
+    // check: settings, acls, existence
+    foreach (array_keys($docs) as $id) {
+        if (isHiddenPage($id) || auth_quickaclcheck($id) < AUTH_READ || !page_exists($id, '', false)) {
+            unset($docs[$id]);
         }
     }
 
-    if(!count($docs)) return array();
-
-    // if there are any hits left, sort them by count
+    // sort docs by count
     arsort($docs);
 
     return $docs;
@@ -284,73 +281,96 @@
  * Creates a snippet extract
  *
  * @author Andreas Gohr 
+ * @triggers FULLTEXT_SNIPPET_CREATE
  */
 function ft_snippet($id,$highlight){
-    $text     = rawWiki($id);
-    $match = array();
-    $snippets = array();
-    $utf8_offset = $offset = $end = 0;
-    $len = utf8_strlen($text);
-
-    // build a regexp from the phrases to highlight
-    $re = join('|',array_map('preg_quote_cb',array_filter((array) $highlight)));
-
-    for ($cnt=3; $cnt--;) {
-      if (!preg_match('#('.$re.')#iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) break;
-
-      list($str,$idx) = $match[0];
-
-      // convert $idx (a byte offset) into a utf8 character offset
-      $utf8_idx = utf8_strlen(substr($text,0,$idx));
-      $utf8_len = utf8_strlen($str);
-
-      // establish context, 100 bytes surrounding the match string
-      // first look to see if we can go 100 either side,
-      // then drop to 50 adding any excess if the other side can't go to 50,
-      $pre = min($utf8_idx-$utf8_offset,100);
-      $post = min($len-$utf8_idx-$utf8_len,100);
-
-      if ($pre>50 && $post>50) {
-        $pre = $post = 50;
-      } else if ($pre>50) {
-        $pre = min($pre,100-$post);
-      } else if ($post>50) {
-        $post = min($post, 100-$pre);
-      } else {
-        // both are less than 50, means the context is the whole string
-        // make it so and break out of this loop - there is no need for the
-        // complex snippet calculations
-        $snippets = array($text);
-        break;
-      }
+    $text = rawWiki($id);
+    $evdata = array(
+                'id'        => $id,
+                'text'      => &$text,
+                'highlight' => &$highlight,
+                'snippet'   => '',
+              );
+
+    $evt = new Doku_Event('FULLTEXT_SNIPPET_CREATE',$evdata);
+    if ($evt->advise_before()) {
+        $match = array();
+        $snippets = array();
+        $utf8_offset = $offset = $end = 0;
+        $len = utf8_strlen($text);
+
+        // build a regexp from the phrases to highlight
+        $re1 = '('.join('|',array_map('preg_quote_cb',array_filter((array) $highlight))).')';
+        $re2 = "$re1.{0,75}(?!\\1)$re1";
+        $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1";
+
+        for ($cnt=4; $cnt--;) {
+          if (0) {
+          } else if (preg_match('/'.$re3.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else if (preg_match('/'.$re2.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else if (preg_match('/'.$re1.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else {
+            break;
+          }
+
+          list($str,$idx) = $match[0];
+
+          // convert $idx (a byte offset) into a utf8 character offset
+          $utf8_idx = utf8_strlen(substr($text,0,$idx));
+          $utf8_len = utf8_strlen($str);
+
+          // establish context, 100 bytes surrounding the match string
+          // first look to see if we can go 100 either side,
+          // then drop to 50 adding any excess if the other side can't go to 50,
+          $pre = min($utf8_idx-$utf8_offset,100);
+          $post = min($len-$utf8_idx-$utf8_len,100);
+
+          if ($pre>50 && $post>50) {
+            $pre = $post = 50;
+          } else if ($pre>50) {
+            $pre = min($pre,100-$post);
+          } else if ($post>50) {
+            $post = min($post, 100-$pre);
+          } else {
+            // both are less than 50, means the context is the whole string
+            // make it so and break out of this loop - there is no need for the
+            // complex snippet calculations
+            $snippets = array($text);
+            break;
+          }
+
+          // establish context start and end points, try to append to previous
+          // context if possible
+          $start = $utf8_idx - $pre;
+          $append = ($start < $end) ? $end : false;  // still the end of the previous context snippet
+          $end = $utf8_idx + $utf8_len + $post;      // now set it to the end of this context
+
+          if ($append) {
+            $snippets[count($snippets)-1] .= utf8_substr($text,$append,$end-$append);
+          } else {
+            $snippets[] = utf8_substr($text,$start,$end-$start);
+          }
+
+          // set $offset for next match attempt
+          //   substract strlen to avoid splitting a potential search success,
+          //   this is an approximation as the search pattern may match strings
+          //   of varying length and it will fail if the context snippet
+          //   boundary breaks a matching string longer than the current match
+          $utf8_offset = $utf8_idx + $post;
+          $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$post));
+          $offset = utf8_correctIdx($text,$offset);
+        }
 
-      // establish context start and end points, try to append to previous
-      // context if possible
-      $start = $utf8_idx - $pre;
-      $append = ($start < $end) ? $end : false;  // still the end of the previous context snippet
-      $end = $utf8_idx + $utf8_len + $post;      // now set it to the end of this context
-
-      if ($append) {
-        $snippets[count($snippets)-1] .= utf8_substr($text,$append,$end-$append);
-      } else {
-        $snippets[] = utf8_substr($text,$start,$end-$start);
-      }
+        $m = "\1";
+        $snippets = preg_replace('/'.$re1.'/iu',$m.'$1'.$m,$snippets);
+        $snippet = preg_replace('/'.$m.'([^'.$m.']*?)'.$m.'/iu','$1',hsc(join('... ',$snippets)));
 
-      // set $offset for next match attempt
-      //   substract strlen to avoid splitting a potential search success,
-      //   this is an approximation as the search pattern may match strings
-      //   of varying length and it will fail if the context snippet
-      //   boundary breaks a matching string longer than the current match
-      $utf8_offset = $utf8_idx + $post;
-      $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$post));
-      $offset = utf8_correctIdx($text,$offset);
+        $evdata['snippet'] = $snippet;
     }
+    $evt->advise_after();
+    unset($evt);
 
-    $m = "\1";
-    $snippets = preg_replace('#('.$re.')#iu',$m.'$1'.$m,$snippets);
-    $snippet = preg_replace('#'.$m.'([^'.$m.']*?)'.$m.'#iu','$1',hsc(join('... ',$snippets)));
-
-    return $snippet;
+    return $evdata['snippet'];
 }
 
 /**
@@ -386,60 +406,317 @@
 }
 
 /**
- * Builds an array of search words from a query
+ * Unites found documents and sum up their scores
+ *
+ * based upon ft_resultCombine() function
+ *
+ * @param array $args An array of page arrays
+ * @author Kazutaka Miyasaka 
+ */
+function ft_resultUnite($args) {
+    $array_count = count($args);
+    if ($array_count === 1) {
+        return $args[0];
+    }
+
+    $result = $args[0];
+    for ($i = 1; $i !== $array_count; $i++) {
+        foreach (array_keys($args[$i]) as $id) {
+            $result[$id] += $args[$i][$id];
+        }
+    }
+    return $result;
+}
+
+/**
+ * Computes the difference of documents using page id for comparison
+ *
+ * nearly identical to PHP5's array_diff_key()
  *
- * @todo support OR and parenthesises?
+ * @param array $args An array of page arrays
+ * @author Kazutaka Miyasaka 
+ */
+function ft_resultComplement($args) {
+    $array_count = count($args);
+    if ($array_count === 1) {
+        return $args[0];
+    }
+
+    $result = $args[0];
+    foreach (array_keys($result) as $id) {
+        for ($i = 1; $i !== $array_count; $i++) {
+            if (isset($args[$i][$id])) unset($result[$id]);
+        }
+    }
+    return $result;
+}
+
+/**
+ * Parses a search query and builds an array of search formulas
+ *
+ * @author Andreas Gohr 
+ * @author Kazutaka Miyasaka 
  */
 function ft_queryParser($query){
     global $conf;
-    $swfile   = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
-    if(@file_exists($swfile)){
-        $stopwords = file($swfile);
-    }else{
-        $stopwords = array();
+    $swfile    = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+    $stopwords = @file_exists($swfile) ? file($swfile) : array();
+
+    /**
+     * parse a search query and transform it into intermediate representation
+     *
+     * in a search query, you can use the following expressions:
+     *
+     *   words:
+     *     include
+     *     -exclude
+     *   phrases:
+     *     "phrase to be included"
+     *     -"phrase you want to exclude"
+     *   namespaces:
+     *     @include:namespace (or ns:include:namespace)
+     *     ^exclude:namespace (or -ns:exclude:namespace)
+     *   groups:
+     *     ()
+     *     -()
+     *   operators:
+     *     and ('and' is the default operator: you can always omit this)
+     *     or  (or pipe symbol '|', lower precedence than 'and')
+     *
+     * e.g. a query [ aa "bb cc" @dd:ee ] means "search pages which contain
+     *      a word 'aa', a phrase 'bb cc' and are within a namespace 'dd:ee'".
+     *      this query is equivalent to [ -(-aa or -"bb cc" or -ns:dd:ee) ]
+     *      as long as you don't mind hit counts.
+     *
+     * intermediate representation consists of the following parts:
+     *
+     *   ( )           - group
+     *   AND           - logical and
+     *   OR            - logical or
+     *   NOT           - logical not
+     *   W+:, W-:, W_: - word      (underscore: no need to highlight)
+     *   P+:, P-:      - phrase    (minus sign: logically in NOT group)
+     *   N+:, N-:      - namespace
+     */
+    $parsed_query = '';
+    $parens_level = 0;
+    $terms = preg_split('/(-?".*?")/u', utf8_strtolower($query), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+    foreach ($terms as $term) {
+        $parsed = '';
+        if (preg_match('/^(-?)"(.+)"$/u', $term, $matches)) {
+            // phrase-include and phrase-exclude
+            $not = $matches[1] ? 'NOT' : '';
+            $parsed = $not.ft_termParser($matches[2], $stopwords, false, true);
+        } else {
+            // fix incomplete phrase
+            $term = str_replace('"', ' ', $term);
+
+            // fix parentheses
+            $term = str_replace(')'  , ' ) ', $term);
+            $term = str_replace('('  , ' ( ', $term);
+            $term = str_replace('- (', ' -(', $term);
+
+            // treat pipe symbols as 'OR' operators
+            $term = str_replace('|', ' or ', $term);
+
+            // treat ideographic spaces (U+3000) as search term separators
+            // FIXME: some more separators?
+            $term = preg_replace('/[ \x{3000}]+/u', ' ',  $term);
+            $term = trim($term);
+            if ($term === '') continue;
+
+            $tokens = explode(' ', $term);
+            foreach ($tokens as $token) {
+                if ($token === '(') {
+                    // parenthesis-include-open
+                    $parsed .= '(';
+                    ++$parens_level;
+                } elseif ($token === '-(') {
+                    // parenthesis-exclude-open
+                    $parsed .= 'NOT(';
+                    ++$parens_level;
+                } elseif ($token === ')') {
+                    // parenthesis-any-close
+                    if ($parens_level === 0) continue;
+                    $parsed .= ')';
+                    $parens_level--;
+                } elseif ($token === 'and') {
+                    // logical-and (do nothing)
+                } elseif ($token === 'or') {
+                    // logical-or
+                    $parsed .= 'OR';
+                } elseif (preg_match('/^(?:\^|-ns:)(.+)$/u', $token, $matches)) {
+                    // namespace-exclude
+                    $parsed .= 'NOT(N+:'.$matches[1].')';
+                } elseif (preg_match('/^(?:@|ns:)(.+)$/u', $token, $matches)) {
+                    // namespace-include
+                    $parsed .= '(N+:'.$matches[1].')';
+                } elseif (preg_match('/^-(.+)$/', $token, $matches)) {
+                    // word-exclude
+                    $parsed .= 'NOT('.ft_termParser($matches[1], $stopwords).')';
+                } else {
+                    // word-include
+                    $parsed .= ft_termParser($token, $stopwords);
+                }
+            }
+        }
+        $parsed_query .= $parsed;
     }
 
-    $q = array();
-    $q['query']   = $query;
-    $q['ns']      = array();
-    $q['phrases'] = array();
-    $q['words']   = array();
-    $q['and']     = array();
-    $q['not']     = array();
-
-    // strip namespace from query
-    if(preg_match('/([^@]*)@(.*)/',$query,$match))  {
-        $query = $match[1];
-        $q['ns'] = explode('@',preg_replace("/ /",'',$match[2]));
-    }
-
-    // handle phrase searches
-    while(preg_match('/"(.*?)"/',$query,$match)){
-        $q['phrases'][] = $match[1];
-        $q['and'] = array_merge($q['and'], idx_tokenizer($match[0],$stopwords));
-        $query = preg_replace('/"(.*?)"/','',$query,1);
-    }
-
-    $words = explode(' ',$query);
-    foreach($words as $w){
-        if($w{0} == '-'){
-            $token = idx_tokenizer($w,$stopwords,true);
-            if(count($token)) $q['not'] = array_merge($q['not'],$token);
-        }else{
-            // asian "words" need to be searched as phrases
-            if(@preg_match_all('/(('.IDX_ASIAN.')+)/u',$w,$matches)){
-                $q['phrases'] = array_merge($q['phrases'],$matches[1]);
+    // cleanup (very sensitive)
+    $parsed_query .= str_repeat(')', $parens_level);
+    do {
+        $parsed_query_old = $parsed_query;
+        $parsed_query = preg_replace('/(NOT)?\(\)/u', '', $parsed_query);
+    } while ($parsed_query !== $parsed_query_old);
+    $parsed_query = preg_replace('/(NOT|OR)+\)/u', ')'      , $parsed_query);
+    $parsed_query = preg_replace('/(OR)+/u'      , 'OR'     , $parsed_query);
+    $parsed_query = preg_replace('/\(OR/u'       , '('      , $parsed_query);
+    $parsed_query = preg_replace('/^OR|OR$/u'    , ''       , $parsed_query);
+    $parsed_query = preg_replace('/\)(NOT)?\(/u' , ')AND$1(', $parsed_query);
+
+    // adjustment: make highlightings right
+    $parens_level     = 0;
+    $notgrp_levels    = array();
+    $parsed_query_new = '';
+    $tokens = preg_split('/(NOT\(|[()])/u', $parsed_query, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+    foreach ($tokens as $token) {
+        if ($token === 'NOT(') {
+            $notgrp_levels[] = ++$parens_level;
+        } elseif ($token === '(') {
+            ++$parens_level;
+        } elseif ($token === ')') {
+            if ($parens_level-- === end($notgrp_levels)) array_pop($notgrp_levels);
+        } elseif (count($notgrp_levels) % 2 === 1) {
+            // turn highlight-flag off if terms are logically in "NOT" group
+            $token = preg_replace('/([WPN])\+\:/u', '$1-:', $token);
+        }
+        $parsed_query_new .= $token;
+    }
+    $parsed_query = $parsed_query_new;
 
+    /**
+     * convert infix notation string into postfix (Reverse Polish notation) array
+     * by Shunting-yard algorithm
+     *
+     * see: http://en.wikipedia.org/wiki/Reverse_Polish_notation
+     * see: http://en.wikipedia.org/wiki/Shunting-yard_algorithm
+     */
+    $parsed_ary     = array();
+    $ope_stack      = array();
+    $ope_precedence = array(')' => 1, 'OR' => 2, 'AND' => 3, 'NOT' => 4, '(' => 5);
+    $ope_regex      = '/([()]|OR|AND|NOT)/u';
+
+    $tokens = preg_split($ope_regex, $parsed_query, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+    foreach ($tokens as $token) {
+        if (preg_match($ope_regex, $token)) {
+            // operator
+            $last_ope = end($ope_stack);
+            while ($ope_precedence[$token] <= $ope_precedence[$last_ope] && $last_ope != '(') {
+                $parsed_ary[] = array_pop($ope_stack);
+                $last_ope = end($ope_stack);
             }
-            $token = idx_tokenizer($w,$stopwords,true);
-            if(count($token)){
-                $q['and']   = array_merge($q['and'],$token);
-                $q['words'] = array_merge($q['words'],$token);
+            if ($token == ')') {
+                array_pop($ope_stack); // this array_pop always deletes '('
+            } else {
+                $ope_stack[] = $token;
             }
+        } else {
+            // operand
+            $token_decoded = str_replace(array('OP', 'CP'), array('(', ')'), $token);
+            $parsed_ary[] = $token_decoded;
+        }
+    }
+    $parsed_ary = array_values(array_merge($parsed_ary, array_reverse($ope_stack)));
+
+    // cleanup: each double "NOT" in RPN array actually does nothing
+    $parsed_ary_count = count($parsed_ary);
+    for ($i = 1; $i < $parsed_ary_count; ++$i) {
+        if ($parsed_ary[$i] === 'NOT' && $parsed_ary[$i - 1] === 'NOT') {
+            unset($parsed_ary[$i], $parsed_ary[$i - 1]);
         }
     }
+    $parsed_ary = array_values($parsed_ary);
+
+    // build return value
+    $q = array();
+    $q['query']      = $query;
+    $q['parsed_str'] = $parsed_query;
+    $q['parsed_ary'] = $parsed_ary;
+
+    foreach ($q['parsed_ary'] as $token) {
+        if ($token[2] !== ':') continue;
+        $body = substr($token, 3);
+
+        switch (substr($token, 0, 3)) {
+            case 'N+:':
+                $q['ns'][]        = $body; // for backward compatibility
+                break;
+            case 'N-:':
+                $q['notns'][]     = $body; // for backward compatibility
+                break;
+            case 'W_:':
+                $q['words'][]     = $body;
+                break;
+            case 'W-:':
+                $q['words'][]     = $body;
+                $q['not'][]       = $body; // for backward compatibility
+                break;
+            case 'W+:':
+                $q['words'][]     = $body;
+                $q['highlight'][] = str_replace('*', '', $body);
+                $q['and'][]       = $body; // for backward compatibility
+                break;
+            case 'P-:':
+                $q['phrases'][]   = $body;
+                break;
+            case 'P+:':
+                $q['phrases'][]   = $body;
+                $q['highlight'][] = str_replace('*', '', $body);
+                break;
+        }
+    }
+    foreach (array('words', 'phrases', 'highlight', 'ns', 'notns', 'and', 'not') as $key) {
+        $q[$key] = empty($q[$key]) ? array() : array_values(array_unique($q[$key]));
+    }
 
     return $q;
 }
 
+/**
+ * Transforms given search term into intermediate representation
+ *
+ * This function is used in ft_queryParser() and not for general purpose use.
+ *
+ * @author Kazutaka Miyasaka 
+ */
+function ft_termParser($term, &$stopwords, $consider_asian = true, $phrase_mode = false) {
+    $parsed = '';
+    if ($consider_asian) {
+        // successive asian characters need to be searched as a phrase
+        $words = preg_split('/('.IDX_ASIAN.'+)/u', $term, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($words as $word) {
+            if (preg_match('/'.IDX_ASIAN.'/u', $word)) $phrase_mode = true;
+            $parsed .= ft_termParser($word, $stopwords, false, $phrase_mode);
+        }
+    } else {
+        $term_noparen = str_replace(array('(', ')'), ' ', $term);
+        $words = idx_tokenizer($term_noparen, $stopwords, true);
+
+        // W_: no need to highlight
+        if (empty($words)) {
+            $parsed = '()'; // important: do not remove
+        } elseif ($words[0] === $term) {
+            $parsed = '(W+:'.$words[0].')';
+        } elseif ($phrase_mode) {
+            $term_encoded = str_replace(array('(', ')'), array('OP', 'CP'), $term);
+            $parsed = '((W_:'.implode(')(W_:', $words).')(P+:'.$term_encoded.'))';
+        } else {
+            $parsed = '((W+:'.implode(')(W+:', $words).'))';
+        }
+    }
+    return $parsed;
+}
+
 //Setup VIM: ex: et ts=4 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/geshi/abap.php dokuwiki-rc2009-12-02/inc/geshi/abap.php
--- dokuwiki-2009-02-14/inc/geshi/abap.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/abap.php	2009-12-02 19:50:11.000000000 +0100
@@ -3,19 +3,67 @@
  * abap.php
  * --------
  * Author: Andres Picazo (andres@andrespicazo.com)
+ * Contributors:
+ *  - Sandra Rossi (sandra.rossi@gmail.com)
+ *  - Jacob Laursen (jlu@kmd.dk)
  * Copyright: (c) 2007 Andres Picazo
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * ABAP language file for GeSHi.
  *
+ * Reference abap language documentation (abap 7.1) : http://help.sap.com/abapdocu/en/ABENABAP_INDEX.htm
+ *
+ * ABAP syntax is highly complex, several problems could not be addressed, see TODO below if you dare ;-)
+ * Be aware that in ABAP language, keywords may be composed of several tokens,
+ *    separated by one or more spaces or carriage returns
+ *    (for example CONCATENATE 'hello' 'world' INTO string SEPARATED  BY ' ')
+ *    it's why we must decode them with REGEXPS. As there are many keywords with several tokens,
+ *    I had to create a separate section in the code to simplify the reading.
+ * Be aware that some words may be highlighted several times like for "ref to data", which is first
+ *    highlighted for "ref to data", then secondly for "ref to". It is very important to
+ *    position "ref to" after "ref to data" otherwise "data" wouldn't be highlighted because
+ *    of the previous highlight.
+ * Control, declarative and other statements are assigned URLs to sap documentation website:
+ *    http://help.sap.com/abapdocu/en/ABAP.htm
+ *
  * CHANGES
  * -------
+ * 2009/02/25 (1.0.8.3)
+ *   -  Some more rework of the language file
+ * 2009/01/04 (1.0.8.2)
+ *   -  Major Release, more than 1000 statements and keywords added = whole abap 7.1 (Sandra Rossi)
  * 2007/06/27 (1.0.0)
  *   -  First Release
  *
  * TODO
  * ----
+ *   - in DATA data TYPE type, 2nd "data" and 2nd "type" are highlighted with data
+ *     style, but should be ignored. Same problem for all words!!! This is quite impossible to
+ *     solve it as we should define syntaxes of all statements (huge effort!) and use a lex
+ *     or something like that instead of regexp I guess.
+ *   - Some words are considered as being statement names (report, tables, etc.) though they
+ *     are used as keyword in some statements. For example: FORM xxxx TABLES itab. It was
+ *     arbitrary decided to define them as statement instead of keyword, because it may be
+ *     useful to have the URL to SAP help for some of them.
+ *   - if a comment is between 2 words of a keyword (for example SEPARATED "comment \n BY),
+ *     it is not considered as a keyword, but it should!
+ *   - for statements like "READ DATASET", GeSHi does not allow to set URLs because these
+ *     statements are determined by REGEXPS. For "READ DATASET", the URL should be
+ *     ABAPREAD_DATASET.htm. If a technical solution is found, be careful : URLs
+ *     are sometimes not valid because the URL does not exist. For example, for "AT NEW"
+ *     statement, the URL should be ABAPAT_ITAB.htm (not ABAPAT_NEW.htm).
+ *     There are many other exceptions.
+ *     Note: for adding this functionality within your php program, you can execute this code:
+ *       function add_urls_to_multi_tokens( $matches ) {
+ *           $url = preg_replace( "/[ \n]+/" , "_" , $matches[3] );
+ *           if( $url == $matches[3] ) return $matches[0] ;
+ *           else return $matches[1]."".$matches[3]."".$matches[4];
+ *           }
+ *       $html = $geshi->parse_code();
+ *       $html = preg_replace_callback( "£(zzz:(control|statement|data);\">)(.+?)()£s", "add_urls_to_multi_tokens", $html );
+ *       echo $html;
+ *   - Numbers followed by a dot terminating the statement are not properly recognized
  *
  *************************************************************************************
  *
@@ -37,39 +85,1232 @@
  *
  ************************************************************************************/
 
-$language_data = array (
+$language_data = array(
     'LANG_NAME' => 'ABAP',
-    'COMMENT_SINGLE' => array(1 => '"', 2 => '*'),
+    'COMMENT_SINGLE' => array(
+        1 => '"'
+        ),
     'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // lines beginning with star at 1st position are comments
+        // (star anywhere else is not a comment, especially be careful with
+        // "assign dref->* to " statement)
+        2 => '/^\*.*?$/m'
+        ),
     'CASE_KEYWORDS' => 0,
-    'QUOTEMARKS' => array("'"),
+    'QUOTEMARKS' => array(
+        1 => "'",
+        2 => "`"
+        ),
     'ESCAPE_CHAR' => '',
+
     'KEYWORDS' => array(
-        1 => array(
-            'if', 'return', 'while', 'case', 'default',
-            'do', 'else', 'for', 'endif', 'elseif', 'eq',
-            'not', 'and'
+        //***********************************************
+        // Section 2 : process sequences of several tokens
+        //***********************************************
+
+        7 => array(
+            'at new',
+            'at end of',
+            'at first',
+            'at last',
+            'loop at',
+            'loop at screen',
             ),
-        2 => array(
-            'data', 'types', 'seletion-screen', 'parameters', 'field-symbols', 'extern', 'inline'
+
+        8 => array(
+            'private section',
+            'protected section',
+            'public section',
+            'at line-selection',
+            'at selection-screen',
+            'at user-command',
+            'assign component',
+            'assign table field',
+            'call badi',
+            'call customer-function',
+            'call customer subscreen',
+            'call dialog',
+            'call function',
+            'call method',
+            'call screen',
+            'call selection-screen',
+            'call transaction',
+            'call transformation',
+            'close cursor',
+            'close dataset',
+            'commit work',
+            'convert date',
+            'convert text',
+            'convert time stamp',
+            'create data',
+            'create object',
+            'delete dataset',
+            'delete from',
+            'describe distance',
+            'describe field',
+            'describe list',
+            'describe table',
+            'exec sql',
+            'exit from sql',
+            'exit from step-loop',
+            'export dynpro',
+            'export nametab',
+            'free memory',
+            'generate subroutine-pool',
+            'get badi',
+            'get bit',
+            'get cursor',
+            'get dataset',
+            'get locale',
+            'get parameter',
+            'get pf-status',
+            'get property',
+            'get reference',
+            'get run time',
+            'get time',
+            'get time stamp',
+            'import directory',
+            'insert report',
+            'insert text-pool',
+            'leave list-processing',
+            'leave program',
+            'leave screen',
+            'leave to list-processing',
+            'leave to transaction',
+            'modify line',
+            'modify screen',
+            'move percentage',
+            'open cursor',
+            'open dataset',
+            'raise event',
+            'raise exception',
+            'read dataset',
+            'read line',
+            'read report',
+            'read table',
+            'read textpool',
+            'receive results from function',
+            'refresh control',
+            'rollback work',
+            'set bit',
+            'set blank lines',
+            'set country',
+            'set cursor',
+            'set dataset',
+            'set extended check',
+            'set handler',
+            'set hold data',
+            'set language',
+            'set left scroll-boundary',
+            'set locale',
+            'set margin',
+            'set parameter',
+            'set pf-status',
+            'set property',
+            'set run time analyzer',
+            'set run time clock',
+            'set screen',
+            'set titlebar',
+            'set update task',
+            'set user-command',
+            'suppress dialog',
+            'truncate dataset',
+            'wait until',
+            'wait up to',
             ),
+
+        9 => array(
+            'accepting duplicate keys',
+            'accepting padding',
+            'accepting truncation',
+            'according to',
+            'actual length',
+            'adjacent duplicates',
+            'after input',
+            'all blob columns',
+            'all clob columns',
+            'all fields',
+            'all methods',
+            'all other columns',
+            'and mark',
+            'and return to screen',
+            'and return',
+            'and skip first screen',
+            'and wait',
+            'any table',
+            'appendage type',
+            'archive mode',
+            'archiving parameters',
+            'area handle',
+            'as checkbox',
+            'as icon',
+            'as line',
+            'as listbox',
+            'as person table',
+            'as search patterns',
+            'as separate unit',
+            'as subscreen',
+            'as symbol',
+            'as text',
+            'as window',
+            'at cursor-selection',
+            'at exit-command',
+            'at next application statement',
+            'at position',
+
+            'backup into',
+            'before output',
+            'before unwind',
+            'begin of block',
+            'begin of common part',
+            'begin of line',
+            'begin of screen',
+            'begin of tabbed block',
+            'begin of version',
+            'begin of',
+            'big endian',
+            'binary mode',
+            'binary search',
+            'by kernel module',
+            'bypassing buffer',
+
+            'client specified',
+            'code page',
+            'code page hint',
+            'code page into',
+            'color black',
+            'color blue',
+            'color green',
+            'color pink',
+            'color red',
+            'color yellow',
+            'compression off',
+            'compression on',
+            'connect to',
+            'corresponding fields of table',
+            'corresponding fields of',
+            'cover page',
+            'cover text',
+            'create package',
+            'create private',
+            'create protected',
+            'create public',
+            'current position',
+
+            'data buffer',
+            'data values',
+            'dataset expiration',
+            'daylight saving time',
+            'default key',
+            'default program',
+            'default screen',
+            'defining database',
+            'deleting leading',
+            'deleting trailing',
+            'directory entry',
+            'display like',
+            'display offset',
+            'during line-selection',
+            'dynamic selections',
+
+            'edit mask',
+            'end of block',
+            'end of common part',
+            'end of file',
+            'end of line',
+            'end of screen',
+            'end of tabbed block',
+            'end of version',
+            'end of',
+            'endian into',
+            'ending at',
+            'enhancement options into',
+            'enhancement into',
+            'environment time format',
+            'execute procedure',
+            'exporting list to memory',
+            'extension type',
+
+            'field format',
+            'field selection',
+            'field value into',
+            'final methods',
+            'first occurrence of',
+            'fixed-point arithmetic',
+            'for all entries',
+            'for all instances',
+            'for appending',
+            'for columns',
+            'for event of',
+            'for field',
+            'for high',
+            'for input',
+            'for lines',
+            'for low',
+            'for node',
+            'for output',
+            'for select',
+            'for table',
+            'for testing',
+            'for update',
+            'for user',
+            'frame entry',
+            'frame program from',
+            'from code page',
+            'from context',
+            'from database',
+            'from logfile id',
+            'from number format',
+            'from screen',
+            'from table',
+            'function key',
+
+            'get connection',
+            'global friends',
+            'group by',
+
+            'hashed table of',
+            'hashed table',
+
+            'if found',
+            'ignoring case',
+            'ignoring conversion errors',
+            'ignoring structure boundaries',
+            'implementations from',
+            'in background',
+            'in background task',
+            'in background unit',
+            'in binary mode',
+            'in byte mode',
+            'in char-to-hex mode',
+            'in character mode',
+            'in group',
+            'in legacy binary mode',
+            'in legacy text mode',
+            'in program',
+            'in remote task',
+            'in text mode',
+            'in table',
+            'in update task',
+            'include bound',
+            'include into',
+            'include program from',
+            'include structure',
+            'include type',
+            'including gaps',
+            'index table',
+            'inheriting from',
+            'init destination',
+            'initial line of',
+            'initial line',
+            'initial size',
+            'internal table',
+            'into sortable code',
+
+            'keep in spool',
+            'keeping directory entry',
+            'keeping logical unit of work',
+            'keeping task',
+            'keywords from',
+
+            'left margin',
+            'left outer',
+            'levels into',
+            'line format',
+            'line into',
+            'line of',
+            'line page',
+            'line value from',
+            'line value into',
+            'lines of',
+            'list authority',
+            'list dataset',
+            'list name',
+            'little endian',
+            'lob handle for',
+            'local friends',
+            'locator for',
+            'lower case',
+
+            'main table field',
+            'match count',
+            'match length',
+            'match line',
+            'match offset',
+            'matchcode object',
+            'maximum length',
+            'maximum width into',
+            'memory id',
+            'message into',
+            'messages into',
+            'modif id',
+
+            'nesting level',
+            'new list identification',
+            'next cursor',
+            'no database selection',
+            'no dialog',
+            'no end of line',
+            'no fields',
+            'no flush',
+            'no intervals',
+            'no intervals off',
+            'no standard page heading',
+            'no-extension off',
+            'non-unique key',
+            'non-unique sorted key',
+            'not at end of mode',
+            'number of lines',
+            'number of pages',
+
+            'object key',
+            'obligatory off',
+            'of current page',
+            'of page',
+            'of program',
+            'offset into',
+            'on block',
+            'on commit',
+            'on end of task',
+            'on end of',
+            'on exit-command',
+            'on help-request for',
+            'on radiobutton group',
+            'on rollback',
+            'on value-request for',
+            'open for package',
+            'option class-coding',
+            'option class',
+            'option coding',
+            'option expand',
+            'option syncpoints',
+            'options from',
+            'order by',
+            'overflow into',
+
+            'package section',
+            'package size',
+            'preferred parameter',
+            'preserving identifier escaping',
+            'primary key',
+            'print off',
+            'print on',
+            'program from',
+            'program type',
+
+            'radiobutton groups',
+            'radiobutton group',
+            'range of',
+            'reader for',
+            'receive buffer',
+            'reduced functionality',
+            'ref to data',
+            'ref to object',
+            'ref to',
+
+            'reference into',
+            'renaming with suffix',
+            'replacement character',
+            'replacement count',
+            'replacement length',
+            'replacement line',
+            'replacement offset',
+            'respecting blanks',
+            'respecting case',
+            'result into',
+            'risk level',
+
+            'sap cover page',
+            'search fkeq',
+            'search fkge',
+            'search gkeq',
+            'search gkge',
+            'section of',
+            'send buffer',
+            'separated by',
+            'shared buffer',
+            'shared memory',
+            'shared memory enabled',
+            'skipping byte-order mark',
+            'sorted by',
+            'sorted table of',
+            'sorted table',
+            'spool parameters',
+            'standard table of',
+            'standard table',
+            'starting at',
+            'starting new task',
+            'statements into',
+            'structure default',
+            'structures into',
+
+            'table field',
+            'table of',
+            'text mode',
+            'time stamp',
+            'time zone',
+            'to code page',
+            'to column',
+            'to context',
+            'to first page',
+            'to last page',
+            'to last line',
+            'to line',
+            'to lower case',
+            'to number format',
+            'to page',
+            'to sap spool',
+            'to upper case',
+            'tokens into',
+            'transporting no fields',
+            'type tableview',
+            'type tabstrip',
+
+            'unicode enabling',
+            'up to',
+            'upper case',
+            'using edit mask',
+            'using key',
+            'using no edit mask',
+            'using screen',
+            'using selection-screen',
+            'using selection-set',
+            'using selection-sets of program',
+
+            'valid between',
+            'valid from',
+            'value check',
+            'via job',
+            'via selection-screen',
+            'visible length',
+
+            'whenever found',
+            'with analysis',
+            'with byte-order mark',
+            'with comments',
+            'with current switchstates',
+            'with explicit enhancements',
+            'with frame',
+            'with free selections',
+            'with further secondary keys',
+            'with header line',
+            'with hold',
+            'with implicit enhancements',
+            'with inactive enhancements',
+            'with includes',
+            'with key',
+            'with linefeed',
+            'with list tokenization',
+            'with native linefeed',
+            'with non-unique key',
+            'with null',
+            'with pragmas',
+            'with precompiled headers',
+            'with selection-table',
+            'with smart linefeed',
+            'with table key',
+            'with test code',
+            'with type-pools',
+            'with unique key',
+            'with unix linefeed',
+            'with windows linefeed',
+            'without further secondary keys',
+            'without selection-screen',
+            'without spool dynpro',
+            'without trmac',
+            'word into',
+            'writer for'
+            ),
+
+        //**********************************************************
+        // Other abap statements
+        //**********************************************************
         3 => array(
-            'report', 'write', 'append', 'select', 'endselect', 'call method', 'call function',
-            'loop', 'endloop', 'raise', 'read table', 'concatenate', 'split', 'shift',
-            'condense', 'describe', 'clear', 'endfunction', 'assign', 'create data', 'translate',
-            'continue', 'start-of-selection', 'at selection-screen', 'modify', 'call screen',
-            'create object', 'perform', 'form', 'endform',
-            'reuse_alv_block_list_init', 'zbcialv', 'include'
+            'add',
+            'add-corresponding',
+            'aliases',
+            'append',
+            'assign',
+            'at',
+            'authority-check',
+
+            'break-point',
+
+            'clear',
+            'collect',
+            'compute',
+            'concatenate',
+            'condense',
+            'class',
+            'class-events',
+            'class-methods',
+            'class-pool',
+
+            'define',
+            'delete',
+            'demand',
+            'detail',
+            'divide',
+            'divide-corresponding',
+
+            'editor-call',
+            'end-of-file',
+            'end-enhancement-section',
+            'end-of-definition',
+            'end-of-page',
+            'end-of-selection',
+            'endclass',
+            'endenhancement',
+            'endexec',
+            'endform',
+            'endfunction',
+            'endinterface',
+            'endmethod',
+            'endmodule',
+            'endon',
+            'endprovide',
+            'endselect',
+            'enhancement',
+            'enhancement-point',
+            'enhancement-section',
+            'export',
+            'extract',
+            'events',
+
+            'fetch',
+            'field-groups',
+            'find',
+            'format',
+            'form',
+            'free',
+            'function-pool',
+            'function',
+
+            'get',
+
+            'hide',
+
+            'import',
+            'infotypes',
+            'input',
+            'insert',
+            'include',
+            'initialization',
+            'interface',
+            'interface-pool',
+            'interfaces',
+
+            'leave',
+            'load-of-program',
+            'log-point',
+
+            'maximum',
+            'message',
+            'methods',
+            'method',
+            'minimum',
+            'modify',
+            'move',
+            'move-corresponding',
+            'multiply',
+            'multiply-corresponding',
+
+            'new-line',
+            'new-page',
+            'new-section',
+
+            'overlay',
+
+            'pack',
+            'perform',
+            'position',
+            'print-control',
+            'program',
+            'provide',
+            'put',
+
+            'raise',
+            'refresh',
+            'reject',
+            'replace',
+            'report',
+            'reserve',
+
+            'scroll',
+            'search',
+            'select',
+            'selection-screen',
+            'shift',
+            'skip',
+            'sort',
+            'split',
+            'start-of-selection',
+            'submit',
+            'subtract',
+            'subtract-corresponding',
+            'sum',
+            'summary',
+            'summing',
+            'supply',
+            'syntax-check',
+
+            'top-of-page',
+            'transfer',
+            'translate',
+            'type-pool',
+
+            'uline',
+            'unpack',
+            'update',
+
+            'window',
+            'write'
+
             ),
+
+        //**********************************************************
+        // keywords
+        //**********************************************************
+
         4 => array(
-            'type ref to', 'type', 'begin of',  'end of', 'like', 'into',
-            'from', 'where', 'order by', 'with key', 'string', 'separated by',
-            'exporting', 'importing', 'to upper case', 'to', 'exceptions', 'tables',
-            'using', 'changing'
+            'abbreviated',
+            'abstract',
+            'accept',
+            'acos',
+            'activation',
+            'alias',
+            'align',
+            'all',
+            'allocate',
+            'and',
+            'assigned',
+            'any',
+            'appending',
+            'area',
+            'as',
+            'ascending',
+            'asin',
+            'assigning',
+            'atan',
+            'attributes',
+            'avg',
+
+            'backward',
+            'between',
+            'bit-and',
+            'bit-not',
+            'bit-or',
+            'bit-set',
+            'bit-xor',
+            'boolc',
+            'boolx',
+            'bound',
+            'bt',
+            'blocks',
+            'bounds',
+            'boxed',
+            'by',
+            'byte-ca',
+            'byte-cn',
+            'byte-co',
+            'byte-cs',
+            'byte-na',
+            'byte-ns',
+
+            'ca',
+            'calling',
+            'casting',
+            'ceil',
+            'center',
+            'centered',
+            'changing',
+            'char_off',
+            'charlen',
+            'circular',
+            'class_constructor',
+            'client',
+            'clike',
+            'close',
+            'cmax',
+            'cmin',
+            'cn',
+            'cnt',
+            'co',
+            'col_background',
+            'col_group',
+            'col_heading',
+            'col_key',
+            'col_negative',
+            'col_normal',
+            'col_positive',
+            'col_total',
+            'color',
+            'column',
+            'comment',
+            'comparing',
+            'components',
+            'condition',
+            'context',
+            'copies',
+            'count',
+            'country',
+            'cpi',
+            'creating',
+            'critical',
+            'concat_lines_of',
+            'cos',
+            'cosh',
+            'count_any_not_of',
+            'count_any_of',
+            'cp',
+            'cs',
+            'csequence',
+            'currency',
+            'current',
+            'cx_static_check',
+            'cx_root',
+            'cx_dynamic_check',
+
+            'dangerous',
+            'database',
+            'datainfo',
+            'date',
+            'dbmaxlen',
+            'dd/mm/yy',
+            'dd/mm/yyyy',
+            'ddmmyy',
+            'deallocate',
+            'decfloat',
+            'decfloat16',
+            'decfloat34',
+            'decimals',
+            'default',
+            'deferred',
+            'definition',
+            'department',
+            'descending',
+            'destination',
+            'disconnect',
+            'display-mode',
+            'distance',
+            'distinct',
+            'div',
+            'dummy',
+
+            'encoding',
+            'end-lines',
+            'engineering',
+            'environment',
+            'eq',
+            'equiv',
+            'error_message',
+            'errormessage',
+            'escape',
+            'exact',
+            'exception-table',
+            'exceptions',
+            'exclude',
+            'excluding',
+            'exists',
+            'exp',
+            'exponent',
+            'exporting',
+            'extended_monetary',
+
+            'field',
+            'filter-table',
+            'filters',
+            'filter',
+            'final',
+            'find_any_not_of',
+            'find_any_of',
+            'find_end',
+            'floor',
+            'first-line',
+            'font',
+            'forward',
+            'for',
+            'frac',
+            'from_mixed',
+            'friends',
+            'from',
+
+            'giving',
+            'ge',
+            'gt',
+
+            'handle',
+            'harmless',
+            'having',
+            'head-lines',
+            'help-id',
+            'help-request',
+            'high',
+            'hold',
+            'hotspot',
+
+            'id',
+            'ids',
+            'immediately',
+            'implementation',
+            'importing',
+            'in',
+            'initial',
+            'incl',
+            'including',
+            'increment',
+            'index',
+            'index-line',
+            'inner',
+            'inout',
+            'intensified',
+            'into',
+            'inverse',
+            'is',
+            'iso',
+
+            'join',
+
+            'key',
+            'kind',
+
+            'log10',
+            'language',
+            'late',
+            'layout',
+            'le',
+            'lt',
+            'left-justified',
+            'leftplus',
+            'leftspace',
+            'left',
+            'length',
+            'level',
+            'like',
+            'line-count',
+            'line-size',
+            'lines',
+            'line',
+            'load',
+            'long',
+            'lower',
+            'low',
+            'lpi',
+
+            'matches',
+            'match',
+            'mail',
+            'major-id',
+            'max',
+            'medium',
+            'memory',
+            'message-id',
+            'module',
+            'minor-id',
+            'min',
+            'mm/dd/yyyy',
+            'mm/dd/yy',
+            'mmddyy',
+            'mode',
+            'modifier',
+            'mod',
+            'monetary',
+
+            'name',
+            'nb',
+            'ne',
+            'next',
+            'no-display',
+            'no-extension',
+            'no-gap',
+            'no-gaps',
+            'no-grouping',
+            'no-heading',
+            'no-scrolling',
+            'no-sign',
+            'no-title',
+            'no-topofpage',
+            'no-zero',
+            'nodes',
+            'non-unicode',
+            'no',
+            'number',
+            'nmax',
+            'nmin',
+            'not',
+            'null',
+            'numeric',
+            'numofchar',
+
+            'o',
+            'objects',
+            'obligatory',
+            'occurs',
+            'offset',
+            'off',
+            'of',
+            'only',
+            'open',
+            'option',
+            'optional',
+            'options',
+            'output-length',
+            'output',
+            'out',
+            'on change of',
+            'or',
+            'others',
+
+            'pad',
+            'page',
+            'pages',
+            'parameter-table',
+            'part',
+            'performing',
+            'pos_high',
+            'pos_low',
+            'priority',
+            'public',
+            'pushbutton',
+
+            'queue-only',
+            'quickinfo',
+
+            'raising',
+            'range',
+            'read-only',
+            'received',
+            'receiver',
+            'receiving',
+            'redefinition',
+            'reference',
+            'regex',
+            'replacing',
+            'reset',
+            'responsible',
+            'result',
+            'results',
+            'resumable',
+            'returncode',
+            'returning',
+            'right',
+            'right-specified',
+            'rightplus',
+            'rightspace',
+            'round',
+            'rows',
+            'repeat',
+            'requested',
+            'rescale',
+            'reverse',
+
+            'scale_preserving',
+            'scale_preserving_scientific',
+            'scientific',
+            'scientific_with_leading_zero',
+            'screen',
+            'scrolling',
+            'seconds',
+            'segment',
+            'shift_left',
+            'shift_right',
+            'sign',
+            'simple',
+            'sin',
+            'sinh',
+            'short',
+            'shortdump-id',
+            'sign_as_postfix',
+            'single',
+            'size',
+            'some',
+            'source',
+            'space',
+            'spots',
+            'stable',
+            'state',
+            'static',
+            'statusinfo',
+            'sqrt',
+            'string',
+            'strlen',
+            'structure',
+            'style',
+            'subkey',
+            'submatches',
+            'substring',
+            'substring_after',
+            'substring_before',
+            'substring_from',
+            'substring_to',
+            'super',
+            'supplied',
+            'switch',
+
+            'tan',
+            'tanh',
+            'table_line',
+            'table',
+            'tab',
+            'then',
+            'timestamp',
+            'times',
+            'time',
+            'timezone',
+            'title-lines',
+            'title',
+            'top-lines',
+            'to',
+            'to_lower',
+            'to_mixed',
+            'to_upper',
+            'trace-file',
+            'trace-table',
+            'transporting',
+            'trunc',
+            'type',
+
+            'under',
+            'unique',
+            'unit',
+            'user-command',
+            'using',
+            'utf-8',
+
+            'valid',
+            'value',
+            'value-request',
+            'values',
+            'vary',
+            'varying',
+            'version',
+
+            'warning',
+            'where',
+            'width',
+            'with',
+            'word',
+            'with-heading',
+            'with-title',
+
+            'xsequence',
+            'xstring',
+            'xstrlen',
+
+            'yes',
+            'yymmdd',
+
+            'z',
+            'zero'
+
+            ),
+
+        //**********************************************************
+        // screen statements
+        //**********************************************************
+
+        5 => array(
+            'call subscreen',
+            'chain',
+            'endchain',
+            'on chain-input',
+            'on chain-request',
+            'on help-request',
+            'on input',
+            'on request',
+            'on value-request',
+            'process'
+            ),
+
+        //**********************************************************
+        // internal statements
+        //**********************************************************
+
+        6 => array(
+            'generate dynpro',
+            'generate report',
+            'import dynpro',
+            'import nametab',
+            'include methods',
+            'load report',
+            'scan abap-source',
+            'scan and check abap-source',
+            'syntax-check for dynpro',
+            'syntax-check for program',
+            'syntax-trace',
+            'system-call',
+            'system-exit',
+            'verification-message'
+            ),
+
+        //**********************************************************
+        // Control statements
+        //**********************************************************
+
+        1 => array(
+            'assert',
+            'case',
+            'catch',
+            'check',
+            'cleanup',
+            'continue',
+            'do',
+            'else',
+            'elseif',
+            'endat',
+            'endcase',
+            'endcatch',
+            'endif',
+            'enddo',
+            'endloop',
+            'endtry',
+            'endwhile',
+            'exit',
+            'if',
+            'loop',
+            'resume',
+            'retry',
+            'return',
+            'stop',
+            'try',
+            'when',
+            'while'
+
             ),
+
+        //**********************************************************
+        // variable declaration statements
+        //**********************************************************
+
+        2 => array(
+            'class-data',
+            'controls',
+            'constants',
+            'data',
+            'field-symbols',
+            'fields',
+            'local',
+            'parameters',
+            'ranges',
+            'select-options',
+            'statics',
+            'tables',
+            'type-pools',
+            'types'
+            )
         ),
     'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        0 => array(
+            '->*', '->', '=>',
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', '.'
+            ),
+        1 => array(
+            '>=', '<=', '<', '>', '='
+            ),
+        2 => array(
+            '?='
+            )
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -77,13 +1318,23 @@
         2 => false,
         3 => false,
         4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;',
-            4 => 'color: #993333;'
+            1 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;', //control statements
+            2 => 'color: #cc4050; text-transform: uppercase; font-weight: bold; zzz:data;', //data statements
+            3 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;', //first token of other statements
+            4 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
+            5 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            6 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            7 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            8 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            9 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;'
             ),
         'COMMENTS' => array(
             1 => 'color: #808080; font-style: italic;',
@@ -94,20 +1345,22 @@
             0 => 'color: #000099; font-weight: bold;'
             ),
         'BRACKETS' => array(
-            0 => 'color: #66cc66;'
+            0 => 'color: #808080;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #4da619;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
+            0 => 'color: #3399ff;'
             ),
         'METHODS' => array(
             1 => 'color: #202020;',
             2 => 'color: #202020;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
+            0 => 'color: #808080;',
+            1 => 'color: #800080;',
+            2 => 'color: #0000ff;'
             ),
         'REGEXPS' => array(
             ),
@@ -115,15 +1368,20 @@
             )
         ),
     'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => 'http://sap4.com/wiki/index.php?title={FNAMEL}',
-        4 => ''
+        1 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        2 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        3 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
-        1 => '.',
-        2 => '::'
+        1 => '->',
+        2 => '=>'
         ),
     'REGEXPS' => array(
         ),
@@ -131,7 +1389,21 @@
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
-        )
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            7 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            8 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            9 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        ),
+    'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/actionscript3.php dokuwiki-rc2009-12-02/inc/geshi/actionscript3.php
--- dokuwiki-2009-02-14/inc/geshi/actionscript3.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/actionscript3.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Jordi Boggiano (j.boggiano@seld.be)
  * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/11/26
  *
  * ActionScript3 language file for GeSHi.
@@ -58,6 +58,10 @@
     'LANG_NAME' => 'ActionScript 3',
     'COMMENT_SINGLE' => array(1 => '//'),
     'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '\\',
@@ -67,7 +71,8 @@
             'throw', 'this', 'switch', 'super', 'set', 'return', 'public', 'protected',
             'private', 'null', 'new', 'is', 'internal', 'instanceof', 'in',
             'import', 'if', 'get', 'for', 'false', 'else', 'each', 'do',
-            'delete', 'default', 'continue', 'catch', 'case', 'break', 'as'
+            'delete', 'default', 'continue', 'catch', 'case', 'break', 'as',
+            'extends'
             ),
         2 => array(
             'var'
@@ -78,54 +83,6 @@
         4 => array(
             'class', 'package'
             ),
-        5 => array(
-            'uint', 'int', 'arguments', 'XMLSocket', 'XMLNodeType', 'XMLNode',
-            'XMLList', 'XMLDocument', 'XML', 'Video', 'VerifyError',
-            'URLVariables', 'URLStream', 'URLRequestMethod', 'URLRequestHeader',
-            'URLRequest', 'URLLoaderDataFormat', 'URLLoader', 'URIError',
-            'TypeError', 'Transform', 'TimerEvent', 'Timer', 'TextSnapshot',
-            'TextRenderer', 'TextLineMetrics', 'TextFormatAlign', 'TextFormat',
-            'TextFieldType', 'TextFieldAutoSize', 'TextField', 'TextEvent',
-            'TextDisplayMode', 'TextColorType', 'System', 'SyntaxError',
-            'SyncEvent', 'StyleSheet', 'String', 'StatusEvent', 'StaticText',
-            'StageScaleMode', 'StageQuality', 'StageAlign', 'Stage',
-            'StackOverflowError', 'Sprite', 'SpreadMethod', 'SoundTransform',
-            'SoundMixer', 'SoundLoaderContext', 'SoundChannel', 'Sound',
-            'Socket', 'SimpleButton', 'SharedObjectFlushStatus', 'SharedObject',
-            'Shape', 'SecurityPanel', 'SecurityErrorEvent', 'SecurityError',
-            'SecurityDomain', 'Security', 'ScriptTimeoutError', 'Scene',
-            'SWFVersion', 'Responder', 'RegExp', 'ReferenceError', 'Rectangle',
-            'RangeError', 'QName', 'Proxy', 'ProgressEvent',
-            'PrintJobOrientation', 'PrintJobOptions', 'PrintJob', 'Point',
-            'PixelSnapping', 'ObjectEncoding', 'Object', 'Number', 'NetStream',
-            'NetStatusEvent', 'NetConnection', 'Namespace', 'MovieClip',
-            'MouseEvent', 'Mouse', 'MorphShape', 'Microphone', 'MemoryError',
-            'Matrix', 'Math', 'LocalConnection', 'LoaderInfo', 'LoaderContext',
-            'Loader', 'LineScaleMode', 'KeyboardEvent', 'Keyboard',
-            'KeyLocation', 'JointStyle', 'InvalidSWFError',
-            'InterpolationMethod', 'InteractiveObject', 'IllegalOperationError',
-            'IOErrorEvent', 'IOError', 'IMEEvent', 'IMEConversionMode', 'IME',
-            'IExternalizable', 'IEventDispatcher', 'IDynamicPropertyWriter',
-            'IDynamicPropertyOutput', 'IDataOutput', 'IDataInput', 'ID3Info',
-            'IBitmapDrawable', 'HTTPStatusEvent', 'GridFitType', 'Graphics',
-            'GradientType', 'GradientGlowFilter', 'GradientBevelFilter',
-            'GlowFilter', 'Function', 'FrameLabel', 'FontType', 'FontStyle',
-            'Font', 'FocusEvent', 'FileReferenceList', 'FileReference',
-            'FileFilter', 'ExternalInterface', 'EventPhase', 'EventDispatcher',
-            'Event', 'EvalError', 'ErrorEvent', 'Error', 'Endian', 'EOFError',
-            'DropShadowFilter', 'DisplayObjectContainer', 'DisplayObject',
-            'DisplacementMapFilterMode', 'DisplacementMapFilter', 'Dictionary',
-            'DefinitionError', 'Date', 'DataEvent', 'ConvolutionFilter',
-            'ContextMenuItem', 'ContextMenuEvent', 'ContextMenuBuiltInItems',
-            'ContextMenu', 'ColorTransform', 'ColorMatrixFilter', 'Class',
-            'CapsStyle', 'Capabilities', 'Camera', 'CSMSettings', 'ByteArray',
-            'Boolean', 'BlurFilter', 'BlendMode', 'BitmapFilterType',
-            'BitmapFilterQuality', 'BitmapFilter', 'BitmapDataChannel',
-            'BitmapData', 'Bitmap', 'BevelFilter', 'AsyncErrorEvent', 'Array',
-            'ArgumentError', 'ApplicationDomain', 'AntiAliasType',
-            'ActivityEvent', 'ActionScriptVersion', 'AccessibilityProperties',
-            'Accessibility', 'AVM1Movie'
-            ),
         6 => array(
             'flash.xml', 'flash.utils', 'flash.ui', 'flash.text',
             'flash.system', 'flash.profiler', 'flash.printing', 'flash.net',
@@ -384,10 +341,61 @@
             'AMF0', 'ALWAYS', 'ALPHANUMERIC_HALF', 'ALPHANUMERIC_FULL', 'ALPHA',
             'ADVANCED', 'ADDED_TO_STAGE', 'ADDED', 'ADD', 'ACTIVITY',
             'ACTIONSCRIPT3', 'ACTIONSCRIPT2'
+            ),
+        //FIX: Must be last in order to avoid conflicts with keywords present
+        //in other keyword groups, that might get highlighted as part of the URL.
+        //I know this is not a proper work-around, but should do just fine.
+        5 => array(
+            'uint', 'int', 'arguments', 'XMLSocket', 'XMLNodeType', 'XMLNode',
+            'XMLList', 'XMLDocument', 'XML', 'Video', 'VerifyError',
+            'URLVariables', 'URLStream', 'URLRequestMethod', 'URLRequestHeader',
+            'URLRequest', 'URLLoaderDataFormat', 'URLLoader', 'URIError',
+            'TypeError', 'Transform', 'TimerEvent', 'Timer', 'TextSnapshot',
+            'TextRenderer', 'TextLineMetrics', 'TextFormatAlign', 'TextFormat',
+            'TextFieldType', 'TextFieldAutoSize', 'TextField', 'TextEvent',
+            'TextDisplayMode', 'TextColorType', 'System', 'SyntaxError',
+            'SyncEvent', 'StyleSheet', 'String', 'StatusEvent', 'StaticText',
+            'StageScaleMode', 'StageQuality', 'StageAlign', 'Stage',
+            'StackOverflowError', 'Sprite', 'SpreadMethod', 'SoundTransform',
+            'SoundMixer', 'SoundLoaderContext', 'SoundChannel', 'Sound',
+            'Socket', 'SimpleButton', 'SharedObjectFlushStatus', 'SharedObject',
+            'Shape', 'SecurityPanel', 'SecurityErrorEvent', 'SecurityError',
+            'SecurityDomain', 'Security', 'ScriptTimeoutError', 'Scene',
+            'SWFVersion', 'Responder', 'RegExp', 'ReferenceError', 'Rectangle',
+            'RangeError', 'QName', 'Proxy', 'ProgressEvent',
+            'PrintJobOrientation', 'PrintJobOptions', 'PrintJob', 'Point',
+            'PixelSnapping', 'ObjectEncoding', 'Object', 'Number', 'NetStream',
+            'NetStatusEvent', 'NetConnection', 'Namespace', 'MovieClip',
+            'MouseEvent', 'Mouse', 'MorphShape', 'Microphone', 'MemoryError',
+            'Matrix', 'Math', 'LocalConnection', 'LoaderInfo', 'LoaderContext',
+            'Loader', 'LineScaleMode', 'KeyboardEvent', 'Keyboard',
+            'KeyLocation', 'JointStyle', 'InvalidSWFError',
+            'InterpolationMethod', 'InteractiveObject', 'IllegalOperationError',
+            'IOErrorEvent', 'IOError', 'IMEEvent', 'IMEConversionMode', 'IME',
+            'IExternalizable', 'IEventDispatcher', 'IDynamicPropertyWriter',
+            'IDynamicPropertyOutput', 'IDataOutput', 'IDataInput', 'ID3Info',
+            'IBitmapDrawable', 'HTTPStatusEvent', 'GridFitType', 'Graphics',
+            'GradientType', 'GradientGlowFilter', 'GradientBevelFilter',
+            'GlowFilter', 'Function', 'FrameLabel', 'FontType', 'FontStyle',
+            'Font', 'FocusEvent', 'FileReferenceList', 'FileReference',
+            'FileFilter', 'ExternalInterface', 'EventPhase', 'EventDispatcher',
+            'Event', 'EvalError', 'ErrorEvent', 'Error', 'Endian', 'EOFError',
+            'DropShadowFilter', 'DisplayObjectContainer', 'DisplayObject',
+            'DisplacementMapFilterMode', 'DisplacementMapFilter', 'Dictionary',
+            'DefinitionError', 'Date', 'DataEvent', 'ConvolutionFilter',
+            'ContextMenuItem', 'ContextMenuEvent', 'ContextMenuBuiltInItems',
+            'ContextMenu', 'ColorTransform', 'ColorMatrixFilter', 'Class',
+            'CapsStyle', 'Capabilities', 'Camera', 'CSMSettings', 'ByteArray',
+            'Boolean', 'BlurFilter', 'BlendMode', 'BitmapFilterType',
+            'BitmapFilterQuality', 'BitmapFilter', 'BitmapDataChannel',
+            'BitmapData', 'Bitmap', 'BevelFilter', 'AsyncErrorEvent', 'Array',
+            'ArgumentError', 'ApplicationDomain', 'AntiAliasType',
+            'ActivityEvent', 'ActionScriptVersion', 'AccessibilityProperties',
+            'Accessibility', 'AVM1Movie'
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>', '^', '-', '+', '~', '?', ':'
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>', '^', '-', '+', '~', '?', ':', ';', '.', ','
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -412,7 +420,8 @@
             8 => 'color: #004993;'
             ),
         'COMMENTS' => array(
-            1 => 'color: #009900;',
+            1 => 'color: #009900; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
             'MULTI' => 'color: #3f5fbf;'
             ),
         'ESCAPE_CHAR' => array(
@@ -431,7 +440,7 @@
             0 => 'color: #000000;',
             ),
         'SYMBOLS' => array(
-            0 => 'color: #000000; font-weight: bold;'
+            0 => 'color: #000066; font-weight: bold;'
             ),
         'REGEXPS' => array(
             ),
@@ -443,7 +452,7 @@
         2 => '',
         3 => '',
         4 => '',
-        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html&filter=0&num=100&btnI=lucky',
+        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html',
         6 => '',
         7 => '',
         8 => ''
diff -Naur dokuwiki-2009-02-14/inc/geshi/actionscript.php dokuwiki-rc2009-12-02/inc/geshi/actionscript.php
--- dokuwiki-2009-02-14/inc/geshi/actionscript.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/actionscript.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Steffen Krause (Steffen.krause@muse.de)
  * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/20
  *
  * Actionscript language file for GeSHi.
@@ -48,7 +48,7 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            '#include', 'for', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
+            '#include', 'for', 'foreach', 'each', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
             'endwhile', 'endif', 'switch', 'case', 'endswitch', 'return', 'break', 'continue', 'in'
             ),
         2 => array(
@@ -194,4 +194,4 @@
     'HIGHLIGHT_STRICT_BLOCK' => array()
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/ada.php dokuwiki-rc2009-12-02/inc/geshi/ada.php
--- dokuwiki-2009-02-14/inc/geshi/ada.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/ada.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/29
  *
  * Ada language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/apache.php dokuwiki-rc2009-12-02/inc/geshi/apache.php
--- dokuwiki-2009-02-14/inc/geshi/apache.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/apache.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/29/07
  *
  * Apache language file for GeSHi.
@@ -57,81 +57,355 @@
     'KEYWORDS' => array(
         /*keywords*/
         1 => array(
-            'accessconfig','accessfilename','action','addalt',
-            'addaltbyencoding','addaltbytype','addcharset',
-            'adddefaultcharset','adddescription',
-            'addencoding','addhandler','addicon','addiconbyencoding',
-            'addiconbytype','addlanguage','addmodule','addmoduleinfo',
-            'addtype','agentlog','alias','aliasmatch',
-            'allow','allowconnect','allowoverride','anonymous',
-            'anonymous_authoritative','anonymous_logemail','anonymous_mustgiveemail',
-            'anonymous_nouserid','anonymous_verifyemail','authauthoritative',
-            'authdbauthoritative','authdbgroupfile','authdbmauthoritative',
-            'authdbmgroupfile','authdbuserfile','authdbmuserfile',
-            'authdigestfile','authgroupfile','authname','authtype',
-            'authuserfile','bindaddress','browsermatch','browsermatchnocase',
-            'bs2000account','cachedefaultexpire','cachedirlength','cachedirlevels',
-            'cacheforcecompletion','cachegcinterval','cachelastmodifiedfactor','cachemaxexpire',
-            'cachenegotiateddocs','cacheroot','cachesize','checkspelling',
-            'clearmodulelist','contentdigest','cookieexpires','cookielog',
-            'cookietracking','coredumpdirectory','customlog',
-            'defaulticon','defaultlanguage','defaulttype','define',
-            'deny','directory','directorymatch','directoryindex',
-            'documentroot','errordocument','errorlog','example',
-            'expiresactive','expiresbytype','expiresdefault','extendedstatus',
-            'fancyindexing','files','filesmatch','forcetype',
-            'group','header','headername','hostnamelookups',
-            'identitycheck','ifdefine','ifmodule','imapbase',
-            'imapdefault','imapmenu','include','indexignore','indexorderdefault',
-            'indexoptions','keepalive','keepalivetimeout','languagepriority',
-            'limit','limitexcept','limitrequestbody','limitrequestfields',
-            'limitrequestfieldsize','limitrequestline','listen','listenbacklog',
-            'loadfile','loadmodule','location','locationmatch',
-            'lockfile','logformat','loglevel','maxclients',
-            'maxkeepaliverequests','maxrequestsperchild','maxspareservers','metadir',
-            'metafiles','metasuffix','mimemagicfile','minspareservers',
-            'mmapfile','namevirtualhost','nocache','options','order',
-            'passenv','php_admin_value','php_admin_flag','php_value','pidfile','port','proxyblock','proxydomain',
-            'proxypass','proxypassreverse','proxyreceivebuffersize','proxyremote',
-            'proxyrequests','proxyvia','qsc','readmename',
-            'redirect','redirectmatch','redirectpermanent','redirecttemp',
-            'refererignore','refererlog','removehandler','require',
-            'resourceconfig','rewritebase','rewritecond','rewriteengine',
-            'rewritelock','rewritelog','rewriteloglevel','rewritemap',
-            'rewriteoptions','rewriterule','rlimitcpu','rlimitmem',
-            'rlimitnproc','satisfy','scoreboardfile','script',
-            'scriptalias','scriptaliasmatch','scriptinterpretersource','scriptlog',
-            'scriptlogbuffer','scriptloglength','sendbuffersize',
-            'serveradmin','serveralias','servername','serverpath',
-            'serverroot','serversignature','servertokens','servertype',
-            'setenv','setenvif','setenvifnocase','sethandler',
-            'singlelisten','startservers','threadsperchild','timeout',
-            'transferlog','typesconfig','unsetenv','usecanonicalname',
-            'user','userdir','virtualhost','virtualdocumentroot',
-            'virtualdocumentrootip','virtualscriptalias','virtualscriptaliasip',
-            'xbithack','from','all'
+            //core.c
+            'AcceptFilter','AcceptPathInfo','AccessConfig','AccessFileName',
+            'AddDefaultCharset','AddOutputFilterByType','AllowEncodedSlashes',
+            'AllowOverride','AuthName','AuthType','ContentDigest',
+            'CoreDumpDirectory','DefaultType','DocumentRoot','EnableMMAP',
+            'EnableSendfile','ErrorDocument','ErrorLog','FileETag','ForceType',
+            'HostnameLookups','Include','LimitInternalRecursion',
+            'LimitRequestBody','LimitRequestFields','LimitRequestFieldsize',
+            'LimitRequestLine','LimitXMLRequestBody','LogLevel','MaxMemFree',
+            'MaxRequestsPerChild','NameVirtualHost','Options','PidFile','Port',
+            'Protocol','Require','RLimitCPU','RLimitMEM','RLimitNPROC',
+            'Satisfy','ScoreBoardFile','ServerAdmin','ServerAlias','ServerName',
+            'ServerPath','ServerRoot','ServerSignature','ServerTokens',
+            'SetHandler','SetInputFilter','SetOutputFilter','ThreadStackSize',
+            'Timeout','TraceEnable','UseCanonicalName',
+            'UseCanonicalPhysicalPort',
+
+            //http_core.c
+            'KeepAlive','KeepAliveTimeout','MaxKeepAliveRequests',
+
+            //mod_actions.c
+            'Action','Script',
+
+            //mod_alias.c
+            'Alias','AliasMatch','Redirect','RedirectMatch','RedirectPermanent',
+            'RedirectTemp','ScriptAlias','ScriptAliasMatch',
+
+            //mod_asis.c
+
+            //mod_auth_basic.c
+            'AuthBasicAuthoritative','AuthBasicProvider',
+
+            //mod_auth_digest.c
+            'AuthDigestAlgorithm','AuthDigestDomain','AuthDigestNcCheck',
+            'AuthDigestNonceFormat','AuthDigestNonceLifetime',
+            'AuthDigestProvider','AuthDigestQop','AuthDigestShmemSize',
+
+            //mod_authn_alias.c
+
+            //mod_authn_anon.c
+            'Anonymous','Anonymous_LogEmail','Anonymous_MustGiveEmail',
+            'Anonymous_NoUserId','Anonymous_VerifyEmail',
+
+            //mod_authn_dbd.c
+            'AuthDBDUserPWQuery','AuthDBDUserRealmQuery',
+
+            //mod_authn_dbm.c
+            'AuthDBMType','AuthDBMUserFile',
+
+            //mod_authn_default.c
+            'AuthDefaultAuthoritative',
+
+            //mod_authn_file.c
+            'AuthUserFile',
+
+            //mod_authnz_ldap.c
+            'AuthLDAPBindDN','AuthLDAPBindPassword','AuthLDAPCharsetConfig',
+            'AuthLDAPCompareDNOnServer','AuthLDAPDereferenceAliases',
+            'AuthLDAPGroupAttribute','AuthLDAPGroupAttributeIsDN',
+            'AuthLDAPRemoteUserAttribute','AuthLDAPRemoteUserIsDN',
+            'AuthLDAPURL','AuthzLDAPAuthoritative',
+
+            //mod_authz_dbm.c
+            'AuthDBMGroupFile','AuthzDBMAuthoritative','AuthzDBMType',
+
+            //mod_authz_default.c
+            'AuthzDefaultAuthoritative',
+
+            //mod_authz_groupfile.c
+            'AuthGroupFile','AuthzGroupFileAuthoritative',
+
+            //mod_authz_host.c
+            'Allow','Deny','Order',
+
+            //mod_authz_owner.c
+            'AuthzOwnerAuthoritative',
+
+            //mod_authz_svn.c
+            'AuthzForceUsernameCase','AuthzSVNAccessFile','AuthzSVNAnonymous',
+            'AuthzSVNAuthoritative','AuthzSVNNoAuthWhenAnonymousAllowed',
+
+            //mod_authz_user.c
+            'AuthzUserAuthoritative',
+
+            //mod_autoindex.c
+            'AddAlt','AddAltByEncoding','AddAltByType','AddDescription',
+            'AddIcon','AddIconByEncoding','AddIconByType','DefaultIcon',
+            'FancyIndexing','HeaderName','IndexHeadInsert','IndexIgnore',
+            'IndexOptions','IndexOrderDefault','IndexStyleSheet','ReadmeName',
+
+            //mod_bt.c
+            'Tracker','TrackerDetailURL','TrackerFlags','TrackerHashMaxAge',
+            'TrackerHashMinAge','TrackerHashWatermark','TrackerHome',
+            'TrackerReturnInterval','TrackerReturnMax',
+            'TrackerReturnPeerFactor','TrackerReturnPeers','TrackerRootInclude',
+            'TrackerStyleSheet',
+
+            //mod_bw.c
+            'BandWidth','BandWidthError','BandWidthModule','BandWidthPacket',
+            'ForceBandWidthModule','LargeFileLimit','MaxConnection',
+            'MinBandWidth',
+
+            //mod_cache.c
+            'CacheDefaultExpire','CacheDisable','CacheEnable',
+            'CacheIgnoreCacheControl','CacheIgnoreHeaders',
+            'CacheIgnoreNoLastMod','CacheIgnoreQueryString',
+            'CacheLastModifiedFactor','CacheMaxExpire','CacheStoreNoStore',
+            'CacheStorePrivate',
+
+            //mod_cern_meta.c
+            'MetaDir','MetaFiles','MetaSuffix',
+
+            //mod_cgi.c
+            'ScriptLog','ScriptLogBuffer','ScriptLogLength',
+
+            //mod_charset_lite.c
+            'CharsetDefault','CharsetOptions','CharsetSourceEnc',
+
+            //mod_dav.c
+            'DAV','DAVDepthInfinity','DAVMinTimeout',
+
+            //mod_dav_fs.c
+            'DAVLockDB',
+
+            //mod_dav_lock.c
+            'DAVGenericLockDB',
+
+            //mod_dav_svn.c
+            'SVNActivitiesDB','SVNAllowBulkUpdates','SVNAutoversioning',
+            'SVNIndexXSLT','SVNListParentPath','SVNMasterURI','SVNParentPath',
+            'SVNPath','SVNPathAuthz','SVNReposName','SVNSpecialURI',
+
+            //mod_dbd.c
+            'DBDExptime','DBDKeep','DBDMax','DBDMin','DBDParams','DBDPersist',
+            'DBDPrepareSQL','DBDriver',
+
+            //mod_deflate.c
+            'DeflateBufferSize','DeflateCompressionLevel','DeflateFilterNote',
+            'DeflateMemLevel','DeflateWindowSize',
+
+            //mod_dir.c
+            'DirectoryIndex','DirectorySlash',
+
+            //mod_disk_cache.c
+            'CacheDirLength','CacheDirLevels','CacheMaxFileSize',
+            'CacheMinFileSize','CacheRoot',
+
+            //mod_dumpio.c
+            'DumpIOInput','DumpIOLogLevel','DumpIOOutput',
+
+            //mod_env.c
+            'PassEnv','SetEnv','UnsetEnv',
+
+            //mod_expires.c
+            'ExpiresActive','ExpiresByType','ExpiresDefault',
+
+            //mod_ext_filter.c
+            'ExtFilterDefine','ExtFilterOptions',
+
+            //mod_file_cache.c
+            'cachefile','mmapfile',
+
+            //mod_filter.c
+            'FilterChain','FilterDeclare','FilterProtocol','FilterProvider',
+            'FilterTrace',
+
+            //mod_gnutls.c
+            'GnuTLSCache','GnuTLSCacheTimeout','GnuTLSCertificateFile',
+            'GnuTLSKeyFile','GnuTLSPGPCertificateFile','GnuTLSPGPKeyFile',
+            'GnuTLSClientVerify','GnuTLSClientCAFile','GnuTLSPGPKeyringFile',
+            'GnuTLSEnable','GnuTLSDHFile','GnuTLSRSAFile','GnuTLSSRPPasswdFile',
+            'GnuTLSSRPPasswdConfFile','GnuTLSPriorities',
+            'GnuTLSExportCertificates',
+
+            //mod_headers.c
+            'Header','RequestHeader',
+
+            //mod_imagemap.c
+            'ImapBase','ImapDefault','ImapMenu',
+
+            //mod_include.c
+            'SSIAccessEnable','SSIEndTag','SSIErrorMsg','SSIStartTag',
+            'SSITimeFormat','SSIUndefinedEcho','XBitHack',
+
+            //mod_ident.c
+            'IdentityCheck','IdentityCheckTimeout',
+
+            //mod_info.c
+            'AddModuleInfo',
+
+            //mod_isapi.c
+            'ISAPIAppendLogToErrors','ISAPIAppendLogToQuery','ISAPICacheFile',
+            'ISAPIFakeAsync','ISAPILogNotSupported','ISAPIReadAheadBuffer',
+
+            //mod_log_config.c
+            'BufferedLogs','CookieLog','CustomLog','LogFormat','TransferLog',
+
+            //mod_log_forensic.c
+            'ForensicLog',
+
+            //mod_log_rotate.c
+            'RotateInterval','RotateLogs','RotateLogsLocalTime',
+
+            //mod_logio.c
+
+            //mod_mem_cache.c
+            'MCacheMaxObjectCount','MCacheMaxObjectSize',
+            'MCacheMaxStreamingBuffer','MCacheMinObjectSize',
+            'MCacheRemovalAlgorithm','MCacheSize',
+
+            //mod_mime.c
+            'AddCharset','AddEncoding','AddHandler','AddInputFilter',
+            'AddLanguage','AddOutputFilter','AddType','DefaultLanguage',
+            'ModMimeUsePathInfo','MultiviewsMatch','RemoveCharset',
+            'RemoveEncoding','RemoveHandler','RemoveInputFilter',
+            'RemoveLanguage','RemoveOutputFilter','RemoveType','TypesConfig',
+
+            //mod_mime_magic.c
+            'MimeMagicFile',
+
+            //mod_negotiation.c
+            'CacheNegotiatedDocs','ForceLanguagePriority','LanguagePriority',
+
+            //mod_php5.c
+            'php_admin_flag','php_admin_value','php_flag','php_value',
+            'PHPINIDir',
+
+            //mod_proxy.c
+            'AllowCONNECT','BalancerMember','NoProxy','ProxyBadHeader',
+            'ProxyBlock','ProxyDomain','ProxyErrorOverride',
+            'ProxyFtpDirCharset','ProxyIOBufferSize','ProxyMaxForwards',
+            'ProxyPass','ProxyPassInterpolateEnv','ProxyPassMatch',
+            'ProxyPassReverse','ProxyPassReverseCookieDomain',
+            'ProxyPassReverseCookiePath','ProxyPreserveHost',
+            'ProxyReceiveBufferSize','ProxyRemote','ProxyRemoteMatch',
+            'ProxyRequests','ProxySet','ProxyStatus','ProxyTimeout','ProxyVia',
+
+            //mod_proxy_ajp.c
+
+            //mod_proxy_balancer.c
+
+            //mod_proxy_connect.c
+
+            //mod_proxy_ftp.c
+
+            //mod_proxy_http.c
+
+            //mod_rewrite.c
+            'RewriteBase','RewriteCond','RewriteEngine','RewriteLock',
+            'RewriteLog','RewriteLogLevel','RewriteMap','RewriteOptions',
+            'RewriteRule',
+
+            //mod_setenvif.c
+            'BrowserMatch','BrowserMatchNoCase','SetEnvIf','SetEnvIfNoCase',
+
+            //mod_so.c
+            'LoadFile','LoadModule',
+
+            //mod_speling.c
+            'CheckCaseOnly','CheckSpelling',
+
+            //mod_ssl.c
+            'SSLCACertificateFile','SSLCACertificatePath','SSLCADNRequestFile',
+            'SSLCADNRequestPath','SSLCARevocationFile','SSLCARevocationPath',
+            'SSLCertificateChainFile','SSLCertificateFile',
+            'SSLCertificateKeyFile','SSLCipherSuite','SSLCryptoDevice',
+            'SSLEngine','SSLHonorCipherOrder','SSLMutex','SSLOptions',
+            'SSLPassPhraseDialog','SSLProtocol','SSLProxyCACertificateFile',
+            'SSLProxyCACertificatePath','SSLProxyCARevocationFile',
+            'SSLProxyCARevocationPath','SSLProxyCipherSuite','SSLProxyEngine',
+            'SSLProxyMachineCertificateFile','SSLProxyMachineCertificatePath',
+            'SSLProxyProtocol','SSLProxyVerify','SSLProxyVerifyDepth',
+            'SSLRandomSeed','SSLRenegBufferSize','SSLRequire','SSLRequireSSL',
+            'SSLSessionCache','SSLSessionCacheTimeout','SSLUserName',
+            'SSLVerifyClient','SSLVerifyDepth',
+
+            //mod_status.c
+            'ExtendedStatus','SeeRequestTail',
+
+            //mod_substitute.c
+            'Substitute',
+
+            //mod_suexec.c
+            'SuexecUserGroup',
+
+            //mod_unique_id.c
+
+            //mod_userdir.c
+            'UserDir',
+
+            //mod_usertrack.c
+            'CookieDomain','CookieExpires','CookieName','CookieStyle',
+            'CookieTracking',
+
+            //mod_version.c
+
+            //mod_vhost_alias.c
+            'VirtualDocumentRoot','VirtualDocumentRootIP',
+            'VirtualScriptAlias','VirtualScriptAliasIP',
+
+            //mod_view.c
+            'ViewEnable',
+
+            //mod_win32.c
+            'ScriptInterpreterSource',
+
+            //mpm_winnt.c
+            'Listen','ListenBacklog','ReceiveBufferSize','SendBufferSize',
+            'ThreadLimit','ThreadsPerChild','Win32DisableAcceptEx',
+
+            //mpm_common.c
+            'AcceptMutex','AddModule','ClearModuleList','EnableExceptionHook',
+            'Group','LockFile','MaxClients','MaxSpareServers','MaxSpareThreads',
+            'MinSpareServers','MinSpareThreads','ServerLimit','StartServers',
+            'StartThreads','User',
+
+            //util_ldap.c
+            'LDAPCacheEntries','LDAPCacheTTL','LDAPConnectionTimeout',
+            'LDAPOpCacheEntries','LDAPOpCacheTTL','LDAPSharedCacheFile',
+            'LDAPSharedCacheSize','LDAPTrustedClientCert',
+            'LDAPTrustedGlobalCert','LDAPTrustedMode','LDAPVerifyServerCert',
+
+            //Unknown Mods ...
+            'AgentLog','BindAddress','bs2000account','CacheForceCompletion',
+            'CacheGCInterval','CacheSize','NoCache','qsc','RefererIgnore',
+            'RefererLog','Resourceconfig','ServerType','SingleListen'
             ),
         /*keywords 2*/
         2 => array(
-            'on','off','standalone','inetd','indexes',
+            'all','on','off','standalone','inetd','indexes',
             'force-response-1.0','downgrade-1.0','nokeepalive',
-            'ndexes','includes','followsymlinks','none',
+            'includes','followsymlinks','none',
             'x-compress','x-gzip'
         ),
         /*keywords 3*/
         3 => array(
-            'Directory',
-            'DirectoryMatch',
-            'Files',
-            'FilesMatch',
-            'IfDefine',
-            'IfModule',
-            'IfVersion',
-            'Location',
-            'LocationMatch',
-            'Proxy',
-            'ProxyMatch',
-            'VirtualHost'
+            //core.c
+            'Directory','DirectoryMatch','Files','FilesMatch','IfDefine',
+            'IfModule','Limit','LimitExcept','Location','LocationMatch',
+            'VirtualHost',
+
+            //mod_authn_alias.c
+            'AuthnProviderAlias',
+
+            //mod_proxy.c
+            'Proxy','ProxyMatch',
+
+            //mod_version.c
+            'IfVersion'
         )
     ),
     'SYMBOLS' => array(
@@ -203,4 +477,4 @@
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/applescript.php dokuwiki-rc2009-12-02/inc/geshi/applescript.php
--- dokuwiki-2009-02-14/inc/geshi/applescript.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/applescript.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Stephan Klimek (http://www.initware.org)
  * Copyright: Stephan Klimek (http://www.initware.org)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/07/20
  *
  * AppleScript language file for GeSHi.
@@ -51,27 +51,33 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'script','property','prop','end','to','set','global','local','on','of',
-            'in','given','with','without','return','continue','tell','if','then','else','repeat',
-            'times','while','until','from','exit','try','error','considering','ignoring','timeout',
-            'transaction','my','get','put','into','is'
+            'application','close','count','delete','duplicate','exists','launch','make','move','open',
+            'print','quit','reopen','run','save','saving', 'idle', 'path to', 'number', 'alias', 'list', 'text', 'string',
+            'integer', 'it','me','version','pi','result','space','tab','anything','case','diacriticals','expansion',
+            'hyphens','punctuation','bold','condensed','expanded','hidden','italic','outline','plain',
+            'shadow','strikethrough','subscript','superscript','underline','ask','no','yes','false', 'id',
+            'true','weekday','monday','mon','tuesday','tue','wednesday','wed','thursday','thu','friday',
+            'fri','saturday','sat','sunday','sun','month','january','jan','february','feb','march',
+            'mar','april','apr','may','june','jun','july','jul','august','aug','september', 'quote', 'do JavaScript',
+            'sep','october','oct','november','nov','december','dec','minutes','hours', 'name', 'default answer',
+            'days','weeks', 'folder', 'folders', 'file', 'files', 'window', 'eject', 'disk', 'reveal', 'sleep',
+            'shut down', 'restart', 'display dialog', 'buttons', 'invisibles', 'item', 'items', 'delimiters', 'offset of',
+            'AppleScript\'s', 'choose file', 'choose folder', 'choose from list', 'beep', 'contents', 'do shell script',
+            'paragraph', 'paragraphs', 'missing value', 'quoted form', 'desktop', 'POSIX path', 'POSIX file',
+            'activate', 'document', 'adding', 'receiving', 'content', 'new', 'properties', 'info for', 'bounds',
+            'selection', 'extension', 'into', 'onto', 'by', 'between', 'against', 'set the clipboard to', 'the clipboard'
             ),
         2 => array(
-            'each','some','every','whose','where','id','index','first','second','third','fourth',
+            'each','some','every','whose','where','index','first','second','third','fourth',
             'fifth','sixth','seventh','eighth','ninth','tenth','last','front','back','st','nd',
-            'rd','th','middle','named','through','thru','before','after','beginning','the'
+            'rd','th','middle','named','through','thru','before','after','beginning','the', 'as',
+            'div','mod','and','not','or','contains','equal','equals','isnt', 'less', 'greater'
             ),
         3 => array(
-            'close','copy','count','delete','duplicate','exists','launch','make','move','open',
-            'print','quit','reopen','run','save','saving',
-            'it','me','version','pi','result','space','tab','anything','case','diacriticals','expansion',
-            'hyphens','punctuation','bold','condensed','expanded','hidden','italic','outline','plain',
-            'shadow','strikethrough','subscript','superscript','underline','ask','no','yes','false',
-            'true','weekday','monday','mon','tuesday','tue','wednesday','wed','thursday','thu','friday',
-            'fri','saturday','sat','sunday','sun','month','january','jan','february','feb','march',
-            'mar','april','apr','may','june','jun','july','jul','august','aug','september',
-            'sep','october','oct','november','nov','december','dec','minutes','hours',
-            'days','weeks','div','mod','and','not','or','as','contains','equal','equals','isnt'
+            'script','property','prop','end','to','set','global','local','on','of',
+            'in','given','with','without','return','continue','tell','if','then','else','repeat',
+            'times','while','until','from','exit','try','error','considering','ignoring','timeout',
+            'transaction','my','get','put','is', 'copy'
             )
         ),
     'SYMBOLS' => array(
@@ -85,9 +91,9 @@
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #b1b100;',
-            2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #000066;'
+            1 => 'color: #0066ff;',
+            2 => 'color: #ff0033;',
+            3 => 'color: #ff0033; font-weight: bold;'
             ),
         'COMMENTS' => array(
             1 => 'color: #808080; font-style: italic;',
@@ -96,27 +102,27 @@
             'MULTI' => 'color: #808080; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
+            0 => 'color: #000000; font-weight: bold;'
             ),
         'BRACKETS' => array(
-            0 => 'color: #66cc66;'
+            0 => 'color: #000000;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #009900;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
+            0 => 'color: #000000;'
             ),
         'METHODS' => array(
             1 => 'color: #006600;',
             2 => 'color: #006600;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
+            0 => 'color: #000000;'
             ),
         'REGEXPS' => array(
-            0 => 'color: #0000ff;',
-            4 => 'color: #009999;',
+            0 => 'color: #339933;',
+            4 => 'color: #0066ff;',
             ),
         'SCRIPT' => array(
             )
@@ -140,7 +146,12 @@
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/apt_sources.php dokuwiki-rc2009-12-02/inc/geshi/apt_sources.php
--- dokuwiki-2009-02-14/inc/geshi/apt_sources.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/apt_sources.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/06/17
  *
  * Apt sources.list language file for GeSHi.
@@ -51,7 +51,8 @@
             'stable', 'old-stable', 'testing', 'testing-proposed-updates',
             'unstable', 'unstable-proposed-updates', 'experimental',
             'non-US', 'security', 'volatile', 'volatile-sloppy',
-            'main', 'restricted', 'preview', 'apt-build',
+            'apt-build',
+            'stable/updates',
             //Debian
             'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
             'etch', 'lenny', 'sid',
@@ -64,9 +65,12 @@
             'feisty', 'feisty-updates', 'feisty-security', 'feisty-proposed', 'feisty-backports',
             'gutsy', 'gutsy-updates', 'gutsy-security', 'gutsy-proposed', 'gutsy-backports',
             'hardy', 'hardy-updates', 'hardy-security', 'hardy-proposed', 'hardy-backports',
-            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports',
-            'commercial', 'universe', 'multiverse'
+            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports'
             ),
+        3 => array(
+            'main', 'restricted', 'preview', 'contrib', 'non-free',
+            'commercial', 'universe', 'multiverse'
+            )
     ),
     'REGEXPS' => array(
         0 => "(((http|ftp):\/\/|file:\/)[^\s]+)|(cdrom:\[[^\]]*\][^\s]*)",
@@ -76,12 +80,14 @@
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => false,
-        2 => false
+        2 => true,
+        3 => true
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
             1 => 'color: #00007f;',
-            2 => 'color: #b1b100;'
+            2 => 'color: #b1b100;',
+            3 => 'color: #b16000;'
             ),
         'COMMENTS' => array(
             1 => 'color: #adadad; font-style: italic;',
@@ -106,7 +112,8 @@
         ),
     'URLS' => array(
         1 => '',
-        2 => ''
+        2 => '',
+        3 => ''
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/asm.php dokuwiki-rc2009-12-02/inc/geshi/asm.php
--- dokuwiki-2009-02-14/inc/geshi/asm.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/asm.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Tux (tux@inmail.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/27
  *
  * x86 Assembler language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/asp.php dokuwiki-rc2009-12-02/inc/geshi/asp.php
--- dokuwiki-2009-02-14/inc/geshi/asp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/asp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Amit Gupta (http://blog.igeek.info/)
  * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/13
  *
  * ASP language file for GeSHi.
@@ -53,7 +53,7 @@
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
         1 => array(
-            'include', 'file', 'Dim', 'Option', 'Explicit', 'Implicit', 'Set', 'Select', 'ReDim', 'Preserve',
+            'include', 'file', 'Const', 'Dim', 'Option', 'Explicit', 'Implicit', 'Set', 'Select', 'ReDim', 'Preserve',
             'ByVal', 'ByRef', 'End', 'Private', 'Public', 'If', 'Then', 'Else', 'ElseIf', 'Case', 'With', 'NOT',
             'While', 'Wend', 'For', 'Loop', 'Do', 'Request', 'Response', 'Server', 'ADODB', 'Session', 'Application',
             'Each', 'In', 'Get', 'Next', 'INT', 'CINT', 'CBOOL', 'CDATE', 'CBYTE', 'CCUR', 'CDBL', 'CLNG', 'CSNG',
@@ -62,9 +62,8 @@
             ),
         2 => array(
             'Null', 'Nothing', 'And',
-            'False', '<%', '%>',
-            '<script language=', '</script>',
-            'True', 'var', 'Or', 'BOF', 'EOF',
+            'False',
+            'True', 'var', 'Or', 'BOF', 'EOF', 'xor',
             'Function', 'Class', 'New', 'Sub'
             ),
         3 => array(
@@ -78,8 +77,12 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
-        ';', ':', '?', '='
+        1 => array(
+            '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+            ';', ':', '?', '='),
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -102,7 +105,7 @@
             0 => 'color: #000099; font-weight: bold;'
             ),
         'BRACKETS' => array(
-            0 => 'color: #006600; font-weight:bold'
+            0 => 'color: #006600; font-weight:bold;'
             ),
         'STRINGS' => array(
             0 => 'color: #cc0000;'
@@ -114,7 +117,8 @@
             1 => 'color: #9900cc;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #006600; font-weight: bold'
+            0 => 'color: #006600; font-weight: bold;',
+            1 => 'color: #000000; font-weight: bold;'
             ),
         'REGEXPS' => array(
             ),
@@ -147,7 +151,7 @@
         2 => array(
             ''
             ),
-        3 => "/(<%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(%>|\Z)/sm"
+        3 => "/(?<%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(?%>|\Z)/sm"
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         0 => true,
@@ -157,4 +161,4 @@
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/autoit.php dokuwiki-rc2009-12-02/inc/geshi/autoit.php
--- dokuwiki-2009-02-14/inc/geshi/autoit.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/autoit.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,16 +4,27 @@
  * --------
  * Author: big_daddy (robert.i.anthony@gmail.com)
  * Copyright: (c) 2006 and to GESHi ;)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/01/26
  *
  * AutoIT language file for GeSHi.
  *
+ * CHANGES
+ * -------
+ * Release 1.0.8.1 (2008/09/15)
+ * - Updated on 22.03.2008 By Tlem (tlem@tuxolem.fr)
+ * - The link on functions will now correctly re-direct to
+ * - http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
+ * - Updated whith au3.api (09.02.2008).
+ * - Updated - 16 Mai 2008 - v3.2.12.0
+ * - Updated - 12 June 2008 - v3.2.12.1
+ * Release 1.0.7.20 (2006/01/26)
+ * - First Release
+ *
  * Current bugs & todo:
  * ----------
- * - dosn't highlight symbols (Please note that in 1.0.X these are not used. Hopefully they will be used in 1.2.X.)
  * - not sure how to get sendkeys to work " {!}, {SPACE} etc... "
- * - jut copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
+ * - just copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
  *
  * Reference: http://www.autoitscript.com/autoit3/docs/
  *************************************************************************************
@@ -22,7 +33,8 @@
  *
  *   GeSHi 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
+ *   the Free Software Foundation; either version 2 of the License,
+or
  *   (at your option) any later version.
  *
  *   GeSHi is distributed in the hope that it will be useful,
@@ -31,8 +43,14 @@
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with GeSHi; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *   along with GeSHi; if not,
+write to the Free Software
+ *   Foundation,
+Inc.,
+59 Temple Place,
+Suite 330,
+Boston,
+MA  02111-1307  USA
  *
  ************************************************************************************/
 
@@ -44,343 +62,1025 @@
         '#cs' => '#ce'),
     'COMMENT_REGEXP' => array(0 => '/(? GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"'),
+    'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
         1 => array(
-            'and', 'byref', 'case', 'const',
-            'continuecase', 'continueloop', 'default', 'dim', 'do',
-            'else', 'elseif', 'endfunc', 'endif', 'endselect',
-            'endswitch', 'endwith', 'enum', 'exit', 'exitloop',
-            'false', 'for', 'func', 'global', 'if', 'in',
-            'local', 'next', 'not', 'or', 'redim',
-            'return', 'select', 'step', 'switch', 'then',
-            'to', 'true', 'until', 'wend', 'while',
-            'with'
+            'And','ByRef','Case','Const','ContinueCase','ContinueLoop',
+            'Default','Dim','Do','Else','ElseIf','EndFunc','EndIf','EndSelect',
+            'EndSwitch','EndWith','Enum','Exit','ExitLoop','False','For','Func',
+            'Global','If','In','Local','Next','Not','Or','ReDim','Return',
+            'Select','Step','Switch','Then','To','True','Until','WEnd','While',
+            'With'
             ),
         2 => array(
-            '@appdatacommondir', '@appdatadir', '@autoitexe', '@autoitpid',
-            '@autoitversion', '@com_eventobj', '@commonfilesdir', '@compiled',
-            '@computername', '@comspec', '@cr', '@crlf', '@desktopcommondir',
-            '@desktopdepth', '@desktopdir', '@desktopheight',
-            '@desktoprefresh', '@desktopwidth', '@documentscommondir',
-            '@error', '@exitcode', '@exitmethod', '@extended',
-            '@favoritescommondir', '@favoritesdir', '@gui_ctrlhandle',
-            '@gui_ctrlid', '@gui_dragfile', '@gui_dragid', '@gui_dropid',
-            '@gui_winhandle', '@homedrive', '@homepath', '@homeshare',
-            '@hotkeypressed', '@hour', '@inetgetactive', '@inetgetbytesread',
-            '@ipaddress1', '@ipaddress2', '@ipaddress3', '@ipaddress4',
-            '@kblayout', '@lf', '@logondnsdomain', '@logondomain',
-            '@logonserver', '@mday', '@min', '@mon', '@mydocumentsdir',
-            '@numparams', '@osbuild', '@oslang', '@osservicepack', '@ostype',
-            '@osversion', '@processorarch', '@programfilesdir',
-            '@programscommondir', '@programsdir', '@scriptdir',
-            '@scriptfullpath', '@scriptlinenumber', '@scriptname', '@sec',
-            '@startmenucommondir', '@startmenudir', '@startupcommondir',
-            '@startupdir', '@sw_disable', '@sw_enable', '@sw_hide', '@sw_lock',
-            '@sw_maximize', '@sw_minimize', '@sw_restore', '@sw_show',
-            '@sw_showdefault', '@sw_showmaximized', '@sw_showminimized',
-            '@sw_showminnoactive', '@sw_showna', '@sw_shownoactivate',
-            '@sw_shownormal', '@sw_unlock', '@systemdir', '@tab', '@tempdir',
-            '@tray_id', '@trayiconflashing', '@trayiconvisible', '@username',
-            '@userprofiledir', '@wday', '@windowsdir', '@workingdir', '@yday',
-            '@year'
+            '@AppDataCommonDir','@AppDataDir','@AutoItExe','@AutoItPID',
+            '@AutoItUnicode','@AutoItVersion','@AutoItX64','@COM_EventObj',
+            '@CommonFilesDir','@Compiled','@ComputerName','@ComSpec','@CR',
+            '@CRLF','@DesktopCommonDir','@DesktopDepth','@DesktopDir',
+            '@DesktopHeight','@DesktopRefresh','@DesktopWidth',
+            '@DocumentsCommonDir','@error','@exitCode','@exitMethod',
+            '@extended','@FavoritesCommonDir','@FavoritesDir','@GUI_CtrlHandle',
+            '@GUI_CtrlId','@GUI_DragFile','@GUI_DragId','@GUI_DropId',
+            '@GUI_WinHandle','@HomeDrive','@HomePath','@HomeShare',
+            '@HotKeyPressed','@HOUR','@InetGetActive','@InetGetBytesRead',
+            '@IPAddress1','@IPAddress2','@IPAddress3','@IPAddress4','@KBLayout',
+            '@LF','@LogonDNSDomain','@LogonDomain','@LogonServer','@MDAY',
+            '@MIN','@MON','@MyDocumentsDir','@NumParams','@OSBuild','@OSLang',
+            '@OSServicePack','@OSTYPE','@OSVersion','@ProcessorArch',
+            '@ProgramFilesDir','@ProgramsCommonDir','@ProgramsDir','@ScriptDir',
+            '@ScriptFullPath','@ScriptLineNumber','@ScriptName','@SEC',
+            '@StartMenuCommonDir','@StartMenuDir','@StartupCommonDir',
+            '@StartupDir','@SW_DISABLE','@SW_ENABLE','@SW_HIDE','@SW_LOCK',
+            '@SW_MAXIMIZE','@SW_MINIMIZE','@SW_RESTORE','@SW_SHOW',
+            '@SW_SHOWDEFAULT','@SW_SHOWMAXIMIZED','@SW_SHOWMINIMIZED',
+            '@SW_SHOWMINNOACTIVE','@SW_SHOWNA','@SW_SHOWNOACTIVATE',
+            '@SW_SHOWNORMAL','@SW_UNLOCK','@SystemDir','@TAB','@TempDir',
+            '@TRAY_ID','@TrayIconFlashing','@TrayIconVisible','@UserName',
+            '@UserProfileDir','@WDAY','@WindowsDir','@WorkingDir','@YDAY',
+            '@YEAR'
             ),
         3 => array(
-            'abs', 'acos', 'adlibdisable', 'adlibenable', 'asc', 'asin',
-            'assign', 'atan', 'autoitsetoption', 'autoitwingettitle',
-            'autoitwinsettitle', 'beep', 'binarystring', 'bitand', 'bitnot',
-            'bitor', 'bitrotate', 'bitshift', 'bitxor', 'blockinput', 'break',
-            'call', 'cdtray', 'ceiling', 'chr', 'clipget', 'clipput',
-            'consoleread', 'consolewrite', 'consolewriteerror', 'controlclick',
-            'controlcommand', 'controldisable', 'controlenable',
-            'controlfocus', 'controlgetfocus', 'controlgethandle',
-            'controlgetpos', 'controlgettext', 'controlhide',
-            'controllistview', 'controlmove', 'controlsend', 'controlsettext',
-            'controlshow', 'cos', 'dec', 'dircopy', 'dircreate', 'dirgetsize',
-            'dirmove', 'dirremove', 'dllcall', 'dllclose', 'dllopen',
-            'dllstructcreate', 'dllstructgetdata', 'dllstructgetptr',
-            'dllstructgetsize', 'dllstructsetdata', 'drivegetdrive',
-            'drivegetfilesystem', 'drivegetlabel', 'drivegetserial',
-            'drivegettype', 'drivemapadd', 'drivemapdel', 'drivemapget',
-            'drivesetlabel', 'drivespacefree', 'drivespacetotal',
-            'drivestatus', 'envget', 'envset', 'envupdate', 'eval', 'execute',
-            'exp', 'filechangedir', 'fileclose', 'filecopy',
-            'filecreatentfslink', 'filecreateshortcut', 'filedelete',
-            'fileexists', 'filefindfirstfile', 'filefindnextfile',
-            'filegetattrib', 'filegetlongname', 'filegetshortcut',
-            'filegetshortname', 'filegetsize', 'filegettime', 'filegetversion',
-            'fileinstall', 'filemove', 'fileopen', 'fileopendialog',
-            'fileread', 'filereadline', 'filerecycle', 'filerecycleempty',
-            'filesavedialog', 'fileselectfolder', 'filesetattrib',
-            'filesettime', 'filewrite', 'filewriteline', 'floor',
-            'ftpsetproxy', 'guicreate', 'guictrlcreateavi',
-            'guictrlcreatebutton', 'guictrlcreatecheckbox',
-            'guictrlcreatecombo', 'guictrlcreatecontextmenu',
-            'guictrlcreatedate', 'guictrlcreatedummy', 'guictrlcreateedit',
-            'guictrlcreategraphic', 'guictrlcreategroup', 'guictrlcreateicon',
-            'guictrlcreateinput', 'guictrlcreatelabel', 'guictrlcreatelist',
-            'guictrlcreatelistview', 'guictrlcreatelistviewitem',
-            'guictrlcreatemenu', 'guictrlcreatemenuitem',
-            'guictrlcreatemonthcal', 'guictrlcreateobj', 'guictrlcreatepic',
-            'guictrlcreateprogress', 'guictrlcreateradio',
-            'guictrlcreateslider', 'guictrlcreatetab', 'guictrlcreatetabitem',
-            'guictrlcreatetreeview', 'guictrlcreatetreeviewitem',
-            'guictrlcreateupdown', 'guictrldelete', 'guictrlgethandle',
-            'guictrlgetstate', 'guictrlread', 'guictrlrecvmsg',
-            'guictrlregisterlistviewsort', 'guictrlsendmsg',
-            'guictrlsendtodummy', 'guictrlsetbkcolor', 'guictrlsetcolor',
-            'guictrlsetcursor', 'guictrlsetdata', 'guictrlsetfont',
-            'guictrlsetgraphic', 'guictrlsetimage', 'guictrlsetlimit',
-            'guictrlsetonevent', 'guictrlsetpos', 'guictrlsetresizing',
-            'guictrlsetstate', 'guictrlsetstyle', 'guictrlsettip', 'guidelete',
-            'guigetcursorinfo', 'guigetmsg', 'guiregistermsg', 'guisetbkcolor',
-            'guisetcoord', 'guisetcursor', 'guisetfont', 'guisethelp',
-            'guiseticon', 'guisetonevent', 'guisetstate', 'guistartgroup',
-            'guiswitch', 'hex', 'hotkeyset', 'httpsetproxy', 'hwnd', 'inetget',
-            'inetgetsize', 'inidelete', 'iniread', 'inireadsection',
-            'inireadsectionnames', 'inirenamesection', 'iniwrite',
-            'iniwritesection', 'inputbox', 'int', 'isadmin', 'isarray',
-            'isbinarystring', 'isbool', 'isdeclared', 'isdllstruct', 'isfloat',
-            'ishwnd', 'isint', 'iskeyword', 'isnumber', 'isobj', 'isstring',
-            'log', 'memgetstats', 'mod', 'mouseclick', 'mouseclickdrag',
-            'mousedown', 'mousegetcursor', 'mousegetpos', 'mousemove',
-            'mouseup', 'mousewheel', 'msgbox', 'number', 'objcreate',
-            'objevent', 'objget', 'objname', 'opt', 'ping', 'pixelchecksum',
-            'pixelgetcolor', 'pixelsearch', 'pluginclose', 'pluginopen',
-            'processclose', 'processexists', 'processlist',
-            'processsetpriority', 'processwait', 'processwaitclose',
-            'progressoff', 'progresson', 'progressset', 'random', 'regdelete',
-            'regenumkey', 'regenumval', 'regread', 'regwrite', 'round', 'run',
-            'runasset', 'runwait', 'send', 'seterror', 'setextended',
-            'shellexecute', 'shellexecutewait', 'shutdown', 'sin', 'sleep',
-            'soundplay', 'soundsetwavevolume', 'splashimageon', 'splashoff',
-            'splashtexton', 'sqrt', 'srandom', 'statusbargettext',
-            'stderrread', 'stdinwrite', 'stdoutread', 'string', 'stringaddcr',
-            'stringformat', 'stringinstr', 'stringisalnum', 'stringisalpha',
-            'stringisascii', 'stringisdigit', 'stringisfloat', 'stringisint',
-            'stringislower', 'stringisspace', 'stringisupper',
-            'stringisxdigit', 'stringleft', 'stringlen', 'stringlower',
-            'stringmid', 'stringregexp', 'stringregexpreplace',
-            'stringreplace', 'stringright', 'stringsplit', 'stringstripcr',
-            'stringstripws', 'stringtrimleft', 'stringtrimright',
-            'stringupper', 'tan', 'tcpaccept', 'tcpclosesocket', 'tcpconnect',
-            'tcplisten', 'tcpnametoip', 'tcprecv', 'tcpsend', 'tcpshutdown',
-            'tcpstartup', 'timerdiff', 'timerinit', 'timerstart', 'timerstop',
-            'tooltip', 'traycreateitem', 'traycreatemenu', 'traygetmsg',
-            'trayitemdelete', 'trayitemgethandle', 'trayitemgetstate',
-            'trayitemgettext', 'trayitemsetonevent', 'trayitemsetstate',
-            'trayitemsettext', 'traysetclick', 'trayseticon', 'traysetonevent',
-            'traysetpauseicon', 'traysetstate', 'traysettooltip', 'traytip',
-            'ubound', 'udpbind', 'udpclosesocket', 'udpopen', 'udprecv',
-            'udpsend', 'winactivate', 'winactive', 'winclose', 'winexists',
-            'winflash', 'wingetcaretpos', 'wingetclasslist',
-            'wingetclientsize', 'wingethandle', 'wingetpos', 'wingetprocess',
-            'wingetstate', 'wingettext', 'wingettitle', 'winkill', 'winlist',
-            'winmenuselectitem', 'winminimizeall', 'winminimizeallundo',
-            'winmove', 'winsetontop', 'winsetstate', 'winsettitle',
-            'winsettrans', 'winshow', 'winwait', 'winwaitactive',
-            'winwaitclose', 'winwaitnotactive'
+            'Abs','ACos','AdlibDisable','AdlibEnable','Asc','AscW','ASin',
+            'Assign','ATan','AutoItSetOption','AutoItWinGetTitle',
+            'AutoItWinSetTitle','Beep','Binary','BinaryLen','BinaryMid',
+            'BinaryToString','BitAND','BitNOT','BitOR','BitRotate','BitShift',
+            'BitXOR','BlockInput','Break','Call','CDTray','Ceiling','Chr',
+            'ChrW','ClipGet','ClipPut','ConsoleRead','ConsoleWrite',
+            'ConsoleWriteError','ControlClick','ControlCommand',
+            'ControlDisable','ControlEnable','ControlFocus','ControlGetFocus',
+            'ControlGetHandle','ControlGetPos','ControlGetText','ControlHide',
+            'ControlListView','ControlMove','ControlSend','ControlSetText',
+            'ControlShow','ControlTreeView','Cos','Dec','DirCopy','DirCreate',
+            'DirGetSize','DirMove','DirRemove','DllCall','DllCallbackFree',
+            'DllCallbackGetPtr','DllCallbackRegister','DllClose','DllOpen',
+            'DllStructCreate','DllStructGetData','DllStructGetPtr',
+            'DllStructGetSize','DllStructSetData','DriveGetDrive',
+            'DriveGetFileSystem','DriveGetLabel','DriveGetSerial',
+            'DriveGetType','DriveMapAdd','DriveMapDel','DriveMapGet',
+            'DriveSetLabel','DriveSpaceFree','DriveSpaceTotal','DriveStatus',
+            'EnvGet','EnvSet','EnvUpdate','Eval','Execute','Exp',
+            'FileChangeDir','FileClose','FileCopy','FileCreateNTFSLink',
+            'FileCreateShortcut','FileDelete','FileExists','FileFindFirstFile',
+            'FileFindNextFile','FileGetAttrib','FileGetLongName',
+            'FileGetShortcut','FileGetShortName','FileGetSize','FileGetTime',
+            'FileGetVersion','FileInstall','FileMove','FileOpen',
+            'FileOpenDialog','FileRead','FileReadLine','FileRecycle',
+            'FileRecycleEmpty','FileSaveDialog','FileSelectFolder',
+            'FileSetAttrib','FileSetTime','FileWrite','FileWriteLine','Floor',
+            'FtpSetProxy','GUICreate','GUICtrlCreateAvi','GUICtrlCreateButton',
+            'GUICtrlCreateCheckbox','GUICtrlCreateCombo',
+            'GUICtrlCreateContextMenu','GUICtrlCreateDate','GUICtrlCreateDummy',
+            'GUICtrlCreateEdit','GUICtrlCreateGraphic','GUICtrlCreateGroup',
+            'GUICtrlCreateIcon','GUICtrlCreateInput','GUICtrlCreateLabel',
+            'GUICtrlCreateList','GUICtrlCreateListView',
+            'GUICtrlCreateListViewItem','GUICtrlCreateMenu',
+            'GUICtrlCreateMenuItem','GUICtrlCreateMonthCal','GUICtrlCreateObj',
+            'GUICtrlCreatePic','GUICtrlCreateProgress','GUICtrlCreateRadio',
+            'GUICtrlCreateSlider','GUICtrlCreateTab','GUICtrlCreateTabItem',
+            'GUICtrlCreateTreeView','GUICtrlCreateTreeViewItem',
+            'GUICtrlCreateUpdown','GUICtrlDelete','GUICtrlGetHandle',
+            'GUICtrlGetState','GUICtrlRead','GUICtrlRecvMsg',
+            'GUICtrlRegisterListViewSort','GUICtrlSendMsg','GUICtrlSendToDummy',
+            'GUICtrlSetBkColor','GUICtrlSetColor','GUICtrlSetCursor',
+            'GUICtrlSetData','GUICtrlSetFont','GUICtrlSetDefColor',
+            'GUICtrlSetDefBkColor','GUICtrlSetGraphic','GUICtrlSetImage',
+            'GUICtrlSetLimit','GUICtrlSetOnEvent','GUICtrlSetPos',
+            'GUICtrlSetResizing','GUICtrlSetState','GUICtrlSetStyle',
+            'GUICtrlSetTip','GUIDelete','GUIGetCursorInfo','GUIGetMsg',
+            'GUIGetStyle','GUIRegisterMsg','GUISetAccelerators()',
+            'GUISetBkColor','GUISetCoord','GUISetCursor','GUISetFont',
+            'GUISetHelp','GUISetIcon','GUISetOnEvent','GUISetState',
+            'GUISetStyle','GUIStartGroup','GUISwitch','Hex','HotKeySet',
+            'HttpSetProxy','HWnd','InetGet','InetGetSize','IniDelete','IniRead',
+            'IniReadSection','IniReadSectionNames','IniRenameSection',
+            'IniWrite','IniWriteSection','InputBox','Int','IsAdmin','IsArray',
+            'IsBinary','IsBool','IsDeclared','IsDllStruct','IsFloat','IsHWnd',
+            'IsInt','IsKeyword','IsNumber','IsObj','IsPtr','IsString','Log',
+            'MemGetStats','Mod','MouseClick','MouseClickDrag','MouseDown',
+            'MouseGetCursor','MouseGetPos','MouseMove','MouseUp','MouseWheel',
+            'MsgBox','Number','ObjCreate','ObjEvent','ObjGet','ObjName','Opt',
+            'Ping','PixelChecksum','PixelGetColor','PixelSearch','PluginClose',
+            'PluginOpen','ProcessClose','ProcessExists','ProcessGetStats',
+            'ProcessList','ProcessSetPriority','ProcessWait','ProcessWaitClose',
+            'ProgressOff','ProgressOn','ProgressSet','Ptr','Random','RegDelete',
+            'RegEnumKey','RegEnumVal','RegRead','RegWrite','Round','Run',
+            'RunAs','RunAsWait','RunWait','Send','SendKeepActive','SetError',
+            'SetExtended','ShellExecute','ShellExecuteWait','Shutdown','Sin',
+            'Sleep','SoundPlay','SoundSetWaveVolume','SplashImageOn',
+            'SplashOff','SplashTextOn','Sqrt','SRandom','StatusbarGetText',
+            'StderrRead','StdinWrite','StdioClose','StdoutRead','String',
+            'StringAddCR','StringCompare','StringFormat','StringInStr',
+            'StringIsAlNum','StringIsAlpha','StringIsASCII','StringIsDigit',
+            'StringIsFloat','StringIsInt','StringIsLower','StringIsSpace',
+            'StringIsUpper','StringIsXDigit','StringLeft','StringLen',
+            'StringLower','StringMid','StringRegExp','StringRegExpReplace',
+            'StringReplace','StringRight','StringSplit','StringStripCR',
+            'StringStripWS','StringToBinary','StringTrimLeft','StringTrimRight',
+            'StringUpper','Tan','TCPAccept','TCPCloseSocket','TCPConnect',
+            'TCPListen','TCPNameToIP','TCPRecv','TCPSend','TCPShutdown',
+            'TCPStartup','TimerDiff','TimerInit','ToolTip','TrayCreateItem',
+            'TrayCreateMenu','TrayGetMsg','TrayItemDelete','TrayItemGetHandle',
+            'TrayItemGetState','TrayItemGetText','TrayItemSetOnEvent',
+            'TrayItemSetState','TrayItemSetText','TraySetClick','TraySetIcon',
+            'TraySetOnEvent','TraySetPauseIcon','TraySetState','TraySetToolTip',
+            'TrayTip','UBound','UDPBind','UDPCloseSocket','UDPOpen','UDPRecv',
+            'UDPSend','UDPShutdown','UDPStartup','VarGetType','WinActivate',
+            'WinActive','WinClose','WinExists','WinFlash','WinGetCaretPos',
+            'WinGetClassList','WinGetClientSize','WinGetHandle','WinGetPos',
+            'WinGetProcess','WinGetState','WinGetText','WinGetTitle','WinKill',
+            'WinList','WinMenuSelectItem','WinMinimizeAll','WinMinimizeAllUndo',
+            'WinMove','WinSetOnTop','WinSetState','WinSetTitle','WinSetTrans',
+            'WinWait','WinWaitActive','WinWaitClose','WinWaitNotActive'
             ),
         4 => array(
-            '_arrayadd', '_arraybinarysearch', '_arraycreate', '_arraydelete',
-            '_arraydisplay', '_arrayinsert', '_arraymax', '_arraymaxindex',
-            '_arraymin', '_arrayminindex', '_arraypop', '_arraypush',
-            '_arrayreverse', '_arraysearch', '_arraysort', '_arrayswap',
-            '_arraytoclip', '_arraytostring', '_arraytrim', '_colorgetblue',
-            '_colorgetgreen', '_colorgetred', '_dateadd', '_datedayofweek',
-            '_datedaysinmonth', '_datediff', '_dateisleapyear', '_dateisvalid',
-            '_datetimeformat', '_datetimesplit', '_datetodayofweek',
-            '_datetodayofweekiso', '_datetodayvalue', '_dayvaluetodate',
-            '_now', '_nowcalc', '_nowcalcdate', '_nowdate', '_nowtime',
-            '_setdate', '_settime', '_tickstotime', '_timetoticks',
-            '_weeknumberiso', '_filecountlines', '_filecreate',
-            '_filelisttoarray', '_fileprint', '_filereadtoarray',
-            '_filewritefromarray', '_filewritelog', '_filewritetoline',
-            '_pathfull', '_pathmake', '_pathsplit', '_replacestringinfile',
-            '_tempfile', '_guictrlcomboadddir', '_guictrlcomboaddstring',
-            '_guictrlcomboautocomplete', '_guictrlcombodeletestring',
-            '_guictrlcombofindstring', '_guictrlcombogetcount',
-            '_guictrlcombogetcursel', '_guictrlcombogetdroppedcontrolrect',
-            '_guictrlcombogetdroppedstate', '_guictrlcombogetdroppedwidth',
-            '_guictrlcombogeteditsel', '_guictrlcombogetextendedui',
-            '_guictrlcombogethorizontalextent', '_guictrlcombogetitemheight',
-            '_guictrlcombogetlbtext', '_guictrlcombogetlbtextlen',
-            '_guictrlcombogetlist', '_guictrlcombogetlocale',
-            '_guictrlcombogetminvisible', '_guictrlcombogettopindex',
-            '_guictrlcomboinitstorage', '_guictrlcomboinsertstring',
-            '_guictrlcombolimittext', '_guictrlcomboresetcontent',
-            '_guictrlcomboselectstring', '_guictrlcombosetcursel',
-            '_guictrlcombosetdroppedwidth', '_guictrlcomboseteditsel',
-            '_guictrlcombosetextendedui', '_guictrlcombosethorizontalextent',
-            '_guictrlcombosetitemheight', '_guictrlcombosetminvisible',
-            '_guictrlcombosettopindex', '_guictrlcomboshowdropdown',
-            '_guictrleditcanundo', '_guictrleditemptyundobuffer',
-            '_guictrleditfind', '_guictrleditgetfirstvisibleline',
-            '_guictrleditgetline', '_guictrleditgetlinecount',
-            '_guictrleditgetmodify', '_guictrleditgetrect',
-            '_guictrleditgetsel', '_guictrleditlinefromchar',
-            '_guictrleditlineindex', '_guictrleditlinelength',
-            '_guictrleditlinescroll', '_guictrleditreplacesel',
-            '_guictrleditscroll', '_guictrleditsetmodify',
-            '_guictrleditsetrect', '_guictrleditsetsel', '_guictrleditundo',
-            '_guictrlipaddressclear', '_guictrlipaddresscreate',
-            '_guictrlipaddressdelete', '_guictrlipaddressget',
-            '_guictrlipaddressisblank', '_guictrlipaddressset',
-            '_guictrlipaddresssetfocus', '_guictrlipaddresssetfont',
-            '_guictrlipaddresssetrange', '_guictrlipaddressshowhide',
-            '_guictrllistadddir', '_guictrllistadditem', '_guictrllistclear',
-            '_guictrllistcount', '_guictrllistdeleteitem',
-            '_guictrllistfindstring', '_guictrllistgetanchorindex',
-            '_guictrllistgetcaretindex', '_guictrllistgethorizontalextent',
-            '_guictrllistgetinfo', '_guictrllistgetitemrect',
-            '_guictrllistgetlocale', '_guictrllistgetselcount',
-            '_guictrllistgetselitems', '_guictrllistgetselitemstext',
-            '_guictrllistgetselstate', '_guictrllistgettext',
-            '_guictrllistgettextlen', '_guictrllistgettopindex',
-            '_guictrllistinsertitem', '_guictrllistreplacestring',
-            '_guictrllistselectedindex', '_guictrllistselectindex',
-            '_guictrllistselectstring', '_guictrllistselitemrange',
-            '_guictrllistselitemrangeex', '_guictrllistsetanchorindex',
-            '_guictrllistsetcaretindex', '_guictrllistsethorizontalextent',
-            '_guictrllistsetlocale', '_guictrllistsetsel',
-            '_guictrllistsettopindex', '_guictrllistsort',
-            '_guictrllistswapstring', '_guictrllistviewcopyitems',
-            '_guictrllistviewdeleteallitems', '_guictrllistviewdeletecolumn',
-            '_guictrllistviewdeleteitem',
-            '_guictrllistviewdeleteitemsselected',
-            '_guictrllistviewensurevisible', '_guictrllistviewfinditem',
-            '_guictrllistviewgetbackcolor', '_guictrllistviewgetcallbackmask',
-            '_guictrllistviewgetcheckedstate',
-            '_guictrllistviewgetcolumnorder', '_guictrllistviewgetcolumnwidth',
-            '_guictrllistviewgetcounterpage', '_guictrllistviewgetcursel',
-            '_guictrllistviewgetextendedlistviewstyle',
-            '_guictrllistviewgetheader', '_guictrllistviewgethotcursor',
-            '_guictrllistviewgethotitem', '_guictrllistviewgethovertime',
-            '_guictrllistviewgetitemcount', '_guictrllistviewgetitemtext',
-            '_guictrllistviewgetitemtextarray', '_guictrllistviewgetnextitem',
-            '_guictrllistviewgetselectedcount',
-            '_guictrllistviewgetselectedindices',
-            '_guictrllistviewgetsubitemscount', '_guictrllistviewgettopindex',
-            '_guictrllistviewgetunicodeformat', '_guictrllistviewhidecolumn',
-            '_guictrllistviewinsertcolumn', '_guictrllistviewinsertitem',
-            '_guictrllistviewjustifycolumn', '_guictrllistviewscroll',
-            '_guictrllistviewsetcheckstate',
-            '_guictrllistviewsetcolumnheadertext',
-            '_guictrllistviewsetcolumnorder', '_guictrllistviewsetcolumnwidth',
-            '_guictrllistviewsethotitem', '_guictrllistviewsethovertime',
-            '_guictrllistviewsetitemcount', '_guictrllistviewsetitemselstate',
-            '_guictrllistviewsetitemtext', '_guictrllistviewsort',
-            '_guictrlmonthcalget1stdow', '_guictrlmonthcalgetcolor',
-            '_guictrlmonthcalgetdelta', '_guictrlmonthcalgetmaxselcount',
-            '_guictrlmonthcalgetmaxtodaywidth',
-            '_guictrlmonthcalgetminreqrect', '_guictrlmonthcalset1stdow',
-            '_guictrlmonthcalsetcolor', '_guictrlmonthcalsetdelta',
-            '_guictrlmonthcalsetmaxselcount', '_guictrlslidercleartics',
-            '_guictrlslidergetlinesize', '_guictrlslidergetnumtics',
-            '_guictrlslidergetpagesize', '_guictrlslidergetpos',
-            '_guictrlslidergetrangemax', '_guictrlslidergetrangemin',
-            '_guictrlslidersetlinesize', '_guictrlslidersetpagesize',
-            '_guictrlslidersetpos', '_guictrlslidersetticfreq',
-            '_guictrlstatusbarcreate', '_guictrlstatusbarcreateprogress',
-            '_guictrlstatusbardelete', '_guictrlstatusbargetborders',
-            '_guictrlstatusbargeticon', '_guictrlstatusbargetparts',
-            '_guictrlstatusbargetrect', '_guictrlstatusbargettext',
-            '_guictrlstatusbargettextlength', '_guictrlstatusbargettip',
-            '_guictrlstatusbargetunicode', '_guictrlstatusbarissimple',
-            '_guictrlstatusbarresize', '_guictrlstatusbarsetbkcolor',
-            '_guictrlstatusbarseticon', '_guictrlstatusbarsetminheight',
-            '_guictrlstatusbarsetparts', '_guictrlstatusbarsetsimple',
-            '_guictrlstatusbarsettext', '_guictrlstatusbarsettip',
-            '_guictrlstatusbarsetunicode', '_guictrlstatusbarshowhide',
-            '_guictrltabdeleteallitems', '_guictrltabdeleteitem',
-            '_guictrltabdeselectall', '_guictrltabgetcurfocus',
-            '_guictrltabgetcursel', '_guictrltabgetextendedstyle',
-            '_guictrltabgetitemcount', '_guictrltabgetitemrect',
-            '_guictrltabgetrowcount', '_guictrltabgetunicodeformat',
-            '_guictrltabhighlightitem', '_guictrltabsetcurfocus',
-            '_guictrltabsetcursel', '_guictrltabsetmintabwidth',
-            '_guictrltabsetunicodeformat', '_guictrltreeviewdeleteallitems',
-            '_guictrltreeviewdeleteitem', '_guictrltreeviewexpand',
-            '_guictrltreeviewgetbkcolor', '_guictrltreeviewgetcount',
-            '_guictrltreeviewgetindent', '_guictrltreeviewgetlinecolor',
-            '_guictrltreeviewgetparenthandle', '_guictrltreeviewgetparentid',
-            '_guictrltreeviewgetstate', '_guictrltreeviewgettext',
-            '_guictrltreeviewgettextcolor', '_guictrltreeviewgettree',
-            '_guictrltreeviewinsertitem', '_guictrltreeviewsetbkcolor',
-            '_guictrltreeviewseticon', '_guictrltreeviewsetindent',
-            '_guictrltreeviewsetlinecolor', '_guictrltreeviewsetstate',
-            '_guictrltreeviewsettext', '_guictrltreeviewsettextcolor',
-            '_guictrltreeviewsort', '_ie_example', '_ie_introduction',
-            '_ie_versioninfo', '_ieaction', '_ieattach', '_iebodyreadhtml',
-            '_iebodyreadtext', '_iebodywritehtml', '_iecreate',
-            '_iecreateembedded', '_iedocgetobj', '_iedocinserthtml',
-            '_iedocinserttext', '_iedocreadhtml', '_iedocwritehtml',
-            '_ieerrorhandlerderegister', '_ieerrorhandlerregister',
-            '_ieerrornotify', '_ieformelementcheckboxselect',
-            '_ieformelementgetcollection', '_ieformelementgetobjbyname',
-            '_ieformelementgetvalue', '_ieformelementoptionselect',
-            '_ieformelementradioselect', '_ieformelementsetvalue',
-            '_ieformgetcollection', '_ieformgetobjbyname', '_ieformimageclick',
-            '_ieformreset', '_ieformsubmit', '_ieframegetcollection',
-            '_ieframegetobjbyname', '_iegetobjbyname',
-            '_ieheadinserteventscript', '_ieimgclick', '_ieimggetcollection',
-            '_ieisframeset', '_ielinkclickbyindex', '_ielinkclickbytext',
-            '_ielinkgetcollection', '_ieloadwait', '_ieloadwaittimeout',
-            '_ienavigate', '_iepropertyget', '_iepropertyset', '_iequit',
-            '_ietablegetcollection', '_ietablewritetoarray',
-            '_ietagnameallgetcollection', '_ietagnamegetcollection', '_getip',
-            '_inetexplorercapable', '_inetgetsource', '_inetmail',
-            '_inetsmtpmail', '_tcpiptoname', '_degree', '_mathcheckdiv',
-            '_max', '_min', '_radian', '_choosecolor', '_choosefont',
-            '_clipputfile', '_iif', '_ispressed', '_mousetrap', '_singleton',
-            '_processgetname', '_processgetpriority', '_rundos',
-            '_sendmessage', '_soundclose', '_soundlength', '_soundopen',
-            '_soundpause', '_soundplay', '_soundpos', '_soundresume',
-            '_soundseek', '_soundstatus', '_soundstop', '_sqlite_changes',
-            '_sqlite_close', '_sqlite_display2dresult', '_sqlite_encode',
-            '_sqlite_errcode', '_sqlite_errmsg', '_sqlite_escape',
-            '_sqlite_exec', '_sqlite_fetchdata', '_sqlite_fetchnames',
-            '_sqlite_gettable', '_sqlite_gettable2d',
-            '_sqlite_lastinsertrowid', '_sqlite_libversion', '_sqlite_open',
-            '_sqlite_query', '_sqlite_queryfinalize', '_sqlite_queryreset',
-            '_sqlite_querysinglerow', '_sqlite_savemode', '_sqlite_settimeout',
-            '_sqlite_shutdown', '_sqlite_sqliteexe', '_sqlite_startup',
-            '_sqlite_totalchanges', '_hextostring', '_stringaddcomma',
-            '_stringbetween', '_stringencrypt', '_stringinsert',
-            '_stringproper', '_stringrepeat', '_stringreverse', '_stringtohex',
-            '_viclose', '_viexeccommand', '_vifindgpib', '_vigpibbusreset',
-            '_vigtl', '_viopen', '_visetattribute', '_visettimeout'
+            'ArrayAdd','ArrayBinarySearch','ArrayConcatenate','ArrayDelete',
+            'ArrayDisplay','ArrayFindAll','ArrayInsert','ArrayMax',
+            'ArrayMaxIndex','ArrayMin','ArrayMinIndex','ArrayPop','ArrayPush',
+            'ArrayReverse','ArraySearch','ArraySort','ArraySwap','ArrayToClip',
+            'ArrayToString','ArrayTrim','ChooseColor','ChooseFont',
+            'ClipBoard_ChangeChain','ClipBoard_Close','ClipBoard_CountFormats',
+            'ClipBoard_Empty','ClipBoard_EnumFormats','ClipBoard_FormatStr',
+            'ClipBoard_GetData','ClipBoard_GetDataEx','ClipBoard_GetFormatName',
+            'ClipBoard_GetOpenWindow','ClipBoard_GetOwner',
+            'ClipBoard_GetPriorityFormat','ClipBoard_GetSequenceNumber',
+            'ClipBoard_GetViewer','ClipBoard_IsFormatAvailable',
+            'ClipBoard_Open','ClipBoard_RegisterFormat','ClipBoard_SetData',
+            'ClipBoard_SetDataEx','ClipBoard_SetViewer','ClipPutFile',
+            'ColorConvertHSLtoRGB','ColorConvertRGBtoHSL','ColorGetBlue',
+            'ColorGetGreen','ColorGetRed','Date_Time_CompareFileTime',
+            'Date_Time_DOSDateTimeToArray','Date_Time_DOSDateTimeToFileTime',
+            'Date_Time_DOSDateTimeToStr','Date_Time_DOSDateToArray',
+            'Date_Time_DOSDateToStr','Date_Time_DOSTimeToArray',
+            'Date_Time_DOSTimeToStr','Date_Time_EncodeFileTime',
+            'Date_Time_EncodeSystemTime','Date_Time_FileTimeToArray',
+            'Date_Time_FileTimeToDOSDateTime',
+            'Date_Time_FileTimeToLocalFileTime','Date_Time_FileTimeToStr',
+            'Date_Time_FileTimeToSystemTime','Date_Time_GetFileTime',
+            'Date_Time_GetLocalTime','Date_Time_GetSystemTime',
+            'Date_Time_GetSystemTimeAdjustment',
+            'Date_Time_GetSystemTimeAsFileTime',
+            'Date_Time_GetSystemTimes','Date_Time_GetTickCount',
+            'Date_Time_GetTimeZoneInformation',
+            'Date_Time_LocalFileTimeToFileTime','Date_Time_SetFileTime',
+            'Date_Time_SetLocalTime','Date_Time_SetSystemTime',
+            'Date_Time_SetSystemTimeAdjustment',
+            'Date_Time_SetTimeZoneInformation','Date_Time_SystemTimeToArray',
+            'Date_Time_SystemTimeToDateStr','Date_Time_SystemTimeToDateTimeStr',
+            'Date_Time_SystemTimeToFileTime','Date_Time_SystemTimeToTimeStr',
+            'Date_Time_SystemTimeToTzSpecificLocalTime',
+            'Date_Time_TzSpecificLocalTimeToSystemTime','DateAdd',
+            'DateDayOfWeek','DateDaysInMonth','DateDiff','DateIsLeapYear',
+            'DateIsValid','DateTimeFormat','DateTimeSplit','DateToDayOfWeek',
+            'DateToDayOfWeekISO','DateToDayValue','DateToMonth',
+            'DayValueToDate','DebugBugReportEnv','DebugOut','DebugSetup',
+            'Degree','EventLog__Backup','EventLog__Clear','EventLog__Close',
+            'EventLog__Count','EventLog__DeregisterSource','EventLog__Full',
+            'EventLog__Notify','EventLog__Oldest','EventLog__Open',
+            'EventLog__OpenBackup','EventLog__Read','EventLog__RegisterSource',
+            'EventLog__Report','FileCountLines','FileCreate','FileListToArray',
+            'FilePrint','FileReadToArray','FileWriteFromArray',
+            'FileWriteLog','FileWriteToLine','GDIPlus_ArrowCapCreate',
+            'GDIPlus_ArrowCapDispose','GDIPlus_ArrowCapGetFillState',
+            'GDIPlus_ArrowCapGetHeight','GDIPlus_ArrowCapGetMiddleInset',
+            'GDIPlus_ArrowCapGetWidth','GDIPlus_ArrowCapSetFillState',
+            'GDIPlus_ArrowCapSetHeight','GDIPlus_ArrowCapSetMiddleInset',
+            'GDIPlus_ArrowCapSetWidth','GDIPlus_BitmapCloneArea',
+            'GDIPlus_BitmapCreateFromFile','GDIPlus_BitmapCreateFromGraphics',
+            'GDIPlus_BitmapCreateFromHBITMAP',
+            'GDIPlus_BitmapCreateHBITMAPFromBitmap','GDIPlus_BitmapDispose',
+            'GDIPlus_BitmapLockBits','GDIPlus_BitmapUnlockBits',
+            'GDIPlus_BrushClone','GDIPlus_BrushCreateSolid',
+            'GDIPlus_BrushDispose','GDIPlus_BrushGetType',
+            'GDIPlus_CustomLineCapDispose','GDIPlus_Decoders',
+            'GDIPlus_DecodersGetCount','GDIPlus_DecodersGetSize',
+            'GDIPlus_Encoders','GDIPlus_EncodersGetCLSID',
+            'GDIPlus_EncodersGetCount','GDIPlus_EncodersGetParamList',
+            'GDIPlus_EncodersGetParamListSize','GDIPlus_EncodersGetSize',
+            'GDIPlus_FontCreate','GDIPlus_FontDispose',
+            'GDIPlus_FontFamilyCreate','GDIPlus_FontFamilyDispose',
+            'GDIPlus_GraphicsClear','GDIPlus_GraphicsCreateFromHDC',
+            'GDIPlus_GraphicsCreateFromHWND','GDIPlus_GraphicsDispose',
+            'GDIPlus_GraphicsDrawArc','GDIPlus_GraphicsDrawBezier',
+            'GDIPlus_GraphicsDrawClosedCurve','GDIPlus_GraphicsDrawCurve',
+            'GDIPlus_GraphicsDrawEllipse','GDIPlus_GraphicsDrawImage',
+            'GDIPlus_GraphicsDrawImageRect','GDIPlus_GraphicsDrawImageRectRect',
+            'GDIPlus_GraphicsDrawLine','GDIPlus_GraphicsDrawPie',
+            'GDIPlus_GraphicsDrawPolygon','GDIPlus_GraphicsDrawRect',
+            'GDIPlus_GraphicsDrawString','GDIPlus_GraphicsDrawStringEx',
+            'GDIPlus_GraphicsFillClosedCurve','GDIPlus_GraphicsFillEllipse',
+            'GDIPlus_GraphicsFillPie','GDIPlus_GraphicsFillRect',
+            'GDIPlus_GraphicsGetDC','GDIPlus_GraphicsGetSmoothingMode',
+            'GDIPlus_GraphicsMeasureString','GDIPlus_GraphicsReleaseDC',
+            'GDIPlus_GraphicsSetSmoothingMode','GDIPlus_GraphicsSetTransform',
+            'GDIPlus_ImageDispose','GDIPlus_ImageGetGraphicsContext',
+            'GDIPlus_ImageGetHeight','GDIPlus_ImageGetWidth',
+            'GDIPlus_ImageLoadFromFile','GDIPlus_ImageSaveToFile',
+            'GDIPlus_ImageSaveToFileEx','GDIPlus_MatrixCreate',
+            'GDIPlus_MatrixDispose','GDIPlus_MatrixRotate','GDIPlus_ParamAdd',
+            'GDIPlus_ParamInit','GDIPlus_PenCreate','GDIPlus_PenDispose',
+            'GDIPlus_PenGetAlignment','GDIPlus_PenGetColor',
+            'GDIPlus_PenGetCustomEndCap','GDIPlus_PenGetDashCap',
+            'GDIPlus_PenGetDashStyle','GDIPlus_PenGetEndCap',
+            'GDIPlus_PenGetWidth','GDIPlus_PenSetAlignment',
+            'GDIPlus_PenSetColor','GDIPlus_PenSetCustomEndCap',
+            'GDIPlus_PenSetDashCap','GDIPlus_PenSetDashStyle',
+            'GDIPlus_PenSetEndCap','GDIPlus_PenSetWidth','GDIPlus_RectFCreate',
+            'GDIPlus_Shutdown','GDIPlus_Startup','GDIPlus_StringFormatCreate',
+            'GDIPlus_StringFormatDispose','GetIP','GUICtrlAVI_Close',
+            'GUICtrlAVI_Create','GUICtrlAVI_Destroy','GUICtrlAVI_Open',
+            'GUICtrlAVI_OpenEx','GUICtrlAVI_Play','GUICtrlAVI_Seek',
+            'GUICtrlAVI_Show','GUICtrlAVI_Stop','GUICtrlButton_Click',
+            'GUICtrlButton_Create','GUICtrlButton_Destroy',
+            'GUICtrlButton_Enable','GUICtrlButton_GetCheck',
+            'GUICtrlButton_GetFocus','GUICtrlButton_GetIdealSize',
+            'GUICtrlButton_GetImage','GUICtrlButton_GetImageList',
+            'GUICtrlButton_GetState','GUICtrlButton_GetText',
+            'GUICtrlButton_GetTextMargin','GUICtrlButton_SetCheck',
+            'GUICtrlButton_SetFocus','GUICtrlButton_SetImage',
+            'GUICtrlButton_SetImageList','GUICtrlButton_SetSize',
+            'GUICtrlButton_SetState','GUICtrlButton_SetStyle',
+            'GUICtrlButton_SetText','GUICtrlButton_SetTextMargin',
+            'GUICtrlButton_Show','GUICtrlComboBox_AddDir',
+            'GUICtrlComboBox_AddString','GUICtrlComboBox_AutoComplete',
+            'GUICtrlComboBox_BeginUpdate','GUICtrlComboBox_Create',
+            'GUICtrlComboBox_DeleteString','GUICtrlComboBox_Destroy',
+            'GUICtrlComboBox_EndUpdate','GUICtrlComboBox_FindString',
+            'GUICtrlComboBox_FindStringExact','GUICtrlComboBox_GetComboBoxInfo',
+            'GUICtrlComboBox_GetCount','GUICtrlComboBox_GetCurSel',
+            'GUICtrlComboBox_GetDroppedControlRect',
+            'GUICtrlComboBox_GetDroppedControlRectEx',
+            'GUICtrlComboBox_GetDroppedState','GUICtrlComboBox_GetDroppedWidth',
+            'GUICtrlComboBox_GetEditSel','GUICtrlComboBox_GetEditText',
+            'GUICtrlComboBox_GetExtendedUI',
+            'GUICtrlComboBox_GetHorizontalExtent',
+            'GUICtrlComboBox_GetItemHeight','GUICtrlComboBox_GetLBText',
+            'GUICtrlComboBox_GetLBTextLen','GUICtrlComboBox_GetList',
+            'GUICtrlComboBox_GetListArray','GUICtrlComboBox_GetLocale',
+            'GUICtrlComboBox_GetLocaleCountry','GUICtrlComboBox_GetLocaleLang',
+            'GUICtrlComboBox_GetLocalePrimLang',
+            'GUICtrlComboBox_GetLocaleSubLang','GUICtrlComboBox_GetMinVisible',
+            'GUICtrlComboBox_GetTopIndex','GUICtrlComboBox_InitStorage',
+            'GUICtrlComboBox_InsertString','GUICtrlComboBox_LimitText',
+            'GUICtrlComboBox_ReplaceEditSel','GUICtrlComboBox_ResetContent',
+            'GUICtrlComboBox_SelectString','GUICtrlComboBox_SetCurSel',
+            'GUICtrlComboBox_SetDroppedWidth','GUICtrlComboBox_SetEditSel',
+            'GUICtrlComboBox_SetEditText','GUICtrlComboBox_SetExtendedUI',
+            'GUICtrlComboBox_SetHorizontalExtent',
+            'GUICtrlComboBox_SetItemHeight','GUICtrlComboBox_SetMinVisible',
+            'GUICtrlComboBox_SetTopIndex','GUICtrlComboBox_ShowDropDown',
+            'GUICtrlComboBoxEx_AddDir','GUICtrlComboBoxEx_AddString',
+            'GUICtrlComboBoxEx_BeginUpdate','GUICtrlComboBoxEx_Create',
+            'GUICtrlComboBoxEx_CreateSolidBitMap',
+            'GUICtrlComboBoxEx_DeleteString','GUICtrlComboBoxEx_Destroy',
+            'GUICtrlComboBoxEx_EndUpdate','GUICtrlComboBoxEx_FindStringExact',
+            'GUICtrlComboBoxEx_GetComboBoxInfo',
+            'GUICtrlComboBoxEx_GetComboControl','GUICtrlComboBoxEx_GetCount',
+            'GUICtrlComboBoxEx_GetCurSel',
+            'GUICtrlComboBoxEx_GetDroppedControlRect',
+            'GUICtrlComboBoxEx_GetDroppedControlRectEx',
+            'GUICtrlComboBoxEx_GetDroppedState',
+            'GUICtrlComboBoxEx_GetDroppedWidth',
+            'GUICtrlComboBoxEx_GetEditControl','GUICtrlComboBoxEx_GetEditSel',
+            'GUICtrlComboBoxEx_GetEditText',
+            'GUICtrlComboBoxEx_GetExtendedStyle',
+            'GUICtrlComboBoxEx_GetExtendedUI','GUICtrlComboBoxEx_GetImageList',
+            'GUICtrlComboBoxEx_GetItem','GUICtrlComboBoxEx_GetItemEx',
+            'GUICtrlComboBoxEx_GetItemHeight','GUICtrlComboBoxEx_GetItemImage',
+            'GUICtrlComboBoxEx_GetItemIndent',
+            'GUICtrlComboBoxEx_GetItemOverlayImage',
+            'GUICtrlComboBoxEx_GetItemParam',
+            'GUICtrlComboBoxEx_GetItemSelectedImage',
+            'GUICtrlComboBoxEx_GetItemText','GUICtrlComboBoxEx_GetItemTextLen',
+            'GUICtrlComboBoxEx_GetList','GUICtrlComboBoxEx_GetListArray',
+            'GUICtrlComboBoxEx_GetLocale','GUICtrlComboBoxEx_GetLocaleCountry',
+            'GUICtrlComboBoxEx_GetLocaleLang',
+            'GUICtrlComboBoxEx_GetLocalePrimLang',
+            'GUICtrlComboBoxEx_GetLocaleSubLang',
+            'GUICtrlComboBoxEx_GetMinVisible','GUICtrlComboBoxEx_GetTopIndex',
+            'GUICtrlComboBoxEx_InitStorage','GUICtrlComboBoxEx_InsertString',
+            'GUICtrlComboBoxEx_LimitText','GUICtrlComboBoxEx_ReplaceEditSel',
+            'GUICtrlComboBoxEx_ResetContent','GUICtrlComboBoxEx_SetCurSel',
+            'GUICtrlComboBoxEx_SetDroppedWidth','GUICtrlComboBoxEx_SetEditSel',
+            'GUICtrlComboBoxEx_SetEditText',
+            'GUICtrlComboBoxEx_SetExtendedStyle',
+            'GUICtrlComboBoxEx_SetExtendedUI','GUICtrlComboBoxEx_SetImageList',
+            'GUICtrlComboBoxEx_SetItem','GUICtrlComboBoxEx_SetItemEx',
+            'GUICtrlComboBoxEx_SetItemHeight','GUICtrlComboBoxEx_SetItemImage',
+            'GUICtrlComboBoxEx_SetItemIndent',
+            'GUICtrlComboBoxEx_SetItemOverlayImage',
+            'GUICtrlComboBoxEx_SetItemParam',
+            'GUICtrlComboBoxEx_SetItemSelectedImage',
+            'GUICtrlComboBoxEx_SetMinVisible','GUICtrlComboBoxEx_SetTopIndex',
+            'GUICtrlComboBoxEx_ShowDropDown','GUICtrlDTP_Create',
+            'GUICtrlDTP_Destroy','GUICtrlDTP_GetMCColor','GUICtrlDTP_GetMCFont',
+            'GUICtrlDTP_GetMonthCal','GUICtrlDTP_GetRange',
+            'GUICtrlDTP_GetRangeEx','GUICtrlDTP_GetSystemTime',
+            'GUICtrlDTP_GetSystemTimeEx','GUICtrlDTP_SetFormat',
+            'GUICtrlDTP_SetMCColor','GUICtrlDTP_SetMCFont',
+            'GUICtrlDTP_SetRange','GUICtrlDTP_SetRangeEx',
+            'GUICtrlDTP_SetSystemTime','GUICtrlDTP_SetSystemTimeEx',
+            'GUICtrlEdit_AppendText','GUICtrlEdit_BeginUpdate',
+            'GUICtrlEdit_CanUndo','GUICtrlEdit_CharFromPos',
+            'GUICtrlEdit_Create','GUICtrlEdit_Destroy',
+            'GUICtrlEdit_EmptyUndoBuffer','GUICtrlEdit_EndUpdate',
+            'GUICtrlEdit_Find','GUICtrlEdit_FmtLines',
+            'GUICtrlEdit_GetFirstVisibleLine','GUICtrlEdit_GetLimitText',
+            'GUICtrlEdit_GetLine','GUICtrlEdit_GetLineCount',
+            'GUICtrlEdit_GetMargins','GUICtrlEdit_GetModify',
+            'GUICtrlEdit_GetPasswordChar','GUICtrlEdit_GetRECT',
+            'GUICtrlEdit_GetRECTEx','GUICtrlEdit_GetSel','GUICtrlEdit_GetText',
+            'GUICtrlEdit_GetTextLen','GUICtrlEdit_HideBalloonTip',
+            'GUICtrlEdit_InsertText','GUICtrlEdit_LineFromChar',
+            'GUICtrlEdit_LineIndex','GUICtrlEdit_LineLength',
+            'GUICtrlEdit_LineScroll','GUICtrlEdit_PosFromChar',
+            'GUICtrlEdit_ReplaceSel','GUICtrlEdit_Scroll',
+            'GUICtrlEdit_SetLimitText','GUICtrlEdit_SetMargins',
+            'GUICtrlEdit_SetModify','GUICtrlEdit_SetPasswordChar',
+            'GUICtrlEdit_SetReadOnly','GUICtrlEdit_SetRECT',
+            'GUICtrlEdit_SetRECTEx','GUICtrlEdit_SetRECTNP',
+            'GUICtrlEdit_SetRectNPEx','GUICtrlEdit_SetSel',
+            'GUICtrlEdit_SetTabStops','GUICtrlEdit_SetText',
+            'GUICtrlEdit_ShowBalloonTip','GUICtrlEdit_Undo',
+            'GUICtrlHeader_AddItem','GUICtrlHeader_ClearFilter',
+            'GUICtrlHeader_ClearFilterAll','GUICtrlHeader_Create',
+            'GUICtrlHeader_CreateDragImage','GUICtrlHeader_DeleteItem',
+            'GUICtrlHeader_Destroy','GUICtrlHeader_EditFilter',
+            'GUICtrlHeader_GetBitmapMargin','GUICtrlHeader_GetImageList',
+            'GUICtrlHeader_GetItem','GUICtrlHeader_GetItemAlign',
+            'GUICtrlHeader_GetItemBitmap','GUICtrlHeader_GetItemCount',
+            'GUICtrlHeader_GetItemDisplay','GUICtrlHeader_GetItemFlags',
+            'GUICtrlHeader_GetItemFormat','GUICtrlHeader_GetItemImage',
+            'GUICtrlHeader_GetItemOrder','GUICtrlHeader_GetItemParam',
+            'GUICtrlHeader_GetItemRect','GUICtrlHeader_GetItemRectEx',
+            'GUICtrlHeader_GetItemText','GUICtrlHeader_GetItemWidth',
+            'GUICtrlHeader_GetOrderArray','GUICtrlHeader_GetUnicodeFormat',
+            'GUICtrlHeader_HitTest','GUICtrlHeader_InsertItem',
+            'GUICtrlHeader_Layout','GUICtrlHeader_OrderToIndex',
+            'GUICtrlHeader_SetBitmapMargin',
+            'GUICtrlHeader_SetFilterChangeTimeout',
+            'GUICtrlHeader_SetHotDivider','GUICtrlHeader_SetImageList',
+            'GUICtrlHeader_SetItem','GUICtrlHeader_SetItemAlign',
+            'GUICtrlHeader_SetItemBitmap','GUICtrlHeader_SetItemDisplay',
+            'GUICtrlHeader_SetItemFlags','GUICtrlHeader_SetItemFormat',
+            'GUICtrlHeader_SetItemImage','GUICtrlHeader_SetItemOrder',
+            'GUICtrlHeader_SetItemParam','GUICtrlHeader_SetItemText',
+            'GUICtrlHeader_SetItemWidth','GUICtrlHeader_SetOrderArray',
+            'GUICtrlHeader_SetUnicodeFormat','GUICtrlIpAddress_ClearAddress',
+            'GUICtrlIpAddress_Create','GUICtrlIpAddress_Destroy',
+            'GUICtrlIpAddress_Get','GUICtrlIpAddress_GetArray',
+            'GUICtrlIpAddress_GetEx','GUICtrlIpAddress_IsBlank',
+            'GUICtrlIpAddress_Set','GUICtrlIpAddress_SetArray',
+            'GUICtrlIpAddress_SetEx','GUICtrlIpAddress_SetFocus',
+            'GUICtrlIpAddress_SetFont','GUICtrlIpAddress_SetRange',
+            'GUICtrlIpAddress_ShowHide','GUICtrlListBox_AddFile',
+            'GUICtrlListBox_AddString','GUICtrlListBox_BeginUpdate',
+            'GUICtrlListBox_Create','GUICtrlListBox_DeleteString',
+            'GUICtrlListBox_Destroy','GUICtrlListBox_Dir',
+            'GUICtrlListBox_EndUpdate','GUICtrlListBox_FindInText',
+            'GUICtrlListBox_FindString','GUICtrlListBox_GetAnchorIndex',
+            'GUICtrlListBox_GetCaretIndex','GUICtrlListBox_GetCount',
+            'GUICtrlListBox_GetCurSel','GUICtrlListBox_GetHorizontalExtent',
+            'GUICtrlListBox_GetItemData','GUICtrlListBox_GetItemHeight',
+            'GUICtrlListBox_GetItemRect','GUICtrlListBox_GetItemRectEx',
+            'GUICtrlListBox_GetListBoxInfo','GUICtrlListBox_GetLocale',
+            'GUICtrlListBox_GetLocaleCountry','GUICtrlListBox_GetLocaleLang',
+            'GUICtrlListBox_GetLocalePrimLang',
+            'GUICtrlListBox_GetLocaleSubLang','GUICtrlListBox_GetSel',
+            'GUICtrlListBox_GetSelCount','GUICtrlListBox_GetSelItems',
+            'GUICtrlListBox_GetSelItemsText','GUICtrlListBox_GetText',
+            'GUICtrlListBox_GetTextLen','GUICtrlListBox_GetTopIndex',
+            'GUICtrlListBox_InitStorage','GUICtrlListBox_InsertString',
+            'GUICtrlListBox_ItemFromPoint','GUICtrlListBox_ReplaceString',
+            'GUICtrlListBox_ResetContent','GUICtrlListBox_SelectString',
+            'GUICtrlListBox_SelItemRange','GUICtrlListBox_SelItemRangeEx',
+            'GUICtrlListBox_SetAnchorIndex','GUICtrlListBox_SetCaretIndex',
+            'GUICtrlListBox_SetColumnWidth','GUICtrlListBox_SetCurSel',
+            'GUICtrlListBox_SetHorizontalExtent','GUICtrlListBox_SetItemData',
+            'GUICtrlListBox_SetItemHeight','GUICtrlListBox_SetLocale',
+            'GUICtrlListBox_SetSel','GUICtrlListBox_SetTabStops',
+            'GUICtrlListBox_SetTopIndex','GUICtrlListBox_Sort',
+            'GUICtrlListBox_SwapString','GUICtrlListBox_UpdateHScroll',
+            'GUICtrlListView_AddArray','GUICtrlListView_AddColumn',
+            'GUICtrlListView_AddItem','GUICtrlListView_AddSubItem',
+            'GUICtrlListView_ApproximateViewHeight',
+            'GUICtrlListView_ApproximateViewRect',
+            'GUICtrlListView_ApproximateViewWidth','GUICtrlListView_Arrange',
+            'GUICtrlListView_BeginUpdate','GUICtrlListView_CancelEditLabel',
+            'GUICtrlListView_ClickItem','GUICtrlListView_CopyItems',
+            'GUICtrlListView_Create','GUICtrlListView_CreateDragImage',
+            'GUICtrlListView_CreateSolidBitMap',
+            'GUICtrlListView_DeleteAllItems','GUICtrlListView_DeleteColumn',
+            'GUICtrlListView_DeleteItem','GUICtrlListView_DeleteItemsSelected',
+            'GUICtrlListView_Destroy','GUICtrlListView_DrawDragImage',
+            'GUICtrlListView_EditLabel','GUICtrlListView_EnableGroupView',
+            'GUICtrlListView_EndUpdate','GUICtrlListView_EnsureVisible',
+            'GUICtrlListView_FindInText','GUICtrlListView_FindItem',
+            'GUICtrlListView_FindNearest','GUICtrlListView_FindParam',
+            'GUICtrlListView_FindText','GUICtrlListView_GetBkColor',
+            'GUICtrlListView_GetBkImage','GUICtrlListView_GetCallbackMask',
+            'GUICtrlListView_GetColumn','GUICtrlListView_GetColumnCount',
+            'GUICtrlListView_GetColumnOrder',
+            'GUICtrlListView_GetColumnOrderArray',
+            'GUICtrlListView_GetColumnWidth','GUICtrlListView_GetCounterPage',
+            'GUICtrlListView_GetEditControl',
+            'GUICtrlListView_GetExtendedListViewStyle',
+            'GUICtrlListView_GetGroupInfo',
+            'GUICtrlListView_GetGroupViewEnabled','GUICtrlListView_GetHeader',
+            'GUICtrlListView_GetHotCursor','GUICtrlListView_GetHotItem',
+            'GUICtrlListView_GetHoverTime','GUICtrlListView_GetImageList',
+            'GUICtrlListView_GetISearchString','GUICtrlListView_GetItem',
+            'GUICtrlListView_GetItemChecked','GUICtrlListView_GetItemCount',
+            'GUICtrlListView_GetItemCut','GUICtrlListView_GetItemDropHilited',
+            'GUICtrlListView_GetItemEx','GUICtrlListView_GetItemFocused',
+            'GUICtrlListView_GetItemGroupID','GUICtrlListView_GetItemImage',
+            'GUICtrlListView_GetItemIndent','GUICtrlListView_GetItemParam',
+            'GUICtrlListView_GetItemPosition',
+            'GUICtrlListView_GetItemPositionX',
+            'GUICtrlListView_GetItemPositionY','GUICtrlListView_GetItemRect',
+            'GUICtrlListView_GetItemRectEx','GUICtrlListView_GetItemSelected',
+            'GUICtrlListView_GetItemSpacing','GUICtrlListView_GetItemSpacingX',
+            'GUICtrlListView_GetItemSpacingY','GUICtrlListView_GetItemState',
+            'GUICtrlListView_GetItemStateImage','GUICtrlListView_GetItemText',
+            'GUICtrlListView_GetItemTextArray',
+            'GUICtrlListView_GetItemTextString','GUICtrlListView_GetNextItem',
+            'GUICtrlListView_GetNumberOfWorkAreas','GUICtrlListView_GetOrigin',
+            'GUICtrlListView_GetOriginX','GUICtrlListView_GetOriginY',
+            'GUICtrlListView_GetOutlineColor',
+            'GUICtrlListView_GetSelectedColumn',
+            'GUICtrlListView_GetSelectedCount',
+            'GUICtrlListView_GetSelectedIndices',
+            'GUICtrlListView_GetSelectionMark','GUICtrlListView_GetStringWidth',
+            'GUICtrlListView_GetSubItemRect','GUICtrlListView_GetTextBkColor',
+            'GUICtrlListView_GetTextColor','GUICtrlListView_GetToolTips',
+            'GUICtrlListView_GetTopIndex','GUICtrlListView_GetUnicodeFormat',
+            'GUICtrlListView_GetView','GUICtrlListView_GetViewDetails',
+            'GUICtrlListView_GetViewLarge','GUICtrlListView_GetViewList',
+            'GUICtrlListView_GetViewRect','GUICtrlListView_GetViewSmall',
+            'GUICtrlListView_GetViewTile','GUICtrlListView_HideColumn',
+            'GUICtrlListView_HitTest','GUICtrlListView_InsertColumn',
+            'GUICtrlListView_InsertGroup','GUICtrlListView_InsertItem',
+            'GUICtrlListView_JustifyColumn','GUICtrlListView_MapIDToIndex',
+            'GUICtrlListView_MapIndexToID','GUICtrlListView_RedrawItems',
+            'GUICtrlListView_RegisterSortCallBack',
+            'GUICtrlListView_RemoveAllGroups','GUICtrlListView_RemoveGroup',
+            'GUICtrlListView_Scroll','GUICtrlListView_SetBkColor',
+            'GUICtrlListView_SetBkImage','GUICtrlListView_SetCallBackMask',
+            'GUICtrlListView_SetColumn','GUICtrlListView_SetColumnOrder',
+            'GUICtrlListView_SetColumnOrderArray',
+            'GUICtrlListView_SetColumnWidth',
+            'GUICtrlListView_SetExtendedListViewStyle',
+            'GUICtrlListView_SetGroupInfo','GUICtrlListView_SetHotItem',
+            'GUICtrlListView_SetHoverTime','GUICtrlListView_SetIconSpacing',
+            'GUICtrlListView_SetImageList','GUICtrlListView_SetItem',
+            'GUICtrlListView_SetItemChecked','GUICtrlListView_SetItemCount',
+            'GUICtrlListView_SetItemCut','GUICtrlListView_SetItemDropHilited',
+            'GUICtrlListView_SetItemEx','GUICtrlListView_SetItemFocused',
+            'GUICtrlListView_SetItemGroupID','GUICtrlListView_SetItemImage',
+            'GUICtrlListView_SetItemIndent','GUICtrlListView_SetItemParam',
+            'GUICtrlListView_SetItemPosition',
+            'GUICtrlListView_SetItemPosition32',
+            'GUICtrlListView_SetItemSelected','GUICtrlListView_SetItemState',
+            'GUICtrlListView_SetItemStateImage','GUICtrlListView_SetItemText',
+            'GUICtrlListView_SetOutlineColor',
+            'GUICtrlListView_SetSelectedColumn',
+            'GUICtrlListView_SetSelectionMark','GUICtrlListView_SetTextBkColor',
+            'GUICtrlListView_SetTextColor','GUICtrlListView_SetToolTips',
+            'GUICtrlListView_SetUnicodeFormat','GUICtrlListView_SetView',
+            'GUICtrlListView_SetWorkAreas','GUICtrlListView_SimpleSort',
+            'GUICtrlListView_SortItems','GUICtrlListView_SubItemHitTest',
+            'GUICtrlListView_UnRegisterSortCallBack',
+            'GUICtrlMenu_AddMenuItem','GUICtrlMenu_AppendMenu',
+            'GUICtrlMenu_CheckMenuItem','GUICtrlMenu_CheckRadioItem',
+            'GUICtrlMenu_CreateMenu','GUICtrlMenu_CreatePopup',
+            'GUICtrlMenu_DeleteMenu','GUICtrlMenu_DestroyMenu',
+            'GUICtrlMenu_DrawMenuBar','GUICtrlMenu_EnableMenuItem',
+            'GUICtrlMenu_FindItem','GUICtrlMenu_FindParent',
+            'GUICtrlMenu_GetItemBmp','GUICtrlMenu_GetItemBmpChecked',
+            'GUICtrlMenu_GetItemBmpUnchecked','GUICtrlMenu_GetItemChecked',
+            'GUICtrlMenu_GetItemCount','GUICtrlMenu_GetItemData',
+            'GUICtrlMenu_GetItemDefault','GUICtrlMenu_GetItemDisabled',
+            'GUICtrlMenu_GetItemEnabled','GUICtrlMenu_GetItemGrayed',
+            'GUICtrlMenu_GetItemHighlighted','GUICtrlMenu_GetItemID',
+            'GUICtrlMenu_GetItemInfo','GUICtrlMenu_GetItemRect',
+            'GUICtrlMenu_GetItemRectEx','GUICtrlMenu_GetItemState',
+            'GUICtrlMenu_GetItemStateEx','GUICtrlMenu_GetItemSubMenu',
+            'GUICtrlMenu_GetItemText','GUICtrlMenu_GetItemType',
+            'GUICtrlMenu_GetMenu','GUICtrlMenu_GetMenuBackground',
+            'GUICtrlMenu_GetMenuBarInfo','GUICtrlMenu_GetMenuContextHelpID',
+            'GUICtrlMenu_GetMenuData','GUICtrlMenu_GetMenuDefaultItem',
+            'GUICtrlMenu_GetMenuHeight','GUICtrlMenu_GetMenuInfo',
+            'GUICtrlMenu_GetMenuStyle','GUICtrlMenu_GetSystemMenu',
+            'GUICtrlMenu_InsertMenuItem','GUICtrlMenu_InsertMenuItemEx',
+            'GUICtrlMenu_IsMenu','GUICtrlMenu_LoadMenu',
+            'GUICtrlMenu_MapAccelerator','GUICtrlMenu_MenuItemFromPoint',
+            'GUICtrlMenu_RemoveMenu','GUICtrlMenu_SetItemBitmaps',
+            'GUICtrlMenu_SetItemBmp','GUICtrlMenu_SetItemBmpChecked',
+            'GUICtrlMenu_SetItemBmpUnchecked','GUICtrlMenu_SetItemChecked',
+            'GUICtrlMenu_SetItemData','GUICtrlMenu_SetItemDefault',
+            'GUICtrlMenu_SetItemDisabled','GUICtrlMenu_SetItemEnabled',
+            'GUICtrlMenu_SetItemGrayed','GUICtrlMenu_SetItemHighlighted',
+            'GUICtrlMenu_SetItemID','GUICtrlMenu_SetItemInfo',
+            'GUICtrlMenu_SetItemState','GUICtrlMenu_SetItemSubMenu',
+            'GUICtrlMenu_SetItemText','GUICtrlMenu_SetItemType',
+            'GUICtrlMenu_SetMenu','GUICtrlMenu_SetMenuBackground',
+            'GUICtrlMenu_SetMenuContextHelpID','GUICtrlMenu_SetMenuData',
+            'GUICtrlMenu_SetMenuDefaultItem','GUICtrlMenu_SetMenuHeight',
+            'GUICtrlMenu_SetMenuInfo','GUICtrlMenu_SetMenuStyle',
+            'GUICtrlMenu_TrackPopupMenu','GUICtrlMonthCal_Create',
+            'GUICtrlMonthCal_Destroy','GUICtrlMonthCal_GetColor',
+            'GUICtrlMonthCal_GetColorArray','GUICtrlMonthCal_GetCurSel',
+            'GUICtrlMonthCal_GetCurSelStr','GUICtrlMonthCal_GetFirstDOW',
+            'GUICtrlMonthCal_GetFirstDOWStr','GUICtrlMonthCal_GetMaxSelCount',
+            'GUICtrlMonthCal_GetMaxTodayWidth',
+            'GUICtrlMonthCal_GetMinReqHeight','GUICtrlMonthCal_GetMinReqRect',
+            'GUICtrlMonthCal_GetMinReqRectArray',
+            'GUICtrlMonthCal_GetMinReqWidth','GUICtrlMonthCal_GetMonthDelta',
+            'GUICtrlMonthCal_GetMonthRange','GUICtrlMonthCal_GetMonthRangeMax',
+            'GUICtrlMonthCal_GetMonthRangeMaxStr',
+            'GUICtrlMonthCal_GetMonthRangeMin',
+            'GUICtrlMonthCal_GetMonthRangeMinStr',
+            'GUICtrlMonthCal_GetMonthRangeSpan','GUICtrlMonthCal_GetRange',
+            'GUICtrlMonthCal_GetRangeMax','GUICtrlMonthCal_GetRangeMaxStr',
+            'GUICtrlMonthCal_GetRangeMin','GUICtrlMonthCal_GetRangeMinStr',
+            'GUICtrlMonthCal_GetSelRange','GUICtrlMonthCal_GetSelRangeMax',
+            'GUICtrlMonthCal_GetSelRangeMaxStr',
+            'GUICtrlMonthCal_GetSelRangeMin',
+            'GUICtrlMonthCal_GetSelRangeMinStr','GUICtrlMonthCal_GetToday',
+            'GUICtrlMonthCal_GetTodayStr','GUICtrlMonthCal_GetUnicodeFormat',
+            'GUICtrlMonthCal_HitTest','GUICtrlMonthCal_SetColor',
+            'GUICtrlMonthCal_SetCurSel','GUICtrlMonthCal_SetDayState',
+            'GUICtrlMonthCal_SetFirstDOW','GUICtrlMonthCal_SetMaxSelCount',
+            'GUICtrlMonthCal_SetMonthDelta','GUICtrlMonthCal_SetRange',
+            'GUICtrlMonthCal_SetSelRange','GUICtrlMonthCal_SetToday',
+            'GUICtrlMonthCal_SetUnicodeFormat','GUICtrlRebar_AddBand',
+            'GUICtrlRebar_AddToolBarBand','GUICtrlRebar_BeginDrag',
+            'GUICtrlRebar_Create','GUICtrlRebar_DeleteBand',
+            'GUICtrlRebar_Destroy','GUICtrlRebar_DragMove',
+            'GUICtrlRebar_EndDrag','GUICtrlRebar_GetBandBackColor',
+            'GUICtrlRebar_GetBandBorders','GUICtrlRebar_GetBandBordersEx',
+            'GUICtrlRebar_GetBandChildHandle','GUICtrlRebar_GetBandChildSize',
+            'GUICtrlRebar_GetBandCount','GUICtrlRebar_GetBandForeColor',
+            'GUICtrlRebar_GetBandHeaderSize','GUICtrlRebar_GetBandID',
+            'GUICtrlRebar_GetBandIdealSize','GUICtrlRebar_GetBandLength',
+            'GUICtrlRebar_GetBandLParam','GUICtrlRebar_GetBandMargins',
+            'GUICtrlRebar_GetBandMarginsEx','GUICtrlRebar_GetBandRect',
+            'GUICtrlRebar_GetBandRectEx','GUICtrlRebar_GetBandStyle',
+            'GUICtrlRebar_GetBandStyleBreak',
+            'GUICtrlRebar_GetBandStyleChildEdge',
+            'GUICtrlRebar_GetBandStyleFixedBMP',
+            'GUICtrlRebar_GetBandStyleFixedSize',
+            'GUICtrlRebar_GetBandStyleGripperAlways',
+            'GUICtrlRebar_GetBandStyleHidden',
+            'GUICtrlRebar_GetBandStyleHideTitle',
+            'GUICtrlRebar_GetBandStyleNoGripper',
+            'GUICtrlRebar_GetBandStyleTopAlign',
+            'GUICtrlRebar_GetBandStyleUseChevron',
+            'GUICtrlRebar_GetBandStyleVariableHeight',
+            'GUICtrlRebar_GetBandText','GUICtrlRebar_GetBarHeight',
+            'GUICtrlRebar_GetBKColor','GUICtrlRebar_GetColorScheme',
+            'GUICtrlRebar_GetRowCount','GUICtrlRebar_GetRowHeight',
+            'GUICtrlRebar_GetTextColor','GUICtrlRebar_GetToolTips',
+            'GUICtrlRebar_GetUnicodeFormat','GUICtrlRebar_HitTest',
+            'GUICtrlRebar_IDToIndex','GUICtrlRebar_MaximizeBand',
+            'GUICtrlRebar_MinimizeBand','GUICtrlRebar_MoveBand',
+            'GUICtrlRebar_SetBandBackColor','GUICtrlRebar_SetBandForeColor',
+            'GUICtrlRebar_SetBandHeaderSize','GUICtrlRebar_SetBandID',
+            'GUICtrlRebar_SetBandIdealSize','GUICtrlRebar_SetBandLength',
+            'GUICtrlRebar_SetBandLParam','GUICtrlRebar_SetBandStyle',
+            'GUICtrlRebar_SetBandStyleBreak',
+            'GUICtrlRebar_SetBandStyleChildEdge',
+            'GUICtrlRebar_SetBandStyleFixedBMP',
+            'GUICtrlRebar_SetBandStyleFixedSize',
+            'GUICtrlRebar_SetBandStyleGripperAlways',
+            'GUICtrlRebar_SetBandStyleHidden',
+            'GUICtrlRebar_SetBandStyleHideTitle',
+            'GUICtrlRebar_SetBandStyleNoGripper',
+            'GUICtrlRebar_SetBandStyleTopAlign',
+            'GUICtrlRebar_SetBandStyleUseChevron',
+            'GUICtrlRebar_SetBandStyleVariableHeight',
+            'GUICtrlRebar_SetBandText','GUICtrlRebar_SetBKColor',
+            'GUICtrlRebar_SetColorScheme','GUICtrlRebar_SetTextColor',
+            'GUICtrlRebar_SetToolTips','GUICtrlRebar_SetUnicodeFormat',
+            'GUICtrlRebar_ShowBand','GUICtrlSlider_ClearSel',
+            'GUICtrlSlider_ClearTics','GUICtrlSlider_Create',
+            'GUICtrlSlider_Destroy','GUICtrlSlider_GetBuddy',
+            'GUICtrlSlider_GetChannelRect','GUICtrlSlider_GetLineSize',
+            'GUICtrlSlider_GetNumTics','GUICtrlSlider_GetPageSize',
+            'GUICtrlSlider_GetPos','GUICtrlSlider_GetPTics',
+            'GUICtrlSlider_GetRange','GUICtrlSlider_GetRangeMax',
+            'GUICtrlSlider_GetRangeMin','GUICtrlSlider_GetSel',
+            'GUICtrlSlider_GetSelEnd','GUICtrlSlider_GetSelStart',
+            'GUICtrlSlider_GetThumbLength','GUICtrlSlider_GetThumbRect',
+            'GUICtrlSlider_GetThumbRectEx','GUICtrlSlider_GetTic',
+            'GUICtrlSlider_GetTicPos','GUICtrlSlider_GetToolTips',
+            'GUICtrlSlider_GetUnicodeFormat','GUICtrlSlider_SetBuddy',
+            'GUICtrlSlider_SetLineSize','GUICtrlSlider_SetPageSize',
+            'GUICtrlSlider_SetPos','GUICtrlSlider_SetRange',
+            'GUICtrlSlider_SetRangeMax','GUICtrlSlider_SetRangeMin',
+            'GUICtrlSlider_SetSel','GUICtrlSlider_SetSelEnd',
+            'GUICtrlSlider_SetSelStart','GUICtrlSlider_SetThumbLength',
+            'GUICtrlSlider_SetTic','GUICtrlSlider_SetTicFreq',
+            'GUICtrlSlider_SetTipSide','GUICtrlSlider_SetToolTips',
+            'GUICtrlSlider_SetUnicodeFormat','GUICtrlStatusBar_Create',
+            'GUICtrlStatusBar_Destroy','GUICtrlStatusBar_EmbedControl',
+            'GUICtrlStatusBar_GetBorders','GUICtrlStatusBar_GetBordersHorz',
+            'GUICtrlStatusBar_GetBordersRect','GUICtrlStatusBar_GetBordersVert',
+            'GUICtrlStatusBar_GetCount','GUICtrlStatusBar_GetHeight',
+            'GUICtrlStatusBar_GetIcon','GUICtrlStatusBar_GetParts',
+            'GUICtrlStatusBar_GetRect','GUICtrlStatusBar_GetRectEx',
+            'GUICtrlStatusBar_GetText','GUICtrlStatusBar_GetTextFlags',
+            'GUICtrlStatusBar_GetTextLength','GUICtrlStatusBar_GetTextLengthEx',
+            'GUICtrlStatusBar_GetTipText','GUICtrlStatusBar_GetUnicodeFormat',
+            'GUICtrlStatusBar_GetWidth','GUICtrlStatusBar_IsSimple',
+            'GUICtrlStatusBar_Resize','GUICtrlStatusBar_SetBkColor',
+            'GUICtrlStatusBar_SetIcon','GUICtrlStatusBar_SetMinHeight',
+            'GUICtrlStatusBar_SetParts','GUICtrlStatusBar_SetSimple',
+            'GUICtrlStatusBar_SetText','GUICtrlStatusBar_SetTipText',
+            'GUICtrlStatusBar_SetUnicodeFormat','GUICtrlStatusBar_ShowHide',
+            'GUICtrlTab_Create','GUICtrlTab_DeleteAllItems',
+            'GUICtrlTab_DeleteItem','GUICtrlTab_DeselectAll',
+            'GUICtrlTab_Destroy','GUICtrlTab_FindTab','GUICtrlTab_GetCurFocus',
+            'GUICtrlTab_GetCurSel','GUICtrlTab_GetDisplayRect',
+            'GUICtrlTab_GetDisplayRectEx','GUICtrlTab_GetExtendedStyle',
+            'GUICtrlTab_GetImageList','GUICtrlTab_GetItem',
+            'GUICtrlTab_GetItemCount','GUICtrlTab_GetItemImage',
+            'GUICtrlTab_GetItemParam','GUICtrlTab_GetItemRect',
+            'GUICtrlTab_GetItemRectEx','GUICtrlTab_GetItemState',
+            'GUICtrlTab_GetItemText','GUICtrlTab_GetRowCount',
+            'GUICtrlTab_GetToolTips','GUICtrlTab_GetUnicodeFormat',
+            'GUICtrlTab_HighlightItem','GUICtrlTab_HitTest',
+            'GUICtrlTab_InsertItem','GUICtrlTab_RemoveImage',
+            'GUICtrlTab_SetCurFocus','GUICtrlTab_SetCurSel',
+            'GUICtrlTab_SetExtendedStyle','GUICtrlTab_SetImageList',
+            'GUICtrlTab_SetItem','GUICtrlTab_SetItemImage',
+            'GUICtrlTab_SetItemParam','GUICtrlTab_SetItemSize',
+            'GUICtrlTab_SetItemState','GUICtrlTab_SetItemText',
+            'GUICtrlTab_SetMinTabWidth','GUICtrlTab_SetPadding',
+            'GUICtrlTab_SetToolTips','GUICtrlTab_SetUnicodeFormat',
+            'GUICtrlToolbar_AddBitmap','GUICtrlToolbar_AddButton',
+            'GUICtrlToolbar_AddButtonSep','GUICtrlToolbar_AddString',
+            'GUICtrlToolbar_ButtonCount','GUICtrlToolbar_CheckButton',
+            'GUICtrlToolbar_ClickAccel','GUICtrlToolbar_ClickButton',
+            'GUICtrlToolbar_ClickIndex','GUICtrlToolbar_CommandToIndex',
+            'GUICtrlToolbar_Create','GUICtrlToolbar_Customize',
+            'GUICtrlToolbar_DeleteButton','GUICtrlToolbar_Destroy',
+            'GUICtrlToolbar_EnableButton','GUICtrlToolbar_FindToolbar',
+            'GUICtrlToolbar_GetAnchorHighlight','GUICtrlToolbar_GetBitmapFlags',
+            'GUICtrlToolbar_GetButtonBitmap','GUICtrlToolbar_GetButtonInfo',
+            'GUICtrlToolbar_GetButtonInfoEx','GUICtrlToolbar_GetButtonParam',
+            'GUICtrlToolbar_GetButtonRect','GUICtrlToolbar_GetButtonRectEx',
+            'GUICtrlToolbar_GetButtonSize','GUICtrlToolbar_GetButtonState',
+            'GUICtrlToolbar_GetButtonStyle','GUICtrlToolbar_GetButtonText',
+            'GUICtrlToolbar_GetColorScheme',
+            'GUICtrlToolbar_GetDisabledImageList',
+            'GUICtrlToolbar_GetExtendedStyle','GUICtrlToolbar_GetHotImageList',
+            'GUICtrlToolbar_GetHotItem','GUICtrlToolbar_GetImageList',
+            'GUICtrlToolbar_GetInsertMark','GUICtrlToolbar_GetInsertMarkColor',
+            'GUICtrlToolbar_GetMaxSize','GUICtrlToolbar_GetMetrics',
+            'GUICtrlToolbar_GetPadding','GUICtrlToolbar_GetRows',
+            'GUICtrlToolbar_GetString','GUICtrlToolbar_GetStyle',
+            'GUICtrlToolbar_GetStyleAltDrag',
+            'GUICtrlToolbar_GetStyleCustomErase','GUICtrlToolbar_GetStyleFlat',
+            'GUICtrlToolbar_GetStyleList','GUICtrlToolbar_GetStyleRegisterDrop',
+            'GUICtrlToolbar_GetStyleToolTips',
+            'GUICtrlToolbar_GetStyleTransparent',
+            'GUICtrlToolbar_GetStyleWrapable','GUICtrlToolbar_GetTextRows',
+            'GUICtrlToolbar_GetToolTips','GUICtrlToolbar_GetUnicodeFormat',
+            'GUICtrlToolbar_HideButton','GUICtrlToolbar_HighlightButton',
+            'GUICtrlToolbar_HitTest','GUICtrlToolbar_IndexToCommand',
+            'GUICtrlToolbar_InsertButton','GUICtrlToolbar_InsertMarkHitTest',
+            'GUICtrlToolbar_IsButtonChecked','GUICtrlToolbar_IsButtonEnabled',
+            'GUICtrlToolbar_IsButtonHidden',
+            'GUICtrlToolbar_IsButtonHighlighted',
+            'GUICtrlToolbar_IsButtonIndeterminate',
+            'GUICtrlToolbar_IsButtonPressed','GUICtrlToolbar_LoadBitmap',
+            'GUICtrlToolbar_LoadImages','GUICtrlToolbar_MapAccelerator',
+            'GUICtrlToolbar_MoveButton','GUICtrlToolbar_PressButton',
+            'GUICtrlToolbar_SetAnchorHighlight','GUICtrlToolbar_SetBitmapSize',
+            'GUICtrlToolbar_SetButtonBitMap','GUICtrlToolbar_SetButtonInfo',
+            'GUICtrlToolbar_SetButtonInfoEx','GUICtrlToolbar_SetButtonParam',
+            'GUICtrlToolbar_SetButtonSize','GUICtrlToolbar_SetButtonState',
+            'GUICtrlToolbar_SetButtonStyle','GUICtrlToolbar_SetButtonText',
+            'GUICtrlToolbar_SetButtonWidth','GUICtrlToolbar_SetCmdID',
+            'GUICtrlToolbar_SetColorScheme',
+            'GUICtrlToolbar_SetDisabledImageList',
+            'GUICtrlToolbar_SetDrawTextFlags','GUICtrlToolbar_SetExtendedStyle',
+            'GUICtrlToolbar_SetHotImageList','GUICtrlToolbar_SetHotItem',
+            'GUICtrlToolbar_SetImageList','GUICtrlToolbar_SetIndent',
+            'GUICtrlToolbar_SetIndeterminate','GUICtrlToolbar_SetInsertMark',
+            'GUICtrlToolbar_SetInsertMarkColor','GUICtrlToolbar_SetMaxTextRows',
+            'GUICtrlToolbar_SetMetrics','GUICtrlToolbar_SetPadding',
+            'GUICtrlToolbar_SetParent','GUICtrlToolbar_SetRows',
+            'GUICtrlToolbar_SetStyle','GUICtrlToolbar_SetStyleAltDrag',
+            'GUICtrlToolbar_SetStyleCustomErase','GUICtrlToolbar_SetStyleFlat',
+            'GUICtrlToolbar_SetStyleList','GUICtrlToolbar_SetStyleRegisterDrop',
+            'GUICtrlToolbar_SetStyleToolTips',
+            'GUICtrlToolbar_SetStyleTransparent',
+            'GUICtrlToolbar_SetStyleWrapable','GUICtrlToolbar_SetToolTips',
+            'GUICtrlToolbar_SetUnicodeFormat','GUICtrlToolbar_SetWindowTheme',
+            'GUICtrlTreeView_Add','GUICtrlTreeView_AddChild',
+            'GUICtrlTreeView_AddChildFirst','GUICtrlTreeView_AddFirst',
+            'GUICtrlTreeView_BeginUpdate','GUICtrlTreeView_ClickItem',
+            'GUICtrlTreeView_Create','GUICtrlTreeView_CreateDragImage',
+            'GUICtrlTreeView_CreateSolidBitMap','GUICtrlTreeView_Delete',
+            'GUICtrlTreeView_DeleteAll','GUICtrlTreeView_DeleteChildren',
+            'GUICtrlTreeView_Destroy','GUICtrlTreeView_DisplayRect',
+            'GUICtrlTreeView_DisplayRectEx','GUICtrlTreeView_EditText',
+            'GUICtrlTreeView_EndEdit','GUICtrlTreeView_EndUpdate',
+            'GUICtrlTreeView_EnsureVisible','GUICtrlTreeView_Expand',
+            'GUICtrlTreeView_ExpandedOnce','GUICtrlTreeView_FindItem',
+            'GUICtrlTreeView_FindItemEx','GUICtrlTreeView_GetBkColor',
+            'GUICtrlTreeView_GetBold','GUICtrlTreeView_GetChecked',
+            'GUICtrlTreeView_GetChildCount','GUICtrlTreeView_GetChildren',
+            'GUICtrlTreeView_GetCount','GUICtrlTreeView_GetCut',
+            'GUICtrlTreeView_GetDropTarget','GUICtrlTreeView_GetEditControl',
+            'GUICtrlTreeView_GetExpanded','GUICtrlTreeView_GetFirstChild',
+            'GUICtrlTreeView_GetFirstItem','GUICtrlTreeView_GetFirstVisible',
+            'GUICtrlTreeView_GetFocused','GUICtrlTreeView_GetHeight',
+            'GUICtrlTreeView_GetImageIndex',
+            'GUICtrlTreeView_GetImageListIconHandle',
+            'GUICtrlTreeView_GetIndent','GUICtrlTreeView_GetInsertMarkColor',
+            'GUICtrlTreeView_GetISearchString','GUICtrlTreeView_GetItemByIndex',
+            'GUICtrlTreeView_GetItemHandle','GUICtrlTreeView_GetItemParam',
+            'GUICtrlTreeView_GetLastChild','GUICtrlTreeView_GetLineColor',
+            'GUICtrlTreeView_GetNext','GUICtrlTreeView_GetNextChild',
+            'GUICtrlTreeView_GetNextSibling','GUICtrlTreeView_GetNextVisible',
+            'GUICtrlTreeView_GetNormalImageList',
+            'GUICtrlTreeView_GetParentHandle','GUICtrlTreeView_GetParentParam',
+            'GUICtrlTreeView_GetPrev','GUICtrlTreeView_GetPrevChild',
+            'GUICtrlTreeView_GetPrevSibling','GUICtrlTreeView_GetPrevVisible',
+            'GUICtrlTreeView_GetScrollTime','GUICtrlTreeView_GetSelected',
+            'GUICtrlTreeView_GetSelectedImageIndex',
+            'GUICtrlTreeView_GetSelection','GUICtrlTreeView_GetSiblingCount',
+            'GUICtrlTreeView_GetState','GUICtrlTreeView_GetStateImageIndex',
+            'GUICtrlTreeView_GetStateImageList','GUICtrlTreeView_GetText',
+            'GUICtrlTreeView_GetTextColor','GUICtrlTreeView_GetToolTips',
+            'GUICtrlTreeView_GetTree','GUICtrlTreeView_GetUnicodeFormat',
+            'GUICtrlTreeView_GetVisible','GUICtrlTreeView_GetVisibleCount',
+            'GUICtrlTreeView_HitTest','GUICtrlTreeView_HitTestEx',
+            'GUICtrlTreeView_HitTestItem','GUICtrlTreeView_Index',
+            'GUICtrlTreeView_InsertItem','GUICtrlTreeView_IsFirstItem',
+            'GUICtrlTreeView_IsParent','GUICtrlTreeView_Level',
+            'GUICtrlTreeView_SelectItem','GUICtrlTreeView_SelectItemByIndex',
+            'GUICtrlTreeView_SetBkColor','GUICtrlTreeView_SetBold',
+            'GUICtrlTreeView_SetChecked','GUICtrlTreeView_SetCheckedByIndex',
+            'GUICtrlTreeView_SetChildren','GUICtrlTreeView_SetCut',
+            'GUICtrlTreeView_SetDropTarget','GUICtrlTreeView_SetFocused',
+            'GUICtrlTreeView_SetHeight','GUICtrlTreeView_SetIcon',
+            'GUICtrlTreeView_SetImageIndex','GUICtrlTreeView_SetIndent',
+            'GUICtrlTreeView_SetInsertMark',
+            'GUICtrlTreeView_SetInsertMarkColor',
+            'GUICtrlTreeView_SetItemHeight','GUICtrlTreeView_SetItemParam',
+            'GUICtrlTreeView_SetLineColor','GUICtrlTreeView_SetNormalImageList',
+            'GUICtrlTreeView_SetScrollTime','GUICtrlTreeView_SetSelected',
+            'GUICtrlTreeView_SetSelectedImageIndex','GUICtrlTreeView_SetState',
+            'GUICtrlTreeView_SetStateImageIndex',
+            'GUICtrlTreeView_SetStateImageList','GUICtrlTreeView_SetText',
+            'GUICtrlTreeView_SetTextColor','GUICtrlTreeView_SetToolTips',
+            'GUICtrlTreeView_SetUnicodeFormat','GUICtrlTreeView_Sort',
+            'GUIImageList_Add','GUIImageList_AddBitmap','GUIImageList_AddIcon',
+            'GUIImageList_AddMasked','GUIImageList_BeginDrag',
+            'GUIImageList_Copy','GUIImageList_Create','GUIImageList_Destroy',
+            'GUIImageList_DestroyIcon','GUIImageList_DragEnter',
+            'GUIImageList_DragLeave','GUIImageList_DragMove',
+            'GUIImageList_Draw','GUIImageList_DrawEx','GUIImageList_Duplicate',
+            'GUIImageList_EndDrag','GUIImageList_GetBkColor',
+            'GUIImageList_GetIcon','GUIImageList_GetIconHeight',
+            'GUIImageList_GetIconSize','GUIImageList_GetIconSizeEx',
+            'GUIImageList_GetIconWidth','GUIImageList_GetImageCount',
+            'GUIImageList_GetImageInfoEx','GUIImageList_Remove',
+            'GUIImageList_ReplaceIcon','GUIImageList_SetBkColor',
+            'GUIImageList_SetIconSize','GUIImageList_SetImageCount',
+            'GUIImageList_Swap','GUIScrollBars_EnableScrollBar',
+            'GUIScrollBars_GetScrollBarInfoEx','GUIScrollBars_GetScrollBarRect',
+            'GUIScrollBars_GetScrollBarRGState',
+            'GUIScrollBars_GetScrollBarXYLineButton',
+            'GUIScrollBars_GetScrollBarXYThumbBottom',
+            'GUIScrollBars_GetScrollBarXYThumbTop',
+            'GUIScrollBars_GetScrollInfo','GUIScrollBars_GetScrollInfoEx',
+            'GUIScrollBars_GetScrollInfoMax','GUIScrollBars_GetScrollInfoMin',
+            'GUIScrollBars_GetScrollInfoPage','GUIScrollBars_GetScrollInfoPos',
+            'GUIScrollBars_GetScrollInfoTrackPos','GUIScrollBars_GetScrollPos',
+            'GUIScrollBars_GetScrollRange','GUIScrollBars_Init',
+            'GUIScrollBars_ScrollWindow','GUIScrollBars_SetScrollInfo',
+            'GUIScrollBars_SetScrollInfoMax','GUIScrollBars_SetScrollInfoMin',
+            'GUIScrollBars_SetScrollInfoPage','GUIScrollBars_SetScrollInfoPos',
+            'GUIScrollBars_SetScrollRange','GUIScrollBars_ShowScrollBar',
+            'GUIToolTip_Activate','GUIToolTip_AddTool','GUIToolTip_AdjustRect',
+            'GUIToolTip_BitsToTTF','GUIToolTip_Create','GUIToolTip_DelTool',
+            'GUIToolTip_Destroy','GUIToolTip_EnumTools',
+            'GUIToolTip_GetBubbleHeight','GUIToolTip_GetBubbleSize',
+            'GUIToolTip_GetBubbleWidth','GUIToolTip_GetCurrentTool',
+            'GUIToolTip_GetDelayTime','GUIToolTip_GetMargin',
+            'GUIToolTip_GetMarginEx','GUIToolTip_GetMaxTipWidth',
+            'GUIToolTip_GetText','GUIToolTip_GetTipBkColor',
+            'GUIToolTip_GetTipTextColor','GUIToolTip_GetTitleBitMap',
+            'GUIToolTip_GetTitleText','GUIToolTip_GetToolCount',
+            'GUIToolTip_GetToolInfo','GUIToolTip_HitTest',
+            'GUIToolTip_NewToolRect','GUIToolTip_Pop','GUIToolTip_PopUp',
+            'GUIToolTip_SetDelayTime','GUIToolTip_SetMargin',
+            'GUIToolTip_SetMaxTipWidth','GUIToolTip_SetTipBkColor',
+            'GUIToolTip_SetTipTextColor','GUIToolTip_SetTitle',
+            'GUIToolTip_SetToolInfo','GUIToolTip_SetWindowTheme',
+            'GUIToolTip_ToolExists','GUIToolTip_ToolToArray',
+            'GUIToolTip_TrackActivate','GUIToolTip_TrackPosition',
+            'GUIToolTip_TTFToBits','GUIToolTip_Update',
+            'GUIToolTip_UpdateTipText','HexToString','IE_Example',
+            'IE_Introduction','IE_VersionInfo','IEAction','IEAttach',
+            'IEBodyReadHTML','IEBodyReadText','IEBodyWriteHTML','IECreate',
+            'IECreateEmbedded','IEDocGetObj','IEDocInsertHTML',
+            'IEDocInsertText','IEDocReadHTML','IEDocWriteHTML',
+            'IEErrorHandlerDeRegister','IEErrorHandlerRegister','IEErrorNotify',
+            'IEFormElementCheckBoxSelect','IEFormElementGetCollection',
+            'IEFormElementGetObjByName','IEFormElementGetValue',
+            'IEFormElementOptionSelect','IEFormElementRadioSelect',
+            'IEFormElementSetValue','IEFormGetCollection','IEFormGetObjByName',
+            'IEFormImageClick','IEFormReset','IEFormSubmit',
+            'IEFrameGetCollection','IEFrameGetObjByName','IEGetObjById',
+            'IEGetObjByName','IEHeadInsertEventScript','IEImgClick',
+            'IEImgGetCollection','IEIsFrameSet','IELinkClickByIndex',
+            'IELinkClickByText','IELinkGetCollection','IELoadWait',
+            'IELoadWaitTimeout','IENavigate','IEPropertyGet','IEPropertySet',
+            'IEQuit','IETableGetCollection','IETableWriteToArray',
+            'IETagNameAllGetCollection','IETagNameGetCollection','Iif',
+            'INetExplorerCapable','INetGetSource','INetMail','INetSmtpMail',
+            'IsPressed','MathCheckDiv','Max','MemGlobalAlloc','MemGlobalFree',
+            'MemGlobalLock','MemGlobalSize','MemGlobalUnlock','MemMoveMemory',
+            'MemMsgBox','MemShowError','MemVirtualAlloc','MemVirtualAllocEx',
+            'MemVirtualFree','MemVirtualFreeEx','Min','MouseTrap',
+            'NamedPipes_CallNamedPipe','NamedPipes_ConnectNamedPipe',
+            'NamedPipes_CreateNamedPipe','NamedPipes_CreatePipe',
+            'NamedPipes_DisconnectNamedPipe',
+            'NamedPipes_GetNamedPipeHandleState','NamedPipes_GetNamedPipeInfo',
+            'NamedPipes_PeekNamedPipe','NamedPipes_SetNamedPipeHandleState',
+            'NamedPipes_TransactNamedPipe','NamedPipes_WaitNamedPipe',
+            'Net_Share_ConnectionEnum','Net_Share_FileClose',
+            'Net_Share_FileEnum','Net_Share_FileGetInfo','Net_Share_PermStr',
+            'Net_Share_ResourceStr','Net_Share_SessionDel',
+            'Net_Share_SessionEnum','Net_Share_SessionGetInfo',
+            'Net_Share_ShareAdd','Net_Share_ShareCheck','Net_Share_ShareDel',
+            'Net_Share_ShareEnum','Net_Share_ShareGetInfo',
+            'Net_Share_ShareSetInfo','Net_Share_StatisticsGetSvr',
+            'Net_Share_StatisticsGetWrk','Now','NowCalc','NowCalcDate',
+            'NowDate','NowTime','PathFull','PathMake','PathSplit',
+            'ProcessGetName','ProcessGetPriority','Radian',
+            'ReplaceStringInFile','RunDOS','ScreenCapture_Capture',
+            'ScreenCapture_CaptureWnd','ScreenCapture_SaveImage',
+            'ScreenCapture_SetBMPFormat','ScreenCapture_SetJPGQuality',
+            'ScreenCapture_SetTIFColorDepth','ScreenCapture_SetTIFCompression',
+            'Security__AdjustTokenPrivileges','Security__GetAccountSid',
+            'Security__GetLengthSid','Security__GetTokenInformation',
+            'Security__ImpersonateSelf','Security__IsValidSid',
+            'Security__LookupAccountName','Security__LookupAccountSid',
+            'Security__LookupPrivilegeValue','Security__OpenProcessToken',
+            'Security__OpenThreadToken','Security__OpenThreadTokenEx',
+            'Security__SetPrivilege','Security__SidToStringSid',
+            'Security__SidTypeStr','Security__StringSidToSid','SendMessage',
+            'SendMessageA','SetDate','SetTime','Singleton','SoundClose',
+            'SoundLength','SoundOpen','SoundPause','SoundPlay','SoundPos',
+            'SoundResume','SoundSeek','SoundStatus','SoundStop',
+            'SQLite_Changes','SQLite_Close','SQLite_Display2DResult',
+            'SQLite_Encode','SQLite_ErrCode','SQLite_ErrMsg','SQLite_Escape',
+            'SQLite_Exec','SQLite_FetchData','SQLite_FetchNames',
+            'SQLite_GetTable','SQLite_GetTable2d','SQLite_LastInsertRowID',
+            'SQLite_LibVersion','SQLite_Open','SQLite_Query',
+            'SQLite_QueryFinalize','SQLite_QueryReset','SQLite_QuerySingleRow',
+            'SQLite_SaveMode','SQLite_SetTimeout','SQLite_Shutdown',
+            'SQLite_SQLiteExe','SQLite_Startup','SQLite_TotalChanges',
+            'StringAddComma','StringBetween','StringEncrypt','StringInsert',
+            'StringProper','StringRepeat','StringReverse','StringSplit',
+            'StringToHex','TCPIpToName','TempFile','TicksToTime','Timer_Diff',
+            'Timer_GetTimerID','Timer_Init','Timer_KillAllTimers',
+            'Timer_KillTimer','Timer_SetTimer','TimeToTicks','VersionCompare',
+            'viClose','viExecCommand','viFindGpib','viGpibBusReset','viGTL',
+            'viOpen','viSetAttribute','viSetTimeout','WeekNumberISO',
+            'WinAPI_AttachConsole','WinAPI_AttachThreadInput','WinAPI_Beep',
+            'WinAPI_BitBlt','WinAPI_CallNextHookEx','WinAPI_Check',
+            'WinAPI_ClientToScreen','WinAPI_CloseHandle',
+            'WinAPI_CommDlgExtendedError','WinAPI_CopyIcon',
+            'WinAPI_CreateBitmap','WinAPI_CreateCompatibleBitmap',
+            'WinAPI_CreateCompatibleDC','WinAPI_CreateEvent',
+            'WinAPI_CreateFile','WinAPI_CreateFont','WinAPI_CreateFontIndirect',
+            'WinAPI_CreateProcess','WinAPI_CreateSolidBitmap',
+            'WinAPI_CreateSolidBrush','WinAPI_CreateWindowEx',
+            'WinAPI_DefWindowProc','WinAPI_DeleteDC','WinAPI_DeleteObject',
+            'WinAPI_DestroyIcon','WinAPI_DestroyWindow','WinAPI_DrawEdge',
+            'WinAPI_DrawFrameControl','WinAPI_DrawIcon','WinAPI_DrawIconEx',
+            'WinAPI_DrawText','WinAPI_EnableWindow','WinAPI_EnumDisplayDevices',
+            'WinAPI_EnumWindows','WinAPI_EnumWindowsPopup',
+            'WinAPI_EnumWindowsTop','WinAPI_ExpandEnvironmentStrings',
+            'WinAPI_ExtractIconEx','WinAPI_FatalAppExit','WinAPI_FillRect',
+            'WinAPI_FindExecutable','WinAPI_FindWindow','WinAPI_FlashWindow',
+            'WinAPI_FlashWindowEx','WinAPI_FloatToInt',
+            'WinAPI_FlushFileBuffers','WinAPI_FormatMessage','WinAPI_FrameRect',
+            'WinAPI_FreeLibrary','WinAPI_GetAncestor','WinAPI_GetAsyncKeyState',
+            'WinAPI_GetClassName','WinAPI_GetClientHeight',
+            'WinAPI_GetClientRect','WinAPI_GetClientWidth',
+            'WinAPI_GetCurrentProcess','WinAPI_GetCurrentProcessID',
+            'WinAPI_GetCurrentThread','WinAPI_GetCurrentThreadId',
+            'WinAPI_GetCursorInfo','WinAPI_GetDC','WinAPI_GetDesktopWindow',
+            'WinAPI_GetDeviceCaps','WinAPI_GetDIBits','WinAPI_GetDlgCtrlID',
+            'WinAPI_GetDlgItem','WinAPI_GetFileSizeEx','WinAPI_GetFocus',
+            'WinAPI_GetForegroundWindow','WinAPI_GetIconInfo',
+            'WinAPI_GetLastError','WinAPI_GetLastErrorMessage',
+            'WinAPI_GetModuleHandle','WinAPI_GetMousePos','WinAPI_GetMousePosX',
+            'WinAPI_GetMousePosY','WinAPI_GetObject','WinAPI_GetOpenFileName',
+            'WinAPI_GetOverlappedResult','WinAPI_GetParent',
+            'WinAPI_GetProcessAffinityMask','WinAPI_GetSaveFileName',
+            'WinAPI_GetStdHandle','WinAPI_GetStockObject','WinAPI_GetSysColor',
+            'WinAPI_GetSysColorBrush','WinAPI_GetSystemMetrics',
+            'WinAPI_GetTextExtentPoint32','WinAPI_GetWindow',
+            'WinAPI_GetWindowDC','WinAPI_GetWindowHeight',
+            'WinAPI_GetWindowLong','WinAPI_GetWindowRect',
+            'WinAPI_GetWindowText','WinAPI_GetWindowThreadProcessId',
+            'WinAPI_GetWindowWidth','WinAPI_GetXYFromPoint',
+            'WinAPI_GlobalMemStatus','WinAPI_GUIDFromString',
+            'WinAPI_GUIDFromStringEx','WinAPI_HiWord','WinAPI_InProcess',
+            'WinAPI_IntToFloat','WinAPI_InvalidateRect','WinAPI_IsClassName',
+            'WinAPI_IsWindow','WinAPI_IsWindowVisible','WinAPI_LoadBitmap',
+            'WinAPI_LoadImage','WinAPI_LoadLibrary','WinAPI_LoadLibraryEx',
+            'WinAPI_LoadShell32Icon','WinAPI_LoadString','WinAPI_LocalFree',
+            'WinAPI_LoWord','WinAPI_MakeDWord','WinAPI_MAKELANGID',
+            'WinAPI_MAKELCID','WinAPI_MakeLong','WinAPI_MessageBeep',
+            'WinAPI_Mouse_Event','WinAPI_MoveWindow','WinAPI_MsgBox',
+            'WinAPI_MulDiv','WinAPI_MultiByteToWideChar',
+            'WinAPI_MultiByteToWideCharEx','WinAPI_OpenProcess',
+            'WinAPI_PointFromRect','WinAPI_PostMessage','WinAPI_PrimaryLangId',
+            'WinAPI_PtInRect','WinAPI_ReadFile','WinAPI_ReadProcessMemory',
+            'WinAPI_RectIsEmpty','WinAPI_RedrawWindow',
+            'WinAPI_RegisterWindowMessage','WinAPI_ReleaseCapture',
+            'WinAPI_ReleaseDC','WinAPI_ScreenToClient','WinAPI_SelectObject',
+            'WinAPI_SetBkColor','WinAPI_SetCapture','WinAPI_SetCursor',
+            'WinAPI_SetDefaultPrinter','WinAPI_SetDIBits','WinAPI_SetEvent',
+            'WinAPI_SetFocus','WinAPI_SetFont','WinAPI_SetHandleInformation',
+            'WinAPI_SetLastError','WinAPI_SetParent',
+            'WinAPI_SetProcessAffinityMask','WinAPI_SetSysColors',
+            'WinAPI_SetTextColor','WinAPI_SetWindowLong','WinAPI_SetWindowPos',
+            'WinAPI_SetWindowsHookEx','WinAPI_SetWindowText',
+            'WinAPI_ShowCursor','WinAPI_ShowError','WinAPI_ShowMsg',
+            'WinAPI_ShowWindow','WinAPI_StringFromGUID','WinAPI_SubLangId',
+            'WinAPI_SystemParametersInfo','WinAPI_TwipsPerPixelX',
+            'WinAPI_TwipsPerPixelY','WinAPI_UnhookWindowsHookEx',
+            'WinAPI_UpdateLayeredWindow','WinAPI_UpdateWindow',
+            'WinAPI_ValidateClassName','WinAPI_WaitForInputIdle',
+            'WinAPI_WaitForMultipleObjects','WinAPI_WaitForSingleObject',
+            'WinAPI_WideCharToMultiByte','WinAPI_WindowFromPoint',
+            'WinAPI_WriteConsole','WinAPI_WriteFile',
+            'WinAPI_WriteProcessMemory','WinNet_AddConnection',
+            'WinNet_AddConnection2','WinNet_AddConnection3',
+            'WinNet_CancelConnection','WinNet_CancelConnection2',
+            'WinNet_CloseEnum','WinNet_ConnectionDialog',
+            'WinNet_ConnectionDialog1','WinNet_DisconnectDialog',
+            'WinNet_DisconnectDialog1','WinNet_EnumResource',
+            'WinNet_GetConnection','WinNet_GetConnectionPerformance',
+            'WinNet_GetLastError','WinNet_GetNetworkInformation',
+            'WinNet_GetProviderName','WinNet_GetResourceInformation',
+            'WinNet_GetResourceParent','WinNet_GetUniversalName',
+            'WinNet_GetUser','WinNet_OpenEnum','WinNet_RestoreConnection',
+            'WinNet_UseConnection','Word_VersionInfo','WordAttach','WordCreate',
+            'WordDocAdd','WordDocAddLink','WordDocAddPicture','WordDocClose',
+            'WordDocFindReplace','WordDocGetCollection',
+            'WordDocLinkGetCollection','WordDocOpen','WordDocPrint',
+            'WordDocPropertyGet','WordDocPropertySet','WordDocSave',
+            'WordDocSaveAs','WordErrorHandlerDeRegister',
+            'WordErrorHandlerRegister','WordErrorNotify','WordMacroRun',
+            'WordPropertyGet','WordPropertySet','WordQuit'
             ),
         5 => array(
-            '#include', '#include-once', '#notrayicon'
+            'ce','comments-end','comments-start','cs','include','include-once',
+            'NoTrayIcon','RequireAdmin'
             ),
         6 => array(
-            '#forceref', '#compiler_allow_decompile', '#compiler_au3check_dat',
-            '#compiler_au3check_parameters',
-            '#compiler_au3check_stop_onwarning', '#compiler_aut2exe',
-            '#compiler_autoit3', '#compiler_compression', '#compiler_icon',
-            '#compiler_outfile', '#compiler_outfile_type',
-            '#compiler_passphrase', '#compiler_plugin_funcs',
-            '#compiler_prompt', '#compiler_res_comment',
-            '#compiler_res_description', '#compiler_res_field',
-            '#compiler_res_field1name', '#compiler_res_field1value',
-            '#compiler_res_field2name', '#compiler_res_field2value',
-            '#compiler_res_fileversion',
-            '#compiler_res_fileversion_autoincrement',
-            '#compiler_res_legalcopyright', '#compiler_run_after',
-            '#compiler_run_au3check', '#compiler_run_before',
-            '#compiler_run_cvswrapper', '#compiler_run_tidy',
-            '#compiler_tidy_stop_onerror', '#compiler_useupx', '#endregion',
-            '#region', '#run_debug_mode', '#tidy_parameters'
+            'AutoIt3Wrapper_Au3Check_Parameters',
+            'AutoIt3Wrapper_Au3Check_Stop_OnWarning',
+            'AutoIt3Wrapper_Change2CUI','AutoIt3Wrapper_Compression',
+            'AutoIt3Wrapper_cvsWrapper_Parameters','AutoIt3Wrapper_Icon',
+            'AutoIt3Wrapper_Outfile','AutoIt3Wrapper_Outfile_Type',
+            'AutoIt3Wrapper_Plugin_Funcs','AutoIt3Wrapper_Res_Comment',
+            'AutoIt3Wrapper_Res_Description','AutoIt3Wrapper_Res_Field',
+            'AutoIt3Wrapper_Res_File_Add','AutoIt3Wrapper_Res_Fileversion',
+            'AutoIt3Wrapper_Res_FileVersion_AutoIncrement',
+            'AutoIt3Wrapper_Res_Icon_Add','AutoIt3Wrapper_Res_Language',
+            'AutoIt3Wrapper_Res_LegalCopyright',
+            'AutoIt3Wrapper_res_requestedExecutionLevel',
+            'AutoIt3Wrapper_Res_SaveSource','AutoIt3Wrapper_Run_After',
+            'AutoIt3Wrapper_Run_Au3check','AutoIt3Wrapper_Run_Before',
+            'AutoIt3Wrapper_Run_cvsWrapper','AutoIt3Wrapper_Run_Debug_Mode',
+            'AutoIt3Wrapper_Run_Obfuscator','AutoIt3Wrapper_Run_Tidy',
+            'AutoIt3Wrapper_Tidy_Stop_OnError','AutoIt3Wrapper_UseAnsi',
+            'AutoIt3Wrapper_UseUpx','AutoIt3Wrapper_UseX64',
+            'AutoIt3Wrapper_Version','EndRegion','forceref',
+            'Obfuscator_Ignore_Funcs','Obfuscator_Ignore_Variables',
+            'Obfuscator_Parameters','Region','Tidy_Parameters'
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']',
-        '+', '-', '*', '/', '&', '^',
-        '=', '+=', '-=', '*=', '/=', '&=',
-        '==', '<', '<=', '>', '>=',
-        ',',
+        '(',')','[',']',
+        '+','-','*','/','&','^',
+        '=','+=','-=','*=','/=','&=',
+        '==','<','<=','>','>=',
+        ',','.'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -427,7 +1127,7 @@
             ),
         'SCRIPT' => array(
             )
-            ),
+        ),
     'URLS' => array(
         1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
         2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
@@ -442,7 +1142,7 @@
         ),
     'REGEXPS' => array(
         //Variables
-        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
         ),
     'STRICT_MODE_APPLIES' => GESHI_MAYBE,
     'SCRIPT_DELIMITERS' => array(
@@ -452,7 +1152,20 @@
         1 => true,
         2 => true,
         3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(?
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/avisynth.php dokuwiki-rc2009-12-02/inc/geshi/avisynth.php
--- dokuwiki-2009-02-14/inc/geshi/avisynth.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/avisynth.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,194 @@
+ 'AviSynth',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/', '[*' => '*]'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //  Reserved words.
+        1 => array(
+            'try', 'cache', 'function', 'global', 'return'
+            ),
+        // Constants / special variables.
+        2 => array(
+            'true', 'yes', 'false', 'no', '__END__'
+            ),
+        // Internal Filters.
+        3 => array(
+            'AviSource', 'AviFileSource', 'AddBorders', 'AlignedSplice', 'AssumeFPS', 'AssumeScaledFPS',
+            'AssumeFrameBased', 'AssumeFieldBased', 'AssumeBFF', 'AssumeTFF', 'Amplify', 'AmplifydB',
+            'AssumeSampleRate', 'AudioDub', 'AudioDubEx', 'Animate', 'ApplyRange',
+            'BicubicResize', 'BilinearResize', 'BlackmanResize', 'Blur', 'Bob', 'BlankClip', 'Blackness',
+            'ColorYUV', 'ConvertBackToYUY2', 'ConvertToRGB', 'ConvertToRGB24', 'ConvertToRGB32',
+            'ConvertToYUY2', 'ConvertToY8', 'ConvertToYV411', 'ConvertToYV12', 'ConvertToYV16', 'ConvertToYV24',
+            'ColorKeyMask', 'Crop', 'CropBottom', 'ChangeFPS', 'ConvertFPS', 'ComplementParity', 'ConvertAudioTo8bit',
+            'ConvertAudioTo16bit', 'ConvertAudioTo24bit', 'ConvertAudioTo32bit', 'ConvertAudioToFloat', 'ConvertToMono',
+            'ConditionalFilter', 'ConditionalReader', 'ColorBars', 'Compare',
+            'DirectShowSource', 'DeleteFrame', 'Dissolve', 'DuplicateFrame', 'DoubleWeave', 'DelayAudio',
+            'EnsureVBRMP3Sync',
+            'FixLuminance', 'FlipHorizontal', 'FlipVertical', 'FixBrokenChromaUpsampling', 'FadeIn0', 'FadeIn',
+            'FadeIn2', 'FadeOut0', 'FadeOut', 'FadeOut2', 'FadeIO0', 'FadeIO', 'FadeIO2', 'FreezeFrame', 'FrameEvaluate',
+            'GreyScale', 'GaussResize', 'GeneralConvolution', 'GetChannel', 'GetLeftChannel', 'GetRightChannel',
+            'HorizontalReduceBy2', 'Histogram',
+            'ImageReader', 'ImageSource', 'ImageWriter', 'Invert', 'Interleave', 'Info',
+            'KillAudio', 'KillVideo',
+            'Levels', 'Limiter', 'Layer', 'Letterbox', 'LanczosResize', 'Lanczos4Resize', 'Loop',
+            'MergeARGB', 'MergeRGB', 'MergeChroma', 'MergeLuma', 'Merge', 'Mask', 'MaskHS', 'MergeChannels', 'MixAudio',
+            'MonoToStereo', 'MessageClip',
+            'Normalize',
+            'OpenDMLSource', 'Overlay',
+            'PointResize', 'PeculiarBlend', 'Pulldown',
+            'RGBAdjust', 'ResetMask', 'Reverse', 'ResampleAudio', 'ReduceBy2',
+            'SegmentedAviSource', 'SegmentedDirectShowSource', 'SoundOut', 'ShowAlpha', 'ShowRed', 'ShowGreen',
+            'ShowBlue', 'SwapUV', 'Subtract', 'SincResize', 'Spline16Resize', 'Spline36Resize', 'Spline64Resize',
+            'SelectEven', 'SelectOdd', 'SelectEvery', 'SelectRangeEvery', 'Sharpen', 'SpatialSoften', 'SeparateFields',
+            'ShowFiveVersions', 'ShowFrameNumber', 'ShowSMPTE', 'ShowTime', 'StackHorizontal', 'StackVertical', 'Subtitle',
+            'SwapFields', 'SuperEQ', 'SSRC', 'ScriptClip',
+            'Tweak', 'TurnLeft', 'TurnRight', 'Turn180', 'TemporalSoften', 'TimeStretch', 'TCPServer', 'TCPSource', 'Trim',
+            'Tone',
+            'UToY', 'UToY8', 'UnalignedSplice',
+            'VToY', 'VToY8', 'VerticalReduceBy2', 'Version',
+            'WavSource', 'Weave', 'WriteFile', 'WriteFileIf', 'WriteFileStart', 'WriteFileEnd',
+            'YToUV'
+            ),
+        // Internal functions.
+        4 => array(
+            'Abs', 'Apply', 'Assert', 'AverageLuma', 'AverageChromaU', 'AverageChromaV',
+            'Ceil', 'Cos', 'Chr', 'ChromaUDifference', 'ChromaVDifference',
+            'Defined', 'Default',
+            'Exp', 'Exist', 'Eval',
+            'Floor', 'Frac', 'Float', 'Findstr', 'GetMTMode',
+            'HexValue',
+            'Int', 'IsBool', 'IsClip', 'IsFloat', 'IsInt', 'IsString', 'Import',
+            'LoadPlugin', 'Log', 'LCase', 'LeftStr', 'LumaDifference', 'LoadVirtualDubPlugin', 'LoadVFAPIPlugin',
+            'LoadCPlugin', 'Load_Stdcall_Plugin',
+            'Max', 'MulDiv', 'MidStr',
+            'NOP',
+            'OPT_AllowFloatAudio', 'OPT_UseWaveExtensible',
+            'Pi', 'Pow',
+            'Round', 'Rand', 'RevStr', 'RightStr', 'RGBDifference', 'RGBDifferenceFromPrevious', 'RGBDifferenceToNext',
+            'Sin', 'Sqrt', 'Sign', 'Spline', 'StrLen', 'String', 'Select', 'SetMemoryMax', 'SetWorkingDir', 'SetMTMode',
+            'SetPlanarLegacyAlignment',
+            'Time',
+            'UCase', 'UDifferenceFromPrevious', 'UDifferenceToNext', 'UPlaneMax', 'UPlaneMin', 'UPlaneMedian',
+            'UPlaneMinMaxDifference',
+            'Value', 'VersionNumber', 'VersionString', 'VDifferenceFromPrevious', 'VDifferenceToNext', 'VPlaneMax',
+            'VPlaneMin', 'VPlaneMedian', 'VPlaneMinMaxDifference',
+            'YDifferenceFromPrevious', 'YDifferenceToNext', 'YPlaneMax', 'YPlaneMin', 'YPlaneMedian',
+            'YPlaneMinMaxDifference'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '++', '-', '--', '/', '*', '%',
+        '=', '==', '<', '<=', '>', '>=', '<>', '!=',
+        '!', '?', ':',
+        '|', '||', '&&',
+        '\\',
+        '(', ')', '{', '}',
+        '.', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC3300; font-weight:bold;',
+            4 => 'color:#660000; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://avisynth.org/mediawiki/{FNAME}',
+        4 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/bash.php dokuwiki-rc2009-12-02/inc/geshi/bash.php
--- dokuwiki-2009-02-14/inc/geshi/bash.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/bash.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org)
  * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/20
  *
  * BASH language file for GeSHi.
@@ -63,11 +63,27 @@
         //Variables
         1 => "/\\$\\{[^\\n\\}]*?\\}/i",
         //BASH-style Heredoc
-        2 => '/<<-?\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU'
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Escaped String Starters
+        3 => "/\\\\['\"]/siU"
         ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
+        // $var
+        2 => "#\\$[a-z_][a-z0-9_]*#i",
+        // ${...}
+        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        // $(...)
+        4 => "/\\$\\([^\\n\\)]*?\\)/i",
+        // `...`
+        5 => "/`[^`]*`/"
+        ),
     'KEYWORDS' => array(
         1 => array(
             'case', 'do', 'done', 'elif', 'else', 'esac', 'fi', 'for', 'function',
@@ -190,16 +206,23 @@
         'COMMENTS' => array(
             0 => 'color: #666666; font-style: italic;',
             1 => 'color: #800000;',
-            2 => 'color: #cc0000; font-style: italic;'
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #007800;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;',
+            'HARD' => 'color: #000099; font-weight: bold;'
             ),
         'BRACKETS' => array(
             0 => 'color: #7a0874; font-weight: bold;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
             ),
         'NUMBERS' => array(
             0 => 'color: #000000;'
@@ -233,11 +256,11 @@
         //Variables without braces
         1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
         //Variable assignment
-        2 => "(? "(? "\\$[*#\$\\-\\?!]",
         //Parameters of commands
-        5 => "(?<=\s)-[0-9a-zA-Z\-]+(?=[\s=]|$)"
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|$)"
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
@@ -251,9 +274,9 @@
         ),
         'KEYWORDS' => array(
             'DISALLOWED_BEFORE' => "(?  "(?![\.\-a-zA-Z0-9_%])"
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
         )
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/basic4gl.php dokuwiki-rc2009-12-02/inc/geshi/basic4gl.php
--- dokuwiki-2009-02-14/inc/geshi/basic4gl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/basic4gl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Matthew Webb (bmatthew1@blueyonder.co.uk)
  * Copyright: (c) 2004 Matthew Webb (http://matthew-4gl.wikispaces.com)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/09/15
  *
  * Basic4GL language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/bf.php dokuwiki-rc2009-12-02/inc/geshi/bf.php
--- dokuwiki-2009-02-14/inc/geshi/bf.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/bf.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,114 @@
+ 'Brainfuck',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => '/[^\n+\-<>\[\]\.\,Y]+/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-'),
+        1 => array('[', ']'),
+        2 => array('<', '>'),
+        3 => array('.', ','),
+        4 => array('Y') //Brainfork Extension ;-)
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;',
+            1 => 'color: #660000;',
+            2 => 'color: #000066;',
+            3 => 'color: #660066;',
+            4 => 'color: #666600;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOW_BEFORE' => '',
+            'DISALLOW_AFTER' => ''
+            )
+        )
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/blitzbasic.php dokuwiki-rc2009-12-02/inc/geshi/blitzbasic.php
--- dokuwiki-2009-02-14/inc/geshi/blitzbasic.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/blitzbasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------------
  * Author: P�draig O`Connel (info@moonsword.info)
  * Copyright: (c) 2005 P�draig O`Connel (http://moonsword.info)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 16.10.2005
  *
  * BlitzBasic language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/bnf.php dokuwiki-rc2009-12-02/inc/geshi/bnf.php
--- dokuwiki-2009-02-14/inc/geshi/bnf.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/bnf.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Rowan Rodrik van der Molen (rowan@bigsmoke.us)
  * Copyright: (c) 2006 Rowan Rodrik van der Molen (http://www.bigsmoke.us/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/09/28
  *
  * BNF (Backus-Naur form) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/boo.php dokuwiki-rc2009-12-02/inc/geshi/boo.php
--- dokuwiki-2009-02-14/inc/geshi/boo.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/boo.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
  * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/09/10
  *
  * Boo language file for GeSHi.
@@ -48,104 +48,104 @@
     'HARDESCAPE' => array('\"""'),
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
-        'namespace' => array(
+        1 => array(//Namespace
             'namespace', 'import', 'from'
             ),
-        'jump' => array(
+        2 => array(//Jump
             'yield', 'return', 'goto', 'continue', 'break'
             ),
-        'conditional' => array(
+        3 => array(//Conditional
             'while', 'unless', 'then', 'in', 'if', 'for', 'else', 'elif'
             ),
-        'property' => array(
+        4 => array(//Property
             'set', 'get'
             ),
-        'exception' => array(
+        5 => array(//Exception
             'try', 'raise', 'failure', 'except', 'ensure'
             ),
-        'visibility' => array(
+        6 => array(//Visibility
             'public', 'private', 'protected', 'internal'
             ),
-        'define' => array(
+        7 => array(//Define
             'struct', 'ref', 'of', 'interface', 'event', 'enum', 'do', 'destructor', 'def', 'constructor', 'class'
             ),
-        'cast' => array(
+        8 => array(//Cast
             'typeof', 'cast', 'as'
             ),
-        'bimacro' => array(
+        9 => array(//BiMacro
             'yieldAll', 'using', 'unchecked', 'rawArayIndexing', 'print', 'normalArrayIndexing', 'lock',
             'debug', 'checked', 'assert'
             ),
-        'biattr' => array(
+        10 => array(//BiAttr
             'required', 'property', 'meta', 'getter', 'default'
             ),
-        'bifunc' => array(
+        11 => array(//BiFunc
             'zip', 'shellp', 'shellm', 'shell', 'reversed', 'range', 'prompt',
             'matrix', 'map', 'len', 'join', 'iterator', 'gets', 'enumerate', 'cat', 'array'
             ),
-        'hifunc' => array(
+        12 => array(//HiFunc
             '__switch__', '__initobj__', '__eval__', '__addressof__', 'quack'
             ),
-        'primitive' => array(
+        13 => array(//Primitive
             'void', 'ushort', 'ulong', 'uint', 'true', 'timespan', 'string', 'single',
             'short', 'sbyte', 'regex', 'object', 'null', 'long', 'int', 'false', 'duck',
             'double', 'decimal', 'date', 'char', 'callable', 'byte', 'bool'
             ),
-        'operator' => array(
+        14 => array(//Operator
             'not', 'or', 'and', 'is', 'isa',
             ),
-        'modifier' => array(
+        15 => array(//Modifier
             'virtual', 'transient', 'static', 'partial', 'override', 'final', 'abstract'
             ),
-        'access' => array(
+        16 => array(//Access
             'super', 'self'
             ),
-        'pass' => array(
+        17 => array(//Pass
             'pass'
             )
         ),
     'SYMBOLS' => array(
-         '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
+        '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        'namespace' => true,
-        'jump' => true,
-        'conditional' => true,
-        'property' => true,
-        'exception' => true,
-        'visibility' => true,
-        'define' => true,
-        'cast' => true,
-        'bimacro' => true,
-        'biattr' => true,
-        'bifunc' => true,
-        'hifunc' => true,
-        'primitive' => true,
-        'operator' => true,
-        'modifier' => true,
-        'access' => true,
-        'pass' => true
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            'namespace' => 'color:green;font-weight:bold;',
-            'jump' => 'color:navy;',
-            'conditional' => 'color:blue;font-weight:bold;',
-            'property' => 'color:#8B4513;',
-            'exception' => 'color:teal;font-weight:bold;',
-            'visibility' => 'color:blue;font-weight:bold;',
-            'define' => 'color:blue;font-weight:bold;',
-            'cast' => 'color:blue;font-weight:bold;',
-            'bimacro' => 'color:maroon;',
-            'biattr' => 'color:maroon;',
-            'bifunc' => 'color:purple;',
-            'hifunc' => 'color:#4B0082;',
-            'primitive' => 'color:purple;font-weight:bold;',
-            'operator' => 'color:#008B8B;font-weight:bold;',
-            'modifier' => 'color:brown;',
-            'access' => 'color:black;font-weight:bold;',
-            'pass' => 'color:gray;'
+            1 => 'color:green;font-weight:bold;',
+            2 => 'color:navy;',
+            3 => 'color:blue;font-weight:bold;',
+            4 => 'color:#8B4513;',
+            5 => 'color:teal;font-weight:bold;',
+            6 => 'color:blue;font-weight:bold;',
+            7 => 'color:blue;font-weight:bold;',
+            8 => 'color:blue;font-weight:bold;',
+            9 => 'color:maroon;',
+            10 => 'color:maroon;',
+            11 => 'color:purple;',
+            12 => 'color:#4B0082;',
+            13 => 'color:purple;font-weight:bold;',
+            14 => 'color:#008B8B;font-weight:bold;',
+            15 => 'color:brown;',
+            16 => 'color:black;font-weight:bold;',
+            17 => 'color:gray;'
             ),
         'COMMENTS' => array(
             1 => 'color: #999999; font-style: italic;',
@@ -180,28 +180,28 @@
             )
         ),
     'URLS' => array(
-        'namespace' => '',
-        'jump' => '',
-        'conditional' => '',
-        'property' => '',
-        'exception' => '',
-        'visibility' => '',
-        'define' => '',
-        'cast' => '',
-        'bimacro' => '',
-        'biattr' => '',
-        'bifunc' => '',
-        'hifunc' => '',
-        'primitive' => '',
-        'operator' => '',
-        'modifier' => '',
-        'access' => '',
-        'pass' => ''
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => ''
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
-            0 => '.',
-            1 => '::'
+        0 => '.',
+        1 => '::'
         ),
     'REGEXPS' => array(
         #0 => '%(@)?\/(?:(?(1)[^\/\\\\\r\n]+|[^\/\\\\\r\n \t]+)|\\\\[\/\\\\\w+()|.*?$^[\]{}\d])+\/%'
diff -Naur dokuwiki-2009-02-14/inc/geshi/caddcl.php dokuwiki-rc2009-12-02/inc/geshi/caddcl.php
--- dokuwiki-2009-02-14/inc/geshi/caddcl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/caddcl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * CAD DCL (Dialog Control Language) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/cadlisp.php dokuwiki-rc2009-12-02/inc/geshi/cadlisp.php
--- dokuwiki-2009-02-14/inc/geshi/cadlisp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cadlisp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * AutoCAD/IntelliCAD Lisp language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/cfdg.php dokuwiki-rc2009-12-02/inc/geshi/cfdg.php
--- dokuwiki-2009-02-14/inc/geshi/cfdg.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cfdg.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: John Horigan 
  * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/03/11
  *
  * CFDG language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/cfm.php dokuwiki-rc2009-12-02/inc/geshi/cfm.php
--- dokuwiki-2009-02-14/inc/geshi/cfm.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cfm.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Diego
  * Copyright: (c) 2006 Diego
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/02/25
  *
  * ColdFusion language file for GeSHi.
@@ -61,11 +61,11 @@
             'cflog', 'cflogin', 'cfloginuser', 'cflogout', 'cfloop', 'cfmail',
             'cfmailparam', 'cfmailpart', 'cfmodule', 'cfNTauthenticate',
             'cfobject', 'cfobjectcache', 'cfoutput', 'cfparam', 'cfpop',
-            'cfprocessingdirective', 'cfprocessingdirective', 'cfprocparam',
+            'cfprocessingdirective', 'cfprocparam',
             'cfprocresult', 'cfproperty', 'cfquery', 'cfqueryparam',
             'cfregistry', 'cfreport', 'cfreportparam', 'cfrethrow', 'cfreturn',
             'cfsavecontent', 'cfschedule', 'cfscript', 'cfsearch', 'cfselect',
-            'cfset', 'cfsetting', 'cfsilent', 'cfsilent', 'cfstoredproc',
+            'cfset', 'cfsetting', 'cfsilent', 'cfstoredproc',
             'cfswitch', 'cftable', 'cftextarea', 'cfthrow', 'cftimer',
             'cftrace', 'cftransaction', 'cftree', 'cftreeitem', 'cftry',
             'cfupdate', 'cfwddx'
@@ -296,4 +296,4 @@
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/cil.php dokuwiki-rc2009-12-02/inc/geshi/cil.php
--- dokuwiki-2009-02-14/inc/geshi/cil.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cil.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
  * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/10/24
  *
  * CIL (Common Intermediate Language) language file for GeSHi.
@@ -45,7 +45,7 @@
     'QUOTEMARKS' => array('"'),
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
-        'dotted' => array(
+        1 => array(//Dotted
             '.zeroinit', '.vtfixup', '.vtentry', '.vtable', '.ver', '.try', '.subsystem', '.size', '.set', '.removeon',
             '.publickeytoken', '.publickey', '.property', '.permissionset', '.permission', '.pdirect', '.param', '.pack',
             '.override', '.other', '.namespace', '.mresource', '.module', '.method', '.maxstack', '.manifestres', '.locals',
@@ -53,7 +53,7 @@
             '.export', '.event', '.entrypoint', '.emitbyte', '.data', '.custom', '.culture', '.ctor', '.corflags', '.class',
             '.cctor', '.assembly', '.addon'
             ),
-        'attr' => array(
+        2 => array(//Attributes
             'wrapper', 'with', 'winapi', 'virtual', 'vector', 'vararg', 'value', 'userdefined', 'unused', 'unmanagedexp',
             'unmanaged', 'unicode', 'to', 'tls', 'thiscall', 'synchronized', 'struct', 'strict', 'storage', 'stdcall',
             'static', 'specialname', 'special', 'serializable', 'sequential', 'sealed', 'runtime', 'rtspecialname', 'request',
@@ -69,20 +69,20 @@
             'cf', 'cdecl', 'catch', 'beforefieldinit', 'autochar', 'auto', 'at', 'assert', 'assembly', 'as', 'any', 'ansi',
             'alignment', 'algorithm', 'abstract'
             ),
-        'types' => array(
+        3 => array(//Types
             'wchar', 'void', 'variant', 'unsigned', 'valuetype', 'typedref', 'tbstr', 'sysstring', 'syschar', 'string',
             'streamed_object', 'stream', 'stored_object', 'safearray', 'objectref', 'object', 'nullref', 'method', 'lpwstr',
             'lpvoid', 'lptstr', 'lpstruct', 'lpstr', 'iunknown', 'int64', 'int32', 'int16', 'int8', 'int', 'idispatch',
-            'hresult', 'float64', 'float32', 'float', 'decimal', 'date', 'currency', 'class', 'char', 'carray', 'byvalstr',
+            'hresult', 'float64', 'float32', 'float', 'decimal', 'date', 'currency', 'char', 'carray', 'byvalstr',
             'bytearray', 'boxed', 'bool', 'blob_object', 'blob', 'array'
             ),
-        'prefix' => array(
+        4 => array(//Prefix
             'volatile', 'unaligned', 'tail', 'readonly', 'no', 'constrained'
             ),
-        'suffix' => array(
+        5 => array(//Suffix
             'un', 'u8', 'u4', 'u2', 'u1', 'u', 's', 'ref', 'r8', 'r4', 'm1', 'i8', 'i4', 'i2', 'i1', 'i'#, '.8', '.7', '.6', '.5', '.4', '.3', '.2', '.1', '.0'
             ),
-        'base' => array(
+        6 => array(//Base
             'xor', 'switch', 'sub', 'stloc',
             'stind', 'starg',
             'shr', 'shl', 'ret', 'rem', 'pop', 'or', 'not', 'nop', 'neg', 'mul',
@@ -94,19 +94,19 @@
             'brfalse', 'break', 'br', 'bne', 'blt', 'ble', 'bgt', 'bge', 'beq', 'arglist',
             'and', 'add'
             ),
-        'object' => array(
+        7 => array(//Object
             'unbox.any', 'unbox', 'throw', 'stsfld', 'stobj', 'stfld', 'stelem', 'sizeof', 'rethrow', 'refanyval', 'refanytype', 'newobj',
             'newarr', 'mkrefany', 'ldvirtftn', 'ldtoken', 'ldstr', 'ldsflda', 'ldsfld', 'ldobj', 'ldlen', 'ldflda', 'ldfld',
             'ldelema', 'ldelem', 'isinst', 'initobj', 'cpobj', 'castclass',
             'callvirt', 'callmostderived', 'box'
             ),
-        'other' => array(
+        8 => array(//Other
             'prefixref', 'prefix7', 'prefix6', 'prefix5', 'prefix4', 'prefix3', 'prefix2', 'prefix1', 'prefix0'
             ),
-        'literal' => array(
+        9 => array(//Literal
             'true', 'null', 'false'
             ),
-        'commentlike' => array(
+        10 => array(//Comment-like
             '#line', '^THE_END^'
             )
         ),
@@ -115,29 +115,29 @@
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        'dotted' => true,
-        'attr' => true,
-        'types' => true,
-        'prefix' => true,
-        'suffix' => true,
-        'base' => true,
-        'object' => true,
-        'other' => true,
-        'literal' => true,
-        'commentlike' => true
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            'dotted' => 'color:maroon;font-weight:bold;',
-            'attr' => 'color:blue;font-weight:bold;',
-            'types' => 'color:purple;font-weight:bold;',
-            'prefix' => 'color:teal;',
-            'suffix' => 'color:blue;',
-            'base' => 'color:blue;',
-            'object' => 'color:blue;',
-            'other' => 'color:blue;',
-            'literal' => 'color:00008B',
-            'commentlike' => 'color:gray'
+            1 => 'color:maroon;font-weight:bold;',
+            2 => 'color:blue;font-weight:bold;',
+            3 => 'color:purple;font-weight:bold;',
+            4 => 'color:teal;',
+            5 => 'color:blue;',
+            6 => 'color:blue;',
+            7 => 'color:blue;',
+            8 => 'color:blue;',
+            9 => 'color:00008B',
+            10 => 'color:gray'
             ),
         'COMMENTS' => array(
             0 => 'color:gray;font-style:italic;'
@@ -167,16 +167,16 @@
             )
         ),
     'URLS' => array(
-        'dotted' => '',
-        'attr' => '',
-        'types' => '',
-        'prefix' => '',
-        'suffix' => '',
-        'base' => '',
-        'object' => '',
-        'other' => '',
-        'literal' => '',
-        'commentlike' => ''
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => ''
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/c_mac.php dokuwiki-rc2009-12-02/inc/geshi/c_mac.php
--- dokuwiki-2009-02-14/inc/geshi/c_mac.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/c_mac.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * C for Macs language file for GeSHi.
@@ -43,14 +43,31 @@
     'LANG_NAME' => 'C (Mac)',
     'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    //Multiline-continued single-line comments
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-                 GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-                 GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
             'if', 'return', 'while', 'case', 'continue', 'default',
@@ -117,10 +134,10 @@
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
@@ -135,7 +152,13 @@
             'MULTI' => 'color: #ff0000; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #666666; font-weight: bold;'
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
             ),
         'BRACKETS' => array(
             0 => 'color: #000000;'
@@ -186,4 +209,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/cobol.php dokuwiki-rc2009-12-02/inc/geshi/cobol.php
--- dokuwiki-2009-02-14/inc/geshi/cobol.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cobol.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: BenBE (BenBE@omorphia.org)
  * Copyright: (c) 2007-2008 BenBE (http://www.omorphia.de/)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/07/02
  *
  * COBOL language file for GeSHi.
@@ -43,131 +43,132 @@
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"', "'"),
     'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array( //Compiler Directives
-            "ANSI", "BLANK", "NOBLANK", "CALL-SHARED", "CANCEL", "NOCANCEL",
-            "CHECK", "CODE", "NOCODE", "COLUMNS", "COMPACT", "NOCOMPACT",
-            "COMPILE", "CONSULT", "NOCONSULT", "CROSSREF", "NOCROSSREF",
-            "DIAGNOSE-74", "NODIAGNOSE-74", "DIAGNOSE-85", "NODIAGNOSE-85",
-            "DIAGNOSEALL", "NODIAGNOSEALL", "ENDIF", "ENDUNIT", "ENV",
-            "ERRORFILE", "ERRORS", "FIPS", "NOFIPS", "FMAP", "HEADING", "HEAP",
-            "HIGHPIN", "HIGHREQUESTERS", "ICODE", "NOICODE", "IF", "IFNOT",
-            "INNERLIST", "NOINNERLIST", "INSPECT", "NOINSPECT", "LARGEDATA",
-            "LD", "LESS-CODE", "LIBRARY", "LINES", "LIST", "NOLIST", "LMAP",
-            "NOLMAP", "MAIN", "MAP", "NOMAP", "NLD", "NONSTOP", "NON-SHARED",
-            "OPTIMIZE", "PERFORM-TRACE", "PORT", "NOPORT", "RESETTOG",
-            "RUNNABLE", "RUNNAMED", "SAVE", "SAVEABEND", "NOSAVEABEND",
-            "SEARCH", "NOSEARCH", "SECTION", "SETTOG", "SHARED", "SHOWCOPY",
-            "NOSHOWCOPY", "SHOWFILE", "NOSHOWFILE", "SOURCE", "SQL", "NOSQL",
-            "SQLMEM", "SUBSET", "SUBTYPE", "SUPPRESS", "NOSUPPRESS", "SYMBOLS",
-            "NOSYMBOLS", "SYNTAX", "TANDEM", "TRAP2", "NOTRAP2", "TRAP2-74",
-            "NOTRAP2-74", "UL", "WARN", "NOWARN"
+            'ANSI', 'BLANK', 'NOBLANK', 'CALL-SHARED', 'CANCEL', 'NOCANCEL',
+            'CHECK', 'CODE', 'NOCODE', 'COLUMNS', 'COMPACT', 'NOCOMPACT',
+            'COMPILE', 'CONSULT', 'NOCONSULT', 'CROSSREF', 'NOCROSSREF',
+            'DIAGNOSE-74', 'NODIAGNOSE-74', 'DIAGNOSE-85', 'NODIAGNOSE-85',
+            'DIAGNOSEALL', 'NODIAGNOSEALL', 'ENDIF', 'ENDUNIT', 'ENV',
+            'ERRORFILE', 'ERRORS', 'FIPS', 'NOFIPS', 'FMAP', 'HEADING', 'HEAP',
+            'HIGHPIN', 'HIGHREQUESTERS', 'ICODE', 'NOICODE', 'IF', 'IFNOT',
+            'INNERLIST', 'NOINNERLIST', 'INSPECT', 'NOINSPECT', 'LARGEDATA',
+            'LD', 'LESS-CODE', 'LIBRARY', 'LINES', 'LIST', 'NOLIST', 'LMAP',
+            'NOLMAP', 'MAIN', 'MAP', 'NOMAP', 'NLD', 'NONSTOP', 'NON-SHARED',
+            'OPTIMIZE', 'PERFORM-TRACE', 'PORT', 'NOPORT', 'RESETTOG',
+            'RUNNABLE', 'RUNNAMED', 'SAVE', 'SAVEABEND', 'NOSAVEABEND',
+            'SEARCH', 'NOSEARCH', 'SECTION', 'SETTOG', 'SHARED', 'SHOWCOPY',
+            'NOSHOWCOPY', 'SHOWFILE', 'NOSHOWFILE', 'SOURCE', 'SQL', 'NOSQL',
+            'SQLMEM', 'SUBSET', 'SUBTYPE', 'SUPPRESS', 'NOSUPPRESS', 'SYMBOLS',
+            'NOSYMBOLS', 'SYNTAX', 'TANDEM', 'TRAP2', 'NOTRAP2', 'TRAP2-74',
+            'NOTRAP2-74', 'UL', 'WARN', 'NOWARN'
             ),
         2 => array( //Statement Keywords
-            "ACCEPT", "ADD", "TO", "GIVING", "CORRESPONDING", "ALTER", "CALL",
-            "CANCEL", "CHECKPOINT", "CLOSE", "COMPUTE", "CONTINUE", "COPY",
-            "DELETE", "DISPLAY", "DIVIDE", "INTO", "REMAINDER", "ENTER",
-            "COBOL", "EVALUATE", "EXIT", "GO", "IF", "INITIALIZE", "INSPECT",
-            "TALLYING", "REPLACING", "CONVERTING", "LOCKFILE", "MERGE", "MOVE",
-            "CORRESPONDING", "MULTIPLY", "BY", "OPEN", "PERFORM", "TIMES",
-            "UNTIL", "VARYING", "READ", "RELEASE", "REPLACE", "RETURN",
-            "REWRITE", "SEARCH", "SET", "UP", "DOWN", "SORT", "START",
-            "STARTBACKUP", "STOP", "STRING", "SUBTRACT", "FROM", "UNLOCKFILE",
-            "UNLOCKRECORD", "UNSTRING", "USE", "DEBUGGING", "AFTER",
-            "EXCEPTION", "WRITE"
+            'ACCEPT', 'ADD', 'TO', 'GIVING', 'CORRESPONDING', 'ALTER', 'CALL',
+            'CHECKPOINT', 'CLOSE', 'COMPUTE', 'CONTINUE', 'COPY',
+            'DELETE', 'DISPLAY', 'DIVIDE', 'INTO', 'REMAINDER', 'ENTER',
+            'COBOL', 'EVALUATE', 'EXIT', 'GO', 'INITIALIZE',
+            'TALLYING', 'REPLACING', 'CONVERTING', 'LOCKFILE', 'MERGE', 'MOVE',
+            'MULTIPLY', 'OPEN', 'PERFORM', 'TIMES',
+            'UNTIL', 'VARYING', 'RETURN',
             ),
         3 => array( //Reserved in some contexts
-            "ACCESS", "ADDRESS", "ADVANCING", "AFTER", "ALL",
-            "ALPHABET", "ALPHABETIC", "ALPHABETIC-LOWER", "ALPHABETIC-UPPER",
-            "ALPHANUMERIC", "ALPHANUMERIC-EDITED", "ALSO", "ALTER", "ALTERNATE",
-            "AND", "ANY", "APPROXIMATE", "AREA", "AREAS", "ASCENDING", "ASSIGN",
-            "AT", "AUTHOR", "BEFORE", "BINARY", "BLANK", "BLOCK", "BOTTOM", "BY",
-            "CALL", "CANCEL", "CD", "CF", "CH", "CHARACTER", "CHARACTERS",
-            "CHARACTER-SET", "CHECKPOINT", "CLASS", "CLOCK-UNITS", "CLOSE",
-            "COBOL", "CODE", "CODE-SET", "COLLATING", "COLUMN", "COMMA",
-            "COMMON", "COMMUNICATION", "COMP", "COMP-3", "COMP-5",
-            "COMPUTATIONAL", "COMPUTATIONAL-3", "COMPUTATIONAL-5",
-            "CONFIGURATION", "CONTAINS", "CONTENT", "CONTINUE", "CONTROL",
-            "CONTROLS", "CONVERTING", "COPY", "CORR", "CORRESPONDING", "COUNT",
-            "CURRENCY", "DATA", "DATE", "DATE-COMPILED", "DATE-WRITTEN", "DAY",
-            "DAY-OF-WEEK", "DE", "DEBUG-CONTENTS", "DEBUG-ITEM", "DEBUG-LINE",
-            "DEBUG-SUB-2", "DEBUG-SUB-3", "DEBUGGING", "DECIMAL-POINT",
-            "DECLARATIVES", "DEBUG-NAME", "DEBUG-SUB-1", "DELETE", "DELIMITED",
-            "DELIMITER", "DEPENDING", "DESCENDING", "DESTINATION", "DETAIL",
-            "DISABLE", "DISPLAY", "DIVIDE", "DIVISION", "DOWN", "DUPLICATES",
-            "DYNAMIC", "EGI", "ELSE", "EMI", "ENABLE", "END", "END-ADD",
-            "END-COMPUTE", "END-DELETE", "END-DIVIDE", "END-EVALUATE", "END-IF",
-            "END-MULTIPLY", "END-OF-PAGE", "END-PERFORM", "END-READ",
-            "END-RECEIVE", "END-RETURN", "END-REWRITE", "END-SEARCH",
-            "END-START", "END-STRING", "END-SUBTRACT", "END-UNSTRING",
-            "END-WRITE", "ENTER", "EOP", "EQUAL", "ERROR", "ESI", "EVALUATE",
-            "EVERY", "EXCEPTION", "EXCLUSIVE", "EXIT", "EXTEND",
-            "EXTENDED-STORAGE", "EXTERNAL", "FALSE", "FD", "FILE",
-            "FILE-CONTROL", "FILLER", "FINAL", "FIRST", "FOOTING", "FOR",
-            "FROM", "FUNCTION", "GENERATE", "GENERIC", "GIVING", "GLOBAL",
-            "GO", "GREATER", "GROUP", "GUARDIAN-ERR", "HEADING", "HIGH-VALUE",
-            "HIGH-VALUES", "I-O", "I-O-CONTROL", "IDENTIFICATION", "IF", "IN",
-            "INDEX", "INDEXED", "INDICATE", "INITIAL", "INITIALIZE", "INITIATE",
-            "INPUT", "INPUT-OUTPUT", "INSPECT", "INSTALLATION", "INTO",
-            "INVALID", "IS", "JUST", "JUSTIFIED", "KEY", "LABEL", "LAST",
-            "LEADING", "LEFT", "LENGTH", "LESS", "LIMIT", "LIMITS", "LINAGE",
-            "LINAGE-COUNTER", "LINE", "LINE-COUNTER", "LINKAGE", "LOCK",
-            "LOCKFILE", "LOW-VALUE", "LOW-VALUES", "MEMORY", "MERGE", "MESSAGE",
-            "MODE", "MODULES", "MOVE", "MULTIPLE", "MULTIPLY", "NATIVE",
-            "NEGATIVE", "NEXT", "NO", "NOT", "NULL", "NULLS", "NUMBER",
-            "NUMERIC", "NUMERIC-EDITED", "OBJECT-COMPUTER", "OCCURS", "OF",
-            "OFF", "OMITTED", "ON", "OPEN", "OPTIONAL", "OR", "ORDER",
-            "ORGANIZATION", "OTHER", "OUTPUT", "OVERFLOW", "PACKED-DECIMAL",
-            "PADDING", "PAGE", "PAGE-COUNTER", "PERFORM", "PF", "PH", "PIC",
-            "PICTURE", "PLUS", "POINTER", "POSITION", "POSITIVE", "PRINTING",
-            "PROCEDURE", "PROCEDURES", "PROCEED", "PROGRAM", "PROGRAM-ID",
-            "PROGRAM-STATUS", "PROGRAM-STATUS-1", "PROGRAM-STATUS-2", "PROMPT",
-            "PROTECTED", "PURGE", "QUEUE", "QUOTE", "QUOTES", "RANDOM", "RD",
-            "READ", "RECEIVE", "RECEIVE-CONTROL", "RECORD", "RECORDS",
-            "REDEFINES", "REEL", "REFERENCE", "REFERENCES", "RELATIVE",
-            "RELEASE", "REMAINDER", "REMOVAL", "RENAMES", "REPLACE",
-            "REPLACING", "REPLY", "REPORT", "REPORTING", "REPORTS", "RERUN",
-            "RESERVE", "RESET", "REVERSED", "REWIND", "REWRITE", "RF",
-            "RH", "RIGHT", "ROUNDED", "RUN", "SAME", "SD", "SEARCH", "SECTION",
-            "SECURITY", "SEGMENT", "SEGMENT-LIMIT", "SELECT", "SEND",
-            "SENTENCE", "SEPARATE", "SEQUENCE", "SEQUENTIAL", "SET", "SHARED",
-            "SIGN", "SIZE", "SORT", "SORT-MERGE", "SOURCE", "SOURCE-COMPUTER",
-            "SPACE", "SPACES", "SPECIAL-NAMES", "STANDARD", "STANDARD-1",
-            "STANDARD-2", "START", "STARTBACKUP", "STATUS", "STOP", "STRING",
-            "SUB-QUEUE-1", "SUB-QUEUE-2", "SUB-QUEUE-3", "SUBTRACT", "SUM",
-            "SUPPRESS", "SYMBOLIC", "SYNC", "SYNCDEPTH", "SYNCHRONIZED",
-            "TABLE", "TAL", "TALLYING", "TAPE", "TERMINAL", "TERMINATE", "TEST",
-            "TEXT", "THAN", "THEN", "THROUGH", "THRU", "TIME", "TIMES", "TO",
-            "TOP", "TRAILING", "TRUE", "TYPE", "UNIT", "UNLOCK", "UNLOCKFILE",
-            "UNLOCKRECORD", "UNSTRING", "UNTIL", "UP", "UPON", "USAGE", "USE",
-            "USING", "VALUE", "VALUES", "VARYING", "WHEN", "WITH", "WORDS",
-            "WORKING-STORAGE", "WRITE", "ZERO", "ZEROES"
+            'ACCESS', 'ADDRESS', 'ADVANCING', 'AFTER', 'ALL',
+            'ALPHABET', 'ALPHABETIC', 'ALPHABETIC-LOWER', 'ALPHABETIC-UPPER',
+            'ALPHANUMERIC', 'ALPHANUMERIC-EDITED', 'ALSO', 'ALTERNATE',
+            'AND', 'ANY', 'APPROXIMATE', 'AREA', 'AREAS', 'ASCENDING', 'ASSIGN',
+            'AT', 'AUTHOR', 'BEFORE', 'BINARY', 'BLOCK', 'BOTTOM', 'BY',
+            'CD', 'CF', 'CH', 'CHARACTER', 'CHARACTERS',
+            'CHARACTER-SET', 'CLASS', 'CLOCK-UNITS',
+            'CODE-SET', 'COLLATING', 'COLUMN', 'COMMA',
+            'COMMON', 'COMMUNICATION', 'COMP', 'COMP-3', 'COMP-5',
+            'COMPUTATIONAL', 'COMPUTATIONAL-3', 'COMPUTATIONAL-5',
+            'CONFIGURATION', 'CONTAINS', 'CONTENT', 'CONTROL',
+            'CONTROLS', 'CORR', 'COUNT',
+            'CURRENCY', 'DATA', 'DATE', 'DATE-COMPILED', 'DATE-WRITTEN', 'DAY',
+            'DAY-OF-WEEK', 'DE', 'DEBUG-CONTENTS', 'DEBUG-ITEM', 'DEBUG-LINE',
+            'DEBUG-SUB-2', 'DEBUG-SUB-3', 'DEBUGGING', 'DECIMAL-POINT',
+            'DECLARATIVES', 'DEBUG-NAME', 'DEBUG-SUB-1', 'DELIMITED',
+            'DELIMITER', 'DEPENDING', 'DESCENDING', 'DESTINATION', 'DETAIL',
+            'DISABLE', 'DIVISION', 'DOWN', 'DUPLICATES',
+            'DYNAMIC', 'EGI', 'ELSE', 'EMI', 'ENABLE', 'END', 'END-ADD',
+            'END-COMPUTE', 'END-DELETE', 'END-DIVIDE', 'END-EVALUATE', 'END-IF',
+            'END-MULTIPLY', 'END-OF-PAGE', 'END-PERFORM', 'END-READ',
+            'END-RECEIVE', 'END-RETURN', 'END-REWRITE', 'END-SEARCH',
+            'END-START', 'END-STRING', 'END-SUBTRACT', 'END-UNSTRING',
+            'END-WRITE', 'EOP', 'EQUAL', 'ERROR', 'ESI',
+            'EVERY', 'EXCEPTION', 'EXCLUSIVE', 'EXTEND',
+            'EXTENDED-STORAGE', 'EXTERNAL', 'FALSE', 'FD', 'FILE',
+            'FILE-CONTROL', 'FILLER', 'FINAL', 'FIRST', 'FOOTING', 'FOR',
+            'FROM', 'FUNCTION', 'GENERATE', 'GENERIC', 'GLOBAL',
+            'GREATER', 'GROUP', 'GUARDIAN-ERR', 'HIGH-VALUE',
+            'HIGH-VALUES', 'I-O', 'I-O-CONTROL', 'IDENTIFICATION', 'IN',
+            'INDEX', 'INDEXED', 'INDICATE', 'INITIAL', 'INITIATE',
+            'INPUT', 'INPUT-OUTPUT', 'INSTALLATION',
+            'INVALID', 'IS', 'JUST', 'JUSTIFIED', 'KEY', 'LABEL', 'LAST',
+            'LEADING', 'LEFT', 'LESS', 'LIMIT', 'LIMITS', 'LINAGE',
+            'LINAGE-COUNTER', 'LINE', 'LINE-COUNTER', 'LINKAGE', 'LOCK',
+            'LOW-VALUE', 'LOW-VALUES', 'MEMORY', 'MESSAGE',
+            'MODE', 'MODULES', 'MULTIPLE', 'NATIVE',
+            'NEGATIVE', 'NEXT', 'NO', 'NOT', 'NULL', 'NULLS', 'NUMBER',
+            'NUMERIC', 'NUMERIC-EDITED', 'OBJECT-COMPUTER', 'OCCURS', 'OF',
+            'OFF', 'OMITTED', 'ON', 'OPTIONAL', 'OR', 'ORDER',
+            'ORGANIZATION', 'OTHER', 'OUTPUT', 'OVERFLOW', 'PACKED-DECIMAL',
+            'PADDING', 'PAGE', 'PAGE-COUNTER', 'PF', 'PH', 'PIC',
+            'PICTURE', 'PLUS', 'POINTER', 'POSITION', 'POSITIVE', 'PRINTING',
+            'PROCEDURE', 'PROCEDURES', 'PROCEED', 'PROGRAM', 'PROGRAM-ID',
+            'PROGRAM-STATUS', 'PROGRAM-STATUS-1', 'PROGRAM-STATUS-2', 'PROMPT',
+            'PROTECTED', 'PURGE', 'QUEUE', 'QUOTE', 'QUOTES', 'RD',
+            'RECEIVE', 'RECEIVE-CONTROL', 'RECORD', 'RECORDS',
+            'REDEFINES', 'REEL', 'REFERENCE', 'REFERENCES', 'RELATIVE',
+            'REMOVAL', 'RENAMES', 'REPLACE',
+            'REPLY', 'REPORT', 'REPORTING', 'REPORTS', 'RERUN',
+            'RESERVE', 'RESET', 'REVERSED', 'REWIND', 'REWRITE', 'RF',
+            'RH', 'RIGHT', 'ROUNDED', 'RUN', 'SAME', 'SD',
+            'SECURITY', 'SEGMENT', 'SEGMENT-LIMIT', 'SELECT', 'SEND',
+            'SENTENCE', 'SEPARATE', 'SEQUENCE', 'SEQUENTIAL', 'SET',
+            'SIGN', 'SIZE', 'SORT', 'SORT-MERGE', 'SOURCE-COMPUTER',
+            'SPACE', 'SPACES', 'SPECIAL-NAMES', 'STANDARD', 'STANDARD-1',
+            'STANDARD-2', 'START', 'STARTBACKUP', 'STATUS', 'STOP', 'STRING',
+            'SUB-QUEUE-1', 'SUB-QUEUE-2', 'SUB-QUEUE-3', 'SUBTRACT',
+            'SYMBOLIC', 'SYNC', 'SYNCDEPTH', 'SYNCHRONIZED',
+            'TABLE', 'TAL', 'TAPE', 'TERMINAL', 'TERMINATE', 'TEST',
+            'TEXT', 'THAN', 'THEN', 'THROUGH', 'THRU', 'TIME',
+            'TOP', 'TRAILING', 'TRUE', 'TYPE', 'UNIT', 'UNLOCK', 'UNLOCKFILE',
+            'UNLOCKRECORD', 'UNSTRING', 'UP', 'UPON', 'USAGE', 'USE',
+            'USING', 'VALUE', 'VALUES', 'WHEN', 'WITH', 'WORDS',
+            'WORKING-STORAGE', 'WRITE', 'ZERO', 'ZEROES'
             ),
         4 => array( //Standard functions
-            "ACOS", "ANNUITY", "ASIN", "ATAN", "CHAR", "COS", "CURRENT-DATE",
-            "DATE-OF-INTEGER", "DAY-OF-INTEGER", "FACTORIAL", "INTEGER",
-            "INTEGER-OF-DATE", "INTEGER-OF-DAY", "INTEGER-PART", "LENGTH",
-            "LOG", "LOG10", "LOWER-CASE", "MAX", "MEAN", "MEDIAN", "MIDRANGE",
-            "MIN", "MOD", "NUMVAL", "NUMVAL-C", "ORD", "ORD-MAX", "ORD-MIN",
-            "PRESENT-VALUE", "RANDOM", "RANGE", "REM", "REVERSE", "SIN", "SQRT",
-            "STANDARD-DEVIATION", "SUM", "TAN", "UPPER-CASE", "VARIANCE",
-            "WHEN-COMPILED"
+            'ACOS', 'ANNUITY', 'ASIN', 'ATAN', 'CHAR', 'COS', 'CURRENT-DATE',
+            'DATE-OF-INTEGER', 'DAY-OF-INTEGER', 'FACTORIAL', 'INTEGER',
+            'INTEGER-OF-DATE', 'INTEGER-OF-DAY', 'INTEGER-PART', 'LENGTH',
+            'LOG', 'LOG10', 'LOWER-CASE', 'MAX', 'MEAN', 'MEDIAN', 'MIDRANGE',
+            'MIN', 'MOD', 'NUMVAL', 'NUMVAL-C', 'ORD', 'ORD-MAX', 'ORD-MIN',
+            'PRESENT-VALUE', 'RANDOM', 'RANGE', 'REM', 'REVERSE', 'SIN', 'SQRT',
+            'STANDARD-DEVIATION', 'SUM', 'TAN', 'UPPER-CASE', 'VARIANCE',
+            'WHEN-COMPILED'
             ),
         5 => array( //Privileged Built-in Functions
-            "#IN", "#OUT", "#TERM", "#TEMP", "#DYNAMIC", "COBOL85^ARMTRAP",
-            "COBOL85^COMPLETION", "COBOL_COMPLETION_", "COBOL_CONTROL_",
-            "COBOL_GETENV_", "COBOL_PUTENV_", "COBOL85^RETURN^SORT^ERRORS",
-            "COBOL_RETURN_SORT_ERRORS_", "COBOL85^REWIND^SEQUENTIAL",
-            "COBOL_REWIND_SEQUENTIAL_", "COBOL85^SET^SORT^PARAM^TEXT",
-            "COBOL_SET_SORT_PARAM_TEXT_", "COBOL85^SET^SORT^PARAM^VALUE",
-            "COBOL_SET_SORT_PARAM_VALUE_", "COBOL_SET_MAX_RECORD_",
-            "COBOL_SETMODE_", "COBOL85^SPECIAL^OPEN", "COBOL_SPECIAL_OPEN_",
-            "COBOLASSIGN", "COBOL_ASSIGN_", "COBOLFILEINFO", "COBOL_FILE_INFO_",
-            "COBOLSPOOLOPEN", "CREATEPROCESS", "ALTERPARAMTEXT",
-            "CHECKLOGICALNAME", "CHECKMESSAGE", "DELETEASSIGN", "DELETEPARAM",
-            "DELETESTARTUP", "GETASSIGNTEXT", "GETASSIGNVALUE", "GETBACKUPCPU",
-            "GETPARAMTEXT", "GETSTARTUPTEXT", "PUTASSIGNTEXT", "PUTASSIGNVALUE",
-            "PUTPARAMTEXT", "PUTSTARTUPTEXT"
+            '#IN', '#OUT', '#TERM', '#TEMP', '#DYNAMIC', 'COBOL85^ARMTRAP',
+            'COBOL85^COMPLETION', 'COBOL_COMPLETION_', 'COBOL_CONTROL_',
+            'COBOL_GETENV_', 'COBOL_PUTENV_', 'COBOL85^RETURN^SORT^ERRORS',
+            'COBOL_RETURN_SORT_ERRORS_', 'COBOL85^REWIND^SEQUENTIAL',
+            'COBOL_REWIND_SEQUENTIAL_', 'COBOL85^SET^SORT^PARAM^TEXT',
+            'COBOL_SET_SORT_PARAM_TEXT_', 'COBOL85^SET^SORT^PARAM^VALUE',
+            'COBOL_SET_SORT_PARAM_VALUE_', 'COBOL_SET_MAX_RECORD_',
+            'COBOL_SETMODE_', 'COBOL85^SPECIAL^OPEN', 'COBOL_SPECIAL_OPEN_',
+            'COBOLASSIGN', 'COBOL_ASSIGN_', 'COBOLFILEINFO', 'COBOL_FILE_INFO_',
+            'COBOLSPOOLOPEN', 'CREATEPROCESS', 'ALTERPARAMTEXT',
+            'CHECKLOGICALNAME', 'CHECKMESSAGE', 'DELETEASSIGN', 'DELETEPARAM',
+            'DELETESTARTUP', 'GETASSIGNTEXT', 'GETASSIGNVALUE', 'GETBACKUPCPU',
+            'GETPARAMTEXT', 'GETSTARTUPTEXT', 'PUTASSIGNTEXT', 'PUTASSIGNVALUE',
+            'PUTPARAMTEXT', 'PUTSTARTUPTEXT'
             )
         ),
     'SYMBOLS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/c.php dokuwiki-rc2009-12-02/inc/geshi/c.php
--- dokuwiki-2009-02-14/inc/geshi/c.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/c.php	2009-12-02 19:50:11.000000000 +0100
@@ -5,14 +5,17 @@
  * Author: Nigel McNie (nigel@geshi.org)
  * Contributors:
  *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Michael Mol (mikemol@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * C language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2009/01/22 (1.0.8.3)
+ *   -  Made keywords case-sensitive.
  * 2008/05/23 (1.0.7.22)
  *   -  Added description of extra language features (SF#1970248)
  * 2004/XX/XX (1.0.4)
@@ -26,7 +29,7 @@
  * 2004/07/14 (1.0.0)
  *   -  First Release
  *
- * TODO (updated 2004/11/27)
+ * TODO (updated 2009/02/08)
  * -------------------------
  *  -  Get a list of inbuilt functions to add (and explore C more
  *     to complete this rather bare language file
@@ -53,16 +56,33 @@
 
 $language_data = array (
     'LANG_NAME' => 'C',
-    'COMMENT_SINGLE' => array(2 => '#'),
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    //Multiline-continued single-line comments
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-                 GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-                 GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
             'if', 'return', 'while', 'case', 'continue', 'default',
@@ -90,10 +110,10 @@
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
@@ -108,7 +128,13 @@
             'MULTI' => 'color: #808080; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
             ),
         'BRACKETS' => array(
             0 => 'color: #009900;'
@@ -159,4 +185,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/cpp.php dokuwiki-rc2009-12-02/inc/geshi/cpp.php
--- dokuwiki-2009-02-14/inc/geshi/cpp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cpp.php	2009-12-02 19:50:11.000000000 +0100
@@ -7,7 +7,7 @@
  *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
  *  - Jack Lloyd (lloyd@randombit.net)
  * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/09/27
  *
  * C++ language file for GeSHi.
@@ -52,14 +52,31 @@
     'LANG_NAME' => 'C++',
     'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    //Multiline-continued single-line comments
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-                 GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-                 GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
             'break', 'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
@@ -121,10 +138,10 @@
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
@@ -139,7 +156,13 @@
             'MULTI' => 'color: #ff0000; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #666666; font-weight: bold;'
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
             ),
         'BRACKETS' => array(
             0 => 'color: #008000;'
@@ -200,4 +223,4 @@
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/cpp-qt.php dokuwiki-rc2009-12-02/inc/geshi/cpp-qt.php
--- dokuwiki-2009-02-14/inc/geshi/cpp-qt.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/cpp-qt.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Iulian M
  * Copyright: (c) 2006 Iulian M
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/09/27
  *
  * C++ (with QT extensions) language file for GeSHi.
@@ -41,18 +41,35 @@
     'LANG_NAME' => 'C++ (QT)',
     'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    //Multiline-continued Singleline comments
-    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-                 GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-                 GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
             'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
-            'switch', 'while'
+            'switch', 'while', 'delete', 'new', 'this'
             ),
         2 => array(
             'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
@@ -73,7 +90,7 @@
             'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals'
             ),
         3 => array(
-            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'cin', 'cerr', 'clog', 'cout',
             'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
             'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
             'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
@@ -202,40 +219,46 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', ';', '|', '<', '>'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        1 => false,
-        2 => false,
-        3 => false,
-        4 => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
         5 => true,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #0000ff;',
-            2 => 'color: #0000ff;',
-            3 => 'color: #0000dd;',
-            4 => 'color: #0000ff;',
-            5 => 'color: #0000ee;'
+            1 => 'color: #000000; font-weight:bold;',
+            2 => 'color: #0057AE;',
+            3 => 'color: #2B74C7;',
+            4 => 'color: #0057AE;',
+            5 => 'color: #22aadd;'
             ),
         'COMMENTS' => array(
-            1 => 'color: #ff0000;',
-            2 => 'color: #339900;',
-            'MULTI' => 'color: #ff0000; font-style: italic;'
+            1 => 'color: #888888;',
+            2 => 'color: #006E28;',
+            'MULTI' => 'color: #888888; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #666666; font-weight: bold;'
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
             ),
         'BRACKETS' => array(
-            0 => 'color: #000000;'
+            0 => 'color: #006E28;'
             ),
         'STRINGS' => array(
-            0 => 'color: #666666;'
+            0 => 'color: #BF0303;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #0000dd;',
+            0 => 'color: #B08000;',
             GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
             GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
             GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
@@ -245,11 +268,12 @@
             GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
             ),
         'METHODS' => array(
-            1 => 'color: #007788;',
-            2 => 'color: #007788;'
+            1 => 'color: #2B74C7;',
+            2 => 'color: #2B74C7;',
+            3 => 'color: #2B74C7;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #000000;'
+            0 => 'color: #006E28;'
             ),
         'REGEXPS' => array(
             ),
@@ -266,7 +290,8 @@
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
         1 => '.',
-        2 => '::'
+        2 => '::',
+        3 => '->',
         ),
     'REGEXPS' => array(
         ),
@@ -280,8 +305,11 @@
         'KEYWORDS' => array(
             'DISALLOWED_BEFORE' => "(?|^])",
             'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        ),
+        'OOLANG' => array(
+            'MATCH_AFTER' => '~?[a-zA-Z][a-zA-Z0-9_]*',
         )
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/csharp.php dokuwiki-rc2009-12-02/inc/geshi/csharp.php
--- dokuwiki-2009-02-14/inc/geshi/csharp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/csharp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Alan Juden (alan@judenware.org)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * C# language file for GeSHi.
@@ -52,7 +52,8 @@
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'HARDQUOTE' => array('@"', '"'),
-    'HARDESCAPE' => array('""'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
@@ -60,9 +61,10 @@
             'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
             'finally', 'fixed', 'for', 'foreach', 'goto', 'if', 'implicit',
             'in', 'internal', 'lock', 'namespace', 'null', 'operator', 'out',
-            'override', 'params', 'private', 'protected', 'public', 'readonly',
-            'ref', 'return', 'sealed', 'stackalloc', 'static', 'switch', 'this',
-            'throw', 'true', 'try', 'unsafe', 'using', 'virtual', 'void', 'while'
+            'override', 'params', 'partial', 'private', 'protected', 'public',
+            'readonly', 'ref', 'return', 'sealed', 'stackalloc', 'static',
+            'switch', 'this', 'throw', 'true', 'try', 'unsafe', 'using',
+            'virtual', 'void', 'while'
             ),
         2 => array(
             '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
@@ -245,4 +247,4 @@
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/css.php dokuwiki-rc2009-12-02/inc/geshi/css.php
--- dokuwiki-2009-02-14/inc/geshi/css.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/css.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/18
  *
  * CSS language file for GeSHi.
@@ -187,12 +187,12 @@
         ),
     'REGEXPS' => array(
         //DOM Node ID
-        0 => '\#[a-zA-Z0-9\-_]+',
+        0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
         //CSS classname
-        1 => '\.(?!\d)[a-zA-Z0-9\-_]+\b(?=[\{\.#\s,:].|<\|)',
+        1 => '\.(?!\d)[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*\b(?=[\{\.#\s,:].|<\|)',
         //CSS Pseudo classes
         //note: & is needed for > (i.e. > )
-        2 => ':(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))',
+        2 => '(? '[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)',
         ),
@@ -209,4 +209,4 @@
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/dcs.php dokuwiki-rc2009-12-02/inc/geshi/dcs.php
--- dokuwiki-2009-02-14/inc/geshi/dcs.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/dcs.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,185 @@
+ 'DCS',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(
+        ),
+    'HARDQUOTE' => array(
+        ),
+    'HARDESCAPE' => '',
+    'COMMENT_REGEXP' => array(
+        // Highlight embedded C code in a separate color:
+        2 => '/\bINSERT_C_CODE\b.*?\bEND_C_CODE\b/ims'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(
+        '"'
+        ),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'ascii_value', 'bit_value', 'blank_date', 'calc_unit_values', 'cm',
+            'complete_months', 'complete_years', 'correct', 'create_input_file', 'cy',
+            'date_convert', 'day', 'del_output_separator',
+            'delete_existing_output_files', 'div', 'ex', 'exact_years', 'exp',
+            'extract_date', 'failed_validation', 'file_number', 'first_record',
+            'fract', 'fund_fac_a', 'fund_fac_b', 'fund_fac_c', 'fund_fac_d',
+            'fund_fac_e', 'fund_fac_f', 'fund_fac_g', 'fund_fac_h', 'fund_fac_i',
+            'fund_fac_j', 'fund_fac_k', 'fund_fac_l', 'fund_fac_m', 'fund_fac_n',
+            'fund_fac_o', 'fund_fac_p', 'fund_fac_q', 'fund_fac_r', 'fund_fac_s',
+            'fund_fac_t', 'fund_fac_u', 'fund_fac_v', 'fund_fac_w', 'fund_fac_x',
+            'fund_fac_y', 'fund_fac_z', 'group', 'group_record',
+            'input_file_date_time', 'input_file_extension', 'input_file_location',
+            'input_file_name', 'int', 'invalid', 'last_record', 'leap_year', 'len',
+            'ln', 'log', 'main_format_name', 'max', 'max_num_subrecords', 'message',
+            'min', 'mod', 'month', 'months_add', 'months_sub', 'nearest_months',
+            'nearest_years', 'next_record', 'nm', 'no_of_current_records',
+            'no_of_records', 'numval', 'ny', 'output', 'output_array_as_constants',
+            'output_file_path', 'output_record', 'pmdf_output', 'previous', 'rand',
+            're_start', 'read_generic_table', 'read_generic_table_text',
+            'read_input_footer', 'read_input_footer_text', 'read_input_header',
+            'read_input_header_text', 'record_count', 'record_suppressed', 'round',
+            'round_down', 'round_near', 'round_up', 'run_dcs_program', 'run_parameter',
+            'run_parameter_text', 'set_main_record', 'set_num_subrecords',
+            'sort_array', 'sort_current_records', 'sort_input', 'strval', 'substr',
+            'summarise', 'summarise_record', 'summarise_units',
+            'summarise_units_record', 'suppress_record', 'table_correct',
+            'table_validate', 'terminate', 'time', 'today', 'trim', 'ubound', 'year',
+            'years_add', 'years_sub'
+            ),
+        2 => array(
+            'and', 'as', 'begin', 'boolean', 'byref', 'byval', 'call', 'case', 'date',
+            'default', 'do', 'else', 'elseif', 'end_c_code', 'endfor', 'endfunction',
+            'endif', 'endproc', 'endswitch', 'endwhile', 'eq',
+            'explicit_declarations', 'false', 'for', 'from', 'function', 'ge', 'gt',
+            'if', 'insert_c_code', 'integer', 'le', 'loop', 'lt', 'ne', 'not',
+            'number', 'or', 'private', 'proc', 'public', 'quitloop', 'return',
+            'short', 'step', 'switch', 'text', 'then', 'to', 'true', 'while'
+            ),
+        3 => array(
+            // These keywords are not highlighted by the DCS IDE but we may as well
+            // keep track of them anyway:
+            'mp_file', 'odbc_file'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']',
+        '=', '<', '>',
+        '+', '-', '*', '/', '^',
+        ':', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: red;',
+            2 => 'color: blue;',
+            3 => 'color: black;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: black; background-color: silver;',
+            // Colors for highlighting embedded C code:
+            2 => 'color: maroon; background-color: pink;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: green;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: black;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/delphi.php dokuwiki-rc2009-12-02/inc/geshi/delphi.php
--- dokuwiki-2009-02-14/inc/geshi/delphi.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/delphi.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/26
  *
  * Delphi (Object Pascal) language file for GeSHi.
@@ -50,7 +50,7 @@
     'COMMENT_SINGLE' => array(1 => '//'),
     'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
     //Compiler directives
-    'COMMENT_REGEXP' => array(2 => '/{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
     'CASE_KEYWORDS' => 0,
     'QUOTEMARKS' => array("'"),
     'ESCAPE_CHAR' => '',
@@ -276,7 +276,7 @@
         //Hex numbers
         0 => '\$[0-9a-fA-F]+',
         //Characters
-        1 => '\#\$?[0-9]{1,3}'
+        1 => '\#(?:\$[0-9a-fA-F]{1,2}|\d{1,3})'
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
@@ -286,4 +286,4 @@
     'TAB_WIDTH' => 2
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/diff.php dokuwiki-rc2009-12-02/inc/geshi/diff.php
--- dokuwiki-2009-02-14/inc/geshi/diff.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/diff.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
  * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/12/29
  *
  * Diff-output language file for GeSHi.
@@ -54,20 +54,20 @@
             1 => array(
                 '\ No newline at end of file'
             ),
-            2 => array(
-                '***************' /* This only seems to works in some cases? */
-            ),
+//            2 => array(
+//                '***************' /* This only seems to works in some cases? */
+//            ),
         ),
     'SYMBOLS' => array(
         ),
     'CASE_SENSITIVE' => array(
         1 => false,
-        2 => false
+//        2 => false
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
             1 => 'color: #aaaaaa; font-style: italic;',
-            2 => 'color: #dd6611;',
+//            2 => 'color: #dd6611;',
             ),
         'COMMENTS' => array(
             ),
@@ -107,7 +107,7 @@
         ),
     'URLS' => array(
         1 => '',
-        2 => ''
+//        2 => ''
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(),
diff -Naur dokuwiki-2009-02-14/inc/geshi/div.php dokuwiki-rc2009-12-02/inc/geshi/div.php
--- dokuwiki-2009-02-14/inc/geshi/div.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/div.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Gabriel Lorenzo (ermakina@gmail.com)
  * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/06/19
  *
  * DIV language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/dos.php dokuwiki-rc2009-12-02/inc/geshi/dos.php
--- dokuwiki-2009-02-14/inc/geshi/dos.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/dos.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Alessandro Staltari (staltari@geocities.com)
  * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/07/05
  *
  * DOS language file for GeSHi.
@@ -64,7 +64,7 @@
     'COMMENT_SINGLE' => array(),
     'COMMENT_MULTI' => array(),
     //DOS comment lines
-    'COMMENT_REGEXP' => array(1 => "/^\s*@?REM/mi"),
+    'COMMENT_REGEXP' => array(1 => "/^\s*@?REM.*$/mi"),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
@@ -84,10 +84,11 @@
         /* Internal commands */
         3 => array(
             'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
-            'del', 'copy',
+            'del', 'copy', 'move', 'ren', 'rename',
             'echo',
             'setlocal', 'endlocal', 'set',
-            'pause'
+            'pause',
+            'pushd', 'popd', 'title', 'verify'
             ),
         /* Special files */
         4 => array(
@@ -172,7 +173,7 @@
         /* Arguments or variable evaluation */
         2 => array(
 /*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((? '(%)([\d*]|[^%]*(?=%))((? '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((? '\\2',
             GESHI_MODIFIERS => 'si',
             GESHI_BEFORE => '\\1',
@@ -184,7 +185,14 @@
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         ),
-    'TAB_WIDTH' => 4
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?
diff -Naur dokuwiki-2009-02-14/inc/geshi/dot.php dokuwiki-rc2009-12-02/inc/geshi/dot.php
--- dokuwiki-2009-02-14/inc/geshi/dot.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/dot.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Adrien Friggeri (adrien@friggeri.net)
  * Copyright: (c) 2007 Adrien Friggeri (http://www.friggeri.net)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/05/30
  *
  * dot language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/d.php dokuwiki-rc2009-12-02/inc/geshi/d.php
--- dokuwiki-2009-02-14/inc/geshi/d.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/d.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----
  * Author: Thomas Kuehne (thomas@kuehne.cn)
  * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/04/22
  *
  * D language file for GeSHi.
@@ -44,14 +44,84 @@
 
 $language_data = array (
     'LANG_NAME' => 'D',
-    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_SINGLE' => array(2 => '///', 1 => '//'),
     'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // doxygen comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // raw strings
+        4 => '#r"[^"]*"#s',
+        // Script Style interpreter comment
+        5 => "/\A#!(?=\\/).*?$/m"
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-    'QUOTEMARKS' => array('"', "'", '`'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
-                 GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
-                 GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\'\"?\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#",
+        //Named entity escapes
+        /*6 => "#\\\\&(?:quot|amp|lt|gt|OElig|oelig|Scaron|scaron|Yuml|circ|tilde|".
+            "ensp|emsp|thinsp|zwnj|zwj|lrm|rlm|ndash|mdash|lsquo|rsquo|sbquo|".
+            "ldquo|rdquo|bdquo|dagger|Dagger|permil|lsaquo|rsaquo|euro|nbsp|".
+            "iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|".
+            "shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|".
+            "sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|".
+            "Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|".
+            "Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Ouml|".
+            "times|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|".
+            "aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|".
+            "euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|".
+            "otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|".
+            "yuml|fnof|Alpha|Beta|Gamma|Delta|Epsilon|Zeta|Eta|Theta|Iota|".
+            "Kappa|Lambda|Mu|Nu|Xi|Omicron|Pi|Rho|Sigma|Tau|Upsilon|Phi|Chi|".
+            "Psi|Omega|alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|".
+            "kappa|lambda|mu|nu|xi|omicron|pi|rho|sigmaf|sigma|tau|upsilon|".
+            "phi|chi|psi|omega|thetasym|upsih|piv|bull|hellip|prime|Prime|".
+            "oline|frasl|weierp|image|real|trade|alefsym|larr|uarr|rarr|darr|".
+            "harr|crarr|lArr|uArr|rArr|dArr|hArr|forall|part|exist|empty|".
+            "nabla|isin|notin|ni|prod|sum|minus|lowast|radic|prop|infin|ang|".
+            "and|or|cap|cup|int|there4|sim|cong|asymp|ne|equiv|le|ge|sub|sup|".
+            "nsub|sube|supe|oplus|otimes|perp|sdot|lceil|rceil|lfloor|rfloor|".
+            "lang|rang|loz|spades|clubs|hearts|diams);#",*/
+        // optimized:
+        6 => "#\\\\&(?:A(?:Elig|acute|circ|grave|lpha|ring|tilde|uml)|Beta|".
+            "C(?:cedil|hi)|D(?:agger|elta)|E(?:TH|acute|circ|grave|psilon|ta|uml)|".
+            "Gamma|I(?:acute|circ|grave|ota|uml)|Kappa|Lambda|Mu|N(?:tilde|u)|".
+            "O(?:Elig|acute|circ|grave|m(?:ega|icron)|slash|tilde|uml)|".
+            "P(?:hi|i|rime|si)|Rho|S(?:caron|igma)|T(?:HORN|au|heta)|".
+            "U(?:acute|circ|grave|psilon|uml)|Xi|Y(?:acute|uml)|Zeta|".
+            "a(?:acute|c(?:irc|ute)|elig|grave|l(?:efsym|pha)|mp|n[dg]|ring|".
+            "symp|tilde|uml)|b(?:dquo|eta|rvbar|ull)|c(?:ap|cedil|e(?:dil|nt)|".
+            "hi|irc|lubs|o(?:ng|py)|rarr|u(?:p|rren))|d(?:Arr|a(?:gger|rr)|".
+            "e(?:g|lta)|i(?:ams|vide))|e(?:acute|circ|grave|m(?:pty|sp)|nsp|".
+            "psilon|quiv|t[ah]|u(?:ml|ro)|xist)|f(?:nof|orall|ra(?:c(?:1[24]|34)|sl))|".
+            "g(?:amma|e|t)|h(?:Arr|arr|e(?:arts|llip))|i(?:acute|circ|excl|grave|mage|".
+            "n(?:fin|t)|ota|quest|sin|uml)|kappa|l(?:Arr|a(?:mbda|ng|quo|rr)|ceil|".
+            "dquo|e|floor|o(?:wast|z)|rm|s(?:aquo|quo)|t)|m(?:acr|dash|".
+            "i(?:cro|ddot|nus)|u)|n(?:abla|bsp|dash|e|i|ot(?:in)?|sub|tilde|u)|".
+            "o(?:acute|circ|elig|grave|line|m(?:ega|icron)|plus|r(?:d[fm])?|".
+            "slash|ti(?:lde|mes)|uml)|p(?:ar[at]|er(?:mil|p)|hi|iv?|lusmn|ound|".
+            "r(?:ime|o[dp])|si)|quot|r(?:Arr|a(?:dic|ng|quo|rr)|ceil|dquo|e(?:al|g)|".
+            "floor|ho|lm|s(?:aquo|quo))|s(?:bquo|caron|dot|ect|hy|i(?:gmaf?|m)|".
+            "pades|u(?:be?|m|p[123e]?)|zlig)|t(?:au|h(?:e(?:re4|ta(?:sym)?)|insp|".
+            "orn)|i(?:lde|mes)|rade)|u(?:Arr|a(?:cute|rr)|circ|grave|ml|".
+            "psi(?:h|lon)|uml)|weierp|xi|y(?:acute|en|uml)|z(?:eta|w(?:j|nj)));#",
+        ),
+    'HARDQUOTE' => array('`', '`'),
+    'HARDESCAPE' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
                 'break', 'case', 'continue', 'do', 'else',
@@ -64,7 +134,7 @@
                 'extern', 'false', 'finally', 'function',
                 'import', 'in', 'inout', 'interface',
                 'invariant', 'is', 'mixin', 'module', 'new',
-                'null', 'out', 'pragma', 'super', 'this',
+                'null', 'out', 'pragma', 'ref', 'super', 'this',
                 'throw', 'true', 'try', 'typedef', 'typeid',
                 'typeof', 'union', 'with'
             ),
@@ -134,17 +204,29 @@
             4 => 'color: #993333;'
             ),
         'COMMENTS' => array(
-            1=> 'color: #808080; font-style: italic;',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009933; font-style: italic;',
+            3 => 'color: #009933; font-style: italic;',
+            4 => 'color: #ff0000;',
+            5 => 'color: #0040ff;',
             'MULTI' => 'color: #808080; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            6 => 'color: #666699; font-weight: bold; font-style: italic;',
+            'HARD' => '',
             ),
         'BRACKETS' => array(
             0 => 'color: #66cc66;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
             ),
         'NUMBERS' => array(
             0 => 'color: #0000dd;',
@@ -187,4 +269,4 @@
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/eiffel.php dokuwiki-rc2009-12-02/inc/geshi/eiffel.php
--- dokuwiki-2009-02-14/inc/geshi/eiffel.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/eiffel.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Zoran Simic (zsimic@axarosenberg.com)
  * Copyright: (c) 2005 Zoran Simic
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/06/30
  *
  * Eiffel language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/email.php dokuwiki-rc2009-12-02/inc/geshi/email.php
--- dokuwiki-2009-02-14/inc/geshi/email.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/email.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,209 @@
+ 'eMail (mbox)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'HTTP', 'SMTP', 'ASMTP', 'ESMTP'
+            ),
+        2 => array(
+            'Content-Type','Content-Transfer-Encoding','Content-Disposition',
+            'Delivered-To','Dkim-Signature','Domainkey-Signature','In-Reply-To',
+            'Message-Id','MIME-Version','Received','Received-SPF','References',
+            'Resend-From','Resend-To','Return-Path'
+            ),
+        3 => array(
+            'Date','From','Subject','To',
+            ),
+        4 => array(
+            'by', 'for', 'from', 'id', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':', ';', '<', '>', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => false,
+        3 => false,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #800000; font-weight: bold;',
+            4 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #000040;',
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #008000;',
+            4 => 'color: #0000FF; font-weight: bold;',
+            5 => 'font-weight: bold;',
+            6 => 'color: #400080;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Non-Standard-Header
+        1 => array(
+            GESHI_SEARCH => "(?<=\A\x20|\n)x-[a-z0-9\-]*(?=\s*:|\s*<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "smi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Email-Adresses or Mail-IDs
+        2 => array(
+            GESHI_SEARCH => "\b[\w\.]+@\w+(?:(?:\.\w+)*\.\w{2,4})?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Date values in RFC format
+        3 => array(
+            GESHI_SEARCH => "\b(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s+\d\d?\s+" .
+                "(?:Jan|Feb|Mar|apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+" .
+                "\d{4}\s+\d\d?:\d\d:\d\d\s+[+\-]\d{4}(?:\s+\(\w+\))?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //IP addresses
+        4 => array(
+            GESHI_SEARCH => "(?<=\s)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\s)|".
+                "(?<=\[)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\])|".
+                "(?<==)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "i",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Field-Assignments
+        5 => array(
+            GESHI_SEARCH => "(?<=\s)[A-Z0-9\-]+(?==(?!\s|$))",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //MIME type
+        6 => array(
+            GESHI_SEARCH => "(?<=\s)(?:audio|application|image|multipart|text|".
+                "video|x-[a-z0-9\-]+)\/[a-z0-9][a-z0-9\-]*(?=\s|<|$)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "m",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => "/(?^)[A-Z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?$)/m"
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)',
+                'DISALLOWED_AFTER' => '(?=\s|\b)',
+            )
+        ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/fortran.php dokuwiki-rc2009-12-02/inc/geshi/fortran.php
--- dokuwiki-2009-02-14/inc/geshi/fortran.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/fortran.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----------
  * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
  * Copyright: (C) 2006 Cetric Arrabie
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/04/22
  *
  * Fortran language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/freebasic.php dokuwiki-rc2009-12-02/inc/geshi/freebasic.php
--- dokuwiki-2009-02-14/inc/geshi/freebasic.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/freebasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------------
  * Author: Roberto Rossi
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/08/19
  *
  * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/genero.php dokuwiki-rc2009-12-02/inc/geshi/genero.php
--- dokuwiki-2009-02-14/inc/geshi/genero.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/genero.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Lars Gersmann (lars.gersmann@gmail.com)
  * Copyright: (c) 2007 Lars Gersmann, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/07/01
  *
  * Genero (FOURJ's Genero 4GL) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/gettext.php dokuwiki-rc2009-12-02/inc/geshi/gettext.php
--- dokuwiki-2009-02-14/inc/geshi/gettext.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/gettext.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/05/25
  *
  * GNU Gettext .po/.pot language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/glsl.php dokuwiki-rc2009-12-02/inc/geshi/glsl.php
--- dokuwiki-2009-02-14/inc/geshi/glsl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/glsl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/03/20
  *
  * glSlang language file for GeSHi.
@@ -41,6 +41,12 @@
     'LANG_NAME' => 'glSlang',
     'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '\\',
@@ -54,7 +60,7 @@
             'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
             'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
             'public', 'static', 'extern', 'external', 'packed',
-            'inline', 'noinline'
+            'inline', 'noinline', 'noperspective', 'flat'
             ),
         3 => array(
             'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
@@ -196,4 +202,4 @@
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/gml.php dokuwiki-rc2009-12-02/inc/geshi/gml.php
--- dokuwiki-2009-02-14/inc/geshi/gml.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/gml.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Jos� Jorge Enr�quez (jenriquez@users.sourceforge.net)
  * Copyright: (c) 2005 Jos� Jorge Enr�quez Rodr�guez (http://www.zonamakers.com)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/06/21
  *
  * GML language file for GeSHi.
@@ -435,8 +435,13 @@
             ),
         ),
     'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '&&', '||', '^^', '<', '<=', '==', '!=', '>', '>=',
-        '|', '&', '^', '<<', '>>', '+', '-', '*', '/', '!', '-', '~'
+        '(', ')', '{', '}', '[', ']',
+        '&&', '||', '^^', '&', '|', '^',
+        '<', '<=', '==', '!=', '>', '>=', '=',
+        '<<', '>>',
+        '+=', '-=', '*=', '/=',
+        '+', '-', '*', '/',
+        '!', '~', ',', ';'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
diff -Naur dokuwiki-2009-02-14/inc/geshi/gnuplot.php dokuwiki-rc2009-12-02/inc/geshi/gnuplot.php
--- dokuwiki-2009-02-14/inc/geshi/gnuplot.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/gnuplot.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/07/07
  *
  * Gnuplot script language file for GeSHi.
@@ -41,6 +41,11 @@
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('`', '"', "'"),
     'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         // copy output of help command, indent properly and use this replace regexp:
         // ([a-z0-9_\-]+)(( )+|$)          =>     '\1',\3
@@ -64,7 +69,7 @@
             'cbtics', 'clabel', 'clip', 'cntrparam',
             'colorbox', 'contour', 'datafile', 'date_specifiers',
             'decimalsign', 'dgrid3d', 'dummy', 'encoding',
-            'fit', 'fontpath', 'format', 'grid',
+            'fontpath', 'format', 'grid',
             'hidden3d', 'historysize', 'isosamples', 'key',
             'label', 'lmargin', 'loadpath', 'locale',
             'log', 'logscale', 'macros', 'mapping',
@@ -72,12 +77,12 @@
             'mx2tics', 'mxtics', 'my2tics', 'mytics',
             'mztics', 'object', 'offsets', 'origin',
             'output', 'palette', 'parametric', 'pm3d',
-            'pointsize', 'polar', 'print', 'rmargin',
+            'pointsize', 'polar', 'rmargin',
             'rrange', 'samples', 'size', 'style',
             'surface', 'table', 'term', 'terminal',
             'termoption', 'tics', 'ticscale', 'ticslevel',
             'time_specifiers', 'timefmt', 'timestamp', 'title',
-            'tmargin', 'trange', 'urange', 'view',
+            'trange', 'urange', 'view',
             'vrange', 'x2data', 'x2dtics', 'x2label',
             'x2mtics', 'x2range', 'x2tics', 'x2zeroaxis',
             'xdata', 'xdtics', 'xlabel', 'xmtics',
@@ -139,11 +144,11 @@
             'exists', 'exp', 'floor', 'gamma',
             'gprintf', 'ibeta', 'igamma', 'imag',
             'int', 'inverf', 'invnorm', 'lambertw',
-            'lgamma', 'log', 'log10', 'norm',
+            'lgamma', 'log10', 'norm',
             'rand', 'random', 'real', 'sgn',
             'sin', 'sinh', 'sprintf', 'sqrt',
             'stringcolumn', 'strlen', 'strstrt', 'substr',
-            'system', 'tan', 'tanh', 'timecolumn',
+            'tan', 'tanh', 'timecolumn',
             'tm_hour', 'tm_mday', 'tm_min', 'tm_mon',
             'tm_sec', 'tm_wday', 'tm_yday', 'tm_year',
             'valid', 'word', 'words',
@@ -151,12 +156,12 @@
         5 => array(
             // mixed arguments
             // there is no sane way to get these ones easily...
-            'notitle', 'autofreq', 'x', 'y', 'z',
+            'autofreq', 'x', 'y', 'z',
             'lt', 'linetype', 'lw', 'linewidth', 'ls', 'linestyle',
             'out', 'rotate by', 'screen',
             'enhanced', 'via',
             // `help set key`
-            'on', 'off', 'default', 'inside', 'outside', 'lmargin', 'rmargin', 'tmargin', 'bmargin',
+            'on', 'off', 'default', 'inside', 'outside', 'tmargin',
             'at', 'left', 'right', 'center', 'top', 'bottom', 'vertical', 'horizontal', 'Left', 'Right',
             'noreverse', 'reverse', 'noinvert', 'invert', 'samplen', 'spacing', 'width', 'height',
             'noautotitle', 'autotitle', 'noenhanced', 'nobox', 'box',
@@ -165,7 +170,7 @@
             'landscape', 'portrait', 'eps', 'defaultplex', 'simplex', 'duplex',
             'fontfile', 'add', 'delete', 'nofontfiles', 'level1', 'leveldefault',
             'color', 'colour', 'monochrome', 'solid', 'dashed', 'dashlength', 'dl',
-            'rounded', 'butt', 'palfuncparam', 'size', 'blacktext', 'colortext', 'colourtext',
+            'rounded', 'butt', 'palfuncparam', 'blacktext', 'colortext', 'colourtext',
             'font',
 
             // help set terminal png
@@ -175,10 +180,10 @@
 
             // `help plot`
             'acsplines', 'bezier', 'binary', 'csplines',
-            'datafile', 'every',
+            'every',
             'example', 'frequency', 'index', 'matrix',
-            'parametric', 'ranges', 'sbezier', 'smooth',
-            'special-filenames', 'style', 'thru', 'title',
+            'ranges', 'sbezier', 'smooth',
+            'special-filenames', 'thru',
             'unique', 'using', 'with',
 
             // `help plotting styles`
@@ -211,7 +216,7 @@
         ),
     'REGEXPS' => array(
         //Variable assignment
-        0 => "([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
+        0 => "(?\w])([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
         //Numbers with unit
         1 => "(?<=^|\s)([0-9]*\.?[0-9]+\s*cm)"
         ),
@@ -288,4 +293,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/groovy.php dokuwiki-rc2009-12-02/inc/geshi/groovy.php
--- dokuwiki-2009-02-14/inc/geshi/groovy.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/groovy.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Ivan F. Villanueva B. (geshi_groovy@artificialidea.com)
  * Copyright: (c) 2006 Ivan F. Villanueva B.(http://www.artificialidea.com)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/04/29
  *
  * Groovy language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/haskell.php dokuwiki-rc2009-12-02/inc/geshi/haskell.php
--- dokuwiki-2009-02-14/inc/geshi/haskell.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/haskell.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Jason Dagit (dagit@codersbase.com) based on ocaml.php by Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/08/27
  *
  * Haskell language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/hq9plus.php dokuwiki-rc2009-12-02/inc/geshi/hq9plus.php
--- dokuwiki-2009-02-14/inc/geshi/hq9plus.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/hq9plus.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,104 @@
+ 'HQ9+',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        'H', 'Q', '9', '+', 'h', 'q'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a16000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/html4strict.php dokuwiki-rc2009-12-02/inc/geshi/html4strict.php
--- dokuwiki-2009-02-14/inc/geshi/html4strict.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/html4strict.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/10
  *
  * HTML 4.01 strict language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/idl.php dokuwiki-rc2009-12-02/inc/geshi/idl.php
--- dokuwiki-2009-02-14/inc/geshi/idl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/idl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Cedric Bosdonnat (cedricbosdo@openoffice.org)
  * Copyright: (c) 2006 Cedric Bosdonnat
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/08/20
  *
  * Unoidl language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/ini.php dokuwiki-rc2009-12-02/inc/geshi/ini.php
--- dokuwiki-2009-02-14/inc/geshi/ini.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/ini.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: deguix (cevo_deguix@yahoo.com.br)
  * Copyright: (c) 2005 deguix
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/03/27
  *
  * INI language file for GeSHi.
@@ -100,7 +100,7 @@
         0 => '\[.+\]',
         //Entry names
         1 => array(
-            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_]+)(\s*=)',
+            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_\-]+)(\s*=)',
             GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'm',
             GESHI_BEFORE => '\\1',
diff -Naur dokuwiki-2009-02-14/inc/geshi/inno.php dokuwiki-rc2009-12-02/inc/geshi/inno.php
--- dokuwiki-2009-02-14/inc/geshi/inno.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/inno.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from J�rja Norbert (jnorbi@vipmail.hu)
  * Copyright: (c) 2004 J�rja Norbert, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/07/29
  *
  * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
@@ -185,7 +185,7 @@
         'REGEXPS' => array(
             ),
         'SYMBOLS' => array(
-            0 => 'color:  #000000; font-weight: bold;',
+            0 => 'color: #000000; font-weight: bold;',
             ),
         'SCRIPT' => array(
             )
diff -Naur dokuwiki-2009-02-14/inc/geshi/intercal.php dokuwiki-rc2009-12-02/inc/geshi/intercal.php
--- dokuwiki-2009-02-14/inc/geshi/intercal.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/intercal.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,122 @@
+ 'INTERCAL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //Politeness
+        1 => array(
+            'DO', 'DOES', 'DONT', 'DON\'T', 'NOT', 'PLEASE', 'PLEASENT', 'PLEASEN\'T', 'MAYBE'
+            ),
+        //Statements
+        2 => array(
+            'STASH', 'RETRIEVE', 'NEXT', 'RESUME', 'FORGET', 'ABSTAIN', 'ABSTAINING',
+            'COME', 'FROM', 'CALCULATING', 'REINSTATE', 'IGNORE', 'REMEMBER',
+            'WRITE', 'IN', 'READ', 'OUT', 'GIVE', 'UP'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', ':', ';', '#',
+        '~', '$', '&', '?',
+        '\'', '"', '<-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #000080; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '^\(\d+\)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/io.php dokuwiki-rc2009-12-02/inc/geshi/io.php
--- dokuwiki-2009-02-14/inc/geshi/io.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/io.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2006 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/09/23
  *
  * Io language file for GeSHi. Thanks to Johnathan Wright for the suggestion and help
diff -Naur dokuwiki-2009-02-14/inc/geshi/java5.php dokuwiki-rc2009-12-02/inc/geshi/java5.php
--- dokuwiki-2009-02-14/inc/geshi/java5.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/java5.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/10
  *
  * Java language file for GeSHi.
@@ -56,7 +56,10 @@
     'COMMENT_MULTI' => array('/*' => '*/'),
     'COMMENT_REGEXP' => array(
         //Import and Package directives (Basic Support only)
-        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i'),
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
     'ESCAPE_CHAR' => '\\',
@@ -815,6 +818,7 @@
         'COMMENTS' => array(
             1 => 'color: #666666; font-style: italic;',
             2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
             'MULTI' => 'color: #666666; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/java.php dokuwiki-rc2009-12-02/inc/geshi/java.php
--- dokuwiki-2009-02-14/inc/geshi/java.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/java.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/10
  *
  * Java language file for GeSHi.
@@ -59,7 +59,7 @@
         //Import and Package directives (Basic Support only)
         2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
         // javadoc comments
-        3 => '#/\*\*(?!\*).*\*/#sU'
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
         ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array("'", '"'),
@@ -934,7 +934,7 @@
             1 => 'color: #666666; font-style: italic;',
             2 => 'color: #006699;',
             3 => 'color: #008000; font-style: italic; font-weight: bold;',
-            3  => 'color: #008000; font-style: italic; font-weight: bold;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
             'MULTI' => 'color: #666666; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/javascript.php dokuwiki-rc2009-12-02/inc/geshi/javascript.php
--- dokuwiki-2009-02-14/inc/geshi/javascript.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/javascript.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------------
  * Author: Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/20
  *
  * JavaScript language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/kixtart.php dokuwiki-rc2009-12-02/inc/geshi/kixtart.php
--- dokuwiki-2009-02-14/inc/geshi/kixtart.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/kixtart.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Riley McArdle (riley@glyff.net)
  * Copyright: (c) 2007 Riley McArdle (http://www.glyff.net/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/08/31
  *
  * PHP language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/klonec.php dokuwiki-rc2009-12-02/inc/geshi/klonec.php
--- dokuwiki-2009-02-14/inc/geshi/klonec.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/klonec.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: AUGER Mickael
  * Copyright: Synchronic
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/04/16
  *
  * KLone with C language file for GeSHi.
@@ -46,12 +46,12 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(//mots-cles C
-            'if', 'return', 'while', 'case', 'continue', 'default',
+            'if', 'return', 'while', 'case', 'class', 'continue', 'default',
             'do', 'else', 'for', 'switch', 'goto',
             'null', 'break', 'true', 'enum', 'extern', 'inline', 'false'
             ),
         2 => array(//mots-cles KLone
-            '<%=', '<%!', '<%', '%>', 'out', 'request', 'response',
+            'out', 'request', 'response',
             ),
         3 => array(//fonctions C usuelles
             'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite',
@@ -152,11 +152,16 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '!', '%', '&', '|', '/',
-        '<', '>',
-        '=', '-', '+', '*',
-        '.', ':', ',', ';', '^'
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -200,7 +205,8 @@
             2 => 'color: #006600;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #000000;'
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
             ),
         'REGEXPS' => array(),
         'SCRIPT' => array(
@@ -265,6 +271,9 @@
             6 => array(
                 'DISALLOWED_BEFORE' => '(?<=<|<\/)',
                 'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
             )
         )
     )
diff -Naur dokuwiki-2009-02-14/inc/geshi/klonecpp.php dokuwiki-rc2009-12-02/inc/geshi/klonecpp.php
--- dokuwiki-2009-02-14/inc/geshi/klonecpp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/klonecpp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: AUGER Mickael
  * Copyright: Synchronic
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/04/16
  *
  * KLone with C++ language file for GeSHi.
@@ -66,7 +66,7 @@
             'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC'
             ),
         2 => array(//mots-cles KLone
-            '<%=', '<%!', '<%', '%>', 'out', 'request', 'response',
+            'out', 'request', 'response',
             ),
         3 => array(//fonctions C++ usuelles
             'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
@@ -180,11 +180,16 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '!', '%', '&', '|', '/',
-        '<', '>',
-        '=', '-', '+', '*',
-        '.', ':', ',', ';', '^'
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -228,7 +233,8 @@
             2 => 'color: #006600;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #000000;'
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
             ),
         'REGEXPS' => array(),
         'SCRIPT' => array(
@@ -293,6 +299,9 @@
             6 => array(
                 'DISALLOWED_BEFORE' => '(?<=<|<\/)',
                 'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
             )
         )
     )
diff -Naur dokuwiki-2009-02-14/inc/geshi/latex.php dokuwiki-rc2009-12-02/inc/geshi/latex.php
--- dokuwiki-2009-02-14/inc/geshi/latex.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/latex.php	2009-12-02 19:50:11.000000000 +0100
@@ -2,15 +2,27 @@
 /*************************************************************************************
  * latex.php
  * -----
- * Author: efi, Matthias Pospiech (mail@matthiaspospiech.de)
- * Copyright: (c) 2006 efi, Matthias Pospiech (mail@matthiaspospiech.de), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Author: efi, Matthias Pospiech (matthias@pospiech.eu)
+ * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
  * Date Started: 2006/09/23
  *
  * LaTeX language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2008/08/18 (1.0.8.1)
+ *  - Changes in color and some additional command recognition
+ *  - No special Color for Brackets, it is only distracting
+ *    if color should be reintroduced it should be less bright
+ *  - Math color changed from green to violett, since green is now used for comments
+ *  - Comments are now colored and the only green. The reason for coloring the comments
+ *    is that often important information is in the comments und was merely unvisible before.
+ *  - New Color for [Options]
+ *  - color for labels not specialised anymore. It makes sence in large documents but less in
+ *    small web examples.
+ *  - \@keyword introduced
+ *  - Fixed \& escaped ampersand
  * 2006/09/23 (1.0.0)
  *  -  First Release
  *
@@ -48,18 +60,38 @@
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
+        1 => array(
+            'addlinespace','address','appendix','author','backmatter',
+            'bfseries','bibitem','bigskip','blindtext','caption','captionabove',
+            'captionbelow','cdot','centering','cite','color','colorbox','date',
+            'def','definecolor','documentclass','edef','eqref','else','email','emph','fbox',
+            'fi','flushleft','flushright','footnote','frac','frontmatter','graphicspath','hfill',
+            'hline','hspace','huge','include','includegraphics','infty','input','int','ifx',
+            'item','label','LaTeX','left','let','limits','listfiles','listoffigures',
+            'listoftables','mainmatter','makeatletter','makeatother','makebox',
+            'makeindex','maketitle','mbox','mediumskip','newcommand',
+            'newenvironment','newpage','nocite','nonumber','pagestyle','par','paragraph','parbox',
+            'parident','parskip','partial','raggedleft','raggedright','raisebox','ref',
+            'renewcommand','renewenvironment','right','rule','section','setlength',
+            'sffamily','subparagraph','subsection','subsubsection','sum','table',
+            'tableofcontents','textbf','textcolor','textit','textnormal',
+            'textsuperscript','texttt','title','today','ttfamily','urlstyle',
+            'usepackage','vspace'
+            )
         ),
     'SYMBOLS' => array(
-        '.', ',','\\',"~", "{", "}", "[", "]", "$"
+        "&", "\\", "{", "}", "[", "]"
         ),
     'CASE_SENSITIVE' => array(
+        1 => true,
         GESHI_COMMENTS => false,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
+            1 => 'color: #800000;',
             ),
         'COMMENTS' => array(
-            1 => 'color: #808080; font-style: italic;'
+            1 => 'color: #2C922C; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
             0 =>  'color: #000000; font-weight: bold;'
@@ -74,26 +106,27 @@
         'METHODS' => array(
             ),
         'SYMBOLS' => array(
-            1 =>  'color: #800000; font-weight: bold;'
+            0 =>  'color: #E02020; '
             ),
         'REGEXPS' => array(
-            1 => 'color: #00A000; font-weight: bold;',  // Math inner
-            2 => 'color: #800000; font-weight: normal;', // \keyword #202020
-            3 => 'color: #2222D0; font-weight: normal;', // {...}
-            4 => 'color: #2222D0; font-weight: normal;', // [Option]
-            5 => 'color: #00A000; font-weight: normal;', // Mathe #CCF020
-            6 => 'color: #F00000; font-weight: normal;', // Structure \begin
-            7 => 'color: #F00000; font-weight: normal;', // Structure \end
-            8 => 'color: #F00000; font-weight: normal;', // Structure: Labels
-            //9 => 'color: #F00000; font-weight: normal;',  // Structure
-            10 => 'color: #0000D0; font-weight: bold;',  // Environment
-            11 => 'color: #0000D0; font-weight: bold;',  // Environment
-            12 => 'color: #800000; font-weight: normal;', // Escaped char
+            1 => 'color: #8020E0; font-weight: normal;',  // Math inner
+            2 => 'color: #C08020; font-weight: normal;', // [Option]
+            3 => 'color: #8020E0; font-weight: normal;', // Maths
+            4 => 'color: #800000; font-weight: normal;', // Structure: Labels
+            5 => 'color: #00008B; font-weight: bold;',  // Structure (\section{->x<-})
+            6 => 'color: #800000; font-weight: normal;', // Structure (\section)
+            7 => 'color: #0000D0; font-weight: normal;', // Environment \end or \begin{->x<-} (brighter blue)
+            8 => 'color: #C00000; font-weight: normal;', // Structure \end or \begin
+            9 => 'color: #2020C0; font-weight: normal;', // {...}
+            10 => 'color: #800000; font-weight: normal;', // \%, \& etc.
+            11 => 'color: #E00000; font-weight: normal;', // \@keyword
+            12 => 'color: #800000; font-weight: normal;', // \keyword
         ),
         'SCRIPT' => array(
             )
         ),
     'URLS' => array(
+        1 => 'http://www.golatex.de/wiki/index.php?title=%5C{FNAME}',
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
@@ -101,102 +134,64 @@
     'REGEXPS' => array(
         // Math inner
         1 => array(
-            GESHI_SEARCH => "(\\\\begin\\{)(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)(\\})(.*)(\\\\end\\{)(\\2)(\\})",
-            GESHI_REPLACE => '\4',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '\1\2\3',
-            GESHI_AFTER => '\5\6\7'
-            ),
-        // \keywords
-        2 => array(
-            GESHI_SEARCH => "(\\\\)([a-zA-Z]+)",
-            GESHI_REPLACE => '\1\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // {parameters}
-        3 => array(
-            GESHI_SEARCH => "(\\{)(.*)(\\})",
-            GESHI_REPLACE => '\2',
+            GESHI_SEARCH => "(\\\\begin\\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)\\})(.*)(\\\\end\\{\\2\\})",
+            GESHI_REPLACE => '\3',
             GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
+            GESHI_AFTER => '\4'
             ),
         // [options]
-        4 => array(
-            GESHI_SEARCH => "(\[)(.+)(\])",
-            GESHI_REPLACE => '\2',
-            GESHI_MODIFIERS => 'Us',
-            GESHI_BEFORE => '\1',
-            GESHI_AFTER => '\3'
-            ),
-        // Math mode with $ ... $
-        5 => array(
-            GESHI_SEARCH => "(\\$)(.+)(\\$)",
-            GESHI_REPLACE => '\1\2\3',
+        2 => array(
+            GESHI_SEARCH => "(?<=\[).+(?=\])",
+            GESHI_REPLACE => '\0',
             GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
             ),
-        // Structure begin
-        6 => array(
-            GESHI_SEARCH => "(\\\\begin)(?=[^a-zA-Z])",
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
-        // Structure end
-        7 => array(
-            GESHI_SEARCH => "(\\\\end)(?=[^a-zA-Z])",
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
+        // Math mode with $ ... $
+        3 => array(
+            GESHI_SEARCH => "\\$.+\\$",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
             ),
         // Structure: Label
-        8 => array(
-            GESHI_SEARCH => "(\\\\)(label|pageref|ref|cite)(?=[^a-zA-Z])",
-            GESHI_REPLACE => '\\1\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => ''
-            ),
+        4 => "\\\\(?:label|pageref|ref|cite)(?=[^a-zA-Z])",
         // Structure: sections
-        /*9 => array(
-            GESHI_SEARCH => "(\\\\)(part|chapter|section|subsection|subsubsection|paragraph|subparagraph)(?=[^a-zA-Z])",
-            GESHI_REPLACE => '\1\\2',
-            GESHI_MODIFIERS => '',
-            GESHI_BEFORE => '',
-            GESHI_AFTER => '\\3'
-            ),*/
-
-        // environment begin
-        10 => array(
-            GESHI_SEARCH => "(\\\\begin)(\\{)(.*)(\\})",
-            GESHI_REPLACE => '\\3',
+        5 => array(
+            GESHI_SEARCH => "(\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'U',
-            GESHI_BEFORE => '',
+            GESHI_BEFORE => '\\1',
             GESHI_AFTER => ''
             ),
-        // environment end
-        11 => array(
-            GESHI_SEARCH => "(\\\\end)(\\{)(.*)(\\})",
-            GESHI_REPLACE => '\\3',
+        // Structure: sections
+        6 => "\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?(?=[^a-zA-Z])",
+        // environment \begin{} and \end{} (i.e. the things inside the {})
+        7 => array(
+            GESHI_SEARCH => "(\\\\(?:begin|end)\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'U',
-            GESHI_BEFORE => '',
+            GESHI_BEFORE => '\\1',
             GESHI_AFTER => ''
             ),
-
-        // environment end
-        12 => array(
-            GESHI_SEARCH => "(\\\\[_$%])",
-            GESHI_REPLACE => '\\1',
-            GESHI_MODIFIERS => '',
+        // Structure \begin and \end
+        8 => "\\\\(?:end|begin)(?=[^a-zA-Z])",
+        // {parameters}
+        9 => array(
+            GESHI_SEARCH => "(?<=\\{)(?!<\|!REG3XP5!>).*(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
-            )
+            ),
+        // \%, \& usw.
+        10 => "\\\\(?:[_$%]|&)",
+        //  \@keywords
+        11 => "(?)\\\\@[a-zA-Z]+\*?",
+        // \keywords
+        12 => "(?)\\\\[a-zA-Z]+\*?",
 
 // ---------------------------------------------
         ),
@@ -209,11 +204,15 @@
         'COMMENTS' => array(
             'DISALLOWED_BEFORE' => '\\'
         ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<=\\\\)",
+            'DISALLOWED_AFTER' => "(?![A-Za-z0-9])"
+        ),
         'ENABLE_FLAGS' => array(
             'NUMBERS' => GESHI_NEVER,
-            'SYMBOLS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER
         )
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/lisp.php dokuwiki-rc2009-12-02/inc/geshi/lisp.php
--- dokuwiki-2009-02-14/inc/geshi/lisp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lisp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * Generic Lisp language file for GeSHi.
@@ -50,7 +50,7 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'not','defun','princ',
+            'not','defun','princ','when',
             'eval','apply','funcall','quote','identity','function',
             'complement','backquote','lambda','set','setq','setf',
             'defmacro','gensym','make','symbol','intern',
@@ -73,11 +73,16 @@
             'rem','min','max','abs','sin','cos','tan','expt','exp','sqrt',
             'random','logand','logior','logxor','lognot','bignums','logeqv',
             'lognand','lognor','logorc2','logtest','logbitp','logcount',
-            'integer','nil'
+            'integer','nil','parse-integer'
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|'
+        '(', ')', '{', '}', '[', ']',
+        '!', '%', '^', '&',
+        ' + ',' - ',' * ',' / ',
+        '=','<','>',
+        '.',':',',',';',
+        '|'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -128,6 +133,11 @@
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            )
         )
 );
 
diff -Naur dokuwiki-2009-02-14/inc/geshi/locobasic.php dokuwiki-rc2009-12-02/inc/geshi/locobasic.php
--- dokuwiki-2009-02-14/inc/geshi/locobasic.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/locobasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,130 @@
+ 'Locomotive Basic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => 'REM'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "AFTER", "AND", "AUTO", "BORDER", "BREAK", "CALL", "CAT", "CHAIN",
+            "CLEAR", "CLG", "CLS", "CLOSEIN", "CLOSEOUT", "CONT", "CURSOR",
+            "DATA", "DEF", "DEFINT", "DEFREAL", "DEFSTR", "DEG", "DELETE",
+            "DERR", "DI", "DIM", "DRAW", "DRAWR", "EDIT", "EI", "ELSE", "END",
+            "ENV", "ENT", "EOF", "ERASE", "ERL", "ERR", "ERROR", "EVERY",
+            "FILL", "FN", "FOR", "FRAME", "GOSUB", "GOTO", "GRAPHICS", "HIMEM",
+            "IF", "INK", "INPUT", "KEY", "LET", "LINE", "LIST", "LOAD",
+            "LOCATE", "MASK", "MEMORY", "MERGE", "MODE", "MOVE", "MOVER", "NEW",
+            "NEXT", "NOT", "ON", "OPENIN", "OPENOUT", "OR", "ORIGIN", "PAPER",
+            "PEEK", "PEN", "PLOT", "PLOTR", "POKE", "PRINT", "RAD", "RANDOMIZE",
+            "READ", "RELEASE", "REMAIN", "RENUM", "RESTORE", "RESUME", "RETURN",
+            "RUN", "SAVE", "SPEED", "SOUND", "SPC", "SQ", "STEP", "STOP", "SWAP",
+            "SYMBOL", "TAB", "TAG", "TAGOFF", "TEST", "TESTR", "TIME", "TO",
+            "THEN", "TRON", "TROFF", "USING", "WAIT", "WEND", "WHILE", "WIDTH",
+            "WINDOW", "WRITE", "XOR", "ZONE"
+            ),
+        2 => array(
+            "ABS", "ASC", "ATN", "BIN", "CHR", "CINT", "COPYCHR", "COS",
+            "CREAL", "DEC", "FIX", "FRE", "EXP", "HEX", "INKEY", "INP", "INSTR",
+            "INT", "JOY", "LEFT", "LEN", "LOG", "LOG10", "LOWER", "MAX", "MID",
+            "MIN", "MOD", "OUT", "PI", "POS", "RIGHT", "RND", "ROUND", "SGN",
+            "SIN", "SPACE", "SQR", "STR", "STRING", "TAN", "UNT", "UPPER",
+            "VAL", "VPOS", "XPOS", "YPOS"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #008888; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0044ff;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/lolcode.php dokuwiki-rc2009-12-02/inc/geshi/lolcode.php
--- dokuwiki-2009-02-14/inc/geshi/lolcode.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lolcode.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,152 @@
+ 'LOLcode',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\bBTW\b.*$/im",
+        2 => "/(^|\b)(?:OBTW\b.+?\bTLDR|LOL\b.+?\/LOL)(\b|$)/si"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => '/:[)>o":]/',
+        2 => '/:\([\da-f]+\)/i',
+        3 => '/:\{\w+\}/i',
+        4 => '/:\[\w+\]/i',
+        ),
+    'KEYWORDS' => array(
+        //Statements
+        1 => array(
+            'VISIBLE', 'HAI', 'KTHX', 'KTHXBYE', 'SMOOSH', 'GIMMEH', 'PLZ',
+            'ON', 'INVISIBLE', 'R', 'ITZ', 'GTFO', 'COMPLAIN', 'GIMME',
+
+            'OPEN', 'FILE', 'I HAS A', 'AWSUM THX', 'O NOES', 'CAN', 'HAS', 'HAZ',
+            'HOW DOES I', 'IF U SAY SO', 'FOUND YR', 'BORROW', 'OWN', 'ALONG',
+            'WITH', 'WIT', 'LOOK', 'AT', 'AWSUM', 'THX'
+            ),
+        //Conditionals
+        2 => array(
+            'IZ', 'YARLY', 'NOWAI', 'WTF?', 'MEBBE', 'OMG', 'OMGWTF',
+            'ORLY?', 'OF', 'NOPE', 'SO', 'IM', 'MAI',
+
+            'O RLY?', 'SUM', 'BOTH SAEM', 'DIFFRINT', 'BOTH', 'EITHER', 'WON',
+            'DIFF', 'PRODUKT', 'QUOSHUNT', 'MOD', 'MKAY', 'OK', 'THING',
+            'BIGNESS'
+            ),
+        //Repetition
+        3 => array(
+            'IN', 'OUTTA', 'LOOP', 'WHILE'
+            ),
+        //Operators \Math
+        4 => array(
+            'AN', 'AND', 'NOT', 'UP', 'YR', 'UPPIN', 'NERF', 'NERFIN', 'NERFZ',
+            'SMASHING', 'UR', 'KINDA', 'LIKE', 'SAEM', 'BIG', 'SMALL',
+            'BIGGR', 'SMALLR', 'BIGGER', 'SMALLER', 'GOOD', 'CUTE', 'THAN'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', '?',
+        '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #000080;',
+            3 => 'color: #000080;',
+            4 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; style: italic;',
+            2 => 'color: #666666; style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/lotusformulas.php dokuwiki-rc2009-12-02/inc/geshi/lotusformulas.php
--- dokuwiki-2009-02-14/inc/geshi/lotusformulas.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lotusformulas.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ------------------------
  * Author: Richard Civil (info@richardcivil.net)
  * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/04/12
  *
  * @Formula/@Command language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/lotusscript.php dokuwiki-rc2009-12-02/inc/geshi/lotusscript.php
--- dokuwiki-2009-02-14/inc/geshi/lotusscript.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lotusscript.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ------------------------
  * Author: Richard Civil (info@richardcivil.net)
  * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/04/12
  *
  * LotusScript language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/lscript.php dokuwiki-rc2009-12-02/inc/geshi/lscript.php
--- dokuwiki-2009-02-14/inc/geshi/lscript.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lscript.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,387 @@
+ 'LScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+    //Yes, I'm aware these are out of order,
+    //I had to rearrange and couldn't be bothered changing the numbers...
+        7 => array(
+            '@data', '@define', '@else', '@end', '@fpdepth', '@if', '@include',
+            '@insert', '@library', '@localipc', '@name', '@save', '@script',
+            '@sequence', '@version', '@warnings'
+            ),
+        1 => array(
+            'break', 'case', 'continue', 'else', 'end', 'false', 'for',
+            'foreach', 'if', 'return', 'switch', 'true', 'while',
+            ),
+        3 => array(
+            'active', 'alertlevel', 'alpha', 'alphaprefix', 'animfilename', 'autokeycreate',
+            'backdroptype', 'blue', 'boxthreshold', 'button',
+            'channelsvisible', 'childrenvisible', 'compfg', 'compbg', 'compfgalpha',
+            'coneangles', 'cosine', 'count', 'ctl', 'curFilename', 'curFrame',
+            'currenttime', 'curTime', 'curType',
+            'depth', 'diffshade', 'diffuse', 'dimensions', 'displayopts', 'dynamicupdate',
+            'end', 'eta',
+            'filename', 'flags', 'fogtype', 'fps', 'frame', 'frameend', 'frameheight',
+            'framestart', 'framestep', 'framewidth',
+            'generalopts', 'genus', 'geometry', 'gNorm', 'goal', 'green',
+            'h', 'hasAlpha', 'height',
+            'id', 'innerlimit', 'isColor',
+            'keyCount', 'keys',
+            'limiteregion', 'locked', 'luminous',
+            'maxsamplesperpixel', 'minsamplesperpixel', 'mirror', 'motionx', 'motiony',
+            'name', 'newFilename', 'newFrame', 'newTime', 'newType', 'null', 'numthreads',
+            'objID', 'oPos', 'outerlimit', 'oXfrm',
+            'parent', 'pixel', 'pixelaspect', 'point', 'points', 'pointcount', 'polNum',
+            'polycount', 'polygon', 'polygons', 'postBehavior', 'preBehavior', 'previewend',
+            'previewstart', 'previewstep',
+            'range', 'rawblue', 'rawgreen', 'rawred', 'rayLength', 'raySource', 'red',
+            'reflectblue', 'reflectgreen', 'reflectred', 'recursiondepth', 'renderend',
+            'renderopts', 'renderstart', 'renderstep', 'rendertype', 'restlength',
+            'rgbprefix', 'roughness',
+            'selected', 'setColor', 'setPattern', 'shading', 'shadow', 'shadows',
+            'shadowtype', 'size', 'source', 'special', 'specshade', 'specular',
+            'spotsize', 'start', 'sx', 'sy', 'sz',
+            'target', 'totallayers', 'totalpoints', 'totalpolygons', 'trans', 'transparency',
+            'type',
+            'value', 'view', 'visible', 'visibility',
+            'w', 'width', 'wNorm', 'wPos', 'wXfrm',
+            'x', 'xoffset',
+            'y', 'yoffset',
+            'z'
+            ),
+        4 => array(
+            'addLayer', 'addParticle', 'alphaspot', 'ambient', 'asAsc', 'asBin',
+            'asInt', 'asNum', 'asStr', 'asVec', 'attach', 'axislocks',
+            'backdropColor', 'backdropRay', 'backdropSqueeze', 'bone', 'blurLength',
+            'close', 'color', 'contains', 'copy', 'createKey',
+            'deleteKey', 'detach', 'drawCircle', 'drawLine', 'drawPoint', 'drawText',
+            'drawTriangle',
+            'edit', 'eof', 'event',
+            'firstChannel', 'firstLayer', 'firstSelect', 'focalLength', 'fogColor',
+            'fogMaxAmount', 'fogMaxDist', 'fogMinAmount', 'fogMinDist',
+            'fovAngles', 'fStop', 'firstChild', 'focalDistance',
+            'get', 'getChannelGroup', 'getEnvelope', 'getForward', 'getKeyBias',
+            'getKeyContinuity', 'getKeyCurve', 'getKeyHermite', 'getKeyTension',
+            'getKeyTime', 'getKeyValue', 'getParticle', 'getPivot', 'getPosition',
+            'getRight', 'getRotation', 'getSelect', 'getScaling', 'getTag', 'getTexture',
+            'getUp', 'getValue', 'getWorldPosition', 'getWorldForward', 'getWorldRight',
+            'getWorldRotation', 'getWorldUp', 'globalBlur', 'globalMask', 'globalResolution',
+            'hasCCEnd', 'hasCCStart',
+            'illuminate', 'indexOf', 'isAscii', 'isAlnum', 'isAlpha', 'isBone',
+            'isCamera', 'isChannel', 'isChannelGroup', 'isCntrl', 'isCurve', 'isDigit',
+            'isEnvelope', 'isImage', 'isInt', 'isLight', 'isLower', 'isMapped', 'isMesh',
+            'isNil', 'isNum', 'IsOpen', 'isOriginal', 'isPrint', 'isPunct', 'isScene',
+            'isSpace', 'isStr', 'isUpper', 'isValid', 'isVMap', 'isVec', 'isXDigit',
+            'keyExists',
+            'layer', 'layerName', 'layerVisible', 'limits', 'line', 'linecount', 'load', 'luma',
+            'next', 'nextLayer', 'nextSelect', 'nextChannel', 'nextChild', 'nl',
+            'offset', 'open',
+            'pack', 'param', 'parse', 'paste', 'persist', 'polygonCount', 'position',
+            'rayCast', 'rayTrace', 'read', 'readByte', 'readInt', 'readNumber',
+            'readDouble', 'readShort', 'readString', 'readVector', 'reduce',
+            'remParticle', 'renderCamera', 'reopen', 'replace', 'reset', 'restParam',
+            'rewind', 'rgb', 'rgbambient', 'rgbcolor', 'rgbspot',
+            'save', 'schemaPosition', 'select', 'set', 'setChannelGroup', 'setKeyBias',
+            'setKeyContinuity', 'setKeyCurve',
+            'setKeyHermite', 'setKeyTension', 'setKeyValue', 'setParticle', 'setPoints',
+            'setTag', 'setValue', 'server', 'serverFlags', 'sortA', 'sortD', 'surface',
+            'trunc',
+            'write', 'writeln', 'writeByte', 'writeData', 'writeNumber', 'writeDouble',
+            'writeShort', 'writeString', 'writeVector',
+            'vertex', 'vertexCount',
+            'zoomFactor'
+            ),
+        2 => array(
+            'abs', 'acos', 'angle', 'append', 'ascii', 'asin', 'atan',
+            'binary',
+            'ceil', 'center', 'chdir', 'clearimage', 'cloned', 'comringattach',
+            'comringdecode', 'comringdetach', 'comringencode', 'comringmsg', 'cos',
+            'cosh', 'cot', 'cross2d', 'cross3d', 'csc', 'ctlstring', 'ctlinteger',
+            'ctlnumber', 'ctlvector', 'ctldistance', 'ctlchoice', 'ctltext',
+            'ctlcolor', 'ctlsurface', 'ctlfont', 'ctlpopup', 'ctledit', 'ctlpercent',
+            'ctlangle', 'ctlrgb', 'ctlhsv', 'ctlcheckbox', 'ctlstate', 'ctlfilename',
+            'ctlbutton', 'ctllistbox', 'ctlslider', 'ctlminislider', 'ctlsep', 'ctlimage',
+            'ctltab', 'ctlallitems', 'ctlmeshitems', 'ctlcameraitems', 'ctllightitems',
+            'ctlboneitems', 'ctlimageitems', 'ctlchannel', 'ctlviewport', 'Control_Management',
+            'ctlpage', 'ctlgroup', 'ctlposition', 'ctlactive', 'ctlvisible', 'ctlalign',
+            'ctlrefresh', 'ctlmenu', 'ctlinfo',
+            'date', 'debug', 'deg', 'dot2d', 'dot3d', 'drawborder', 'drawbox', 'drawcircle',
+            'drawelipse', 'drawerase', 'drawfillcircle', 'drawfillelipse', 'drawline',
+            'drawpixel', 'drawtext', 'drawtextwidth', 'drawtextheight', 'dump',
+            'error', 'exp', 'expose', 'extent',
+            'fac', 'filecrc', 'filedelete', 'fileexists', 'filefind', 'filerename',
+            'filestat', 'floor', 'format', 'frac', 'fullpath',
+            'gamma', 'getdir', 'getenv', 'getfile', 'getfirstitem', 'getsep', 'getvalue',
+            'globalrecall', 'globalstore',
+            'hash', 'hex', 'hostBuild', 'hostVersion', 'hypot',
+            'info', 'integer',
+            'library', 'licenseId', 'lscriptVersion', 'load', 'loadimage', 'log', 'log10',
+            'matchdirs', 'matchfiles', 'max', 'min', 'mkdir', 'mod', 'monend', 'moninit', 'monstep',
+            'nil', 'normalize', 'number',
+            'octal', 'overlayglyph',
+            'parse', 'platform', 'pow',
+            'rad', 'random', 'randu', 'range', 'read', 'readdouble', 'readInt', 'readNumber',
+            'readShort', 'recall', 'regexp', 'reqabort', 'reqbegin', 'reqend', 'reqisopen',
+            'reqkeyboard', 'reqopen', 'reqposition', 'reqpost', 'reqredraw',
+            'reqsize', 'reqresize', 'requpdate', 'rmdir', 'round', 'runningUnder',
+            'save', 'sec', 'select', 'selector', 'setdesc', 'setvalue', 'sin', 'sinh', 'size',
+            'sizeof', 'sleep', 'spawn', 'split', 'sqrt', 'step', 'store', 'string', 'strleft',
+            'strlower', 'strright', 'strsub', 'strupper',
+            'tan', 'tanh', 'targetobject', 'terminate', 'text', 'time',
+            'wait', 'warn', 'when', 'write', 'writeDouble', 'writeInt', 'writeNumber', 'writeShort',
+            'var', 'vector', 'visitnodes', 'vmag',
+            ),
+        5 => array(
+            'addcurve', 'addpoint', 'addpolygon', 'addquad', 'addtriangle', 'alignpols',
+            'autoflex', 'axisdrill',
+            'bend', 'bevel', 'boolean', 'boundingbox',
+            'changepart', 'changesurface', 'close', 'closeall', 'cmdseq', 'copy', 'copysurface',
+            'createsurface', 'cut',
+            'deformregion', 'delete',
+            'editbegin', 'editend', 'exit', 'extrude',
+            'fixedflex', 'flip', 'fontclear', 'fontcount', 'fontindex', 'fontload',
+            'fontname', 'fracsubdivide', 'freezecurves',
+            'getdefaultsurface',
+            'jitter',
+            'lathe', 'layerName', 'layerVisible', 'lyrbg', 'lyrdata', 'lyrempty', 'lyremptybg',
+            'lyremptyfg', 'lyrfg', 'lyrsetbg', 'lyrsetfg', 'lyrswap',
+            'magnet', 'make4patch', 'makeball', 'makebox', 'makecone', 'makedisc',
+            'maketesball', 'maketext', 'mergepoints', 'mergepols', 'meshedit', 'mirror',
+            'morphpols', 'move',
+            'new', 'nextsurface',
+            'paste', 'pathclone', 'pathextrude', 'pixel', 'pointcount', 'pointinfo',
+            'pointmove', 'pole', 'polycount', 'polyinfo', 'polynormal', 'polypointcount',
+            'polypoints', 'polysurface',
+            'quantize',
+            'railclone', 'railextrude', 'redo', 'removepols', 'rempoint', 'rempoly',
+            'renamesurface', 'revert', 'rotate',
+            'scale', 'selhide', 'selinvert', 'selmode', 'selpoint', 'selpolygon', 'selunhide',
+            'selectvmap', 'setlayername', 'setobject', 'setpivot', 'setsurface', 'shapebevel',
+            'shear', 'skinpols', 'smooth', 'smoothcurves', 'smoothscale', 'smoothshift',
+            'soliddrill', 'splitpols', 'subdivide', 'swaphidden',
+            'taper', 'triple', 'toggleCCend', 'toggleCCstart', 'togglepatches', 'twist',
+            'undo', 'undogroupend', 'undogroupbegin', 'unifypols', 'unweld',
+            'vortex',
+            'weldaverage', 'weldpoints'
+            ),
+        6 => array(
+            'About', 'AboutOpenGL', 'AdaptiveSampling', 'AdaptiveThreshold',
+            'AddAreaLight', 'AddBone', 'AddButton', 'AddCamera', 'AddChildBone',
+            'AddDistantLight', 'AddEnvelope', 'AddLinearLight', 'AddNull',
+            'AddPartigon', 'AddPlugins', 'AddPointLight', 'AddPosition',
+            'AddRotation', 'AddScale', 'AddSpotlight', 'AddToSelection',
+            'AdjustRegionTool', 'AffectCaustics', 'AffectDiffuse', 'AffectOpenGL',
+            'AffectSpecular', 'AlertLevel', 'AmbientColor', 'AmbientIntensity',
+            'Antialiasing', 'ApertureHeight', 'ApplyServer', 'AreaLight',
+            'AutoConfirm', 'AutoFrameAdvance', 'AutoKey',
+            'BackdropColor', 'BackView', 'BController', 'BLimits', 'BLurLength', 'BoneActive',
+            'BoneFalloffType', 'BoneJointComp', 'BoneJointCompAmounts', 'BoneJointCompParent',
+            'BoneLimitedRange', 'BoneMaxRange', 'BoneMinRange', 'BoneMuscleFlex',
+            'BoneMuscleFlexAmounts', 'BoneMuscleFlexParent', 'BoneNormalization',
+            'BoneRestLength', 'BoneRestPosition', 'BoneRestRotation', 'BoneSource',
+            'BoneStrength', 'BoneStrengthMultiply', 'BoneWeightMapName', 'BoneWeightMapOnly',
+            'BoneWeightShade', 'BoneXRay', 'BottomView', 'BoundingBoxThreshold',
+            'BStiffness',
+            'CacheCaustics', 'CacheRadiosity', 'CacheShadowMap',
+            'CameraMask', 'CameraView', 'CameraZoomTool', 'CastShadow', 'CausticIntensity',
+            'CenterItem', 'CenterMouse', 'ChangeTool', 'ClearAllBones', 'ClearAllCameras',
+            'ClearAllLights', 'ClearAllObjects', 'ClearAudio', 'ClearScene', 'ClearSelected',
+            'Clone', 'CommandHistory', 'CommandInput', 'Compositing', 'ConeAngleTool',
+            'ContentDirectory', 'CreateKey',
+            'DecreaseGrid', 'DeleteKey', 'DepthBufferAA', 'DepthOfField', 'DisplayOptions',
+            'DistantLight', 'DrawAntialiasing', 'DrawBones', 'DrawChildBones', 'DynamicUpdate',
+            'EditBones', 'EditCameras', 'EditKeys', 'EditLights',
+            'EditMenus', 'EditObjects', 'EditPlugins', 'EditServer', 'EnableCaustics',
+            'EnableDeformations', 'EnableIK', 'EnableLensFlares', 'EnableRadiosity', 'EnableServer',
+            'EnableShadowMaps', 'EnableVIPER', 'EnableVolumetricLights', 'EnableXH',
+            'EnableYP', 'EnableZB', 'EnahancedAA', 'ExcludeLight', 'ExcludeObject',
+            'EyeSeparation',
+            'FasterBones', 'FirstFrame', 'FirstItem', 'FitAll', 'FitSelected',
+            'FlareIntensity', 'FlareOptions', 'FocalDistance', 'FogColor', 'FogMaxAmount',
+            'FogMaxDistance', 'FogMinAmount', 'FogMinDistance', 'FogType', 'FractionalFrames',
+            'FrameSize', 'FramesPerSecond', 'FrameStep', 'FreePreview', 'FrontView', 'FullTimeIK',
+            'GeneralOptions', 'Generics', 'GlobalApertureHeight', 'GlobalBlurLength',
+            'GlobalFrameSize', 'GlobalIllumination', 'GlobalMaskPosition', 'GlobalMotionBlur',
+            'GlobalParticleBlur', 'GlobalPixelAspect', 'GlobalResolutionMulitplier', 'GoalItem',
+            'GoalStrength', 'GoToFrame', 'GradientBackdrop', 'GraphEditor', 'GridSize', 'GroundColor',
+            'HController', 'HideToolbar', 'HideWindows', 'HLimits', 'HStiffness',
+            'ImageEditor', 'ImageProcessing', 'IncludeLight', 'IncludeObject', 'IncreaseGrid',
+            'IndirectBounces', 'Item_SetWindowPos', 'ItemActive', 'ItemColor', 'ItemLock',
+            'ItemProperties', 'ItemVisibilty',
+            'KeepGoalWithinReach',
+            'LastFrame', 'LastItem', 'LastPluginInterface', 'Layout_SetWindowPos',
+            'Layout_SetWindowSize', 'LeftView', 'LensFlare', 'LensFStop', 'LightColor',
+            'LightConeAngle', 'LightEdgeAngle', 'LightFalloffType', 'LightIntensity',
+            'LightIntensityTool', 'LightQuality', 'LightRange', 'LightView', 'LimitB',
+            'LimitDynamicRange', 'LimitedRegion', 'LimitH', 'LimitP', 'LinearLight',
+            'LoadAudio', 'LoadFromScene', 'LoadMotion', 'LoadObject', 'LoadObjectLayer',
+            'LoadPreview', 'LoadScene', 'LocalCoordinateSystem',
+            'MakePreview', 'MaskColor', 'MaskPosition', 'MasterPlugins', 'MatchGoalOrientation',
+            'MatteColor', 'MatteObject', 'MetaballResolution', 'Model', 'MorphAmount',
+            'MorphAmountTool', 'MorphMTSE', 'MorphSurfaces', 'MorphTarget', 'MotionBlur',
+            'MotionBlurDOFPreview', 'MotionOptions', 'MovePathTool', 'MovePivotTool', 'MoveTool',
+            'NadirColor', 'NetRender', 'NextFrame', 'NextItem', 'NextKey', 'NextSibling',
+            'NextViewLayout', 'NoiseReduction', 'Numeric',
+            'ObjectDissolve',
+            'ParentCoordinateSystem', 'ParentInPlace', 'ParentItem',
+            'ParticleBlur', 'PathAlignLookAhead', 'PathAlignMaxLookSteps', 'PathAlignReliableDist',
+            'Pause', 'PController', 'PerspectiveView',
+            'PivotPosition', 'PivotRotation', 'PixelAspect', 'PlayAudio', 'PlayBackward',
+            'PlayForward', 'PlayPreview', 'PLimits', 'PointLight', 'PolygonEdgeColor',
+            'PolygonEdgeFlags', 'PolygonEdgeThickness', 'PolygonEdgeZScale', 'PolygonSize',
+            'Position', 'Presets', 'PreviewFirstFrame', 'PreviewFrameStep', 'PreviewLastFrame',
+            'PreviewOptions', 'PreviousFrame', 'PreviousItem', 'PreviousKey', 'PreviousSibling',
+            'PreviousViewLayout', 'PStiffness',
+            'Quit',
+            'RadiosityIntensity', 'RadiosityTolerance', 'RadiosityType', 'RayRecursionLimit',
+            'RayTraceReflection', 'RayTraceShadows',
+            'RayTraceTransparency', 'ReceiveShadow', 'RecentContentDirs', 'RecentScenes',
+            'ReconstructionFilter', 'RecordMaxAngles', 'RecordMinAngles', 'RecordPivotRotation',
+            'RecordRestPosition', 'Redraw', 'RedrawNow', 'Refresh', 'RefreshNow', 'RegionPosition',
+            'RemoveEnvelope', 'RemoveFromSelection', 'RemoveServer', 'Rename', 'RenderFrame',
+            'RenderOptions', 'RenderScene', 'RenderSelected', 'RenderThreads',
+            'ReplaceObjectLayer', 'ReplaceWithNull', 'ReplaceWithObject', 'Reset',
+            'ResolutionMultiplier', 'RestLengthTool', 'RightView', 'RotatePivotTool',
+            'RotateTool', 'Rotation',
+            'SaveAllObjects', 'SaveCommandList', 'SaveCommandMessages',
+            'SaveEndomorph', 'SaveLight', 'SaveLWSC1', 'SaveMotion', 'SaveObject', 'SaveObjectCopy',
+            'SavePreview', 'SaveScene', 'SaveSceneAs', 'SaveSceneCopy', 'SaveTransformed',
+            'SaveViewLayout', 'Scale', 'Scene_SetWindowPos', 'Scene_SetWindowSize',
+            'SceneEditor', 'SchematicPosition', 'SchematicView', 'SelectAllBones',
+            'SelectAllCameras', 'SelectAllLights', 'SelectAllObjects', 'SelectByName',
+            'SelectChild', 'SelectItem', 'SelectParent', 'SelfShadow', 'ShadowColor',
+            'ShadowExclusion', 'ShadowMapAngle', 'ShadowMapFitCone', 'ShadowMapFuzziness',
+            'ShadowMapSize', 'ShadowType', 'ShowCages', 'ShowFieldChart', 'ShowHandles',
+            'ShowIKChains', 'ShowMotionPaths', 'ShowSafeAreas', 'ShowTargetLines',
+            'ShrinkEdgesWithDistance', 'SingleView', 'SizeTool', 'SkelegonsToBones', 'SkyColor',
+            'Spotlight', 'SquashTool', 'Statistics', 'StatusMsg', 'Stereoscopic', 'StretchTool',
+            'SubdivisionOrder', 'SubPatchLevel', 'SurfaceEditor', 'Synchronize',
+            'TargetItem', 'TopView',
+            'UnaffectedByFog', 'UnaffectedByIK', 'Undo', 'UnseenByAlphaChannel', 'UnseenByCamera',
+            'UnseenByRays', 'UseGlobalResolution', 'UseGlobalBlur', 'UseGlobalMask',
+            'UseMorphedPositions',
+            'ViewLayout', 'VIPER', 'VolumetricLighting',
+            'VolumetricLightingOptions', 'VolumetricRadiosity', 'Volumetrics',
+            'WorldCoordinateSystem',
+            'XYView', 'XZView',
+            'ZenithColor', 'ZoomFactor', 'ZoomIn', 'ZoomInX2', 'ZoomOut', 'ZoomOutX2', 'ZYView',
+            'Camera', 'Channel', 'ChannelGroup', 'Envelope', 'File', 'Glyph', 'Icon', 'Image',
+            'Light', 'Mesh', 'Scene', 'Surface', 'VMap'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '<', '>', '+', '-', '*', '/', '!', '%', '&', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #FF6820; font-weight: bold;', //LS_COMMANDS
+            3 => 'color: #007F7F; font-weight: bold;', //LS_MEMBERS
+            4 => 'color: #800080; font-weight: bold;', //LS_METHODS
+            5 => 'color: #51BD95; font-weight: bold;', //LS_MODELER
+            6 => 'color: #416F85; font-weight: bold;', //LS_GENERAL
+            7 => 'color: #C92929; font-weight: bold;'  //LS_COMMANDS (cont)
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #7F7F7F;',
+            'MULTI' => 'color: #7F7F7F;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00C800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #6953AC;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                )
+            )
+        )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/lsl2.php dokuwiki-rc2009-12-02/inc/geshi/lsl2.php
--- dokuwiki-2009-02-14/inc/geshi/lsl2.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lsl2.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,898 @@
+ 'LSL2',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // flow control
+            'do',
+            'else',
+            'for',
+            'if',
+            'jump',
+            'return',
+            'state',
+            'while',
+            ),
+        2 => array( // manifest constants
+            'ACTIVE',
+            'AGENT',
+            'AGENT_ALWAYS_RUN',
+            'AGENT_ATTACHMENTS',
+            'AGENT_AWAY',
+            'AGENT_BUSY',
+            'AGENT_CROUCHING',
+            'AGENT_FLYING',
+            'AGENT_IN_AIR',
+            'AGENT_MOUSELOOK',
+            'AGENT_ON_OBJECT',
+            'AGENT_SCRIPTED',
+            'AGENT_SITTING',
+            'AGENT_TYPING',
+            'AGENT_WALKING',
+            'ALL_SIDES',
+            'ANIM_ON',
+            'ATTACH_BACK',
+            'ATTACH_BELLY',
+            'ATTACH_CHEST',
+            'ATTACH_CHIN',
+            'ATTACH_HEAD',
+            'ATTACH_HUD_BOTTOM',
+            'ATTACH_HUD_BOTTOM_LEFT',
+            'ATTACH_HUD_BOTTOM_RIGHT',
+            'ATTACH_HUD_CENTER_1',
+            'ATTACH_HUD_CENTER_2',
+            'ATTACH_HUD_TOP_CENTER',
+            'ATTACH_HUD_TOP_LEFT',
+            'ATTACH_HUD_TOP_RIGHT',
+            'ATTACH_LEAR',
+            'ATTACH_LEYE',
+            'ATTACH_LFOOT',
+            'ATTACH_LHAND',
+            'ATTACH_LHIP',
+            'ATTACH_LLARM',
+            'ATTACH_LLLEG',
+            'ATTACH_LPEC',
+            'ATTACH_LSHOULDER',
+            'ATTACH_LUARM',
+            'ATTACH_LULEG',
+            'ATTACH_MOUTH',
+            'ATTACH_NOSE',
+            'ATTACH_PELVIS',
+            'ATTACH_REAR',
+            'ATTACH_REYE',
+            'ATTACH_RFOOT',
+            'ATTACH_RHAND',
+            'ATTACH_RHIP',
+            'ATTACH_RLARM',
+            'ATTACH_RLLEG',
+            'ATTACH_RPEC',
+            'ATTACH_RSHOULDER',
+            'ATTACH_RUARM',
+            'ATTACH_RULEG',
+            'CAMERA_ACTIVE',
+            'CAMERA_BEHINDNESS_ANGLE',
+            'CAMERA_BEHINDNESS_LAG',
+            'CAMERA_DISTANCE',
+            'CAMERA_FOCUS',
+            'CAMERA_FOCUS_LAG',
+            'CAMERA_FOCUS_LOCKED',
+            'CAMERA_FOCUS_OFFSET',
+            'CAMERA_FOCUS_THRESHOLD',
+            'CAMERA_PITCH',
+            'CAMERA_POSITION',
+            'CAMERA_POSITION_LAG',
+            'CAMERA_POSITION_LOCKED',
+            'CAMERA_POSITION_THRESHOLD',
+            'CHANGED_ALLOWED_DROP',
+            'CHANGED_COLOR',
+            'CHANGED_INVENTORY',
+            'CHANGED_LINK',
+            'CHANGED_OWNER',
+            'CHANGED_REGION',
+            'CHANGED_SCALE',
+            'CHANGED_SHAPE',
+            'CHANGED_TELEPORT',
+            'CHANGED_TEXTURE',
+            'CLICK_ACTION_NONE',
+            'CLICK_ACTION_OPEN',
+            'CLICK_ACTION_OPEN_MEDIA',
+            'CLICK_ACTION_PAY',
+            'CLICK_ACTION_SIT',
+            'CLICK_ACTION_TOUCH',
+            'CONTROL_BACK',
+            'CONTROL_DOWN',
+            'CONTROL_FWD',
+            'CONTROL_LBUTTON',
+            'CONTROL_LEFT',
+            'CONTROL_ML_LBUTTON',
+            'CONTROL_RIGHT',
+            'CONTROL_ROT_LEFT',
+            'CONTROL_ROT_RIGHT',
+            'CONTROL_UP',
+            'DATA_BORN',
+            'DATA_NAME',
+            'DATA_ONLINE',
+            'DATA_PAYINFO',
+            'DATA_RATING',
+            'DATA_SIM_POS',
+            'DATA_SIM_RATING',
+            'DATA_SIM_STATUS',
+            'DEBUG_CHANNEL',
+            'DEG_TO_RAD',
+            'EOF',
+            'FALSE',
+            'HTTP_BODY_MAXLENGTH',
+            'HTTP_BODY_TRUNCATED',
+            'HTTP_METHOD',
+            'HTTP_MIMETYPE',
+            'HTTP_VERIFY_CERT',
+            'INVENTORY_ALL',
+            'INVENTORY_ANIMATION',
+            'INVENTORY_BODYPART',
+            'INVENTORY_CLOTHING',
+            'INVENTORY_GESTURE',
+            'INVENTORY_LANDMARK',
+            'INVENTORY_NONE',
+            'INVENTORY_NOTECARD',
+            'INVENTORY_OBJECT',
+            'INVENTORY_SCRIPT',
+            'INVENTORY_SOUND',
+            'INVENTORY_TEXTURE',
+            'LAND_LEVEL',
+            'LAND_LOWER',
+            'LAND_NOISE',
+            'LAND_RAISE',
+            'LAND_REVERT',
+            'LAND_SMOOTH',
+            'LINK_ALL_CHILDREN',
+            'LINK_ALL_OTHERS',
+            'LINK_ROOT',
+            'LINK_SET',
+            'LINK_THIS',
+            'LIST_STAT_GEOMETRIC_MEAN',
+            'LIST_STAT_MAX',
+            'LIST_STAT_MEAN',
+            'LIST_STAT_MEDIAN',
+            'LIST_STAT_MIN',
+            'LIST_STAT_NUM_COUNT',
+            'LIST_STAT_RANGE',
+            'LIST_STAT_STD_DEV',
+            'LIST_STAT_SUM',
+            'LIST_STAT_SUM_SQUARES',
+            'LOOP',
+            'MASK_BASE',
+            'MASK_EVERYONE',
+            'MASK_GROUP',
+            'MASK_NEXT',
+            'MASK_OWNER',
+            'NULL_KEY',
+            'OBJECT_CREATOR',
+            'OBJECT_DESC',
+            'OBJECT_GROUP',
+            'OBJECT_NAME',
+            'OBJECT_OWNER',
+            'OBJECT_POS',
+            'OBJECT_ROT',
+            'OBJECT_UNKNOWN_DETAIL',
+            'OBJECT_VELOCITY',
+            'PARCEL_DETAILS_AREA',
+            'PARCEL_DETAILS_DESC',
+            'PARCEL_DETAILS_GROUP',
+            'PARCEL_DETAILS_NAME',
+            'PARCEL_DETAILS_OWNER',
+            'PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS',
+            'PARCEL_FLAG_ALLOW_CREATE_OBJECTS',
+            'PARCEL_FLAG_ALLOW_DAMAGE',
+            'PARCEL_FLAG_ALLOW_FLY',
+            'PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_GROUP_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_LANDMARK',
+            'PARCEL_FLAG_ALLOW_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_TERRAFORM',
+            'PARCEL_FLAG_LOCAL_SOUND_ONLY',
+            'PARCEL_FLAG_RESTRICT_PUSHOBJECT',
+            'PARCEL_FLAG_USE_ACCESS_GROUP',
+            'PARCEL_FLAG_USE_ACCESS_LIST',
+            'PARCEL_FLAG_USE_BAN_LIST',
+            'PARCEL_FLAG_USE_LAND_PASS_LIST',
+            'PARCEL_MEDIA_COMMAND_AGENT',
+            'PARCEL_MEDIA_COMMAND_AUTO_ALIGN',
+            'PARCEL_MEDIA_COMMAND_DESC',
+            'PARCEL_MEDIA_COMMAND_LOOP_SET',
+            'PARCEL_MEDIA_COMMAND_PAUSE',
+            'PARCEL_MEDIA_COMMAND_PLAY',
+            'PARCEL_MEDIA_COMMAND_SIZE',
+            'PARCEL_MEDIA_COMMAND_STOP',
+            'PARCEL_MEDIA_COMMAND_TEXTURE',
+            'PARCEL_MEDIA_COMMAND_TIME',
+            'PARCEL_MEDIA_COMMAND_TYPE',
+            'PARCEL_MEDIA_COMMAND_URL',
+            'PASSIVE',
+            'PAYMENT_INFO_ON_FILE',
+            'PAYMENT_INFO_USED',
+            'PAY_DEFAULT',
+            'PAY_HIDE',
+            'PERMISSION_ATTACH',
+            'PERMISSION_CHANGE_LINKS',
+            'PERMISSION_CONTROL_CAMERA',
+            'PERMISSION_DEBIT',
+            'PERMISSION_TAKE_CONTROLS',
+            'PERMISSION_TRACK_CAMERA',
+            'PERMISSION_TRIGGER_ANIMATION',
+            'PERM_ALL',
+            'PERM_COPY',
+            'PERM_MODIFY',
+            'PERM_MOVE',
+            'PERM_TRANSFER',
+            'PI',
+            'PI_BY_TWO',
+            'PRIM_BUMP_BARK',
+            'PRIM_BUMP_BLOBS',
+            'PRIM_BUMP_BRICKS',
+            'PRIM_BUMP_BRIGHT',
+            'PRIM_BUMP_CHECKER',
+            'PRIM_BUMP_CONCRETE',
+            'PRIM_BUMP_DARK',
+            'PRIM_BUMP_DISKS',
+            'PRIM_BUMP_GRAVEL',
+            'PRIM_BUMP_LARGETILE',
+            'PRIM_BUMP_NONE',
+            'PRIM_BUMP_SHINY',
+            'PRIM_BUMP_SIDING',
+            'PRIM_BUMP_STONE',
+            'PRIM_BUMP_STUCCO',
+            'PRIM_BUMP_SUCTION',
+            'PRIM_BUMP_TILE',
+            'PRIM_BUMP_WEAVE',
+            'PRIM_BUMP_WOOD',
+            'PRIM_COLOR',
+            'PRIM_FULLBRIGHT',
+            'PRIM_HOLE_CIRCLE',
+            'PRIM_HOLE_DEFAULT',
+            'PRIM_HOLE_SQUARE',
+            'PRIM_HOLE_TRIANGLE',
+            'PRIM_MATERIAL',
+            'PRIM_MATERIAL_FLESH',
+            'PRIM_MATERIAL_GLASS',
+            'PRIM_MATERIAL_LIGHT',
+            'PRIM_MATERIAL_METAL',
+            'PRIM_MATERIAL_PLASTIC',
+            'PRIM_MATERIAL_RUBBER',
+            'PRIM_MATERIAL_STONE',
+            'PRIM_MATERIAL_WOOD',
+            'PRIM_PHANTOM',
+            'PRIM_PHYSICS',
+            'PRIM_POSITION',
+            'PRIM_ROTATION',
+            'PRIM_SHINY_HIGH',
+            'PRIM_SHINY_LOW',
+            'PRIM_SHINY_MEDIUM',
+            'PRIM_SHINY_NONE',
+            'PRIM_SIZE',
+            'PRIM_TEMP_ON_REZ',
+            'PRIM_TEXTURE',
+            'PRIM_TYPE',
+            'PRIM_TYPE_BOX',
+            'PRIM_TYPE_CYLINDER',
+            'PRIM_TYPE_PRISM',
+            'PRIM_TYPE_RING',
+            'PRIM_TYPE_SPHERE',
+            'PRIM_TYPE_TORUS',
+            'PRIM_TYPE_TUBE',
+            'PSYS_PART_BOUNCE_MASK',
+            'PSYS_PART_EMISSIVE_MASK',
+            'PSYS_PART_END_ALPHA',
+            'PSYS_PART_END_COLOR',
+            'PSYS_PART_END_SCALE',
+            'PSYS_PART_FLAGS',
+            'PSYS_PART_FOLLOW_SRC_MASK',
+            'PSYS_PART_FOLLOW_VELOCITY_MASK',
+            'PSYS_PART_INTERP_COLOR_MASK',
+            'PSYS_PART_INTERP_SCALE_MASK',
+            'PSYS_PART_MAX_AGE',
+            'PSYS_PART_START_ALPHA',
+            'PSYS_PART_START_COLOR',
+            'PSYS_PART_START_SCALE',
+            'PSYS_PART_TARGET_LINEAR_MASK',
+            'PSYS_PART_TARGET_POS_MASK',
+            'PSYS_PART_WIND_MASK',
+            'PSYS_SRC_ACCEL',
+            'PSYS_SRC_ANGLE_BEGIN',
+            'PSYS_SRC_ANGLE_END',
+            'PSYS_SRC_BURST_PART_COUNT',
+            'PSYS_SRC_BURST_RADIUS',
+            'PSYS_SRC_BURST_RATE',
+            'PSYS_SRC_BURST_SPEED_MAX',
+            'PSYS_SRC_BURST_SPEED_MIN',
+            'PSYS_SRC_INNERANGLE',
+            'PSYS_SRC_MAX_AGE',
+            'PSYS_SRC_OMEGA',
+            'PSYS_SRC_OUTERANGLE',
+            'PSYS_SRC_PATTERN',
+            'PSYS_SRC_PATTERN_ANGLE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY',
+            'PSYS_SRC_PATTERN_DROP',
+            'PSYS_SRC_PATTERN_EXPLODE',
+            'PSYS_SRC_TARGET_KEY',
+            'PSYS_SRC_TEXTURE',
+            'RAD_TO_DEG',
+            'REMOTE_DATA_CHANNEL',
+            'REMOTE_DATA_REQUEST',
+            'SCRIPTED',
+            'SQRT2',
+            'STATUS_BLOCK_GRAB',
+            'STATUS_DIE_AT_EDGE',
+            'STATUS_PHANTOM',
+            'STATUS_PHYSICS',
+            'STATUS_RETURN_AT_EDGE',
+            'STATUS_ROTATE_X',
+            'STATUS_ROTATE_Y',
+            'STATUS_ROTATE_Z',
+            'STATUS_SANDBOX',
+            'TRUE',
+            'TWO_PI',
+            'VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_ANGULAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_ANGULAR_FRICTION_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DIRECTION',
+            'VEHICLE_ANGULAR_MOTOR_TIMESCALE',
+            'VEHICLE_BANKING_EFFICIENCY',
+            'VEHICLE_BANKING_MIX',
+            'VEHICLE_BANKING_TIMESCALE',
+            'VEHICLE_BUOYANCY',
+            'VEHICLE_FLAG_CAMERA_DECOUPLED',
+            'VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT',
+            'VEHICLE_FLAG_HOVER_TERRAIN_ONLY',
+            'VEHICLE_FLAG_HOVER_UP_ONLY',
+            'VEHICLE_FLAG_HOVER_WATER_ONLY',
+            'VEHICLE_FLAG_LIMIT_MOTOR_UP',
+            'VEHICLE_FLAG_LIMIT_ROLL_ONLY',
+            'VEHICLE_FLAG_MOUSELOOK_BANK',
+            'VEHICLE_FLAG_MOUSELOOK_STEER',
+            'VEHICLE_FLAG_NO_DEFLECTION_UP',
+            'VEHICLE_HOVER_EFFICIENCY',
+            'VEHICLE_HOVER_HEIGHT',
+            'VEHICLE_HOVER_TIMESCALE',
+            'VEHICLE_LINEAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_LINEAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_LINEAR_FRICTION_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DIRECTION',
+            'VEHICLE_LINEAR_MOTOR_OFFSET',
+            'VEHICLE_LINEAR_MOTOR_TIMESCALE',
+            'VEHICLE_REFERENCE_FRAME',
+            'VEHICLE_TYPE_AIRPLANE',
+            'VEHICLE_TYPE_BALLOON',
+            'VEHICLE_TYPE_BOAT',
+            'VEHICLE_TYPE_CAR',
+            'VEHICLE_TYPE_NONE',
+            'VEHICLE_TYPE_SLED',
+            'VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY',
+            'VEHICLE_VERTICAL_ATTRACTION_TIMESCALE',
+            'ZERO_ROTATION',
+            'ZERO_VECTOR',
+            ),
+        3 => array( // handlers
+            'at_rot_target',
+            'at_target',
+            'attached',
+            'changed',
+            'collision',
+            'collision_end',
+            'collision_start',
+            'control',
+            'dataserver',
+            'email',
+            'http_response',
+            'land_collision',
+            'land_collision_end',
+            'land_collision_start',
+            'link_message',
+            'listen',
+            'money',
+            'moving_end',
+            'moving_start',
+            'no_sensor',
+            'not_at_rot_target',
+            'not_at_target',
+            'object_rez',
+            'on_rez',
+            'remote_data',
+            'run_time_permissions',
+            'sensor',
+            'state_entry',
+            'state_exit',
+            'timer',
+            'touch',
+            'touch_end',
+            'touch_start',
+            ),
+        4 => array( // data types
+            'float',
+            'integer',
+            'key',
+            'list',
+            'rotation',
+            'string',
+            'vector',
+            ),
+        5 => array( // library
+            'default',
+            'llAbs',
+            'llAcos',
+            'llAddToLandBanList',
+            'llAddToLandPassList',
+            'llAdjustSoundVolume',
+            'llAllowInventoryDrop',
+            'llAngleBetween',
+            'llApplyImpulse',
+            'llApplyRotationalImpulse',
+            'llAsin',
+            'llAtan2',
+            'llAttachToAvatar',
+            'llAvatarOnSitTarget',
+            'llAxes2Rot',
+            'llAxisAngle2Rot',
+            'llBase64ToInteger',
+            'llBase64ToString',
+            'llBreakAllLinks',
+            'llBreakLink',
+            'llCeil',
+            'llClearCameraParams',
+            'llCloseRemoteDataChannel',
+            'llCloud',
+            'llCollisionFilter',
+            'llCollisionSound',
+            'llCollisionSprite',
+            'llCos',
+            'llCreateLink',
+            'llCSV2List',
+            'llDeleteSubList',
+            'llDeleteSubString',
+            'llDetachFromAvatar',
+            'llDetectedGrab',
+            'llDetectedGroup',
+            'llDetectedKey',
+            'llDetectedLinkNumber',
+            'llDetectedName',
+            'llDetectedOwner',
+            'llDetectedPos',
+            'llDetectedRot',
+            'llDetectedTouchBinormal',
+            'llDetectedTouchFace',
+            'llDetectedTouchNormal',
+            'llDetectedTouchPos',
+            'llDetectedTouchST',
+            'llDetectedTouchUV',
+            'llDetectedType',
+            'llDetectedVel',
+            'llDialog',
+            'llDie',
+            'llDumpList2String',
+            'llEdgeOfWorld',
+            'llEjectFromLand',
+            'llEmail',
+            'llEscapeURL',
+            'llEuler2Rot',
+            'llFabs',
+            'llFloor',
+            'llForceMouselook',
+            'llFrand',
+            'llGetAccel',
+            'llGetAgentInfo',
+            'llGetAgentLanguage',
+            'llGetAgentSize',
+            'llGetAlpha',
+            'llGetAndResetTime',
+            'llGetAnimation',
+            'llGetAnimationList',
+            'llGetAttached',
+            'llGetBoundingBox',
+            'llGetCameraPos',
+            'llGetCameraRot',
+            'llGetCenterOfMass',
+            'llGetColor',
+            'llGetCreator',
+            'llGetDate',
+            'llGetEnergy',
+            'llGetForce',
+            'llGetFreeMemory',
+            'llGetGeometricCenter',
+            'llGetGMTclock',
+            'llGetInventoryCreator',
+            'llGetInventoryKey',
+            'llGetInventoryName',
+            'llGetInventoryNumber',
+            'llGetInventoryPermMask',
+            'llGetInventoryType',
+            'llGetKey',
+            'llGetLandOwnerAt',
+            'llGetLinkKey',
+            'llGetLinkName',
+            'llGetLinkNumber',
+            'llGetListEntryType',
+            'llGetListLength',
+            'llGetLocalPos',
+            'llGetLocalRot',
+            'llGetMass',
+            'llGetNextEmail',
+            'llGetNotecardLine',
+            'llGetNumberOfNotecardLines',
+            'llGetNumberOfPrims',
+            'llGetNumberOfSides',
+            'llGetObjectDesc',
+            'llGetObjectDetails',
+            'llGetObjectMass',
+            'llGetObjectName',
+            'llGetObjectPermMask',
+            'llGetObjectPrimCount',
+            'llGetOmega',
+            'llGetOwner',
+            'llGetOwnerKey',
+            'llGetParcelDetails',
+            'llGetParcelFlags',
+            'llGetParcelMaxPrims',
+            'llGetParcelPrimCount',
+            'llGetParcelPrimOwners',
+            'llGetPermissions',
+            'llGetPermissionsKey',
+            'llGetPos',
+            'llGetPrimitiveParams',
+            'llGetRegionAgentCount',
+            'llGetRegionCorner',
+            'llGetRegionFlags',
+            'llGetRegionFPS',
+            'llGetRegionName',
+            'llGetRegionTimeDilation',
+            'llGetRootPosition',
+            'llGetRootRotation',
+            'llGetRot',
+            'llGetScale',
+            'llGetScriptName',
+            'llGetScriptState',
+            'llGetSimulatorHostname',
+            'llGetStartParameter',
+            'llGetStatus',
+            'llGetSubString',
+            'llGetSunDirection',
+            'llGetTexture',
+            'llGetTextureOffset',
+            'llGetTextureRot',
+            'llGetTextureScale',
+            'llGetTime',
+            'llGetTimeOfDay',
+            'llGetTimestamp',
+            'llGetTorque',
+            'llGetUnixTime',
+            'llGetVel',
+            'llGetWallclock',
+            'llGiveInventory',
+            'llGiveInventoryList',
+            'llGiveMoney',
+            'llGround',
+            'llGroundContour',
+            'llGroundNormal',
+            'llGroundRepel',
+            'llGroundSlope',
+            'llHTTPRequest',
+            'llInsertString',
+            'llInstantMessage',
+            'llIntegerToBase64',
+            'llKey2Name',
+            'llList2CSV',
+            'llList2Float',
+            'llList2Integer',
+            'llList2Key',
+            'llList2List',
+            'llList2ListStrided',
+            'llList2Rot',
+            'llList2String',
+            'llList2Vector',
+            'llListen',
+            'llListenControl',
+            'llListenRemove',
+            'llListFindList',
+            'llListInsertList',
+            'llListRandomize',
+            'llListReplaceList',
+            'llListSort',
+            'llListStatistics',
+            'llLoadURL',
+            'llLog',
+            'llLog10',
+            'llLookAt',
+            'llLoopSound',
+            'llLoopSoundMaster',
+            'llLoopSoundSlave',
+            'llMapDestination',
+            'llMD5String',
+            'llMessageLinked',
+            'llMinEventDelay',
+            'llModifyLand',
+            'llModPow',
+            'llMoveToTarget',
+            'llOffsetTexture',
+            'llOpenRemoteDataChannel',
+            'llOverMyLand',
+            'llOwnerSay',
+            'llParcelMediaCommandList',
+            'llParcelMediaQuery',
+            'llParseString2List',
+            'llParseStringKeepNulls',
+            'llParticleSystem',
+            'llPassCollisions',
+            'llPassTouches',
+            'llPlaySound',
+            'llPlaySoundSlave',
+            'llPow',
+            'llPreloadSound',
+            'llPushObject',
+            'llRegionSay',
+            'llReleaseControls',
+            'llRemoteDataReply',
+            'llRemoteDataSetRegion',
+            'llRemoteLoadScriptPin',
+            'llRemoveFromLandBanList',
+            'llRemoveFromLandPassList',
+            'llRemoveInventory',
+            'llRemoveVehicleFlags',
+            'llRequestAgentData',
+            'llRequestInventoryData',
+            'llRequestPermissions',
+            'llRequestSimulatorData',
+            'llResetLandBanList',
+            'llResetLandPassList',
+            'llResetOtherScript',
+            'llResetScript',
+            'llResetTime',
+            'llRezAtRoot',
+            'llRezObject',
+            'llRot2Angle',
+            'llRot2Axis',
+            'llRot2Euler',
+            'llRot2Fwd',
+            'llRot2Left',
+            'llRot2Up',
+            'llRotateTexture',
+            'llRotBetween',
+            'llRotLookAt',
+            'llRotTarget',
+            'llRotTargetRemove',
+            'llRound',
+            'llSameGroup',
+            'llSay',
+            'llScaleTexture',
+            'llScriptDanger',
+            'llSendRemoteData',
+            'llSensor',
+            'llSensorRemove',
+            'llSensorRepeat',
+            'llSetAlpha',
+            'llSetBuoyancy',
+            'llSetCameraAtOffset',
+            'llSetCameraEyeOffset',
+            'llSetCameraParams',
+            'llSetClickAction',
+            'llSetColor',
+            'llSetDamage',
+            'llSetForce',
+            'llSetForceAndTorque',
+            'llSetHoverHeight',
+            'llSetLinkAlpha',
+            'llSetLinkColor',
+            'llSetLinkPrimitiveParams',
+            'llSetLinkTexture',
+            'llSetLocalRot',
+            'llSetObjectDesc',
+            'llSetObjectName',
+            'llSetParcelMusicURL',
+            'llSetPayPrice',
+            'llSetPos',
+            'llSetPrimitiveParams',
+            'llSetRemoteScriptAccessPin',
+            'llSetRot',
+            'llSetScale',
+            'llSetScriptState',
+            'llSetSitText',
+            'llSetSoundQueueing',
+            'llSetSoundRadius',
+            'llSetStatus',
+            'llSetText',
+            'llSetTexture',
+            'llSetTextureAnim',
+            'llSetTimerEvent',
+            'llSetTorque',
+            'llSetTouchText',
+            'llSetVehicleFlags',
+            'llSetVehicleFloatParam',
+            'llSetVehicleRotationParam',
+            'llSetVehicleType',
+            'llSetVehicleVectorParam',
+            'llSHA1String',
+            'llShout',
+            'llSin',
+            'llSitTarget',
+            'llSleep',
+            'llSqrt',
+            'llStartAnimation',
+            'llStopAnimation',
+            'llStopHover',
+            'llStopLookAt',
+            'llStopMoveToTarget',
+            'llStopSound',
+            'llStringLength',
+            'llStringToBase64',
+            'llStringTrim',
+            'llSubStringIndex',
+            'llTakeControls',
+            'llTan',
+            'llTarget',
+            'llTargetOmega',
+            'llTargetRemove',
+            'llTeleportAgentHome',
+            'llToLower',
+            'llToUpper',
+            'llTriggerSound',
+            'llTriggerSoundLimited',
+            'llUnescapeURL',
+            'llUnSit',
+            'llVecDist',
+            'llVecMag',
+            'llVecNorm',
+            'llVolumeDetect',
+            'llWater',
+            'llWhisper',
+            'llWind',
+            'llXorBase64StringsCorrect',
+            ),
+        6 => array( // deprecated
+            'llMakeExplosion',
+            'llMakeFire',
+            'llMakeFountain',
+            'llMakeSmoke',
+            'llSound',
+            'llSoundPreload',
+            'llXorBase64Strings',
+            ),
+        7 => array( // unimplemented
+            'llPointAt',
+            'llRefreshPrimURL',
+            'llReleaseCamera',
+            'llRemoteLoadScript',
+            'llSetPrimURL',
+            'llStopPointAt',
+            'llTakeCamera',
+            'llTextBox',
+            ),
+        8 => array( // God mode
+            'llGodLikeRezObject',
+            'llSetInventoryPermMask',
+            'llSetObjectPermMask',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '(', ')', '[', ']',
+        '=', '+', '-', '*', '/',
+        '+=', '-=', '*=', '/=', '++', '--',
+        '!', '%', '&', '|', '&&', '||',
+        '==', '!=', '<', '>', '<=', '>=',
+        '~', '<<', '>>', '^', ':',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #000080;',
+            3 => 'color: #008080;',
+            4 => 'color: #228b22;',
+            5 => 'color: #b22222;',
+            6 => 'color: #8b0000; background-color: #ffff00;',
+            7 => 'color: #8b0000; background-color: #fa8072;',
+            8 => 'color: #000000; background-color: #ba55d3;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff7f50; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #006400;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        4 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        5 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        6 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        7 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        8 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/lua.php dokuwiki-rc2009-12-02/inc/geshi/lua.php
--- dokuwiki-2009-02-14/inc/geshi/lua.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/lua.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/10
  *
  * LUA language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/m68k.php dokuwiki-rc2009-12-02/inc/geshi/m68k.php
--- dokuwiki-2009-02-14/inc/geshi/m68k.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/m68k.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/02/06
  *
  * Motorola 68000 Assembler language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/make.php dokuwiki-rc2009-12-02/inc/geshi/make.php
--- dokuwiki-2009-02-14/inc/geshi/make.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/make.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,151 @@
+
+ * Copyright: (c) 2008 Neil Bird
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/08/26
+ *
+ * make language file for GeSHi.
+ *
+ * (GNU make specific)
+ *
+ * CHANGES
+ * -------
+ * 2008/09/05 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi 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.
+ *
+ *   GeSHi 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 GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU make',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_REGEXP' => array(
+        //Escaped String Starters
+        2 => "/\\\\['\"]/siU"
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            // core
+            'ifeq', 'else', 'endif', 'ifneq', 'ifdef', 'ifndef',
+            'include', 'vpath', 'export', 'unexport', 'override',
+            'info', 'warning', 'error'
+            ),
+        2 => array(
+            // macros, literals
+            '.SUFFIXES', '.PHONY', '.DEFAULT', '.PRECIOUS', '.IGNORE', '.SILENT', '.EXPORT_ALL_VARIABLES', '.KEEP_STATE',
+            '.LIBPATTERNS', '.NOTPARALLEL', '.DELETE_ON_ERROR', '.INTERMEDIATE', '.POSIX', '.SECONDARY'
+            ),
+        /*
+        3 => array(
+            // funcs - see regex
+            //'subst', 'addprefix', 'addsuffix', 'basename', 'call', 'dir', 'error', 'eval', 'filter-out', 'filter',
+            //'findstring', 'firstword', 'foreach', 'if', 'join', 'notdir', 'origin', 'patsubst', 'shell', 'sort', 'strip',
+            //'suffix', 'warning', 'wildcard', 'word', 'wordlist', 'words'
+            )*/
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '!', '@', '%', '&', '|', '/',
+        '<', '>',
+        '=', '-', '+', '*',
+        '.', ':', ',', ';',
+        '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #666622; font-weight: bold;',
+            2 => 'color: #990000;',
+            //3 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #339900; font-style: italic;',
+            2 => 'color: #000099; font-weight: bold;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(  # keep same as symbols so as to make ${} and $() equiv.
+            0 => 'color: #004400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #004400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088; font-weight: bold;',
+            1 => 'color: #0000CC; font-weight: bold;',
+            2 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(),
+        'METHODS' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        //3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //Simple variables
+        0 => "\\$(?:[^{(&]|&(?:amp|lt|gt);)",
+        //Complex variables/functions [built-ins]
+        1 => array(
+            GESHI_SEARCH => '(\\$[({])(subst|addprefix|addsuffix|basename|call|dir|error|eval|filter-out|filter,|findstring|firstword|foreach|if|join|notdir|origin|patsubst|shell|sort|strip,|suffix|warning|wildcard|word|wordlist|words)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+            //Complex variables/functions [others]
+        2 => array(
+            GESHI_SEARCH => '(\\$[({])([A-Za-z_][A-Za-z_0-9]*)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 8
+// vim: set sw=4 sts=4 :
+);
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/matlab.php dokuwiki-rc2009-12-02/inc/geshi/matlab.php
--- dokuwiki-2009-02-14/inc/geshi/matlab.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/matlab.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----------
  * Author: Florian Knorn (floz@gmx.de)
  * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/02/09
  *
  * Matlab M-file language file for GeSHi.
@@ -45,7 +45,9 @@
     'COMMENT_SINGLE' => array(1 => '%'),
     'COMMENT_MULTI' => array(),
     //Matlab Strings
-    'COMMENT_REGEXP' => array(2 => "/(? array(
+        2 => "/(? GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
@@ -56,113 +58,105 @@
             'switch', 'try', 'while'
             ),
         2 => array(
-            'all','any','exist','find','is','isa','logical','mislocked',
+            'all','any','exist','is','logical','mislocked',
 
-            'builtin','eval','evalc','evalin','feval','function','global',
-            'nargchk','persistent','script','break','case','catch','else',
-            'elseif','end','error','for','if','otherwise','return','switch',
-            'try','warning','while','input','keyboard','menu','pause','class',
-            'double','inferiorto','inline','int8','int16','int32','isa',
-            'loadobj','saveobj','single','superiorto','uint8','int16','uint32',
-            'dbclear','dbcont','dbdown','dbmex','dbquit','dbstack','dbstatus',
-            'dbstep','dbstop','dbtype','dbup','blkdiag','eye','linspace',
-            'logspace','ones','rand','randn','zeros','ans','computer','eps',
-            'flops','i','Inf','inputname','j','NaN','nargin','nargout','pi',
-            'realmax','realmin','varargin','varargout','calendar','clock',
-            'cputime','date','datenum','datestr','datevec','eomday','etime',
-            'now','tic','toc','weekday','cat','diag','fliplr','flipud','repmat',
-            'reshape','rot90','tril','triu','compan','gallery','hadamard',
-            'hankel','hilb','invhilb','magic','pascal','toeplitz','wilkinson',
-            'abs','acos','acosh','acot','acoth','acsc','acsch','angle','asec',
-            'asech','asin','asinh','atan','atanh','atan2','ceil','complex',
-            'conj','cos','cosh','cot','coth','csc','csch','exp','fix','floor',
-            'gcd','imag','lcm','log','log2','log10','mod','nchoosek','real',
-            'rem','round','sec','sech','sign','sin','sinh','sqrt','tan','tanh',
-            'airy','besselh','besseli','besselk','besselj','Bessely','beta',
-            'betainc','betaln','ellipj','ellipke','erf','erfc','erfcx','erfiny',
-            'expint','factorial','gamma','gammainc','gammaln','legendre','pow2',
-            'rat','rats','cart2pol','cart2sph','pol2cart','sph2cart','abs',
-            'eval','real','strings','deblank','findstr','lower','strcat',
-            'strcmp','strcmpi','strjust','strmatch','strncmp','strrep','strtok',
-            'strvcat','symvar','texlabel','upper','char','int2str','mat2str',
-            'num2str','sprintf','sscanf','str2double','str2num','bin2dec',
-            'dec2bin','dec2hex','hex2dec','hex2num','fclose','fopen','fread',
-            'fwrite','fgetl','fgets','fprintf','fscanf','feof','ferror',
-            'frewind','fseek','ftell','sprintf','sscanf','dlmread','dlmwrite',
-            'hdf','imfinfo','imread','imwrite','textread','wk1read','wk1write',
-            'bitand','bitcmp','bitor','bitmax','bitset','bitshift','bitget',
-            'bitxor','fieldnames','getfield','rmfield','setfield','struct',
-            'struct2cell','class','isa','cell','cellfun','cellstr',
-            'cell2struct','celldisp','cellplot','num2cell','cat','flipdim',
-            'ind2sub','ipermute','ndgrid','ndims','permute','reshape',
-            'shiftdim','squeeze','sub2ind','cond','condeig','det','norm','null',
-            'orth','rank','rcond','rref','rrefmovie','subspace','trace','chol',
-            'inv','lscov','lu','nnls','pinv','qr','balance','cdf2rdf','eig',
-            'gsvd','hess','poly','qz','rsf2csf','schur','svd','expm','funm',
-            'logm','sqrtm','qrdelete','qrinsert','bar','barh','hist','hold',
-            'loglog','pie','plot','polar','semilogx','semilogy','subplot',
-            'bar3','bar3h','comet3','cylinder','fill3','plot3','quiver3',
-            'slice','sphere','stem3','waterfall','clabel','datetick','grid',
-            'gtext','legend','plotyy','title','xlabel','ylabel','zlabel',
-            'contour','contourc','contourf','hidden','meshc','mesh','peaks',
-            'surf','surface','surfc','surfl','trimesh','trisurf','coneplot',
-            'contourslice','isocaps','isonormals','isosurface','reducepatch',
-            'reducevolume','shrinkfaces','smooth3','stream2','stream3',
-            'streamline','surf2patch','subvolume','griddata','meshgrid','area',
-            'box','comet','compass','errorbar','ezcontour','ezcontourf',
+            'abs','acos','acosh','acot','acoth','acsc','acsch','airy','angle',
+            'ans','area','asec','asech','asin','asinh','atan','atan2','atanh',
+            'auread','autumn','auwrite','axes','axis','balance','bar','bar3',
+            'bar3h','barh','besselh','besseli','besselj','besselk','Bessely',
+            'beta','betainc','betaln','bicg','bicgstab','bin2dec','bitand',
+            'bitcmp','bitget','bitmax','bitor','bitset','bitshift','bitxor',
+            'blkdiag','bone','box','brighten','builtin','bwcontr','calendar',
+            'camdolly','camlight','camlookat','camorbit','campan','campos',
+            'camproj','camroll','camtarget','camup','camva','camzoom','capture',
+            'cart2pol','cart2sph','cat','caxis','cdf2rdf','ceil','cell',
+            'cell2struct','celldisp','cellfun','cellplot','cellstr','cgs',
+            'char','chol','cholinc','cholupdate','cla','clabel','class','clc',
+            'clf','clg','clock','close','colmmd','colorbar','colorcube',
+            'colordef','colormap','colperm','comet','comet3','compan','compass',
+            'complex','computer','cond','condeig','condest','coneplot','conj',
+            'contour','contourc','contourf','contourslice','contrast','conv',
+            'conv2','convhull','cool','copper','copyobj','corrcoef','cos',
+            'cosh','cot','coth','cov','cplxpair','cputime','cross','csc','csch',
+            'cumprod','cumsum','cumtrapz','cylinder','daspect','date','datenum',
+            'datestr','datetick','datevec','dbclear','dbcont','dbdown',
+            'dblquad','dbmex','dbquit','dbstack','dbstatus','dbstep','dbstop',
+            'dbtype','dbup','deblank','dec2bin','dec2hex','deconv','del2',
+            'delaunay','det','diag','dialog','diff','diffuse','dlmread',
+            'dlmwrite','dmperm','double','dragrect','drawnow','dsearch','eig',
+            'eigs','ellipj','ellipke','eomday','eps','erf','erfc','erfcx',
+            'erfiny','error','errorbar','errordlg','etime','eval','evalc',
+            'evalin','exp','expint','expm','eye','ezcontour','ezcontourf',
             'ezmesh','ezmeshc','ezplot','ezplot3','ezpolar','ezsurf','ezsurfc',
-            'feather','fill','fplot','pareto','pie3','plotmatrix','pcolor',
-            'rose','quiver','ribbon','stairs','scatter','scatter3','stem',
-            'convhull','delaunay','dsearch','inpolygon','polyarea','tsearch',
-            'voronoi','camdolly','camlookat','camorbit','campan','campos',
-            'camproj','camroll','camtarget','camup','camva','camzoom','daspect',
-            'pbaspect','view','viewmtx','xlim','ylim','zlim','camlight',
-            'diffuse','lighting','lightingangle','material','specular',
-            'brighten','bwcontr','caxis','colorbar','colorcube','colordef',
-            'colormap','graymon','hsv2rgb','rgb2hsv','rgbplot','shading',
-            'spinmap','surfnorm','whitebg','autumn','bone','contrast','cool',
-            'copper','flag','gray','hot','hsv','jet','lines','prism','spring',
-            'summer','winter','orient','print','printopt','saveas','copyobj',
-            'findobj','gcbo','gco','get','rotate','ishandle','set','axes',
-            'figure','image','light','line','patch','rectangle','surface',
-            'text Create','uicontext Create','capture','clc','clf','clg',
-            'close','gcf','newplot','refresh','saveas','axis','cla','gca',
-            'propedit','reset','rotate3d','selectmoveresize','shg','ginput',
-            'zoom','dragrect','drawnow','rbbox','dialog','errordlg','helpdlg',
-            'inputdlg','listdlg','msgbox','pagedlg','printdlg','questdlg',
-            'uigetfile','uiputfile','uisetcolor','uisetfont','warndlg','menu',
-            'menuedit','uicontextmenu','uicontrol','uimenu','dragrect',
-            'findfigs','gcbo','rbbox','selectmoveresize','textwrap','uiresume',
-            'uiwait Used','waitbar','waitforbuttonpress','convhull','cumprod',
-            'cumsum','cumtrapz','delaunay','dsearch','factor','inpolygon','max',
-            'mean','median','min','perms','polyarea','primes','prod','sort',
-            'sortrows','std','sum','trapz','tsearch','var','voronoi','del2',
-            'diff','gradient','corrcoef','cov','conv','conv2','deconv','filter',
-            'filter2','abs','angle','cplxpair','fft','fft2','fftshift','ifft',
-            'ifft2','ifftn','ifftshift','nextpow2','unwrap','cross','intersect',
-            'ismember','setdiff','setxor','union','unique','conv','deconv',
-            'poly','polyder','polyeig','polyfit','polyval','polyvalm','residue',
-            'roots','griddata','interp1','interp2','interp3','interpft',
-            'interpn','meshgrid','ndgrid','spline','dblquad','fmin','fmins',
-            'fzero','ode45,','ode113,','ode15s,','ode23s,','ode23t,','ode23tb',
-            'odefile','odeget','odeset','quad,','vectorize','spdiags','speye',
-            'sprand','sprandn','sprandsym','find','full','sparse','spconvert',
-            'nnz','nonzeros','nzmax','spalloc','spfun','spones','colmmd',
-            'colperm','dmperm','randperm','symmmd','symrcm','condest','normest',
-            'bicg','bicgstab','cgs','cholinc','cholupdate','gmres','luinc',
-            'pcg','qmr','qr','qrdelete','qrinsert','qrupdate','eigs','svds',
-            'spparms','lin2mu','mu2lin','sound','soundsc','auread','auwrite',
-            'wavread','wavwrite',
+            'factor','factorial','fclose','feather','feof','ferror','feval',
+            'fft','fft2','fftshift','fgetl','fgets','fieldnames','figure',
+            'fill','fill3','filter','filter2','find','findfigs','findobj',
+            'findstr','fix','flag','flipdim','fliplr','flipud','floor','flops',
+            'fmin','fmins','fopen','fplot','fprintf','fread','frewind','fscanf',
+            'fseek','ftell','full','funm','fwrite','fzero','gallery','gamma',
+            'gammainc','gammaln','gca','gcbo','gcd','gcf','gco','get',
+            'getfield','ginput','gmres','gradient','gray','graymon','grid',
+            'griddata','gsvd','gtext','hadamard','hankel','hdf','helpdlg',
+            'hess','hex2dec','hex2num','hidden','hilb','hist','hold','hot',
+            'hsv','hsv2rgb','i','ifft','ifft2','ifftn','ifftshift','imag',
+            'image','imfinfo','imread','imwrite','ind2sub','Inf','inferiorto',
+            'inline','inpolygon','input','inputdlg','inputname','int16',
+            'int2str','int32','int8','interp1','interp2','interp3','interpft',
+            'interpn','intersect','inv','invhilb','ipermute','isa','ishandle',
+            'ismember','isocaps','isonormals','isosurface','j','jet','keyboard',
+            'lcm','legend','legendre','light','lighting','lightingangle',
+            'lin2mu','line','lines','linspace','listdlg','loadobj','log',
+            'log10','log2','loglog','logm','logspace','lower','lscov','lu',
+            'luinc','magic','mat2str','material','max','mean','median','menu',
+            'menuedit','mesh','meshc','meshgrid','min','mod','msgbox','mu2lin',
+            'NaN','nargchk','nargin','nargout','nchoosek','ndgrid','ndims',
+            'newplot','nextpow2','nnls','nnz','nonzeros','norm','normest','now',
+            'null','num2cell','num2str','nzmax','ode113,','ode15s,','ode23s,',
+            'ode23t,','ode23tb','ode45,','odefile','odeget','odeset','ones',
+            'orient','orth','pagedlg','pareto','pascal','patch','pause',
+            'pbaspect','pcg','pcolor','peaks','perms','permute','pi','pie',
+            'pie3','pinv','plot','plot3','plotmatrix','plotyy','pol2cart',
+            'polar','poly','polyarea','polyder','polyeig','polyfit','polyval',
+            'polyvalm','pow2','primes','print','printdlg','printopt','prism',
+            'prod','propedit','qmr','qr','qrdelete','qrinsert','qrupdate',
+            'quad','questdlg','quiver','quiver3','qz','rand','randn','randperm',
+            'rank','rat','rats','rbbox','rcond','real','realmax','realmin',
+            'rectangle','reducepatch','reducevolume','refresh','rem','repmat',
+            'reset','reshape','residue','rgb2hsv','rgbplot','ribbon','rmfield',
+            'roots','rose','rot90','rotate','rotate3d','round','rref',
+            'rrefmovie','rsf2csf','saveobj','scatter','scatter3','schur',
+            'script','sec','sech','selectmoveresize','semilogx','semilogy',
+            'set','setdiff','setfield','setxor','shading','shg','shiftdim',
+            'shrinkfaces','sign','sin','single','sinh','slice','smooth3','sort',
+            'sortrows','sound','soundsc','spalloc','sparse','spconvert',
+            'spdiags','specular','speye','spfun','sph2cart','sphere','spinmap',
+            'spline','spones','spparms','sprand','sprandn','sprandsym','spring',
+            'sprintf','sqrt','sqrtm','squeeze','sscanf','stairs','std','stem',
+            'stem3','str2double','str2num','strcat','strcmp','strcmpi',
+            'stream2','stream3','streamline','strings','strjust','strmatch',
+            'strncmp','strrep','strtok','struct','struct2cell','strvcat',
+            'sub2ind','subplot','subspace','subvolume','sum','summer',
+            'superiorto','surf','surf2patch','surface','surfc','surfl',
+            'surfnorm','svd','svds','symmmd','symrcm','symvar','tan','tanh',
+            'texlabel','text Create','textread','textwrap','tic','title','toc',
+            'toeplitz','trace','trapz','tril','trimesh','trisurf','triu',
+            'tsearch','uicontext Create','uicontextmenu','uicontrol',
+            'uigetfile','uimenu','uint32','uint8','uiputfile','uiresume',
+            'uisetcolor','uisetfont','uiwait Used','union','unique','unwrap',
+            'upper','var','varargin','varargout','vectorize','view','viewmtx',
+            'voronoi','waitbar','waitforbuttonpress','warndlg','warning',
+            'waterfall','wavread','wavwrite','weekday','whitebg','wilkinson',
+            'winter','wk1read','wk1write','xlabel','xlim','ylabel','ylim',
+            'zeros','zlabel','zlim','zoom',
             //'[Keywords 6]',
-            'addpath','doc','docopt','help','helpdesk','helpwin','lasterr',
-            'lastwarn','lookfor','partialpath','path','pathtool','profile',
-            'profreport','rmpath','type','ver','version','web','what',
-            'whatsnew','which','clear','disp','length','load','mlock',
-            'munlock','openvar','pack','save','saveas','size','who','whos',
-            'workspace','clc','echo','format','home','more','cd','copyfile',
-            'delete','diary','dir','edit','fileparts','fullfile','inmem','ls',
-            'matlabroot','mkdir','open','pwd','tempdir','tempname','matlabrc',
-            'quit'
+            'addpath','cd','clear','copyfile','delete','diary','dir','disp',
+            'doc','docopt','echo','edit','fileparts','format','fullfile','help',
+            'helpdesk','helpwin','home','inmem','lasterr','lastwarn','length',
+            'load','lookfor','ls','matlabrc','matlabroot','mkdir','mlock',
+            'more','munlock','open','openvar','pack','partialpath','path',
+            'pathtool','profile','profreport','pwd','quit','rmpath','save',
+            'saveas','size','tempdir','tempname','type','ver','version','web',
+            'what','whatsnew','which','who','whos','workspace'
             )
         ),
     'SYMBOLS' => array(
@@ -204,6 +198,7 @@
             0 => 'color: #080;'
             ),
         'REGEXPS' => array(
+            0 => 'color: #33f;'
             ),
         'SCRIPT' => array(
             0 => ''
@@ -211,9 +206,7 @@
         ),
     'URLS' => array(
         1 => '',
-        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html',
-        3 => '',
-        4 => ''
+        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
@@ -221,6 +214,8 @@
         2 => '::'
         ),
     'REGEXPS' => array(
+        //Complex numbers
+        0 => '(? GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/mirc.php dokuwiki-rc2009-12-02/inc/geshi/mirc.php
--- dokuwiki-2009-02-14/inc/geshi/mirc.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/mirc.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----
  * Author: Alberto 'Birckin' de Areba (Birckin@hotmail.com)
  * Copyright: (c) 2006 Alberto de Areba
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/05/29
  *
  * mIRC Scripting language file for GeSHi.
@@ -48,7 +48,7 @@
             'alias', 'menu', 'dialog',
             ),
         2 => array(
-            'if', 'elseif', 'else', 'while', 'return', 'goto',
+            'if', 'elseif', 'else', 'while', 'return', 'goto', 'var'
             ),
         3 => array(
             'action','ajinvite','amsg','ame','anick','aop','auser',
@@ -76,7 +76,7 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '{', '}', '[', ']',
+        '(', ')', '{', '}', '[', ']', '/'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -104,6 +104,7 @@
             0 => '',
             ),
         'METHODS' => array(
+            0 => 'color: #008000;'
             ),
         'SYMBOLS' => array(
             0 => 'color: #FF0000;',
@@ -111,11 +112,12 @@
         'REGEXPS' => array(
             0 => 'color: #000099;',
             1 => 'color: #990000;',
-            2 => 'color: #888800;',
+            2 => 'color: #000099;',
             3 => 'color: #888800;',
-            4 => 'color: #000099;',
+            4 => 'color: #888800;',
             5 => 'color: #000099;',
             6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;'
             ),
         'SCRIPT' => array(
             )
@@ -125,19 +127,15 @@
         2 => '',
         3 => 'http://www.mirc.com/{FNAMEL}'
         ),
-    'OOLANG' => false,
-    'OBJECT_SPLITTERS' => array(
-        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
     'REGEXPS' => array(
         //Variable names
         0 => '\$[a-zA-Z0-9]+',
         //Variable names
-        1 => '(%|&)[a-zA-Z0-9]+',
-        //Channel names
-        2 => '(#|@)[a-zA-Z0-9]+',
-        3 => '-[a-z\d]+',
+        1 => '(%|&)[\w\x80-\xFE]+',
         //Client to Client Protocol handling
-        4 => '(on|ctcp) (!|@|&)?(\d|\*):[a-zA-Z]+:',
+        2 => '(on|ctcp) (!|@|&)?(\d|\*):[a-zA-Z]+:',
         /*4 => array(
             GESHI_SEARCH => '((on|ctcp) (!|@|&)?(\d|\*):(Action|Active|Agent|AppActive|Ban|Chat|Close|Connect|Ctcp|CtcpReply|DccServer|DeHelp|DeOp|DeVoice|Dialog|Dns|Error|Exit|FileRcvd|FileSent|GetFail|Help|Hotlink|Input|Invite|Join|KeyDown|KeyUp|Kick|Load|Logon|MidiEnd|Mode|Mp3End|Nick|NoSound|Notice|Notify|Op|Open|Part|Ping|Pong|PlayEnd|Quit|Raw|RawMode|SendFail|Serv|ServerMode|ServerOp|Signal|Snotice|Start|Text|Topic|UnBan|Unload|Unotify|User|Mode|Voice|Wallops|WaveEnd):)',
             GESHI_REPLACE => '\\1',
@@ -145,10 +143,15 @@
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
             ),*/
+        //Channel names
+        3 => '(#|@)[a-zA-Z0-9]+',
+        4 => '-[a-z\d]+',
         //Raw protocol handling
         5 => 'raw (\d|\*):',
         //Timer handling
-        6 => '\/timer(?!s\b)[0-9a-zA-Z_]+',
+        6 => '(?|:|\/)\/timer(?!s\b)[0-9a-zA-Z_]+',
+        // /...
+        7 => '(?|:|\/|\w)\/[a-zA-Z][a-zA-Z0-9]*(?!>)'
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
@@ -157,9 +160,12 @@
         ),
     'PARSER_CONTROL' => array(
         'ENABLE_FLAGS' => array(
-            'NUMBERS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/modula3.php dokuwiki-rc2009-12-02/inc/geshi/modula3.php
--- dokuwiki-2009-02-14/inc/geshi/modula3.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/modula3.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,135 @@
+ 'Modula-3',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'AND', 'ANY', 'ARRAY', 'AS', 'BEGIN', 'BITS', 'BRANDED', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EVAL', 'EXCEPT', 'EXCEPTION',
+            'EXIT', 'EXPORTS', 'FINALLY', 'FOR', 'FROM', 'GENERIC', 'IF', 'IMPORT', 'IN',
+            'INTERFACE', 'LOCK', 'LOOP', 'METHODS', 'MOD', 'MODULE', 'NOT', 'OBJECT', 'OF',
+            'OR', 'OVERRIDE', 'PROCEDURE', 'RAISE', 'RAISES', 'READONLY', 'RECORD', 'REF',
+            'REPEAT', 'RETURN', 'REVEAL', 'ROOT', 'SET', 'THEN', 'TO', 'TRY', 'TYPE', 'TYPECASE',
+            'UNSAFE', 'UNTIL', 'UNTRACED', 'VALUE', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'NULL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS','ADR','ADRSIZE','BITSIZE','BYTESIZE','CEILING','DEC','DISPOSE',
+            'EXTENDED','FIRST','FLOAT','FLOOR','INC','ISTYPE','LAST','LOOPHOLE','MAX','MIN',
+            'NARROW','NEW','NUMBER','ORD','ROUND','SUBARRAY','TRUNC','TYPECODE', 'VAL'
+            ),
+        4 => array(
+            'ADDRESS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
+            'LONGREAL', 'MUTEX', 'REAL', 'REFANY', 'TEXT'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/mpasm.php dokuwiki-rc2009-12-02/inc/geshi/mpasm.php
--- dokuwiki-2009-02-14/inc/geshi/mpasm.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/mpasm.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------
  * Author: Bakalex (bakalex@gmail.com)
  * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/12/6
  *
  * Microchip Assembler language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/mxml.php dokuwiki-rc2009-12-02/inc/geshi/mxml.php
--- dokuwiki-2009-02-14/inc/geshi/mxml.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/mxml.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: David Spurr
  * Copyright: (c) 2007 David Spurr (http://www.defusion.org.uk/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/10/04
  *
  * MXML language file for GeSHi. Based on the XML file by Nigel McNie
diff -Naur dokuwiki-2009-02-14/inc/geshi/mysql.php dokuwiki-rc2009-12-02/inc/geshi/mysql.php
--- dokuwiki-2009-02-14/inc/geshi/mysql.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/mysql.php	2009-12-02 19:50:11.000000000 +0100
@@ -1,14 +1,28 @@
  'MySQL',
-    'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),
+    //'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),    // '--' MUST be folowed by whitespace,not necessarily a space
+    'COMMENT_SINGLE' => array(
+        1 =>'-- ',
+        2 => '#'
+        ),
+    'COMMENT_REGEXP' => array(
+        1 => "/(?:--\s).*?$/",                          // double dash followed by any whitespace
+        ),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    'CASE_KEYWORDS' => 1,
-    'QUOTEMARKS' => array("'", '"'),
-    'ESCAPE_CHAR' => '\\',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,            // @@@ would be nice if this could be defined per group!
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',                              // by default only, can be specified
+    'ESCAPE_REGEXP' => array(
+        1 => "/[_%]/",                                  // search wildcards
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_OCT_PREFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
-            /* Mix */
-            'ALTER DATABASE', 'ALTER TABLE', 'CREATE DATABASE', 'CREATE INDEX', 'CREATE TABLE', 'DROP DATABASE',
-            'DROP INDEX', 'DROP TABLE', 'RENAME TABLE', 'DELETE', 'DO', 'HANDLER', 'INSERT', 'LOAD DATA INFILE',
-            'REPLACE', 'SELECT', 'TRUNCATE', 'UPDATE', 'DESCRIBE', 'USE', 'START TRANSACTION', 'COMMIT', 'ROLLBACK',
-            'SAVEPOINT', 'ROLLBACK TO SAVEPOINT', 'LOCK TABLES', 'UNLOCK_TABLES', 'SET TRANACTIONS', 'SET', 'SHOW',
-            'CREATE PROCEDURE', 'CREATE FUNCTION', 'ALTER PROCEDURE', 'ALTER FUNCTION', 'DROP PROCEDURE', 'DROP FUNCTION',
-            'SHOW CREATE PROCEDURE', 'SHOW CREATE FUNCTION', 'SHOW PROCEDURE STATUS', 'SHOW FUNCTION STATUS',
-            'CALL', 'BEGIN', 'END', 'DECLARE', 'CREATE ROUTINE', 'ALTER ROUTINE', 'CREATE', 'ALTER', 'DROP',
-            'PRIMARY KEY', 'VALUES', 'INTO', 'FROM',
-            'ANALYZE', 'BDB', 'BERKELEYDB', 'BTREE', 'BY', 'CASCADE', 'CHECK', 'COLUMN', 'COLUMNS', 'CONSTRAINT',
-            'CROSS', 'DATABASES', 'DELAYED', 'DISTINCT', 'DISTINCTROW', 'ENCLOSED', 'ERRORS', 'ESCAPED', 'EXISTS',
-            'EXPLAIN', 'FALSE', 'FIELDS', 'FORCE', 'FOREIGN', 'FULLTEXT', 'GEOMETRY', 'GRANT', 'GROUP', 'HASH',
-            'HAVING', 'HELP', 'HIGH_PRIORITY', 'IGNORE', 'INNER', 'INNODB', 'INTERVAL', 'JOIN', 'KEYS', 'KILL',
-            'LINES', 'LOW_PRIORITY', 'MASTER_SERVER_ID', 'MATCH', 'MIDDLEINT', 'MRG_MYISAM', 'NATURAL', 'OPTIMIZE',
-            'OPTION', 'OPTIONALLY', 'ORDER', 'OUTER', 'OUTFILE', 'PRIVILEGES', 'PURGE', 'READ', 'REFERENCES',
-            'REQUIRE', 'RESTRICT', 'RETURNS', 'REVOKE', 'RLIKE', 'RTREE', 'SOME', 'SONAME', 'SPATIAL', 'SQL_BIG_RESULT',
-            'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'STRIPED', 'TERMINATED',
-            'TRUE', 'TYPES', 'UNION', 'USAGE', 'USER_RESOURCES', 'USING', 'VARCHARACTER', 'WARNINGS', 'WHERE', 'WRITE',
-
-            /* Control Flow Functions */
-            'CASE', 'WHEN', 'THEN', 'ELSE', 'END',
-
-            /* String Functions */
-            'UNHEX', 'BIN', 'BIT_LENGTH', 'CHAR_LENGTH', 'CHARACTER_LENGTH', 'COMPRESS', 'CONCAT',
-            'CONCAT_WS', 'CONV', 'ELT', 'EXPORT_SET', 'FIELD', 'FIND_IN_SET', 'FORMAT', 'HEX',
-            'INSERT', 'INSTR', 'LCASE', 'LEFT', 'LENGTH', 'LOAD_FILE', 'LOCATE', 'LOWER', 'LPAD',
-            'LTRIM', 'MAKE_SET', 'MID', 'OCT', 'OCTET_LENGTH', 'ORD', 'POSITION', 'QUOTE', 'REPEAT',
-            'REPLACE', 'REVERSE', 'RIGHT', 'RPAD', 'RTRIM', 'SOUNDEX', 'SPACE', 'SUBSTRING',
-            'SUBSTRING_INDEX', 'TRIM', 'UCASE', 'UPPER', 'UNCOMPRESS', 'UNCOMPRESSD_LENGTH',
-            'MD5', 'SHA1',
-
-            /* Numeric Functions */
-            'ABS', 'ACOS', 'ASIN', 'ATAN', 'ATAN2', 'CEILING', 'CEIL', 'COS', 'COT', 'CRC32', 'DEGREES',
-            'EXP', 'FLOOR', 'LN', 'LOG', 'LOG2', 'LOG10', 'MOD', 'PI', 'POW', 'POWER', 'RADIANS', 'RAND',
-            'ROUND', 'SIGN', 'SIN', 'SQRT', 'TAN', 'TRUNCATE',
-
-            /* Date and Time Functions */
-            'ADDDATE', 'ADDTIME', 'CONVERT_TZ', 'CURDATE', 'CURRENT_DATE', 'CURTIME', 'CURRENT_TIME',
-            'CURRENT_TIMESTAMP', 'DATEDIFF', 'DATE_ADD', 'DATE_SUB', 'DATE_FORMAT', 'DAY',
-            'DAYNAME', 'DAYOFMONTH', 'DAYOFWEEK', 'DAYOFYEAR', 'EXTRACT', 'FROM_DAYS', 'FROM_UNIXTIME',
-            'GET_FORMAT', 'LAST_DAY', 'LOCALTIME', 'LOCALTIMESTAMP', 'MAKEDATE', 'MAKETIME',
-            'MICROSECOND', 'MONTHNAME', 'NOW', 'PERIOD_ADD', 'PERIOD_DIFF', 'QUARTER',
-            'SECOND', 'SEC_TO_TIME', 'STR_TO_DATE', 'SUBDATE', 'SUBTIME', 'SYSDATE', 'TIME', 'TIMEDIFF',
-            'TIMESTAMP', 'TIMESTAMPADD', 'TIMESTAMPDIFF', 'TIME_FORMAT', 'TIME_TO_SEC', 'TO_DAYS',
-            'UNIX_TIMESTAMP', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', 'WEEKDAY', 'WEEKOFYEAR',
-            'YEARWEEK',
-            ),
-        2 => array(
-            'INTEGER', 'SMALLINT', 'DECIMAL', 'NUMERIC', 'FLOAT', 'REAL', 'DOUBLE PRECISION',
-            'DOUBLE', 'INT', 'DEC', 'BIT' ,'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT',
-            'DATETIME', 'DATE', 'TIMESTAMP', 'TIME', 'YEAR',
-            'CHAR', 'VARCHAR', 'BINARY', 'CHARACTER VARYING', 'VARBINARY', 'TINYBLOB', 'TINYTEXT',
-            'BLOB', 'TEXT','MEDIUMBLOB', 'MEDIUMTEXT', 'LONGBLOB', 'LONGTEXT', 'ENUM', 'SET',
-            'SERIAL DEFAULT VALUE', 'SERIAL', 'FIXED'
+            // Mix: statement keywords and keywords that don't fit in any other
+            // category, or have multiple usage/meanings
+            'ACTION','ADD','AFTER','ALGORITHM','ALL','ALTER','ANALYZE','ANY',
+            'ASC','AS','BDB','BEGIN','BERKELEYDB','BINARY','BTREE','CALL',
+            'CASCADED','CASCADE','CHAIN','CHECK','COLUMNS','COLUMN','COMMENT',
+            'COMMIT','COMMITTED','CONSTRAINT','CONTAINS SQL','CONSISTENT',
+            'CONVERT','CREATE','CROSS','DATA','DATABASES',
+            'DECLARE','DEFINER','DELAYED','DELETE','DESCRIBE','DESC',
+            'DETERMINISTIC','DISABLE','DISCARD','DISTINCTROW','DISTINCT','DO',
+            'DROP','DUMPFILE','DUPLICATE KEY','ENABLE','ENCLOSED BY','ENGINE',
+            'ERRORS','ESCAPED BY','EXISTS','EXPLAIN','EXTENDED','FIELDS',
+            'FIRST','FOR EACH ROW','FORCE','FOREIGN KEY','FROM','FULL',
+            'FUNCTION','GLOBAL','GRANT','GROUP BY','HANDLER','HASH','HAVING',
+            'HELP','HIGH_PRIORITY','IF NOT EXISTS','IGNORE','IMPORT','INDEX',
+            'INFILE','INNER','INNODB','INOUT','INTO','INVOKER',
+            'ISOLATION LEVEL','JOIN','KEYS','KEY','KILL','LANGUAGE SQL','LAST',
+            'LIMIT','LINES','LOAD','LOCAL','LOCK','LOW_PRIORITY',
+            'MASTER_SERVER_ID','MATCH','MERGE','MIDDLEINT','MODIFIES SQL DATA',
+            'MODIFY','MRG_MYISAM','NATURAL','NEXT','NO SQL','NO','ON',
+            'OPTIMIZE','OPTIONALLY','OPTION','ORDER BY','OUTER','OUTFILE','OUT',
+            'PARTIAL','PREV','PRIMARY KEY','PRIVILEGES','PROCEDURE','PURGE',
+            'QUICK','READS SQL DATA','READ','REFERENCES','RELEASE','RENAME',
+            'REPEATABLE','REQUIRE','RESTRICT','RETURNS','REVOKE',
+            'ROLLBACK','ROUTINE','RTREE','SAVEPOINT','SELECT',
+            'SERIALIZABLE','SESSION','SET','SHARE MODE','SHOW','SIMPLE',
+            'SNAPSHOT','SOME','SONAME','SQL SECURITY','SQL_BIG_RESULT',
+            'SQL_BUFFER_RESULT','SQL_CACHE','SQL_CALC_FOUND_ROWS',
+            'SQL_NO_CACHE','SQL_SMALL_RESULT','SSL','START','STARTING BY',
+            'STATUS','STRAIGHT_JOIN','STRIPED','TABLESPACE','TABLES','TABLE',
+            'TEMPORARY','TEMPTABLE','TERMINATED BY','TO','TRANSACTIONS',
+            'TRANSACTION','TRIGGER','TYPES','TYPE','UNCOMMITTED','UNDEFINED',
+            'UNION','UNLOCK_TABLES','UPDATE','USAGE','USE','USER_RESOURCES',
+            'USING','VALUES','VALUE','VIEW','WARNINGS','WHERE','WITH ROLLUP',
+            'WITH','WORK','WRITE',
+            ),
+        2 => array(     //No ( must follow
+            // Mix: statement keywords distinguished from functions by the same name
+            "CURRENT_USER", "DATABASE", "IN", "INSERT", "DEFAULT", "REPLACE", "SCHEMA", "TRUNCATE"
             ),
         3 => array(
-            'ZEROFILL', 'NOT NULL', 'UNSIGNED', 'AUTO_INCREMENT', 'UNIQUE', 'NOT', 'NULL', 'CHARACTER SET', 'CHARSET',
-            'ASCII', 'UNICODE', 'NATIONAL', 'BOTH', 'LEADING', 'TRAILING','DEFAULT'
+            // Values (Constants)
+            'FALSE','NULL','TRUE',
             ),
         4 => array(
-            'MICROSECOND', 'SECOND', 'MINUTE', 'HOUR', 'DAY', 'WEEK', 'MONTH', 'QUARTER', 'YEAR', 'SECOND_MICROSECOND',
-            'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'HOUR_MICROSECOND', 'HOUR_SECOND', 'HOUR_MINUTE', 'DAY_MICROSECOND',
-            'DAY_SECOND', 'DAY_MINUTE', 'DAY_HOUR', 'YEAR_MONTH'
-            ),
-        5 => array(
-            'OR', 'XOR', 'AND', 'NOT', 'BETWEEN', 'IS', 'LIKE', 'REGEXP', 'IN', 'DIV',
-            'MOD', 'BINARY', 'COLLATE', 'LIMIT', 'OFFSET'
+            // Column Data Types
+            'BIGINT','BIT','BLOB','BOOLEAN','BOOL','CHARACTER VARYING',
+            'CHAR VARYING','DATETIME','DECIMAL','DEC','DOUBLE PRECISION',
+            'DOUBLE','ENUM','FIXED','FLOAT','GEOMETRYCOLLECTION','GEOMETRY',
+            'INTEGER','INT','LINESTRING','LONGBLOB','LONGTEXT','MEDIUMBLOB',
+            'MEDIUMINT','MEDIUMTEXT','MULTIPOINT','MULTILINESTRING',
+            'MULTIPOLYGON','NATIONAL CHARACTER','NATIONAL CHARACTER VARYING',
+            'NATIONAL CHAR VARYING','NATIONAL VARCHAR','NCHAR VARCHAR','NCHAR',
+            'NUMERIC','POINT','POLYGON','REAL','SERIAL',
+            'SMALLINT','TEXT','TIMESTAMP','TINYBLOB','TINYINT',
+            'TINYTEXT','VARBINARY','VARCHARACTER','VARCHAR',
+            ),
+        5 => array(     //No ( must follow
+            // Column data types distinguished from functions by the same name
+            "CHAR", "DATE", "TIME"
+            ),
+        6 => array(
+            // Table, Column & Index Attributes
+            'AUTO_INCREMENT','AVG_ROW_LENGTH','BOTH','CHECKSUM','CONNECTION',
+            'DATA DIRECTORY','DEFAULT NULL','DELAY_KEY_WRITE','FULLTEXT',
+            'INDEX DIRECTORY','INSERT_METHOD','LEADING','MAX_ROWS','MIN_ROWS',
+            'NOT NULL','PACK_KEYS','ROW_FORMAT','SERIAL DEFAULT VALUE','SIGNED',
+            'SPATIAL','TRAILING','UNIQUE','UNSIGNED','ZEROFILL'
+            ),
+        7 => array(     //No ( must follow
+            // Column attribute distinguished from function by the same name
+            "CHARSET"
+            ),
+        8 => array(
+            // Date and Time Unit Specifiers
+            'DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND',
+            'HOUR_MICROSECOND','HOUR_MINUTE','HOUR_SECOND',
+            'MINUTE_MICROSECOND','MINUTE_SECOND',
+            'SECOND_MICROSECOND','YEAR_MONTH'
+            ),
+        9 => array(     //No ( must follow
+            // Date-time unit specifiers distinguished from functions by the same name
+            "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER", "SECOND", "WEEK", "YEAR"
+            ),
+        10 => array(
+            // Operators (see also Symbols)
+            'AND','BETWEEN','CHARACTER SET','COLLATE','DIV','IS NOT NULL',
+            'IS NOT','IS NULL','IS','LIKE','NOT','OFFSET','OR','REGEXP','RLIKE',
+            'SOUNDS LIKE','XOR'
+            ),
+        11 => array(     //No ( must follow
+            // Operator distinghuished from function by the same name
+            "INTERVAL"
+            ),
+        12 => array(
+            // Control Flow (functions)
+            'CASE','ELSE','END','IFNULL','IF','NULLIF','THEN','WHEN',
+            ),
+        13 => array(
+            // String Functions
+            'ASCII','BIN','BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH',
+            'CONCAT_WS','CONCAT','ELT','EXPORT_SET','FIELD',
+            'FIND_IN_SET','FORMAT','HEX','INSTR','LCASE','LEFT','LENGTH',
+            'LOAD_FILE','LOCATE','LOWER','LPAD','LTRIM','MAKE_SET','MID',
+            'OCTET_LENGTH','ORD','POSITION','QUOTE','REPEAT','REVERSE',
+            'RIGHT','RPAD','RTRIM','SOUNDEX','SPACE','STRCMP','SUBSTRING_INDEX',
+            'SUBSTRING','TRIM','UCASE','UNHEX','UPPER',
+            ),
+        14 => array(     //A ( must follow
+            // String functions distinguished from other keywords by the same name
+            "INSERT", "REPLACE", "CHAR"
+            ),
+        15 => array(
+            // Numeric Functions
+            'ABS','ACOS','ASIN','ATAN2','ATAN','CEILING','CEIL',
+            'CONV','COS','COT','CRC32','DEGREES','EXP','FLOOR','LN','LOG10',
+            'LOG2','LOG','MOD','OCT','PI','POWER','POW','RADIANS','RAND',
+            'ROUND','SIGN','SIN','SQRT','TAN',
+            ),
+        16 => array(     //A ( must follow
+            // Numeric function distinguished from other keyword by the same name
+            "TRUNCATE"
+            ),
+        17 => array(
+            // Date and Time Functions
+            'ADDDATE','ADDTIME','CONVERT_TZ','CURDATE','CURRENT_DATE',
+            'CURRENT_TIME','CURRENT_TIMESTAMP','CURTIME','DATE_ADD',
+            'DATE_FORMAT','DATE_SUB','DATEDIFF','DAYNAME','DAYOFMONTH',
+            'DAYOFWEEK','DAYOFYEAR','EXTRACT','FROM_DAYS','FROM_UNIXTIME',
+            'GET_FORMAT','LAST_DAY','LOCALTIME','LOCALTIMESTAMP','MAKEDATE',
+            'MAKETIME','MONTHNAME','NOW','PERIOD_ADD',
+            'PERIOD_DIFF','SEC_TO_TIME','STR_TO_DATE','SUBDATE','SUBTIME',
+            'SYSDATE','TIME_FORMAT','TIME_TO_SEC',
+            'TIMESTAMPADD','TIMESTAMPDIFF','TO_DAYS',
+            'UNIX_TIMESTAMP','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','WEEKDAY',
+            'WEEKOFYEAR','YEARWEEK',
+            ),
+        18 => array(     //A ( must follow
+            // Date-time functions distinguished from other keywords by the same name
+            "DATE", "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER",
+            "SECOND", "TIME", "WEEK", "YEAR"
+            ),
+        19 => array(
+            // Comparison Functions
+            'COALESCE','GREATEST','ISNULL','LEAST',
+            ),
+        20 => array(     //A ( must follow
+            // Comparison functions distinguished from other keywords by the same name
+            "IN", "INTERVAL"
+            ),
+        21 => array(
+            // Encryption and Compression Functions
+            'AES_DECRYPT','AES_ENCRYPT','COMPRESS','DECODE','DES_DECRYPT',
+            'DES_ENCRYPT','ENCODE','ENCRYPT','MD5','OLD_PASSWORD','PASSWORD',
+            'SHA1','SHA','UNCOMPRESS','UNCOMPRESSED_LENGTH',
+            ),
+        22 => array(
+            // GROUP BY (aggregate) Functions
+            'AVG','BIT_AND','BIT_OR','BIT_XOR','COUNT','GROUP_CONCAT',
+            'MAX','MIN','STDDEV_POP','STDDEV_SAMP','STDDEV','STD','SUM',
+            'VAR_POP','VAR_SAMP','VARIANCE',
+            ),
+        23 => array(
+            // Information Functions
+            'BENCHMARK','COERCIBILITY','COLLATION','CONNECTION_ID',
+            'FOUND_ROWS','LAST_INSERT_ID','ROW_COUNT',
+            'SESSION_USER','SYSTEM_USER','USER','VERSION',
+            ),
+        24 => array(     //A ( must follow
+            // Information functions distinguished from other keywords by the same name
+            "CURRENT_USER", "DATABASE", "SCHEMA", "CHARSET"
+            ),
+        25 => array(
+            // Miscellaneous Functions
+            'ExtractValue','BIT_COUNT','GET_LOCK','INET_ATON','INET_NTOA',
+            'IS_FREE_LOCK','IS_USED_LOCK','MASTER_POS_WAIT','NAME_CONST',
+            'RELEASE_LOCK','SLEEP','UpdateXML','UUID',
+            ),
+        26 => array(     //A ( must follow
+            // Miscellaneous function distinguished from other keyword by the same name
+            "DEFAULT"
+            ),
+        27 => array(
+            // Geometry Functions
+            'Area','AsBinary','AsText','AsWKB','AsWKT','Boundary','Buffer',
+            'Centroid','Contains','ConvexHull','Crosses',
+            'Difference','Dimension','Disjoint','Distance',
+            'EndPoint','Envelope','Equals','ExteriorRing',
+            'GLength','GeomCollFromText','GeomCollFromWKB','GeomFromText',
+            'GeomFromWKB','GeometryCollectionFromText',
+            'GeometryCollectionFromWKB','GeometryFromText','GeometryFromWKB',
+            'GeometryN','GeometryType',
+            'InteriorRingN','Intersection','Intersects','IsClosed','IsEmpty',
+            'IsRing','IsSimple',
+            'LineFromText','LineFromWKB','LineStringFromText',
+            'LineStringFromWKB',
+            'MBRContains','MBRDisjoint','MBREqual','MBRIntersects',
+            'MBROverlaps','MBRTouches','MBRWithin','MLineFromText',
+            'MLineFromWKB','MPointFromText','MPointFromWKB','MPolyFromText',
+            'MPolyFromWKB','MultiLineStringFromText','MultiLineStringFromWKB',
+            'MultiPointFromText','MultiPointFromWKB','MultiPolygonFromText',
+            'MultiPolygonFromWKB',
+            'NumGeometries','NumInteriorRings','NumPoints',
+            'Overlaps',
+            'PointFromText','PointFromWKB','PointN','PointOnSurface',
+            'PolyFromText','PolyFromWKB','PolygonFromText','PolygonFromWKB',
+            'Related','SRID','StartPoint','SymDifference',
+            'Touches',
+            'Union',
+            'Within',
+            'X',
+            'Y',
             ),
         ),
     'SYMBOLS' => array(
-        ':=',
-        '||', 'OR', 'XOR',
-        '&&', 'AND',
-        'NOT',
-        'BETWEEN', 'CASE', 'WHEN', 'THEN', 'ELSE',
-        '=', '<=>', '>=', '>', '<=', '<', '<>', '!=', 'IS', 'LIKE', 'REGEXP', 'IN',
-        '|',
-        '&',
-        '<<', '>>',
-        '-', '+',
-        '*', '/', 'DIV', '%', 'MOD',
-        '^',
-        '~',
-        '!',
-        'BINARY', 'COLLATE',
-        '(', ')',
+        1 => array(
+            /* Operators */
+            '=', ':=',                                      // assignment operators
+            '||', '&&', '!',                                // locical operators
+            '=', '<=>', '>=', '>', '<=', '<', '<>', '!=',   // comparison operators
+            '|', '&', '^', '~', '<<', '>>',                 // bitwise operators
+            '-', '+', '*', '/', '%',                        // numerical operators
+            ),
+        2 => array(
+            /* Other syntactical symbols */
+            '(', ')',
+            ',', ';',
+            ),
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -132,37 +304,86 @@
         2 => false,
         3 => false,
         4 => false,
-        5 => false
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false,
+        17 => false,
+        18 => false,
+        19 => false,
+        20 => false,
+        21 => false,
+        22 => false,
+        23 => false,
+        24 => false,
+        25 => false,
+        26 => false,
+        27 => false,
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #993333; font-weight: bold;',
-            2 => 'color: #aa9933; font-weight: bold;',
-            3 => 'color: #aa3399; font-weight: bold;',
-            4 => 'color: #33aa99; font-weight: bold;',
-            5 => 'color: #993333; font-weight: bold;'
+            1 => 'color: #990099; font-weight: bold;',      // mix
+            2 => 'color: #990099; font-weight: bold;',      // mix
+            3 => 'color: #9900FF; font-weight: bold;',      // constants
+            4 => 'color: #999900; font-weight: bold;',      // column data types
+            5 => 'color: #999900; font-weight: bold;',      // column data types
+            6 => 'color: #FF9900; font-weight: bold;',      // attributes
+            7 => 'color: #FF9900; font-weight: bold;',      // attributes
+            8 => 'color: #9900FF; font-weight: bold;',      // date-time units
+            9 => 'color: #9900FF; font-weight: bold;',      // date-time units
+
+            10 => 'color: #CC0099; font-weight: bold;',      // operators
+            11 => 'color: #CC0099; font-weight: bold;',      // operators
+
+            12 => 'color: #009900;',     // control flow (functions)
+            13 => 'color: #000099;',     // string functions
+            14 => 'color: #000099;',     // string functions
+            15 => 'color: #000099;',     // numeric functions
+            16 => 'color: #000099;',     // numeric functions
+            17 => 'color: #000099;',     // date-time functions
+            18 => 'color: #000099;',     // date-time functions
+            19 => 'color: #000099;',     // comparison functions
+            20 => 'color: #000099;',     // comparison functions
+            21 => 'color: #000099;',     // encryption functions
+            22 => 'color: #000099;',     // aggregate functions
+            23 => 'color: #000099;',     // information functions
+            24 => 'color: #000099;',     // information functions
+            25 => 'color: #000099;',     // miscellaneous functions
+            26 => 'color: #000099;',     // miscellaneous functions
+            27 => 'color: #00CC00;',     // geometry functions
             ),
         'COMMENTS' => array(
-            'MULTI' => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808000; font-style: italic;',
             1 => 'color: #808080; font-style: italic;',
             2 => 'color: #808080; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099; font-weight: bold;'
+            0 => 'color: #004000; font-weight: bold;',
+            1 => 'color: #008080; font-weight: bold;'       // search wildcards
             ),
         'BRACKETS' => array(
-            0 => 'color: #66cc66;'
+            0 => 'color: #FF00FF;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #008000;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
+            0 => 'color: #008080;'
             ),
         'METHODS' => array(
             ),
         'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
+            1 => 'color: #CC0099;',         // operators
+            2 => 'color: #000033;',         // syntax
             ),
         'SCRIPT' => array(
             ),
@@ -170,11 +391,35 @@
             )
         ),
     'URLS' => array(
-        1 => '',
-        2 => '',
-        3 => '',
-        4 => '',
-        5 => ''
+        1 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        2 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        3 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        4 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        5 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        6 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        7 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        8 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+        9 => 'http://search.mysql.com/search?site=refman-51&q={FNAME}&lr=lang_en',
+
+        10 => 'http://dev.mysql.com/doc/refman/5.1/en/non-typed-operators.html',
+        11 => 'http://dev.mysql.com/doc/refman/5.1/en/non-typed-operators.html',
+
+        12 => 'http://dev.mysql.com/doc/refman/5.1/en/control-flow-functions.html',
+        13 => 'http://dev.mysql.com/doc/refman/5.1/en/string-functions.html',
+        14 => 'http://dev.mysql.com/doc/refman/5.1/en/string-functions.html',
+        15 => 'http://dev.mysql.com/doc/refman/5.1/en/numeric-functions.html',
+        16 => 'http://dev.mysql.com/doc/refman/5.1/en/numeric-functions.html',
+        17 => 'http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html',
+        18 => 'http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html',
+        19 => 'http://dev.mysql.com/doc/refman/5.1/en/comparison-operators.html',
+        20 => 'http://dev.mysql.com/doc/refman/5.1/en/comparison-operators.html',
+        21 => 'http://dev.mysql.com/doc/refman/5.1/en/encryption-functions.html',
+        22 => 'http://dev.mysql.com/doc/refman/5.1/en/group-by-functions-and-modifiers.html',
+        23 => 'http://dev.mysql.com/doc/refman/5.1/en/information-functions.html',
+        24 => 'http://dev.mysql.com/doc/refman/5.1/en/information-functions.html',
+        25 => 'http://dev.mysql.com/doc/refman/5.1/en/func-op-summary-ref.html',
+        26 => 'http://dev.mysql.com/doc/refman/5.1/en/func-op-summary-ref.html',
+        27 => 'http://dev.mysql.com/doc/refman/5.1/en/analysing-spatial-information.html',
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
@@ -185,6 +430,45 @@
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            5 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            9 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            11 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            14 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            16 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            18 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            20 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            24 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            26 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                )
+            )
         )
 );
 
diff -Naur dokuwiki-2009-02-14/inc/geshi/nsis.php dokuwiki-rc2009-12-02/inc/geshi/nsis.php
--- dokuwiki-2009-02-14/inc/geshi/nsis.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/nsis.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)
  * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/12/03
  *
  * Nullsoft Scriptable Install System language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/oberon2.php dokuwiki-rc2009-12-02/inc/geshi/oberon2.php
--- dokuwiki-2009-02-14/inc/geshi/oberon2.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/oberon2.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,135 @@
+ 'Oberon-2',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ARRAY', 'BEGIN', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END',
+            'EXIT', 'FOR', 'IF', 'IMPORT', 'IN', 'IS',
+            'LOOP', 'MOD', 'MODULE', 'OF',
+            'OR', 'POINTER', 'PROCEDURE', 'RECORD',
+            'REPEAT', 'RETURN', 'THEN', 'TO',
+            'TYPE', 'UNTIL', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS', 'ASH', 'ASSERT', 'CAP', 'CHR', 'COPY', 'DEC',
+            'ENTIER', 'EXCL', 'HALT', 'INC', 'INCL', 'LEN',
+            'LONG', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD', 'SHORT', 'SIZE'
+            ),
+        4 => array(
+            'BOOLEAN', 'CHAR', 'SHORTINT', 'LONGINT',
+            'INTEGER', 'LONGREAL', 'REAL', 'SET', 'PTR'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/objc.php dokuwiki-rc2009-12-02/inc/geshi/objc.php
--- dokuwiki-2009-02-14/inc/geshi/objc.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/objc.php	2009-12-02 19:50:11.000000000 +0100
@@ -5,7 +5,7 @@
  * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
  * Contributors: Quinn Taylor (quinntaylor@mac.com)
  * Copyright: (c) 2008 Quinn Taylor, 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * Objective-C language file for GeSHi.
@@ -49,8 +49,8 @@
 
 $language_data = array (
     'LANG_NAME' => 'Objective-C',
-	'COMMENT_SINGLE' => array(
-	    //Compiler directives
+    'COMMENT_SINGLE' => array(
+        //Compiler directives
         1 => '#',
         //Single line C-Comments
         2 => '//'
@@ -63,12 +63,12 @@
         3 => "/@(?=\")/"
         ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
-	'QUOTEMARKS' => array('"', "'"),
+    'QUOTEMARKS' => array('"', "'"),
     'ESCAPE_CHAR' => '\\',
 
     'KEYWORDS' => array(
-		// Objective-C keywords
-		1 => array(
+        // Objective-C keywords
+        1 => array(
             'while', 'switch', 'return', 'in', 'if', 'goto', 'foreach', 'for',
             'else', 'do', 'default', 'continue', 'case', '@try', '@throw',
             '@synthesize', '@synchronized', '@selector', '@public', '@protocol',
@@ -76,13 +76,13 @@
             '@implementation', '@finally', '@end', '@encode', '@defs', '@class',
             '@catch'
             ),
-		// Macros and constants
-		2 => array(
+        // Macros and constants
+        2 => array(
             'YES', 'USHRT_MAX', 'ULONG_MAX', 'UINT_MAX', 'UCHAR_MAX', 'true',
             'TMP_MAX', 'stdout', 'stdin', 'stderr', 'SIGTERM', 'SIGSEGV',
             'SIGINT', 'SIGILL', 'SIG_IGN', 'SIGFPE', 'SIG_ERR', 'SIG_DFL',
             'SIGABRT', 'SHRT_MIN', 'SHRT_MAX', 'SEEK_SET', 'SEEK_END',
-            'SEEK_CUR', 'SCHAR_MIN', 'SCHAR_MAX', 'RAND_MAX', 'NULL', 'NULL',
+            'SEEK_CUR', 'SCHAR_MIN', 'SCHAR_MAX', 'RAND_MAX', 'NULL',
             'NO', 'nil', 'Nil', 'L_tmpnam', 'LONG_MIN', 'LONG_MAX',
             'LDBL_MIN_EXP', 'LDBL_MIN', 'LDBL_MAX_EXP', 'LDBL_MAX',
             'LDBL_MANT_DIG', 'LDBL_EPSILON', 'LDBL_DIG', 'INT_MIN', 'INT_MAX',
@@ -94,8 +94,8 @@
             'CLOCKS_PER_SEC', 'CHAR_MIN', 'CHAR_MAX', 'CHAR_BIT', 'BUFSIZ',
             'break'
             ),
-		// C standard library functions
-		3 => array(
+        // C standard library functions
+        3 => array(
             'vsprintf', 'vprintf', 'vfprintf', 'va_start', 'va_end', 'va_arg',
             'ungetc', 'toupper', 'tolower', 'tmpname', 'tmpfile', 'time',
             'tanh', 'tan', 'system', 'strxfrm', 'strtoul', 'strtol', 'strtok',
@@ -108,7 +108,7 @@
             'printf', 'pow', 'perror', 'offsetof', 'modf', 'mktime', 'memset',
             'memmove', 'memcpy', 'memcmp', 'memchr', 'malloc', 'longjmp',
             'log10', 'log', 'localtime', 'ldiv', 'ldexp', 'labs', 'isxdigit',
-            'isupper', 'isspace', 'ispunct', 'ispunct', 'isprint', 'islower',
+            'isupper', 'isspace', 'ispunct', 'isprint', 'islower',
             'isgraph', 'isdigit', 'iscntrl', 'isalpha', 'isalnum', 'gmtime',
             'gets', 'getenv', 'getchar', 'getc', 'fwrite', 'ftell', 'fsetpos',
             'fseek', 'fscanf', 'frexp', 'freopen', 'free', 'fread', 'fputs',
@@ -116,20 +116,20 @@
             'fgetc', 'fflush', 'ferror', 'feof', 'fclose', 'fabs', 'exp',
             'exit', 'div', 'difftime', 'ctime', 'cosh', 'cos', 'clock',
             'clearerr', 'ceil', 'calloc', 'bsearch', 'atol', 'atoi', 'atof',
-            'atexit', 'atan2', 'atan2', 'atan', 'atan', 'assert', 'asin',
-            'asin', 'asctime', 'acos', 'acos', 'abs', 'abort'
+            'atexit', 'atan2', 'atan', 'assert', 'asin', 'asctime', 'acos',
+            'abs', 'abort'
             ),
-		// Data types (C, Objective-C, Cocoa)
-		4 => array(
+        // Data types (C, Objective-C, Cocoa)
+        4 => array(
             'volatile', 'void', 'va_list', 'unsigned', 'union', 'typedef', 'tm',
-            'time_t', 'struct', 'string', 'static', 'size_t', 'sizeof',
+            'time_t', 'struct', 'string', 'static', 'size_t',
             'signed', 'signal', 'short', 'SEL', 'register', 'raise',
             'ptrdiff_t', 'NSZone', 'NSRect', 'NSRange', 'NSPoint', 'long',
             'ldiv_t', 'jmp_buf', 'int', 'IMP', 'id', 'fpos_t', 'float', 'FILE',
             'extern', 'double', 'div_t', 'const', 'clock_t', 'Class', 'char',
             'BOOL', 'auto'
             ),
-		// Foundation classes
+        // Foundation classes
         5 => array(
             'NSXMLParser', 'NSXMLNode', 'NSXMLElement', 'NSXMLDTDNode',
             'NSXMLDTD', 'NSXMLDocument', 'NSWhoseSpecifier',
@@ -186,18 +186,18 @@
             'NSAppleEventDescriptor', 'NSAffineTransform'
             ),
         // Foundation protocols
-		6 => array(
+        6 => array(
             'NSURLProtocolClient', 'NSURLHandleClient', 'NSURLClient',
             'NSURLAuthenticationChallengeSender', 'NSScriptObjectSpecifiers',
             'NSScriptKeyValueCoding', 'NSScriptingComparisonMethods',
-            'NSObject', 'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
+            'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
             'NSLocking', 'NSKeyValueObserving', 'NSKeyValueCoding',
             'NSFastEnumeration', 'NSErrorRecoveryAttempting',
             'NSDecimalNumberBehaviors', 'NSCopying', 'NSComparisonMethods',
             'NSCoding'
             ),
-		// AppKit classes
-		7 => array(
+        // AppKit classes
+        7 => array(
             'NSWorkspace', 'NSWindowController', 'NSWindow', 'NSViewController',
             'NSViewAnimation', 'NSView', 'NSUserDefaultsController',
             'NSTypesetter', 'NSTreeNode', 'NSTreeController', 'NSTrackingArea',
@@ -245,11 +245,11 @@
             'NSArrayController', 'NSApplication', 'NSAnimationContext',
             'NSAnimation', 'NSAlert', 'NSActionCell'
             ),
-		// AppKit protocols
-		8 => array(
+        // AppKit protocols
+        8 => array(
             'NSWindowScripting', 'NSValidatedUserInterfaceItem',
             'NSUserInterfaceValidations', 'NSToolTipOwner',
-            'NSToolbarItemValidation', 'NSTextInput', 'NSTextAttachmentCell',
+            'NSToolbarItemValidation', 'NSTextInput',
             'NSTableDataSource', 'NSServicesRequests',
             'NSPrintPanelAccessorizing', 'NSPlaceholders',
             'NSPathControlDelegate', 'NSPathCellDelegate',
@@ -263,8 +263,8 @@
             'NSColorPickingDefault', 'NSColorPickingCustom', 'NSChangeSpelling',
             'NSAnimatablePropertyContainer', 'NSAccessibility'
             ),
-		// CoreData classes
-		9 => array(
+        // CoreData classes
+        9 => array(
             'NSRelationshipDescription', 'NSPropertyMapping',
             'NSPropertyDescription', 'NSPersistentStoreCoordinator',
             'NSPersistentStore', 'NSMigrationManager', 'NSMappingModel',
@@ -280,52 +280,52 @@
         '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
         ),
     'CASE_SENSITIVE' => array(
-		GESHI_COMMENTS => true,
-		1 => true,
-		2 => true,
-		3 => true,
-		4 => true,
-		5 => true,
-		6 => true,
-		7 => true,
-		8 => true,
-		9 => true
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
         ),
-	// Define the colors for the groups listed above
+    // Define the colors for the groups listed above
     'STYLES' => array(
         'KEYWORDS' => array(
-			1 => 'color: #a61390;',	// Objective-C keywords
-			2 => 'color: #a61390;',	// Macros and constants
-			3 => 'color: #a61390;',	// C standard library functions
-			4 => 'color: #a61390;',	// data types
-			5 => 'color: #400080;',	// Foundation classes
-			6 => 'color: #2a6f76;',	// Foundation protocols
-			7 => 'color: #400080;',	// AppKit classes
-			8 => 'color: #2a6f76;',	// AppKit protocols
-			9 => 'color: #400080;'	// CoreData classes
+            1 => 'color: #a61390;', // Objective-C keywords
+            2 => 'color: #a61390;', // Macros and constants
+            3 => 'color: #a61390;', // C standard library functions
+            4 => 'color: #a61390;', // data types
+            5 => 'color: #400080;', // Foundation classes
+            6 => 'color: #2a6f76;', // Foundation protocols
+            7 => 'color: #400080;', // AppKit classes
+            8 => 'color: #2a6f76;', // AppKit protocols
+            9 => 'color: #400080;' // CoreData classes
             ),
         'COMMENTS' => array(
-			1 => 'color: #6e371a;',	// Preprocessor directives
-			2 => 'color: #11740a; font-style: italic;',	// Normal C single-line comments
-			3 => 'color: #bf1d1a;', // Q-sign in front of Strings
-			'MULTI' => 'color: #11740a; font-style: italic;'
+            1 => 'color: #6e371a;', // Preprocessor directives
+            2 => 'color: #11740a; font-style: italic;', // Normal C single-line comments
+            3 => 'color: #bf1d1a;', // Q-sign in front of Strings
+            'MULTI' => 'color: #11740a; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
-		    0 => 'color: #2400d9;'
+            0 => 'color: #2400d9;'
             ),
         'BRACKETS' => array(
-		    0 => 'color: #002200;'
+            0 => 'color: #002200;'
             ),
         'STRINGS' => array(
-		    0 => 'color: #bf1d1a;'
+            0 => 'color: #bf1d1a;'
             ),
         'NUMBERS' => array(
-		    0 => 'color: #2400d9;'
+            0 => 'color: #2400d9;'
             ),
         'METHODS' => array(
             ),
         'SYMBOLS' => array(
-		    0 => 'color: #002200;'
+            0 => 'color: #002200;'
             ),
         'REGEXPS' => array(
             ),
@@ -335,13 +335,13 @@
     'URLS' => array(
         1 => '',
         2 => '',
-		3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAME}.html',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAME}.html',
         4 => '',
-		5 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/{FNAME}_Class/',
-		6 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Protocols/{FNAME}_Protocol/',
-		7 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/{FNAME}_Class/',
-		8 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Protocols/{FNAME}_Protocol/',
-		9 => 'http://developer.apple.com/documentation/Cocoa/Reference/CoreDataFramework/Classes/{FNAME}_Class/'
+        5 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/{FNAME}_Class/',
+        6 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Protocols/{FNAME}_Protocol/',
+        7 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/{FNAME}_Class/',
+        8 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Protocols/{FNAME}_Protocol/',
+        9 => 'http://developer.apple.com/documentation/Cocoa/Reference/CoreDataFramework/Classes/{FNAME}_Class/'
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/ocaml-brief.php dokuwiki-rc2009-12-02/inc/geshi/ocaml-brief.php
--- dokuwiki-2009-02-14/inc/geshi/ocaml-brief.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/ocaml-brief.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/08/27
  *
  * OCaml (Objective Caml) language file for GeSHi.
@@ -47,7 +47,7 @@
     'KEYWORDS' => array(
         /* main OCaml keywords */
         1 => array(
-            'and', 'As', 'asr', 'begin', 'Class', 'Closed', 'constraint', 'do', 'done', 'downto', 'else',
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
             'end', 'exception', 'external', 'failwith', 'false', 'flush', 'for', 'fun', 'function', 'functor',
             'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
             'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
@@ -57,9 +57,9 @@
         ),
     /* highlighting symbols is really important in OCaml */
     'SYMBOLS' => array(
-            ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
-            '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
-            ),
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
+        ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => false,
diff -Naur dokuwiki-2009-02-14/inc/geshi/ocaml.php dokuwiki-rc2009-12-02/inc/geshi/ocaml.php
--- dokuwiki-2009-02-14/inc/geshi/ocaml.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/ocaml.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Flaie (fireflaie@gmail.com)
  * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/08/27
  *
  * OCaml (Objective Caml) language file for GeSHi.
@@ -47,10 +47,10 @@
     'QUOTEMARKS' => array('"'),
     'ESCAPE_CHAR' => "",
     'KEYWORDS' => array(
-       /* main OCaml keywords */
+        /* main OCaml keywords */
         1 => array(
             'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
-            'end', 'exception', 'external', 'failwith', 'false', 'flush', 'for', 'fun', 'function', 'functor',
+            'end', 'exception', 'external', 'failwith', 'false', 'for', 'fun', 'function', 'functor',
             'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
             'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
             'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
@@ -68,26 +68,32 @@
             ),
         /* just link to the Pervasives functions library, cause it's the default opened library when starting OCaml */
         3 => array(
-            'raise', 'invalid_arg', 'failwith', 'compare', 'min', 'max', 'succ', 'pred', 'mod', 'abs',
-            'max_int', 'min_int', 'sqrt', 'exp', 'log', 'log10', 'cos', 'sin', 'tan', 'acos', 'asin',
-            'atan', 'atan2', 'cosh', 'sinh', 'tanh', 'ceil', 'floor', 'abs_float', 'mod_float', 'frexp',
-            'ldexp', 'modf', 'float', 'float_of_int', 'truncate', 'int_of_float', 'infinity', 'nan',
-            'max_float', 'min_float', 'epsilon_float', 'classify_float', 'int_of_char', 'char_of_int',
-            'ignore', 'string_of_bool', 'bool_of_string', 'string_of_int', 'int_of_string',
-            'string_of_float', 'float_of_string', 'fst', 'snd', 'stdin', 'stdout', 'stderr', 'print_char',
-            'print_string', 'print_int', 'print_float', 'print_endline', 'print_newline', 'prerr_char',
-            'prerr_string', 'prerr_int', 'prerr_float', 'prerr_endline', 'prerr_newline', 'read_line',
-            'read_int', 'read_float', 'open_out', 'open_out_bin', 'open_out_gen', 'flush', 'flush_all',
-            'output_char', 'output_string', 'output', 'output_byte', 'output_binary_int', 'output_value',
-            'seek_out', 'pos_out',  'out_channel_length', 'close_out', 'close_out_noerr', 'set_binary_mode_out',
-            'open_in', 'open_in_bin', 'open_in_gen', 'input_char', 'input_line', 'input', 'really_input',
-            'input_byte', 'input_binary_int', 'input_value', 'seek_in', 'pos_in', 'in_channel_length',
-            'close_in', 'close_in_noerr', 'set_binary_mode_in', 'incr', 'decr', 'string_of_format',
-            'format_of_string', 'exit', 'at_exit'
+            'abs', 'abs_float', 'acos', 'asin', 'at_exit', 'atan', 'atan2',
+            'bool_of_string', 'ceil', 'char_of_int', 'classify_float',
+            'close_in', 'close_in_noerr', 'close_out', 'close_out_noerr',
+            'compare', 'cos', 'cosh', 'decr', 'epsilon_float', 'exit', 'exp',
+            'float', 'float_of_int', 'float_of_string', 'floor', 'flush',
+            'flush_all', 'format_of_string', 'frexp', 'fst', 'ignore',
+            'in_channel_length', 'infinity', 'input', 'input_binary_int',
+            'input_byte', 'input_char', 'input_line', 'input_value',
+            'int_of_char', 'int_of_float', 'int_of_string', 'invalid_arg',
+            'ldexp', 'log', 'log10', 'max', 'max_float', 'max_int', 'min',
+            'min_float', 'min_int', 'mod_float', 'modf', 'nan', 'open_in',
+            'open_in_bin', 'open_in_gen', 'open_out', 'open_out_bin',
+            'open_out_gen', 'out_channel_length', 'output', 'output_binary_int',
+            'output_byte', 'output_char', 'output_string', 'output_value',
+            'pos_in', 'pos_out',  'pred', 'prerr_char', 'prerr_endline',
+            'prerr_float', 'prerr_int', 'prerr_newline', 'prerr_string',
+            'print_char', 'print_endline', 'print_float', 'print_int',
+            'print_newline', 'print_string', 'read_float', 'read_int',
+            'read_line', 'really_input', 'seek_in', 'seek_out',
+            'set_binary_mode_in', 'set_binary_mode_out', 'sin', 'sinh', 'snd',
+            'sqrt', 'string_of_bool', 'string_of_float', 'string_of_format',
+            'string_of_int', 'succ', 'tan', 'tanh', 'truncate'
             ),
         /* here Pervasives Types */
         4 => array (
-            'fpclass', 'in_channel', 'out_channel', 'open_flag', 'Sys_error', 'ref', 'format'
+            'fpclass', 'in_channel', 'out_channel', 'open_flag', 'Sys_error', 'format'
             ),
         /* finally Pervasives Exceptions */
         5 => array (
diff -Naur dokuwiki-2009-02-14/inc/geshi/oobas.php dokuwiki-rc2009-12-02/inc/geshi/oobas.php
--- dokuwiki-2009-02-14/inc/geshi/oobas.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/oobas.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * OpenOffice.org Basic language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/oracle11.php dokuwiki-rc2009-12-02/inc/geshi/oracle11.php
--- dokuwiki-2009-02-14/inc/geshi/oracle11.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/oracle11.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,614 @@
+ 'Oracle 11 SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+//        6 => array(
+//            ),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+//        5 => array(
+//            ),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+//        4 => array(
+//            ),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+//        3 => array(
+//            ),
+
+        //Put ORACLE reserved keywords here (11i).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'APPENDCHILDXML',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASCIISTR',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BIN_TO_NUM',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CARDINALITY',
+            'CASCADE',
+            'CASE',
+            'CAST',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'CLUSTER_ID',
+            'CLUSTER_PROBABILITY',
+            'CLUSTER_SET',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPOSE',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'CORR_K',
+            'CORR_S',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUBE_TABLE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRENT_DATE',
+            'CURRENT_TIMESTAMP',
+            'CURRVAL',
+            'CURSOR',
+            'CV',
+            'DATABASE',
+            'DATAOBJ_TO_PARTITION',
+            'DATE',
+            'DAY',
+            'DBTIMEZONE',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DECOMPOSE',
+            'DEFAULT',
+            'DELETE',
+            'DELETEXML',
+            'DENSE_RANK',
+            'DEPTH',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXISTSNODE',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'EXTRACTVALUE',
+            'FALSE',
+            'FEATURE_ID',
+            'FEATURE_SET',
+            'FEATURE_VALUE',
+            'FETCH',
+            'FILE',
+            'FIRST',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FROM_TZ',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUP_ID',
+            'GROUPING',
+            'GROUPING_ID',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSERTCHILDXML',
+            'INSERTXMLBEFORE',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'ITERATION_NUMBER',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LNNVL',
+            'LOCALTIMESTAMP',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MEDIAN',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NANVL',
+            'NATURAL',
+            'NATURALN',
+            'NCHR',
+            'NEW',
+            'NEW_TIME',
+            'NEXT_DAY',
+            'NEXTVAL',
+            'NLS_CHARSET_DECL_LEN',
+            'NLS_CHARSET_ID',
+            'NLS_CHARSET_NAME',
+            'NLS_INITCAP',
+            'NLS_LOWER',
+            'NLS_UPPER',
+            'NLSSORT',
+            'NOAUDIT',
+            'NOCOMPRESS',
+            'NOCOPY',
+            'NOT',
+            'NOWAIT',
+            'NTILE',
+            'NULL',
+            'NULLIF',
+            'NUMBER',
+            'NUMBER_BASE',
+            'NUMTODSINTERVAL',
+            'NUMTOYMINTERVAL',
+            'NVL',
+            'NVL2',
+            'OCIROWID',
+            'OF',
+            'OFFLINE',
+            'ON',
+            'ONLINE',
+            'OPAQUE',
+            'OPEN',
+            'OPERATOR',
+            'OPTION',
+            'OR',
+            'ORA_HASH',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PATH',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PERCENTILE_CONT',
+            'PERCENTILE_DISC',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'POWERMULTISET',
+            'POWERMULTISET_BY_CARDINALITY',
+            'PRAGMA',
+            'PREDICTION',
+            'PREDICTION_BOUNDS',
+            'PREDICTION_COST',
+            'PREDICTION_DETAILS',
+            'PREDICTION_PROBABILITY',
+            'PREDICTION_SET',
+            'PRESENTNNV',
+            'PRESENTV',
+            'PREVIOUS',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'RAWTONHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGEXP_COUNT',
+            'REGEXP_INSTR',
+            'REGEXP_REPLACE',
+            'REGEXP_SUBSTR',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'REMAINDER',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWIDTONCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SCN_TO_TIMESTAMP',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SESSIONTIMEZONE',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STATS_BINOMIAL_TEST',
+            'STATS_CROSSTAB',
+            'STATS_F_TEST',
+            'STATS_KS_TEST',
+            'STATS_MODE',
+            'STATS_MW_TEST',
+            'STATS_ONE_WAY_ANOVA',
+            'STATS_T_TEST_INDEP',
+            'STATS_T_TEST_INDEPU',
+            'STATS_T_TEST_ONE',
+            'STATS_T_TEST_PAIRED',
+            'STATS_WSR_TEST',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONNECT_BY_PATH',
+            'SYS_CONTEXT',
+            'SYS_DBURIGEN',
+            'SYS_EXTRACT_UTC',
+            'SYS_GUID',
+            'SYS_TYPEID',
+            'SYS_XMLAGG',
+            'SYS_XMLGEN',
+            'SYSDATE',
+            'SYSTEM',
+            'SYSTIMESTAMP',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMESTAMP_TO_SCN',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_BINARY_DOUBLE',
+            'TO_BINARY_FLOAT',
+            'TO_CHAR',
+            'TO_CLOB',
+            'TO_DATE',
+            'TO_DSINTERVAL',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NCHAR',
+            'TO_NCLOB',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TO_TIMESTAMP',
+            'TO_TIMESTAMP_TZ',
+            'TO_YMINTERVAL',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TREAT',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'TZ_OFFSET',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UNISTR',
+            'UPDATE',
+            'UPDATEXML',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WIDTH_BUCKET',
+            'WITH',
+            'WORK',
+            'WRITE',
+            'XMLAGG',
+            'XMLCAST',
+            'XMLCDATA',
+            'XMLCOLATTVAL',
+            'XMLCOMMENT',
+            'XMLCONCAT',
+            'XMLDIFF',
+            'XMLELEMENT',
+            'XMLEXISTS',
+            'XMLFOREST',
+            'XMLPARSE',
+            'XMLPATCH',
+            'XMLPI',
+            'XMLQUERY',
+            'XMLROOT',
+            'XMLSEQUENCE',
+            'XMLSERIALIZE',
+            'XMLTABLE',
+            'XMLTRANSFORM',
+            'YEAR',
+            'ZONE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        3 => false,
+//        4 => false,
+//        5 => false,
+//        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        3 => '',
+//        4 => '',
+//        5 => '',
+//        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/oracle8.php dokuwiki-rc2009-12-02/inc/geshi/oracle8.php
--- dokuwiki-2009-02-14/inc/geshi/oracle8.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/oracle8.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----------
  * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * Oracle 8 language file for GeSHi.
@@ -60,6 +60,7 @@
 //Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
 //        3 => array(
 //            ),
+
 //Put ORACLE reserved keywords here (8.1.7).  I like mine uppercase.
         1 => array(
             'ABS',
diff -Naur dokuwiki-2009-02-14/inc/geshi/pascal.php dokuwiki-rc2009-12-02/inc/geshi/pascal.php
--- dokuwiki-2009-02-14/inc/geshi/pascal.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/pascal.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Tux (tux@inamil.cz)
  * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/26
  *
  * Pascal language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/perl.php dokuwiki-rc2009-12-02/inc/geshi/perl.php
--- dokuwiki-2009-02-14/inc/geshi/perl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/perl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
  * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/20
  *
  * Perl language file for GeSHi.
@@ -63,7 +63,7 @@
         '=for' => '=cut',
         '=encoding' => '=cut',
         '=pod' => '=cut'
-    ),
+        ),
     'COMMENT_REGEXP' => array(
         //Regular expressions
         2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
@@ -72,30 +72,31 @@
         //Heredoc
         4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
         //Predefined variables
-        5 => '/\$(\^[a-zA-Z]?|[\$`\'&_\.,+\-~:\\\\\/"\|%=\?!@<>\(\)\[\]])|@_/',
-    ),
+        5 => '/\$(\^[a-zA-Z]?|[\*\$`\'&_\.,+\-~:;\\\\\/"\|%=\?!@#<>\(\)\[\]])(?!\w)|@[_+\-]|%[!]|\$(?=\{)/',
+        ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"','`'),
     'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
-    'HARDESCAPE' => array('\\\'',),        // Things that must still be escaped inside a hard-quoted string
-                            // If HARDQUOTE is defined, HARDESCAPE must be defined
-                            // This will not work unless the first character of each element is either in the
-                            // QUOTEMARKS array or is the ESCAPE_CHAR
+    'HARDESCAPE' => array('\\\'',),
+        // Things that must still be escaped inside a hard-quoted string
+        // If HARDQUOTE is defined, HARDESCAPE must be defined
+        // This will not work unless the first character of each element is either in the
+        // QUOTEMARKS array or is the ESCAPE_CHAR
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
             'case', 'do', 'else', 'elsif', 'for', 'if', 'then', 'until', 'while', 'foreach', 'my',
-            'or', 'and', 'unless', 'next', 'last', 'redo', 'not', 'our',
-            'reset', 'continue','and', 'cmp', 'ne'
+            'xor', 'or', 'and', 'unless', 'next', 'last', 'redo', 'not', 'our',
+            'reset', 'continue', 'cmp', 'ne', 'eq', 'lt', 'gt', 'le', 'ge',
             ),
         2 => array(
             'use', 'sub', 'new', '__END__', '__DATA__', '__DIE__', '__WARN__', 'BEGIN',
-            'STDIN', 'STDOUT', 'STDERR'
+            'STDIN', 'STDOUT', 'STDERR', 'ARGV', 'ARGVOUT'
             ),
         3 => array(
             'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless',
             'caller', 'chdir', 'chmod', 'chomp', 'chop', 'chown', 'chr',
-            'chroot', 'close', 'closedir', 'connect', 'continue', 'cos',
+            'chroot', 'close', 'closedir', 'connect', 'cos',
             'crypt', 'dbmclose', 'dbmopen', 'defined', 'delete', 'die',
             'dump', 'each', 'endgrent', 'endhostent', 'endnetent', 'endprotoent',
             'endpwent', 'endservent', 'eof', 'eval', 'exec', 'exists', 'exit',
@@ -107,13 +108,13 @@
             'getpwnam', 'getpwuid', 'getservbyname', 'getservbyport', 'getservent',
             'getsockname', 'getsockopt', 'glob', 'gmtime', 'goto', 'grep',
             'hex', 'import', 'index', 'int', 'ioctl', 'join', 'keys', 'kill',
-            'last', 'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
+            'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
             'localtime', 'log', 'lstat', 'm', 'map', 'mkdir', 'msgctl', 'msgget',
-            'msgrcv', 'msgsnd', 'my', 'next', 'no', 'oct', 'open', 'opendir',
-            'ord', 'our', 'pack', 'package', 'pipe', 'pop', 'pos', 'print',
+            'msgrcv', 'msgsnd', 'no', 'oct', 'open', 'opendir',
+            'ord', 'pack', 'package', 'pipe', 'pop', 'pos', 'print',
             'printf', 'prototype', 'push', 'qq', 'qr', 'quotemeta', 'qw',
             'qx', 'q', 'rand', 'read', 'readdir', 'readline', 'readlink', 'readpipe',
-            'recv', 'redo', 'ref', 'rename', 'require', 'return',
+            'recv', 'ref', 'rename', 'require', 'return',
             'reverse', 'rewinddir', 'rindex', 'rmdir', 's', 'scalar', 'seek',
             'seekdir', 'select', 'semctl', 'semget', 'semop', 'send', 'setgrent',
             'sethostent', 'setnetent', 'setpgrp', 'setpriority', 'setprotoent',
@@ -129,9 +130,9 @@
         ),
     'SYMBOLS' => array(
         '<', '>', '=',
-        '!', '@', '~', '&', '|',
+        '!', '@', '~', '&', '|', '^',
         '+','-', '*', '/', '%',
-        ',', ';', '?', ':'
+        ',', ';', '?', '.', ':'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -193,7 +194,7 @@
         ),
     'REGEXPS' => array(
         //Variable
-        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        0 => '(?:\$[\$#]?|\\\\(?:[@%*]?|\\\\*\$|&)|%[$]?|@[$]?|\*[$]?|&[$]?)[a-zA-Z_][a-zA-Z0-9_]*',
         //File Descriptor
         4 => '<[a-zA-Z_][a-zA-Z0-9_]*>',
         ),
@@ -204,9 +205,9 @@
         ),
     'PARSER_CONTROL' => array(
         'COMMENTS' => array(
-           'DISALLOWED_BEFORE' => '$'
+            'DISALLOWED_BEFORE' => '$'
         )
     )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/per.php dokuwiki-rc2009-12-02/inc/geshi/per.php
--- dokuwiki-2009-02-14/inc/geshi/per.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/per.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Lars Gersmann (lars.gersmann@gmail.com)
  * Copyright: (c) 2007 Lars Gersmann
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/06/03
  *
  * Per (forms) (FOURJ's Genero 4GL) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/php-brief.php dokuwiki-rc2009-12-02/inc/geshi/php-brief.php
--- dokuwiki-2009-02-14/inc/geshi/php-brief.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/php-brief.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/02
  *
  * PHP (brief version) language file for GeSHi.
@@ -58,8 +58,9 @@
     'ESCAPE_CHAR' => '\\',
     'HARDQUOTE' => array("'", "'"),
     'HARDESCAPE' => array("\'"),
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
-                 GESHI_NUMBER_FLT_SCI_ZERO,
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
             'include', 'require', 'include_once', 'require_once',
@@ -68,7 +69,7 @@
             ),
         2 => array(
             'null', '__LINE__', '__FILE__',
-            'false', '<?php', '<?', '<?=', '?>', '<%', '<%=', '%>',
+            'false', '<?php',
             'true', 'var', 'default',
             'function', 'class', 'new', '&new', 'public', 'private', 'interface', 'extends',
             'const', 'self'
@@ -90,11 +91,16 @@
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '!', '@', '%', '&', '|', '/',
-        '<', '>',
-        '=', '-', '+', '*',
-        '.', ':', ',', ';'
+        1 => array(
+            '<%', '<%=', '%>', ''
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -136,7 +142,8 @@
             2 => 'color: #004000;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #339933;'
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
             ),
         'REGEXPS' => array(
             0 => 'color: #0000ff;'
@@ -178,8 +185,28 @@
         3 => array(
             ''
             ),
-        4 => "/(<\?(?:php)?)(?:'[^']*?'|\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(\?>|\Z)/sm",
-        5 => "/(<%)(?:'[^']*?'|\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(%>|\Z)/sm"
+        4 => "/(?<\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?\w+)\s.*?\s\k".
+            ")*(?\\?>|\Z)/sm",
+        5 => "/(?<%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?\w+)\s.*?\s\k".
+            ")*(?%>)/sm"
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         0 => true,
@@ -192,4 +219,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/php.php dokuwiki-rc2009-12-02/inc/geshi/php.php
--- dokuwiki-2009-02-14/inc/geshi/php.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/php.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/20
  *
  * PHP language file for GeSHi.
@@ -50,253 +50,969 @@
  *
  ************************************************************************************/
 
-$language_data = array (
+$language_data = array(
     'LANG_NAME' => 'PHP',
     'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
     'COMMENT_MULTI' => array('/*' => '*/'),
-    'HARDQUOTE' => array("'", "'"),
-    'HARDESCAPE' => array("\'"),
     'COMMENT_REGEXP' => array(
         //Heredoc and Nowdoc syntax
         3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+?)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
         // phpdoc comments
-        4 => '#/\*\*(?!\*).*\*/#sU'
+        4 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // Advanced # handling
+        2 => "/#.*?(?:(?=\?\>)|^)/smi"
         ),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"'),
-    'ESCAPE_CHAR' => '\\',
-    'NUMBERS' => GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
-                 GESHI_NUMBER_FLT_SCI_ZERO,
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Octal Char Specs
+        3 => "#\\\\[0-7]{1,3}#",
+        //String Parsing of Variable Names
+        4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
+        //Experimental extension supporting cascaded {${$var}} syntax
+        5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
+        //Format String support in ""-Strings
+        6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
+        ),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
     'KEYWORDS' => array(
         1 => array(
-            'include', 'require', 'include_once', 'require_once',
-            'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile',
-            'endif', 'switch', 'case', 'endswitch', 'endfor', 'endforeach',
-            'return', 'break', 'continue'
+            'as','break','case','continue','default','do','else','elseif',
+            'endfor','endforeach','endif','endswitch','endwhile','for',
+            'foreach','if','include','include_once','require','require_once',
+            'return','switch','while',
+
+            'echo','print'
             ),
         2 => array(
-            'null', '__LINE__', '__FILE__',
-            'false', '<?php', '<?', '<?=', '?>', '<%', '<%=', '%>',
-            '<script language', '</script>',
-            'true', 'var', 'default',
-            'function', 'class', 'new', '&new', 'public', 'private', 'interface', 'extends', 'self', 'const',
-            '__FUNCTION__', '__CLASS__', '__METHOD__', 'PHP_VERSION',
-            'PHP_OS', 'DEFAULT_INCLUDE_PATH', 'PEAR_INSTALL_DIR', 'PEAR_EXTENSION_DIR',
-            'PHP_EXTENSION_DIR', 'PHP_BINDIR', 'PHP_LIBDIR', 'PHP_DATADIR', 'PHP_SYSCONFDIR',
-            'PHP_LOCALSTATEDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_OUTPUT_HANDLER_START', 'PHP_OUTPUT_HANDLER_CONT',
-            'PHP_OUTPUT_HANDLER_END', 'E_ERROR', 'E_WARNING', 'E_PARSE', 'E_NOTICE',
-            'E_CORE_ERROR', 'E_CORE_WARNING', 'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_USER_ERROR',
-            'E_USER_WARNING', 'E_USER_NOTICE', 'E_ALL', 'E_STRICT'
+            '&new','</script>','<?php','<script language',
+            'class','const','declare','extends','function','global','interface',
+            'namespace','new','private','public','self','var'
             ),
         3 => array(
-            'zlib_get_coding_type','zend_version','zend_logo_guid','yp_order','yp_next',
-            'yp_match','yp_master','yp_get_default_domain','yp_first','yp_errno','yp_err_string',
-            'yp_cat','yp_all','xml_set_unparsed_entity_decl_handler','xml_set_start_namespace_decl_handler','xml_set_processing_instruction_handler','xml_set_object',
-            'xml_set_notation_decl_handler','xml_set_external_entity_ref_handler','xml_set_end_namespace_decl_handler','xml_set_element_handler','xml_set_default_handler','xml_set_character_data_handler',
-            'xml_parser_set_option','xml_parser_get_option','xml_parser_free','xml_parser_create_ns','xml_parser_create','xml_parse_into_struct',
-            'xml_parse','xml_get_error_code','xml_get_current_line_number','xml_get_current_column_number','xml_get_current_byte_index','xml_error_string',
-            'wordwrap','wddx_serialize_vars','wddx_serialize_value','wddx_packet_start','wddx_packet_end','wddx_deserialize',
-            'wddx_add_vars','vsprintf','vprintf','virtual','version_compare','var_export',
-            'var_dump','utf8_encode','utf8_decode','usort','usleep','user_error',
-            'urlencode','urldecode','unserialize','unregister_tick_function','unpack','unlink',
-            'unixtojd','uniqid','umask','uksort','ucwords','ucfirst',
-            'uasort','trim','trigger_error','touch','token_name','token_get_all',
-            'tmpfile','time','textdomain','tempnam','tanh','tan',
-            'system','syslog','symlink','substr_replace','substr_count','substr',
-            'strval','strtr','strtoupper','strtotime','strtolower','strtok',
-            'strstr','strspn','strrpos','strrev','strrchr','strpos',
-            'strncmp','strncasecmp','strnatcmp','strnatcasecmp','strlen','stristr',
-            'stripslashes','stripcslashes','strip_tags','strftime','stream_wrapper_register','stream_set_write_buffer',
-            'stream_set_timeout','stream_set_blocking','stream_select','stream_register_wrapper','stream_get_meta_data','stream_filter_prepend',
-            'stream_filter_append','stream_context_set_params','stream_context_set_option','stream_context_get_options','stream_context_create','strcspn',
-            'strcoll','strcmp','strchr','strcasecmp','str_word_count','str_shuffle',
-            'str_rot13','str_replace','str_repeat','str_pad','stat','sscanf',
-            'srand','sqrt','sql_regcase','sprintf','spliti','split',
-            'soundex','sort','socket_writev','socket_write','socket_strerror','socket_shutdown',
-            'socket_setopt','socket_set_timeout','socket_set_option','socket_set_nonblock','socket_set_blocking','socket_set_block',
-            'socket_sendto','socket_sendmsg','socket_send','socket_select','socket_recvmsg','socket_recvfrom',
-            'socket_recv','socket_readv','socket_read','socket_listen','socket_last_error','socket_iovec_set',
-            'socket_iovec_free','socket_iovec_fetch','socket_iovec_delete','socket_iovec_alloc','socket_iovec_add','socket_getsockname',
-            'socket_getpeername','socket_getopt','socket_get_status','socket_get_option','socket_create_pair','socket_create_listen',
-            'socket_create','socket_connect','socket_close','socket_clear_error','socket_bind','socket_accept',
-            'sleep','sizeof','sinh','sin','similar_text','shuffle',
-            'show_source','shmop_write','shmop_size','shmop_read','shmop_open','shmop_delete',
-            'shmop_close','shm_remove_var','shm_remove','shm_put_var','shm_get_var','shm_detach',
-            'shm_attach','shell_exec','sha1_file','sha1','settype','setlocale',
-            'setcookie','set_time_limit','set_socket_blocking','set_magic_quotes_runtime','set_include_path','set_file_buffer',
-            'set_error_handler','session_write_close','session_unset','session_unregister','session_start','session_set_save_handler',
-            'session_set_cookie_params','session_save_path','session_register','session_regenerate_id','session_name','session_module_name',
-            'session_is_registered','session_id','session_get_cookie_params','session_encode','session_destroy','session_decode',
-            'session_cache_limiter','session_cache_expire','serialize','sem_remove','sem_release','sem_get',
-            'sem_acquire','rtrim','rsort','round','rmdir','rewinddir',
-            'rewind','restore_include_path','restore_error_handler','reset','rename','register_tick_function',
-            'register_shutdown_function','realpath','readlink','readgzfile','readfile','readdir',
-            'read_exif_data','rawurlencode','rawurldecode','range','rand','rad2deg',
-            'quotemeta','quoted_printable_decode','putenv','proc_open','proc_close','printf',
-            'print_r','prev','preg_split','preg_replace_callback','preg_replace','preg_quote',
-            'preg_match_all','preg_match','preg_grep','pow','posix_uname','posix_ttyname',
-            'posix_times','posix_strerror','posix_setuid','posix_setsid','posix_setpgid','posix_setgid',
-            'posix_seteuid','posix_setegid','posix_mkfifo','posix_kill','posix_isatty','posix_getuid',
-            'posix_getsid','posix_getrlimit','posix_getpwuid','posix_getpwnam','posix_getppid','posix_getpid',
-            'posix_getpgrp','posix_getpgid','posix_getlogin','posix_getgroups','posix_getgrnam','posix_getgrgid',
-            'posix_getgid','posix_geteuid','posix_getegid','posix_getcwd','posix_get_last_error','posix_errno',
-            'posix_ctermid','pos','popen','pi','phpversion','phpinfo',
-            'phpcredits','php_uname','php_sapi_name','php_logo_guid','php_ini_scanned_files','pg_update',
-            'pg_untrace','pg_unescape_bytea','pg_tty','pg_trace','pg_setclientencoding','pg_set_client_encoding',
-            'pg_send_query','pg_select','pg_result_status','pg_result_seek','pg_result_error','pg_result',
-            'pg_query','pg_put_line','pg_port','pg_ping','pg_pconnect','pg_options',
-            'pg_numrows','pg_numfields','pg_num_rows','pg_num_fields','pg_meta_data','pg_lowrite',
-            'pg_lounlink','pg_loreadall','pg_loread','pg_loopen','pg_loimport','pg_loexport',
-            'pg_locreate','pg_loclose','pg_lo_write','pg_lo_unlink','pg_lo_tell','pg_lo_seek',
-            'pg_lo_read_all','pg_lo_read','pg_lo_open','pg_lo_import','pg_lo_export','pg_lo_create',
-            'pg_lo_close','pg_last_oid','pg_last_notice','pg_last_error','pg_insert','pg_host',
-            'pg_getlastoid','pg_get_result','pg_get_pid','pg_get_notify','pg_freeresult','pg_free_result',
-            'pg_fieldtype','pg_fieldsize','pg_fieldprtlen','pg_fieldnum','pg_fieldname','pg_fieldisnull',
-            'pg_field_type','pg_field_size','pg_field_prtlen','pg_field_num','pg_field_name','pg_field_is_null',
-            'pg_fetch_row','pg_fetch_result','pg_fetch_object','pg_fetch_assoc','pg_fetch_array','pg_fetch_all',
-            'pg_exec','pg_escape_string','pg_escape_bytea','pg_errormessage','pg_end_copy','pg_delete',
-            'pg_dbname','pg_copy_to','pg_copy_from','pg_convert','pg_connection_status','pg_connection_reset',
-            'pg_connection_busy','pg_connect','pg_cmdtuples','pg_close','pg_clientencoding','pg_client_encoding',
-            'pg_cancel_query','pg_affected_rows','pfsockopen','pclose','pathinfo','passthru',
-            'parse_url','parse_str','parse_ini_file','pack','overload','output_reset_rewrite_vars',
-            'output_add_rewrite_var','ord','openssl_x509_read','openssl_x509_parse','openssl_x509_free','openssl_x509_export_to_file',
-            'openssl_x509_export','openssl_x509_checkpurpose','openssl_x509_check_private_key','openssl_verify','openssl_sign','openssl_seal',
-            'openssl_public_encrypt','openssl_public_decrypt','openssl_private_encrypt','openssl_private_decrypt','openssl_pkey_new','openssl_pkey_get_public',
-            'openssl_pkey_get_private','openssl_pkey_free','openssl_pkey_export_to_file','openssl_pkey_export','openssl_pkcs7_verify','openssl_pkcs7_sign',
-            'openssl_pkcs7_encrypt','openssl_pkcs7_decrypt','openssl_open','openssl_get_publickey','openssl_get_privatekey','openssl_free_key',
-            'openssl_error_string','openssl_csr_sign','openssl_csr_new','openssl_csr_export_to_file','openssl_csr_export','openlog',
-            'opendir','octdec','ob_start','ob_list_handlers','ob_implicit_flush','ob_iconv_handler',
-            'ob_gzhandler','ob_get_status','ob_get_level','ob_get_length','ob_get_flush','ob_get_contents',
-            'ob_get_clean','ob_flush','ob_end_flush','ob_end_clean','ob_clean','number_format',
-            'nl_langinfo','nl2br','ngettext','next','natsort','natcasesort',
-            'mysql_unbuffered_query','mysql_thread_id','mysql_tablename','mysql_table_name','mysql_stat','mysql_selectdb',
-            'mysql_select_db','mysql_result','mysql_real_escape_string','mysql_query','mysql_ping','mysql_pconnect',
-            'mysql_numrows','mysql_numfields','mysql_num_rows','mysql_num_fields','mysql_listtables','mysql_listfields',
-            'mysql_listdbs','mysql_list_tables','mysql_list_processes','mysql_list_fields','mysql_list_dbs','mysql_insert_id',
-            'mysql_info','mysql_get_server_info','mysql_get_proto_info','mysql_get_host_info','mysql_get_client_info','mysql_freeresult',
-            'mysql_free_result','mysql_fieldtype','mysql_fieldtable','mysql_fieldname','mysql_fieldlen','mysql_fieldflags',
-            'mysql_field_type','mysql_field_table','mysql_field_seek','mysql_field_name','mysql_field_len','mysql_field_flags',
-            'mysql_fetch_row','mysql_fetch_object','mysql_fetch_lengths','mysql_fetch_field','mysql_fetch_assoc','mysql_fetch_array',
-            'mysql_escape_string','mysql_error','mysql_errno','mysql_dropdb','mysql_drop_db','mysql_dbname',
-            'mysql_db_query','mysql_db_name','mysql_data_seek','mysql_createdb','mysql_create_db','mysql_connect',
-            'mysql_close','mysql_client_encoding','mysql_affected_rows','mysql','mt_srand','mt_rand',
-            'mt_getrandmax','move_uploaded_file','money_format','mktime','mkdir','min',
-            'microtime','method_exists','metaphone','memory_get_usage','md5_file','md5',
-            'mbsubstr','mbstrrpos','mbstrpos','mbstrlen','mbstrcut','mbsplit',
-            'mbregex_encoding','mberegi_replace','mberegi','mbereg_search_setpos','mbereg_search_regs','mbereg_search_pos',
-            'mbereg_search_init','mbereg_search_getregs','mbereg_search_getpos','mbereg_search','mbereg_replace','mbereg_match',
-            'mbereg','mb_substr_count','mb_substr','mb_substitute_character','mb_strwidth','mb_strtoupper',
-            'mb_strtolower','mb_strrpos','mb_strpos','mb_strlen','mb_strimwidth','mb_strcut',
-            'mb_split','mb_send_mail','mb_regex_set_options','mb_regex_encoding','mb_preferred_mime_name','mb_parse_str',
-            'mb_output_handler','mb_language','mb_internal_encoding','mb_http_output','mb_http_input','mb_get_info',
-            'mb_eregi_replace','mb_eregi','mb_ereg_search_setpos','mb_ereg_search_regs','mb_ereg_search_pos','mb_ereg_search_init',
-            'mb_ereg_search_getregs','mb_ereg_search_getpos','mb_ereg_search','mb_ereg_replace','mb_ereg_match','mb_ereg',
-            'mb_encode_numericentity','mb_encode_mimeheader','mb_detect_order','mb_detect_encoding','mb_decode_numericentity','mb_decode_mimeheader',
-            'mb_convert_variables','mb_convert_kana','mb_convert_encoding','mb_convert_case','max','mail',
-            'magic_quotes_runtime','ltrim','lstat','long2ip','log1p','log10',
-            'log','localtime','localeconv','linkinfo','link','levenshtein',
-            'lcg_value','ksort','krsort','key_exists','key','juliantojd',
-            'join','jewishtojd','jdtounix','jdtojulian','jdtojewish','jdtogregorian',
-            'jdtofrench','jdmonthname','jddayofweek','is_writeable','is_writable','is_uploaded_file',
-            'is_subclass_of','is_string','is_scalar','is_resource','is_real','is_readable',
-            'is_object','is_numeric','is_null','is_nan','is_long','is_link',
-            'is_integer','is_int','is_infinite','is_float','is_finite','is_file',
-            'is_executable','is_double','is_dir','is_callable','is_bool','is_array',
-            'is_a','iptcparse','iptcembed','ip2long','intval','ini_set',
-            'ini_restore','ini_get_all','ini_get','ini_alter','in_array','import_request_variables',
-            'implode','image_type_to_mime_type','ignore_user_abort','iconv_set_encoding','iconv_get_encoding','iconv',
-            'i18n_mime_header_encode','i18n_mime_header_decode','i18n_ja_jp_hantozen','i18n_internal_encoding','i18n_http_output','i18n_http_input',
-            'i18n_discover_encoding','i18n_convert','hypot','htmlspecialchars','htmlentities','html_entity_decode',
-            'highlight_string','highlight_file','hexdec','hebrevc','hebrev','headers_sent',
-            'header','gzwrite','gzuncompress','gztell','gzseek','gzrewind',
-            'gzread','gzputs','gzpassthru','gzopen','gzinflate','gzgetss',
-            'gzgets','gzgetc','gzfile','gzeof','gzencode','gzdeflate',
-            'gzcompress','gzclose','gregoriantojd','gmstrftime','gmmktime','gmdate',
-            'glob','gettype','gettimeofday','gettext','getservbyport','getservbyname',
-            'getrusage','getrandmax','getprotobynumber','getprotobyname','getopt','getmyuid',
-            'getmypid','getmyinode','getmygid','getmxrr','getlastmod','getimagesize',
-            'gethostbynamel','gethostbyname','gethostbyaddr','getenv','getdate','getcwd',
-            'getallheaders','get_resource_type','get_required_files','get_parent_class','get_object_vars','get_meta_tags',
-            'get_magic_quotes_runtime','get_magic_quotes_gpc','get_loaded_extensions','get_included_files','get_include_path','get_html_translation_table',
-            'get_extension_funcs','get_defined_vars','get_defined_functions','get_defined_constants','get_declared_classes','get_current_user',
-            'get_class_vars','get_class_methods','get_class','get_cfg_var','get_browser','fwrite',
-            'function_exists','func_num_args','func_get_args','func_get_arg','ftruncate','ftp_systype',
-            'ftp_ssl_connect','ftp_size','ftp_site','ftp_set_option','ftp_rmdir','ftp_rename',
-            'ftp_rawlist','ftp_quit','ftp_pwd','ftp_put','ftp_pasv','ftp_nlist',
-            'ftp_nb_put','ftp_nb_get','ftp_nb_fput','ftp_nb_fget','ftp_nb_continue','ftp_mkdir',
-            'ftp_mdtm','ftp_login','ftp_get_option','ftp_get','ftp_fput','ftp_fget',
-            'ftp_exec','ftp_delete','ftp_connect','ftp_close','ftp_chdir','ftp_cdup',
-            'ftok','ftell','fstat','fsockopen','fseek','fscanf',
-            'frenchtojd','fread','fputs','fpassthru','fopen','fnmatch',
-            'fmod','flush','floor','flock','floatval','filetype',
-            'filesize','filepro_rowcount','filepro_retrieve','filepro_fieldwidth','filepro_fieldtype','filepro_fieldname',
-            'filepro_fieldcount','filepro','fileperms','fileowner','filemtime','fileinode',
-            'filegroup','filectime','fileatime','file_get_contents','file_exists','file',
-            'fgetss','fgets','fgetcsv','fgetc','fflush','feof',
-            'fclose','ezmlm_hash','extract','extension_loaded','expm1','explode',
-            'exp','exif_thumbnail','exif_tagname','exif_read_data','exif_imagetype','exec',
-            'escapeshellcmd','escapeshellarg','error_reporting','error_log','eregi_replace','eregi',
-            'ereg_replace','ereg','end','easter_days','easter_date','each',
-            'doubleval','dngettext','dl','diskfreespace','disk_total_space','disk_free_space',
-            'dirname','dir','dgettext','deg2rad','defined','define_syslog_variables',
-            'define','decoct','dechex','decbin','debug_zval_dump','debug_backtrace',
-            'deaggregate','dcngettext','dcgettext','dba_sync','dba_replace','dba_popen',
-            'dba_optimize','dba_open','dba_nextkey','dba_list','dba_insert','dba_handlers',
-            'dba_firstkey','dba_fetch','dba_exists','dba_delete','dba_close','date',
-            'current','ctype_xdigit','ctype_upper','ctype_space','ctype_punct','ctype_print',
-            'ctype_lower','ctype_graph','ctype_digit','ctype_cntrl','ctype_alpha','ctype_alnum',
-            'crypt','create_function','crc32','count_chars','count','cosh',
-            'cos','copy','convert_cyr_string','constant','connection_status','connection_aborted',
-            'compact','closelog','closedir','clearstatcache','class_exists','chunk_split',
-            'chr','chown','chop','chmod','chgrp','checkdnsrr',
-            'checkdate','chdir','ceil','call_user_method_array','call_user_method','call_user_func_array',
-            'call_user_func','cal_to_jd','cal_info','cal_from_jd','cal_days_in_month','bzwrite',
-            'bzread','bzopen','bzflush','bzerrstr','bzerror','bzerrno',
-            'bzdecompress','bzcompress','bzclose','bindtextdomain','bindec','bind_textdomain_codeset',
-            'bin2hex','bcsub','bcsqrt','bcscale','bcpow','bcmul',
-            'bcmod','bcdiv','bccomp','bcadd','basename','base_convert',
-            'base64_encode','base64_decode','atanh','atan2','atan','assert_options',
-            'assert','asort','asinh','asin','arsort','array_walk',
-            'array_values','array_unshift','array_unique','array_sum','array_splice','array_slice',
-            'array_shift','array_search','array_reverse','array_reduce','array_rand','array_push',
-            'array_pop','array_pad','array_multisort','array_merge_recursive','array_merge','array_map',
-            'array_keys','array_key_exists','array_intersect_assoc','array_intersect','array_flip','array_filter',
-            'array_fill','array_diff_assoc','array_diff','array_count_values','array_chunk','array_change_key_case',
-            'apache_setenv','apache_response_headers','apache_request_headers','apache_note','apache_lookup_uri','apache_get_version',
-            'apache_child_terminate','aggregation_info','aggregate_properties_by_regexp','aggregate_properties_by_list','aggregate_properties','aggregate_methods_by_regexp',
-            'aggregate_methods_by_list','aggregate_methods','aggregate','addslashes','addcslashes','acosh',
-            'acos','abs','_','echo', 'print', 'global', 'static', 'exit', 'array', 'empty',
-            'eval', 'isset', 'unset', 'die', 'list'
+            'abs','acos','acosh','addcslashes','addslashes','aggregate',
+            'aggregate_methods','aggregate_methods_by_list',
+            'aggregate_methods_by_regexp','aggregate_properties',
+            'aggregate_properties_by_list','aggregate_properties_by_regexp',
+            'aggregation_info','apache_child_terminate','apache_get_modules',
+            'apache_get_version','apache_getenv','apache_lookup_uri',
+            'apache_note','apache_request_headers','apache_response_headers',
+            'apache_setenv','array','array_change_key_case','array_chunk',
+            'array_combine','array_count_values','array_diff',
+            'array_diff_assoc','array_diff_key','array_diff_uassoc',
+            'array_diff_ukey','array_fill','array_fill_keys','array_filter',
+            'array_flip','array_intersect','array_intersect_assoc',
+            'array_intersect_key','array_intersect_uassoc',
+            'array_intersect_ukey','array_key_exists','array_keys','array_map',
+            'array_merge','array_merge_recursive','array_multisort','array_pad',
+            'array_pop','array_product','array_push','array_rand',
+            'array_reduce','array_reverse','array_search','array_shift',
+            'array_slice','array_splice','array_sum','array_udiff',
+            'array_udiff_assoc','array_udiff_uassoc','array_uintersect',
+            'array_uintersect_assoc','array_uintersect_uassoc','array_unique',
+            'array_unshift','array_values','array_walk','array_walk_recursive',
+            'arsort','asin','asinh','asort','assert','assert_options','atan',
+            'atan2','atanh','base_convert','base64_decode','base64_encode',
+            'basename','bcadd','bccomp','bcdiv','bcmod','bcmul',
+            'bcompiler_load','bcompiler_load_exe','bcompiler_parse_class',
+            'bcompiler_read','bcompiler_write_class','bcompiler_write_constant',
+            'bcompiler_write_exe_footer','bcompiler_write_file',
+            'bcompiler_write_footer','bcompiler_write_function',
+            'bcompiler_write_functions_from_file','bcompiler_write_header',
+            'bcompiler_write_included_filename','bcpow','bcpowmod','bcscale',
+            'bcsqrt','bcsub','bin2hex','bindec','bindtextdomain',
+            'bind_textdomain_codeset','bitset_empty','bitset_equal',
+            'bitset_excl','bitset_fill','bitset_from_array','bitset_from_hash',
+            'bitset_from_string','bitset_in','bitset_incl',
+            'bitset_intersection','bitset_invert','bitset_is_empty',
+            'bitset_subset','bitset_to_array','bitset_to_hash',
+            'bitset_to_string','bitset_union','blenc_encrypt','bzclose',
+            'bzcompress','bzdecompress','bzerrno','bzerror','bzerrstr',
+            'bzflush','bzopen','bzread','bzwrite','cal_days_in_month',
+            'cal_from_jd','cal_info','cal_to_jd','call_user_func',
+            'call_user_func_array','call_user_method','call_user_method_array',
+            'ceil','chdir','checkdate','checkdnsrr','chgrp','chmod','chop',
+            'chown','chr','chunk_split','class_exists','class_implements',
+            'class_parents','classkit_aggregate_methods',
+            'classkit_doc_comments','classkit_import','classkit_method_add',
+            'classkit_method_copy','classkit_method_redefine',
+            'classkit_method_remove','classkit_method_rename','clearstatcache',
+            'closedir','closelog','com_create_guid','com_event_sink',
+            'com_get_active_object','com_load_typelib','com_message_pump',
+            'com_print_typeinfo','compact','confirm_phpdoc_compiled',
+            'connection_aborted','connection_status','constant',
+            'convert_cyr_string','convert_uudecode','convert_uuencode','copy',
+            'cos','cosh','count','count_chars','cpdf_add_annotation',
+            'cpdf_add_outline','cpdf_arc','cpdf_begin_text','cpdf_circle',
+            'cpdf_clip','cpdf_close','cpdf_closepath',
+            'cpdf_closepath_fill_stroke','cpdf_closepath_stroke',
+            'cpdf_continue_text','cpdf_curveto','cpdf_end_text','cpdf_fill',
+            'cpdf_fill_stroke','cpdf_finalize','cpdf_finalize_page',
+            'cpdf_global_set_document_limits','cpdf_import_jpeg','cpdf_lineto',
+            'cpdf_moveto','cpdf_newpath','cpdf_open','cpdf_output_buffer',
+            'cpdf_page_init','cpdf_rect','cpdf_restore','cpdf_rlineto',
+            'cpdf_rmoveto','cpdf_rotate','cpdf_rotate_text','cpdf_save',
+            'cpdf_save_to_file','cpdf_scale','cpdf_set_action_url',
+            'cpdf_set_char_spacing','cpdf_set_creator','cpdf_set_current_page',
+            'cpdf_set_font','cpdf_set_font_directories',
+            'cpdf_set_font_map_file','cpdf_set_horiz_scaling',
+            'cpdf_set_keywords','cpdf_set_leading','cpdf_set_page_animation',
+            'cpdf_set_subject','cpdf_set_text_matrix','cpdf_set_text_pos',
+            'cpdf_set_text_rendering','cpdf_set_text_rise','cpdf_set_title',
+            'cpdf_set_viewer_preferences','cpdf_set_word_spacing',
+            'cpdf_setdash','cpdf_setflat','cpdf_setgray','cpdf_setgray_fill',
+            'cpdf_setgray_stroke','cpdf_setlinecap','cpdf_setlinejoin',
+            'cpdf_setlinewidth','cpdf_setmiterlimit','cpdf_setrgbcolor',
+            'cpdf_setrgbcolor_fill','cpdf_setrgbcolor_stroke','cpdf_show',
+            'cpdf_show_xy','cpdf_stringwidth','cpdf_stroke','cpdf_text',
+            'cpdf_translate','crack_check','crack_closedict',
+            'crack_getlastmessage','crack_opendict','crc32','create_function',
+            'crypt','ctype_alnum','ctype_alpha','ctype_cntrl','ctype_digit',
+            'ctype_graph','ctype_lower','ctype_print','ctype_punct',
+            'ctype_space','ctype_upper','ctype_xdigit','curl_close',
+            'curl_copy_handle','curl_errno','curl_error','curl_exec',
+            'curl_getinfo','curl_init','curl_multi_add_handle',
+            'curl_multi_close','curl_multi_exec','curl_multi_getcontent',
+            'curl_multi_info_read','curl_multi_init','curl_multi_remove_handle',
+            'curl_multi_select','curl_setopt','curl_setopt_array',
+            'curl_version','current','cvsclient_connect','cvsclient_log',
+            'cvsclient_login','cvsclient_retrieve','date','date_create',
+            'date_date_set','date_default_timezone_get',
+            'date_default_timezone_set','date_format','date_isodate_set',
+            'date_modify','date_offset_get','date_parse','date_sun_info',
+            'date_sunrise','date_sunset','date_time_set','date_timezone_get',
+            'date_timezone_set','db_id_list','dba_close','dba_delete',
+            'dba_exists','dba_fetch','dba_firstkey','dba_handlers','dba_insert',
+            'dba_key_split','dba_list','dba_nextkey','dba_open','dba_optimize',
+            'dba_popen','dba_replace','dba_sync','dbase_add_record',
+            'dbase_close','dbase_create','dbase_delete_record',
+            'dbase_get_header_info','dbase_get_record',
+            'dbase_get_record_with_names','dbase_numfields','dbase_numrecords',
+            'dbase_open','dbase_pack','dbase_replace_record',
+            'dbg_get_all_contexts','dbg_get_all_module_names',
+            'dbg_get_all_source_lines','dbg_get_context_name',
+            'dbg_get_module_name','dbg_get_profiler_results',
+            'dbg_get_source_context','dblist','dbmclose','dbmdelete',
+            'dbmexists','dbmfetch','dbmfirstkey','dbminsert','dbmnextkey',
+            'dbmopen','dbmreplace','dbx_close','dbx_compare','dbx_connect',
+            'dbx_error','dbx_escape_string','dbx_fetch_row','dbx_query',
+            'dbx_sort','dcgettext','dcngettext','deaggregate','debug_backtrace',
+            'debug_zval_dump','debugbreak','decbin','dechex','decoct','define',
+            'defined','define_syslog_variables','deg2rad','dgettext','die',
+            'dio_close','dio_open','dio_read','dio_seek','dio_stat','dio_write',
+            'dir','dirname','disk_free_space','disk_total_space',
+            'diskfreespace','dl','dngettext','docblock_token_name',
+            'docblock_tokenize','dom_import_simplexml','domxml_add_root',
+            'domxml_attributes','domxml_children','domxml_doc_add_root',
+            'domxml_doc_document_element','domxml_doc_get_element_by_id',
+            'domxml_doc_get_elements_by_tagname','domxml_doc_get_root',
+            'domxml_doc_set_root','domxml_doc_validate','domxml_doc_xinclude',
+            'domxml_dump_mem','domxml_dump_mem_file','domxml_dump_node',
+            'domxml_dumpmem','domxml_elem_get_attribute',
+            'domxml_elem_set_attribute','domxml_get_attribute','domxml_getattr',
+            'domxml_html_dump_mem','domxml_new_child','domxml_new_doc',
+            'domxml_new_xmldoc','domxml_node','domxml_node_add_namespace',
+            'domxml_node_attributes','domxml_node_children',
+            'domxml_node_get_content','domxml_node_has_attributes',
+            'domxml_node_new_child','domxml_node_set_content',
+            'domxml_node_set_namespace','domxml_node_unlink_node',
+            'domxml_open_file','domxml_open_mem','domxml_parser',
+            'domxml_parser_add_chunk','domxml_parser_cdata_section',
+            'domxml_parser_characters','domxml_parser_comment',
+            'domxml_parser_end','domxml_parser_end_document',
+            'domxml_parser_end_element','domxml_parser_entity_reference',
+            'domxml_parser_get_document','domxml_parser_namespace_decl',
+            'domxml_parser_processing_instruction',
+            'domxml_parser_start_document','domxml_parser_start_element',
+            'domxml_root','domxml_set_attribute','domxml_setattr',
+            'domxml_substitute_entities_default','domxml_unlink_node',
+            'domxml_version','domxml_xmltree','doubleval','each','easter_date',
+            'easter_days','empty','end','ereg','ereg_replace','eregi',
+            'eregi_replace','error_get_last','error_log','error_reporting',
+            'escapeshellarg','escapeshellcmd','eval','event_deschedule',
+            'event_dispatch','event_free','event_handle_signal',
+            'event_have_events','event_init','event_new','event_pending',
+            'event_priority_set','event_schedule','event_set','event_timeout',
+            'exec','exif_imagetype','exif_read_data','exif_tagname',
+            'exif_thumbnail','exit','exp','explode','expm1','extension_loaded',
+            'extract','ezmlm_hash','fbird_add_user','fbird_affected_rows',
+            'fbird_backup','fbird_blob_add','fbird_blob_cancel',
+            'fbird_blob_close','fbird_blob_create','fbird_blob_echo',
+            'fbird_blob_get','fbird_blob_import','fbird_blob_info',
+            'fbird_blob_open','fbird_close','fbird_commit','fbird_commit_ret',
+            'fbird_connect','fbird_db_info','fbird_delete_user','fbird_drop_db',
+            'fbird_errcode','fbird_errmsg','fbird_execute','fbird_fetch_assoc',
+            'fbird_fetch_object','fbird_fetch_row','fbird_field_info',
+            'fbird_free_event_handler','fbird_free_query','fbird_free_result',
+            'fbird_gen_id','fbird_maintain_db','fbird_modify_user',
+            'fbird_name_result','fbird_num_fields','fbird_num_params',
+            'fbird_param_info','fbird_pconnect','fbird_prepare','fbird_query',
+            'fbird_restore','fbird_rollback','fbird_rollback_ret',
+            'fbird_server_info','fbird_service_attach','fbird_service_detach',
+            'fbird_set_event_handler','fbird_trans','fbird_wait_event','fclose',
+            'fdf_add_doc_javascript','fdf_add_template','fdf_close',
+            'fdf_create','fdf_enum_values','fdf_errno','fdf_error','fdf_get_ap',
+            'fdf_get_attachment','fdf_get_encoding','fdf_get_file',
+            'fdf_get_flags','fdf_get_opt','fdf_get_status','fdf_get_value',
+            'fdf_get_version','fdf_header','fdf_next_field_name','fdf_open',
+            'fdf_open_string','fdf_remove_item','fdf_save','fdf_save_string',
+            'fdf_set_ap','fdf_set_encoding','fdf_set_file','fdf_set_flags',
+            'fdf_set_javascript_action','fdf_set_on_import_javascript',
+            'fdf_set_opt','fdf_set_status','fdf_set_submit_form_action',
+            'fdf_set_target_frame','fdf_set_value','fdf_set_version','feof',
+            'fflush','fgetc','fgetcsv','fgets','fgetss','file','file_exists',
+            'file_get_contents','file_put_contents','fileatime','filectime',
+            'filegroup','fileinode','filemtime','fileowner','fileperms',
+            'filepro','filepro_fieldcount','filepro_fieldname',
+            'filepro_fieldtype','filepro_fieldwidth','filepro_retrieve',
+            'filepro_rowcount','filesize','filetype','filter_has_var',
+            'filter_id','filter_input','filter_input_array','filter_list',
+            'filter_var','filter_var_array','finfo_buffer','finfo_close',
+            'finfo_file','finfo_open','finfo_set_flags','floatval','flock',
+            'floor','flush','fmod','fnmatch','fopen','fpassthru','fprintf',
+            'fputcsv','fputs','fread','frenchtojd','fribidi_charset_info',
+            'fribidi_get_charsets','fribidi_log2vis','fscanf','fseek',
+            'fsockopen','fstat','ftell','ftok','ftp_alloc','ftp_cdup',
+            'ftp_chdir','ftp_chmod','ftp_close','ftp_connect','ftp_delete',
+            'ftp_exec','ftp_fget','ftp_fput','ftp_get','ftp_get_option',
+            'ftp_login','ftp_mdtm','ftp_mkdir','ftp_nb_continue','ftp_nb_fget',
+            'ftp_nb_fput','ftp_nb_get','ftp_nb_put','ftp_nlist','ftp_pasv',
+            'ftp_put','ftp_pwd','ftp_quit','ftp_raw','ftp_rawlist','ftp_rename',
+            'ftp_rmdir','ftp_set_option','ftp_site','ftp_size',
+            'ftp_ssl_connect','ftp_systype','ftruncate','function_exists',
+            'func_get_arg','func_get_args','func_num_args','fwrite','gd_info',
+            'getallheaders','getcwd','getdate','getenv','gethostbyaddr',
+            'gethostbyname','gethostbynamel','getimagesize','getlastmod',
+            'getmxrr','getmygid','getmyinode','getmypid','getmyuid','getopt',
+            'getprotobyname','getprotobynumber','getrandmax','getrusage',
+            'getservbyname','getservbyport','gettext','gettimeofday','gettype',
+            'get_browser','get_cfg_var','get_class','get_class_methods',
+            'get_class_vars','get_current_user','get_declared_classes',
+            'get_defined_constants','get_defined_functions','get_defined_vars',
+            'get_extension_funcs','get_headers','get_html_translation_table',
+            'get_included_files','get_include_path','get_loaded_extensions',
+            'get_magic_quotes_gpc','get_magic_quotes_runtime','get_meta_tags',
+            'get_object_vars','get_parent_class','get_required_files',
+            'get_resource_type','glob','gmdate','gmmktime','gmp_abs','gmp_add',
+            'gmp_and','gmp_clrbit','gmp_cmp','gmp_com','gmp_div','gmp_div_q',
+            'gmp_div_qr','gmp_div_r','gmp_divexact','gmp_fact','gmp_gcd',
+            'gmp_gcdext','gmp_hamdist','gmp_init','gmp_intval','gmp_invert',
+            'gmp_jacobi','gmp_legendre','gmp_mod','gmp_mul','gmp_neg',
+            'gmp_nextprime','gmp_or','gmp_perfect_square','gmp_popcount',
+            'gmp_pow','gmp_powm','gmp_prob_prime','gmp_random','gmp_scan0',
+            'gmp_scan1','gmp_setbit','gmp_sign','gmp_sqrt','gmp_sqrtrem',
+            'gmp_strval','gmp_sub','gmp_xor','gmstrftime','gopher_parsedir',
+            'gregoriantojd','gzclose','gzcompress','gzdeflate','gzencode',
+            'gzeof','gzfile','gzgetc','gzgets','gzgetss','gzinflate','gzopen',
+            'gzpassthru','gzputs','gzread','gzrewind','gzseek','gztell',
+            'gzuncompress','gzwrite','hash','hash_algos','hash_file',
+            'hash_final','hash_hmac','hash_hmac_file','hash_init','hash_update',
+            'hash_update_file','hash_update_stream','header','headers_list',
+            'headers_sent','hebrev','hebrevc','hexdec','highlight_file',
+            'highlight_string','html_doc','html_doc_file','html_entity_decode',
+            'htmlentities','htmlspecialchars','htmlspecialchars_decode',
+            'http_build_cookie','http_build_query','http_build_str',
+            'http_build_url','http_cache_etag','http_cache_last_modified',
+            'http_chunked_decode','http_date','http_deflate','http_get',
+            'http_get_request_body','http_get_request_body_stream',
+            'http_get_request_headers','http_head','http_inflate',
+            'http_match_etag','http_match_modified','http_match_request_header',
+            'http_negotiate_charset','http_negotiate_content_type',
+            'http_negotiate_language','http_parse_cookie','http_parse_headers',
+            'http_parse_message','http_parse_params',
+            'http_persistent_handles_clean','http_persistent_handles_count',
+            'http_persistent_handles_ident','http_post_data','http_post_fields',
+            'http_put_data','http_put_file','http_put_stream','http_redirect',
+            'http_request','http_request_body_encode',
+            'http_request_method_exists','http_request_method_name',
+            'http_request_method_register','http_request_method_unregister',
+            'http_send_content_disposition','http_send_content_type',
+            'http_send_data','http_send_file','http_send_last_modified',
+            'http_send_status','http_send_stream','http_support',
+            'http_throttle','hypot','i18n_convert','i18n_discover_encoding',
+            'i18n_http_input','i18n_http_output','i18n_internal_encoding',
+            'i18n_ja_jp_hantozen','i18n_mime_header_decode',
+            'i18n_mime_header_encode','ibase_add_user','ibase_affected_rows',
+            'ibase_backup','ibase_blob_add','ibase_blob_cancel',
+            'ibase_blob_close','ibase_blob_create','ibase_blob_echo',
+            'ibase_blob_get','ibase_blob_import','ibase_blob_info',
+            'ibase_blob_open','ibase_close','ibase_commit','ibase_commit_ret',
+            'ibase_connect','ibase_db_info','ibase_delete_user','ibase_drop_db',
+            'ibase_errcode','ibase_errmsg','ibase_execute','ibase_fetch_assoc',
+            'ibase_fetch_object','ibase_fetch_row','ibase_field_info',
+            'ibase_free_event_handler','ibase_free_query','ibase_free_result',
+            'ibase_gen_id','ibase_maintain_db','ibase_modify_user',
+            'ibase_name_result','ibase_num_fields','ibase_num_params',
+            'ibase_param_info','ibase_pconnect','ibase_prepare','ibase_query',
+            'ibase_restore','ibase_rollback','ibase_rollback_ret',
+            'ibase_server_info','ibase_service_attach','ibase_service_detach',
+            'ibase_set_event_handler','ibase_trans','ibase_wait_event','iconv',
+            'iconv_get_encoding','iconv_mime_decode',
+            'iconv_mime_decode_headers','iconv_mime_encode',
+            'iconv_set_encoding','iconv_strlen','iconv_strpos','iconv_strrpos',
+            'iconv_substr','id3_get_frame_long_name','id3_get_frame_short_name',
+            'id3_get_genre_id','id3_get_genre_list','id3_get_genre_name',
+            'id3_get_tag','id3_get_version','id3_remove_tag','id3_set_tag',
+            'idate','ignore_user_abort','image_type_to_extension',
+            'image_type_to_mime_type','image2wbmp','imagealphablending',
+            'imageantialias','imagearc','imagechar','imagecharup',
+            'imagecolorallocate','imagecolorallocatealpha','imagecolorat',
+            'imagecolorclosest','imagecolorclosestalpha','imagecolordeallocate',
+            'imagecolorexact','imagecolorexactalpha','imagecolormatch',
+            'imagecolorresolve','imagecolorresolvealpha','imagecolorset',
+            'imagecolorsforindex','imagecolorstotal','imagecolortransparent',
+            'imageconvolution','imagecopy','imagecopymerge',
+            'imagecopymergegray','imagecopyresampled','imagecopyresized',
+            'imagecreate','imagecreatefromgd','imagecreatefromgd2',
+            'imagecreatefromgd2part','imagecreatefromgif','imagecreatefromjpeg',
+            'imagecreatefrompng','imagecreatefromstring','imagecreatefromwbmp',
+            'imagecreatefromxbm','imagecreatetruecolor','imagedashedline',
+            'imagedestroy','imageellipse','imagefill','imagefilledarc',
+            'imagefilledellipse','imagefilledpolygon','imagefilledrectangle',
+            'imagefilltoborder','imagefilter','imagefontheight',
+            'imagefontwidth','imageftbbox','imagefttext','imagegammacorrect',
+            'imagegd','imagegd2','imagegif','imagegrabscreen','imagegrabwindow',
+            'imageinterlace','imageistruecolor','imagejpeg','imagelayereffect',
+            'imageline','imageloadfont','imagepalettecopy','imagepng',
+            'imagepolygon','imagepsbbox','imagepsencodefont',
+            'imagepsextendfont','imagepsfreefont','imagepsloadfont',
+            'imagepsslantfont','imagepstext','imagerectangle','imagerotate',
+            'imagesavealpha','imagesetbrush','imagesetpixel','imagesetstyle',
+            'imagesetthickness','imagesettile','imagestring','imagestringup',
+            'imagesx','imagesy','imagetruecolortopalette','imagettfbbox',
+            'imagettftext','imagetypes','imagewbmp','imagexbm','imap_8bit',
+            'imap_alerts','imap_append','imap_base64','imap_binary','imap_body',
+            'imap_bodystruct','imap_check','imap_clearflag_full','imap_close',
+            'imap_create','imap_createmailbox','imap_delete',
+            'imap_deletemailbox','imap_errors','imap_expunge',
+            'imap_fetch_overview','imap_fetchbody','imap_fetchheader',
+            'imap_fetchstructure','imap_fetchtext','imap_get_quota',
+            'imap_get_quotaroot','imap_getacl','imap_getmailboxes',
+            'imap_getsubscribed','imap_header','imap_headerinfo','imap_headers',
+            'imap_last_error','imap_list','imap_listmailbox',
+            'imap_listsubscribed','imap_lsub','imap_mail','imap_mail_compose',
+            'imap_mail_copy','imap_mail_move','imap_mailboxmsginfo',
+            'imap_mime_header_decode','imap_msgno','imap_num_msg',
+            'imap_num_recent','imap_open','imap_ping','imap_qprint',
+            'imap_rename','imap_renamemailbox','imap_reopen',
+            'imap_rfc822_parse_adrlist','imap_rfc822_parse_headers',
+            'imap_rfc822_write_address','imap_savebody','imap_scan',
+            'imap_scanmailbox','imap_search','imap_set_quota','imap_setacl',
+            'imap_setflag_full','imap_sort','imap_status','imap_subscribe',
+            'imap_thread','imap_timeout','imap_uid','imap_undelete',
+            'imap_unsubscribe','imap_utf7_decode','imap_utf7_encode',
+            'imap_utf8','implode','import_request_variables','in_array',
+            'ini_alter','ini_get','ini_get_all','ini_restore','ini_set',
+            'intval','ip2long','iptcembed','iptcparse','isset','is_a',
+            'is_array','is_bool','is_callable','is_dir','is_double',
+            'is_executable','is_file','is_finite','is_float','is_infinite',
+            'is_int','is_integer','is_link','is_long','is_nan','is_null',
+            'is_numeric','is_object','is_readable','is_real','is_resource',
+            'is_scalar','is_soap_fault','is_string','is_subclass_of',
+            'is_uploaded_file','is_writable','is_writeable','iterator_apply',
+            'iterator_count','iterator_to_array','java_last_exception_clear',
+            'java_last_exception_get','jddayofweek','jdmonthname','jdtofrench',
+            'jdtogregorian','jdtojewish','jdtojulian','jdtounix','jewishtojd',
+            'join','jpeg2wbmp','json_decode','json_encode','juliantojd','key',
+            'key_exists','krsort','ksort','lcg_value','ldap_add','ldap_bind',
+            'ldap_close','ldap_compare','ldap_connect','ldap_count_entries',
+            'ldap_delete','ldap_dn2ufn','ldap_err2str','ldap_errno',
+            'ldap_error','ldap_explode_dn','ldap_first_attribute',
+            'ldap_first_entry','ldap_first_reference','ldap_free_result',
+            'ldap_get_attributes','ldap_get_dn','ldap_get_entries',
+            'ldap_get_option','ldap_get_values','ldap_get_values_len',
+            'ldap_list','ldap_mod_add','ldap_mod_del','ldap_mod_replace',
+            'ldap_modify','ldap_next_attribute','ldap_next_entry',
+            'ldap_next_reference','ldap_parse_reference','ldap_parse_result',
+            'ldap_read','ldap_rename','ldap_search','ldap_set_option',
+            'ldap_sort','ldap_start_tls','ldap_unbind','levenshtein',
+            'libxml_clear_errors','libxml_get_errors','libxml_get_last_error',
+            'libxml_set_streams_context','libxml_use_internal_errors','link',
+            'linkinfo','list','localeconv','localtime','log','log1p','log10',
+            'long2ip','lstat','ltrim','lzf_compress','lzf_decompress',
+            'lzf_optimized_for','magic_quotes_runtime','mail','max','mbereg',
+            'mberegi','mberegi_replace','mbereg_match','mbereg_replace',
+            'mbereg_search','mbereg_search_getpos','mbereg_search_getregs',
+            'mbereg_search_init','mbereg_search_pos','mbereg_search_regs',
+            'mbereg_search_setpos','mbregex_encoding','mbsplit','mbstrcut',
+            'mbstrlen','mbstrpos','mbstrrpos','mbsubstr','mb_check_encoding',
+            'mb_convert_case','mb_convert_encoding','mb_convert_kana',
+            'mb_convert_variables','mb_decode_mimeheader',
+            'mb_decode_numericentity','mb_detect_encoding','mb_detect_order',
+            'mb_encode_mimeheader','mb_encode_numericentity','mb_ereg',
+            'mb_eregi','mb_eregi_replace','mb_ereg_match','mb_ereg_replace',
+            'mb_ereg_search','mb_ereg_search_getpos','mb_ereg_search_getregs',
+            'mb_ereg_search_init','mb_ereg_search_pos','mb_ereg_search_regs',
+            'mb_ereg_search_setpos','mb_get_info','mb_http_input',
+            'mb_http_output','mb_internal_encoding','mb_language',
+            'mb_list_encodings','mb_output_handler','mb_parse_str',
+            'mb_preferred_mime_name','mb_regex_encoding','mb_regex_set_options',
+            'mb_send_mail','mb_split','mb_strcut','mb_strimwidth','mb_stripos',
+            'mb_stristr','mb_strlen','mb_strpos','mb_strrchr','mb_strrichr',
+            'mb_strripos','mb_strrpos','mb_strstr','mb_strtolower',
+            'mb_strtoupper','mb_strwidth','mb_substitute_character','mb_substr',
+            'mb_substr_count','mcrypt_cbc','mcrypt_cfb','mcrypt_create_iv',
+            'mcrypt_decrypt','mcrypt_ecb','mcrypt_enc_get_algorithms_name',
+            'mcrypt_enc_get_block_size','mcrypt_enc_get_iv_size',
+            'mcrypt_enc_get_key_size','mcrypt_enc_get_modes_name',
+            'mcrypt_enc_get_supported_key_sizes',
+            'mcrypt_enc_is_block_algorithm',
+            'mcrypt_enc_is_block_algorithm_mode','mcrypt_enc_is_block_mode',
+            'mcrypt_enc_self_test','mcrypt_encrypt','mcrypt_generic',
+            'mcrypt_generic_deinit','mcrypt_generic_end','mcrypt_generic_init',
+            'mcrypt_get_block_size','mcrypt_get_cipher_name',
+            'mcrypt_get_iv_size','mcrypt_get_key_size','mcrypt_list_algorithms',
+            'mcrypt_list_modes','mcrypt_module_close',
+            'mcrypt_module_get_algo_block_size',
+            'mcrypt_module_get_algo_key_size',
+            'mcrypt_module_get_supported_key_sizes',
+            'mcrypt_module_is_block_algorithm',
+            'mcrypt_module_is_block_algorithm_mode',
+            'mcrypt_module_is_block_mode','mcrypt_module_open',
+            'mcrypt_module_self_test','mcrypt_ofb','md5','md5_file',
+            'mdecrypt_generic','memcache_add','memcache_add_server',
+            'memcache_close','memcache_connect','memcache_debug',
+            'memcache_decrement','memcache_delete','memcache_flush',
+            'memcache_get','memcache_get_extended_stats',
+            'memcache_get_server_status','memcache_get_stats',
+            'memcache_get_version','memcache_increment','memcache_pconnect',
+            'memcache_replace','memcache_set','memcache_set_compress_threshold',
+            'memcache_set_server_params','memory_get_peak_usage',
+            'memory_get_usage','metaphone','mhash','mhash_count',
+            'mhash_get_block_size','mhash_get_hash_name','mhash_keygen_s2k',
+            'method_exists','microtime','mime_content_type','min',
+            'ming_keypress','ming_setcubicthreshold','ming_setscale',
+            'ming_useconstants','ming_useswfversion','mkdir','mktime',
+            'money_format','move_uploaded_file','msql','msql_affected_rows',
+            'msql_close','msql_connect','msql_create_db','msql_createdb',
+            'msql_data_seek','msql_db_query','msql_dbname','msql_drop_db',
+            'msql_dropdb','msql_error','msql_fetch_array','msql_fetch_field',
+            'msql_fetch_object','msql_fetch_row','msql_field_flags',
+            'msql_field_len','msql_field_name','msql_field_seek',
+            'msql_field_table','msql_field_type','msql_fieldflags',
+            'msql_fieldlen','msql_fieldname','msql_fieldtable','msql_fieldtype',
+            'msql_free_result','msql_freeresult','msql_list_dbs',
+            'msql_list_fields','msql_list_tables','msql_listdbs',
+            'msql_listfields','msql_listtables','msql_num_fields',
+            'msql_num_rows','msql_numfields','msql_numrows','msql_pconnect',
+            'msql_query','msql_regcase','msql_result','msql_select_db',
+            'msql_selectdb','msql_tablename','mssql_bind','mssql_close',
+            'mssql_connect','mssql_data_seek','mssql_execute',
+            'mssql_fetch_array','mssql_fetch_assoc','mssql_fetch_batch',
+            'mssql_fetch_field','mssql_fetch_object','mssql_fetch_row',
+            'mssql_field_length','mssql_field_name','mssql_field_seek',
+            'mssql_field_type','mssql_free_result','mssql_free_statement',
+            'mssql_get_last_message','mssql_guid_string','mssql_init',
+            'mssql_min_error_severity','mssql_min_message_severity',
+            'mssql_next_result','mssql_num_fields','mssql_num_rows',
+            'mssql_pconnect','mssql_query','mssql_result','mssql_rows_affected',
+            'mssql_select_db','mt_getrandmax','mt_rand','mt_srand','mysql',
+            'mysql_affected_rows','mysql_client_encoding','mysql_close',
+            'mysql_connect','mysql_createdb','mysql_create_db',
+            'mysql_data_seek','mysql_dbname','mysql_db_name','mysql_db_query',
+            'mysql_dropdb','mysql_drop_db','mysql_errno','mysql_error',
+            'mysql_escape_string','mysql_fetch_array','mysql_fetch_assoc',
+            'mysql_fetch_field','mysql_fetch_lengths','mysql_fetch_object',
+            'mysql_fetch_row','mysql_fieldflags','mysql_fieldlen',
+            'mysql_fieldname','mysql_fieldtable','mysql_fieldtype',
+            'mysql_field_flags','mysql_field_len','mysql_field_name',
+            'mysql_field_seek','mysql_field_table','mysql_field_type',
+            'mysql_freeresult','mysql_free_result','mysql_get_client_info',
+            'mysql_get_host_info','mysql_get_proto_info',
+            'mysql_get_server_info','mysql_info','mysql_insert_id',
+            'mysql_listdbs','mysql_listfields','mysql_listtables',
+            'mysql_list_dbs','mysql_list_fields','mysql_list_processes',
+            'mysql_list_tables','mysql_numfields','mysql_numrows',
+            'mysql_num_fields','mysql_num_rows','mysql_pconnect','mysql_ping',
+            'mysql_query','mysql_real_escape_string','mysql_result',
+            'mysql_selectdb','mysql_select_db','mysql_set_charset','mysql_stat',
+            'mysql_tablename','mysql_table_name','mysql_thread_id',
+            'mysql_unbuffered_query','mysqli_affected_rows','mysqli_autocommit',
+            'mysqli_bind_param','mysqli_bind_result','mysqli_change_user',
+            'mysqli_character_set_name','mysqli_client_encoding','mysqli_close',
+            'mysqli_commit','mysqli_connect','mysqli_connect_errno',
+            'mysqli_connect_error','mysqli_data_seek','mysqli_debug',
+            'mysqli_disable_reads_from_master','mysqli_disable_rpl_parse',
+            'mysqli_dump_debug_info','mysqli_embedded_server_end',
+            'mysqli_embedded_server_start','mysqli_enable_reads_from_master',
+            'mysqli_enable_rpl_parse','mysqli_errno','mysqli_error',
+            'mysqli_escape_string','mysqli_execute','mysqli_fetch',
+            'mysqli_fetch_array','mysqli_fetch_assoc','mysqli_fetch_field',
+            'mysqli_fetch_field_direct','mysqli_fetch_fields',
+            'mysqli_fetch_lengths','mysqli_fetch_object','mysqli_fetch_row',
+            'mysqli_field_count','mysqli_field_seek','mysqli_field_tell',
+            'mysqli_free_result','mysqli_get_charset','mysqli_get_client_info',
+            'mysqli_get_client_version','mysqli_get_host_info',
+            'mysqli_get_metadata','mysqli_get_proto_info',
+            'mysqli_get_server_info','mysqli_get_server_version',
+            'mysqli_get_warnings','mysqli_info','mysqli_init',
+            'mysqli_insert_id','mysqli_kill','mysqli_master_query',
+            'mysqli_more_results','mysqli_multi_query','mysqli_next_result',
+            'mysqli_num_fields','mysqli_num_rows','mysqli_options',
+            'mysqli_param_count','mysqli_ping','mysqli_prepare','mysqli_query',
+            'mysqli_real_connect','mysqli_real_escape_string',
+            'mysqli_real_query','mysqli_report','mysqli_rollback',
+            'mysqli_rpl_parse_enabled','mysqli_rpl_probe',
+            'mysqli_rpl_query_type','mysqli_select_db','mysqli_send_long_data',
+            'mysqli_send_query','mysqli_set_charset',
+            'mysqli_set_local_infile_default','mysqli_set_local_infile_handler',
+            'mysqli_set_opt','mysqli_slave_query','mysqli_sqlstate',
+            'mysqli_ssl_set','mysqli_stat','mysqli_stmt_affected_rows',
+            'mysqli_stmt_attr_get','mysqli_stmt_attr_set',
+            'mysqli_stmt_bind_param','mysqli_stmt_bind_result',
+            'mysqli_stmt_close','mysqli_stmt_data_seek','mysqli_stmt_errno',
+            'mysqli_stmt_error','mysqli_stmt_execute','mysqli_stmt_fetch',
+            'mysqli_stmt_field_count','mysqli_stmt_free_result',
+            'mysqli_stmt_get_warnings','mysqli_stmt_init',
+            'mysqli_stmt_insert_id','mysqli_stmt_num_rows',
+            'mysqli_stmt_param_count','mysqli_stmt_prepare','mysqli_stmt_reset',
+            'mysqli_stmt_result_metadata','mysqli_stmt_send_long_data',
+            'mysqli_stmt_sqlstate','mysqli_stmt_store_result',
+            'mysqli_store_result','mysqli_thread_id','mysqli_thread_safe',
+            'mysqli_use_result','mysqli_warning_count','natcasesort','natsort',
+            'new_xmldoc','next','ngettext','nl2br','nl_langinfo',
+            'ntuser_getdomaincontroller','ntuser_getusergroups',
+            'ntuser_getuserinfo','ntuser_getuserlist','number_format',
+            'ob_clean','ob_deflatehandler','ob_end_clean','ob_end_flush',
+            'ob_etaghandler','ob_flush','ob_get_clean','ob_get_contents',
+            'ob_get_flush','ob_get_length','ob_get_level','ob_get_status',
+            'ob_gzhandler','ob_iconv_handler','ob_implicit_flush',
+            'ob_inflatehandler','ob_list_handlers','ob_start','ob_tidyhandler',
+            'octdec','odbc_autocommit','odbc_binmode','odbc_close',
+            'odbc_close_all','odbc_columnprivileges','odbc_columns',
+            'odbc_commit','odbc_connect','odbc_cursor','odbc_data_source',
+            'odbc_do','odbc_error','odbc_errormsg','odbc_exec','odbc_execute',
+            'odbc_fetch_array','odbc_fetch_into','odbc_fetch_object',
+            'odbc_fetch_row','odbc_field_len','odbc_field_name',
+            'odbc_field_num','odbc_field_precision','odbc_field_scale',
+            'odbc_field_type','odbc_foreignkeys','odbc_free_result',
+            'odbc_gettypeinfo','odbc_longreadlen','odbc_next_result',
+            'odbc_num_fields','odbc_num_rows','odbc_pconnect','odbc_prepare',
+            'odbc_primarykeys','odbc_procedurecolumns','odbc_procedures',
+            'odbc_result','odbc_result_all','odbc_rollback','odbc_setoption',
+            'odbc_specialcolumns','odbc_statistics','odbc_tableprivileges',
+            'odbc_tables','opendir','openlog','openssl_csr_export',
+            'openssl_csr_export_to_file','openssl_csr_get_public_key',
+            'openssl_csr_get_subject','openssl_csr_new','openssl_csr_sign',
+            'openssl_error_string','openssl_free_key','openssl_get_privatekey',
+            'openssl_get_publickey','openssl_open','openssl_pkcs12_export',
+            'openssl_pkcs12_export_to_file','openssl_pkcs12_read',
+            'openssl_pkcs7_decrypt','openssl_pkcs7_encrypt',
+            'openssl_pkcs7_sign','openssl_pkcs7_verify','openssl_pkey_export',
+            'openssl_pkey_export_to_file','openssl_pkey_free',
+            'openssl_pkey_get_details','openssl_pkey_get_private',
+            'openssl_pkey_get_public','openssl_pkey_new',
+            'openssl_private_decrypt','openssl_private_encrypt',
+            'openssl_public_decrypt','openssl_public_encrypt','openssl_seal',
+            'openssl_sign','openssl_verify','openssl_x509_checkpurpose',
+            'openssl_x509_check_private_key','openssl_x509_export',
+            'openssl_x509_export_to_file','openssl_x509_free',
+            'openssl_x509_parse','openssl_x509_read','ord',
+            'output_add_rewrite_var','output_reset_rewrite_vars','overload',
+            'outputdebugstring','pack','parse_ini_file','parse_str','parse_url',
+            'parsekit_compile_file','parsekit_compile_string',
+            'parsekit_func_arginfo','parsekit_opcode_flags',
+            'parsekit_opcode_name','passthru','pathinfo','pclose',
+            'pdf_add_bookmark','pdf_add_launchlink','pdf_add_locallink',
+            'pdf_add_nameddest','pdf_add_note','pdf_add_pdflink',
+            'pdf_add_thumbnail','pdf_add_weblink','pdf_arc','pdf_arcn',
+            'pdf_attach_file','pdf_begin_font','pdf_begin_glyph',
+            'pdf_begin_page','pdf_begin_pattern','pdf_begin_template',
+            'pdf_circle','pdf_clip','pdf_close','pdf_close_image',
+            'pdf_close_pdi','pdf_close_pdi_page','pdf_closepath',
+            'pdf_closepath_fill_stroke','pdf_closepath_stroke','pdf_concat',
+            'pdf_continue_text','pdf_create_gstate','pdf_create_pvf',
+            'pdf_curveto','pdf_delete','pdf_delete_pvf','pdf_encoding_set_char',
+            'pdf_end_font','pdf_end_glyph','pdf_end_page','pdf_end_pattern',
+            'pdf_end_template','pdf_endpath','pdf_fill','pdf_fill_imageblock',
+            'pdf_fill_pdfblock','pdf_fill_stroke','pdf_fill_textblock',
+            'pdf_findfont','pdf_fit_image','pdf_fit_pdi_page',
+            'pdf_fit_textline','pdf_get_apiname','pdf_get_buffer',
+            'pdf_get_errmsg','pdf_get_errnum','pdf_get_parameter',
+            'pdf_get_pdi_parameter','pdf_get_pdi_value','pdf_get_value',
+            'pdf_initgraphics','pdf_lineto','pdf_load_font',
+            'pdf_load_iccprofile','pdf_load_image','pdf_makespotcolor',
+            'pdf_moveto','pdf_new','pdf_open_ccitt','pdf_open_file',
+            'pdf_open_image','pdf_open_image_file','pdf_open_pdi',
+            'pdf_open_pdi_page','pdf_place_image','pdf_place_pdi_page',
+            'pdf_process_pdi','pdf_rect','pdf_restore','pdf_rotate','pdf_save',
+            'pdf_scale','pdf_set_border_color','pdf_set_border_dash',
+            'pdf_set_border_style','pdf_set_gstate','pdf_set_info',
+            'pdf_set_parameter','pdf_set_text_pos','pdf_set_value',
+            'pdf_setcolor','pdf_setdash','pdf_setdashpattern','pdf_setflat',
+            'pdf_setfont','pdf_setlinecap','pdf_setlinejoin','pdf_setlinewidth',
+            'pdf_setmatrix','pdf_setmiterlimit','pdf_setpolydash','pdf_shading',
+            'pdf_shading_pattern','pdf_shfill','pdf_show','pdf_show_boxed',
+            'pdf_show_xy','pdf_skew','pdf_stringwidth','pdf_stroke',
+            'pdf_translate','pdo_drivers','pfsockopen','pg_affected_rows',
+            'pg_cancel_query','pg_clientencoding','pg_client_encoding',
+            'pg_close','pg_cmdtuples','pg_connect','pg_connection_busy',
+            'pg_connection_reset','pg_connection_status','pg_convert',
+            'pg_copy_from','pg_copy_to','pg_dbname','pg_delete','pg_end_copy',
+            'pg_errormessage','pg_escape_bytea','pg_escape_string','pg_exec',
+            'pg_execute','pg_fetch_all','pg_fetch_all_columns','pg_fetch_array',
+            'pg_fetch_assoc','pg_fetch_object','pg_fetch_result','pg_fetch_row',
+            'pg_fieldisnull','pg_fieldname','pg_fieldnum','pg_fieldprtlen',
+            'pg_fieldsize','pg_fieldtype','pg_field_is_null','pg_field_name',
+            'pg_field_num','pg_field_prtlen','pg_field_size','pg_field_table',
+            'pg_field_type','pg_field_type_oid','pg_free_result',
+            'pg_freeresult','pg_get_notify','pg_get_pid','pg_get_result',
+            'pg_getlastoid','pg_host','pg_insert','pg_last_error',
+            'pg_last_notice','pg_last_oid','pg_loclose','pg_locreate',
+            'pg_loexport','pg_loimport','pg_loopen','pg_loread','pg_loreadall',
+            'pg_lounlink','pg_lowrite','pg_lo_close','pg_lo_create',
+            'pg_lo_export','pg_lo_import','pg_lo_open','pg_lo_read',
+            'pg_lo_read_all','pg_lo_seek','pg_lo_tell','pg_lo_unlink',
+            'pg_lo_write','pg_meta_data','pg_numfields','pg_numrows',
+            'pg_num_fields','pg_num_rows','pg_options','pg_parameter_status',
+            'pg_pconnect','pg_ping','pg_port','pg_prepare','pg_put_line',
+            'pg_query','pg_query_params','pg_result','pg_result_error',
+            'pg_result_error_field','pg_result_seek','pg_result_status',
+            'pg_select','pg_send_execute','pg_send_prepare','pg_send_query',
+            'pg_send_query_params','pg_set_client_encoding',
+            'pg_set_error_verbosity','pg_setclientencoding','pg_trace',
+            'pg_transaction_status','pg_tty','pg_unescape_bytea','pg_untrace',
+            'pg_update','pg_version','php_egg_logo_guid','php_ini_loaded_file',
+            'php_ini_scanned_files','php_logo_guid','php_real_logo_guid',
+            'php_sapi_name','php_strip_whitespace','php_uname','phpcredits',
+            'phpdoc_xml_from_string','phpinfo','phpversion','pi','png2wbmp',
+            'pop3_close','pop3_delete_message','pop3_get_account_size',
+            'pop3_get_message','pop3_get_message_count',
+            'pop3_get_message_header','pop3_get_message_ids',
+            'pop3_get_message_size','pop3_get_message_sizes','pop3_open',
+            'pop3_undelete','popen','pos','posix_ctermid','posix_errno',
+            'posix_getcwd','posix_getegid','posix_geteuid','posix_getgid',
+            'posix_getgrgid','posix_getgrnam','posix_getgroups',
+            'posix_getlogin','posix_getpgid','posix_getpgrp','posix_getpid',
+            'posix_getppid','posix_getpwnam','posix_getpwuid','posix_getrlimit',
+            'posix_getsid','posix_getuid','posix_get_last_error','posix_isatty',
+            'posix_kill','posix_mkfifo','posix_setegid','posix_seteuid',
+            'posix_setgid','posix_setpgid','posix_setsid','posix_setuid',
+            'posix_strerror','posix_times','posix_ttyname','posix_uname','pow',
+            'preg_grep','preg_last_error','preg_match','preg_match_all',
+            'preg_quote','preg_replace','preg_replace_callback','preg_split',
+            'prev','print_r','printf','proc_close','proc_get_status',
+            'proc_open','proc_terminate','putenv','quoted_printable_decode',
+            'quotemeta','rad2deg','radius_acct_open','radius_add_server',
+            'radius_auth_open','radius_close','radius_config',
+            'radius_create_request','radius_cvt_addr','radius_cvt_int',
+            'radius_cvt_string','radius_demangle','radius_demangle_mppe_key',
+            'radius_get_attr','radius_get_vendor_attr','radius_put_addr',
+            'radius_put_attr','radius_put_int','radius_put_string',
+            'radius_put_vendor_addr','radius_put_vendor_attr',
+            'radius_put_vendor_int','radius_put_vendor_string',
+            'radius_request_authenticator','radius_send_request',
+            'radius_server_secret','radius_strerror','rand','range',
+            'rawurldecode','rawurlencode','read_exif_data','readdir','readfile',
+            'readgzfile','readlink','realpath','reg_close_key','reg_create_key',
+            'reg_enum_key','reg_enum_value','reg_get_value','reg_open_key',
+            'reg_set_value','register_shutdown_function',
+            'register_tick_function','rename','res_close','res_get','res_list',
+            'res_list_type','res_open','res_set','reset',
+            'restore_error_handler','restore_include_path','rewind','rewinddir',
+            'rmdir','round','rsort','rtrim','runkit_class_adopt',
+            'runkit_class_emancipate','runkit_constant_add',
+            'runkit_constant_redefine','runkit_constant_remove',
+            'runkit_default_property_add','runkit_function_add',
+            'runkit_function_copy','runkit_function_redefine',
+            'runkit_function_remove','runkit_function_rename','runkit_import',
+            'runkit_lint','runkit_lint_file','runkit_method_add',
+            'runkit_method_copy','runkit_method_redefine',
+            'runkit_method_remove','runkit_method_rename','runkit_object_id',
+            'runkit_return_value_used','runkit_sandbox_output_handler',
+            'runkit_superglobals','runkit_zval_inspect','scandir','sem_acquire',
+            'sem_get','sem_release','sem_remove','serialize',
+            'session_cache_expire','session_cache_limiter','session_commit',
+            'session_decode','session_destroy','session_encode',
+            'session_get_cookie_params','session_id','session_is_registered',
+            'session_module_name','session_name','session_regenerate_id',
+            'session_register','session_save_path','session_set_cookie_params',
+            'session_set_save_handler','session_start','session_unregister',
+            'session_unset','session_write_close','set_content',
+            'set_error_handler','set_file_buffer','set_include_path',
+            'set_magic_quotes_runtime','set_socket_blocking','set_time_limit',
+            'setcookie','setlocale','setrawcookie','settype','sha1','sha1_file',
+            'shell_exec','shmop_close','shmop_delete','shmop_open','shmop_read',
+            'shmop_size','shmop_write','shm_attach','shm_detach','shm_get_var',
+            'shm_put_var','shm_remove','shm_remove_var','show_source','shuffle',
+            'similar_text','simplexml_import_dom','simplexml_load_file',
+            'simplexml_load_string','sin','sinh','sizeof','sleep','smtp_close',
+            'smtp_cmd_data','smtp_cmd_mail','smtp_cmd_rcpt','smtp_connect',
+            'snmp_get_quick_print','snmp_get_valueretrieval','snmp_read_mib',
+            'snmp_set_quick_print','snmp_set_valueretrieval','snmp2_get',
+            'snmp2_getnext','snmp2_real_walk','snmp2_set','snmp2_walk',
+            'snmp3_get','snmp3_getnext','snmp3_real_walk','snmp3_set',
+            'snmp3_walk','snmpget','snmpgetnext','snmprealwalk','snmpset',
+            'snmpwalk','snmpwalkoid','socket_accept','socket_bind',
+            'socket_clear_error','socket_close','socket_connect',
+            'socket_create','socket_create_listen','socket_create_pair',
+            'socket_getopt','socket_getpeername','socket_getsockname',
+            'socket_get_option','socket_get_status','socket_iovec_add',
+            'socket_iovec_alloc','socket_iovec_delete','socket_iovec_fetch',
+            'socket_iovec_free','socket_iovec_set','socket_last_error',
+            'socket_listen','socket_read','socket_readv','socket_recv',
+            'socket_recvfrom','socket_recvmsg','socket_select','socket_send',
+            'socket_sendmsg','socket_sendto','socket_setopt','socket_set_block',
+            'socket_set_blocking','socket_set_nonblock','socket_set_option',
+            'socket_set_timeout','socket_shutdown','socket_strerror',
+            'socket_write','socket_writev','sort','soundex','spl_autoload',
+            'spl_autoload_call','spl_autoload_extensions',
+            'spl_autoload_functions','spl_autoload_register',
+            'spl_autoload_unregister','spl_classes','spl_object_hash','split',
+            'spliti','sprintf','sql_regcase','sqlite_array_query',
+            'sqlite_busy_timeout','sqlite_changes','sqlite_close',
+            'sqlite_column','sqlite_create_aggregate','sqlite_create_function',
+            'sqlite_current','sqlite_error_string','sqlite_escape_string',
+            'sqlite_exec','sqlite_factory','sqlite_fetch_all',
+            'sqlite_fetch_array','sqlite_fetch_column_types',
+            'sqlite_fetch_object','sqlite_fetch_single','sqlite_fetch_string',
+            'sqlite_field_name','sqlite_has_more','sqlite_has_prev',
+            'sqlite_last_error','sqlite_last_insert_rowid','sqlite_libencoding',
+            'sqlite_libversion','sqlite_next','sqlite_num_fields',
+            'sqlite_num_rows','sqlite_open','sqlite_popen','sqlite_prev',
+            'sqlite_query','sqlite_rewind','sqlite_seek','sqlite_single_query',
+            'sqlite_udf_decode_binary','sqlite_udf_encode_binary',
+            'sqlite_unbuffered_query','sqlite_valid','sqrt','srand','sscanf',
+            'ssh2_auth_hostbased_file','ssh2_auth_none','ssh2_auth_password',
+            'ssh2_auth_pubkey_file','ssh2_connect','ssh2_exec',
+            'ssh2_fetch_stream','ssh2_fingerprint','ssh2_forward_accept',
+            'ssh2_forward_listen','ssh2_methods_negotiated','ssh2_poll',
+            'ssh2_publickey_add','ssh2_publickey_init','ssh2_publickey_list',
+            'ssh2_publickey_remove','ssh2_scp_recv','ssh2_scp_send','ssh2_sftp',
+            'ssh2_sftp_lstat','ssh2_sftp_mkdir','ssh2_sftp_readlink',
+            'ssh2_sftp_realpath','ssh2_sftp_rename','ssh2_sftp_rmdir',
+            'ssh2_sftp_stat','ssh2_sftp_symlink','ssh2_sftp_unlink',
+            'ssh2_shell','ssh2_tunnel','stat','stats_absolute_deviation',
+            'stats_cdf_beta','stats_cdf_binomial','stats_cdf_cauchy',
+            'stats_cdf_chisquare','stats_cdf_exponential','stats_cdf_f',
+            'stats_cdf_gamma','stats_cdf_laplace','stats_cdf_logistic',
+            'stats_cdf_negative_binomial','stats_cdf_noncentral_chisquare',
+            'stats_cdf_noncentral_f','stats_cdf_noncentral_t',
+            'stats_cdf_normal','stats_cdf_poisson','stats_cdf_t',
+            'stats_cdf_uniform','stats_cdf_weibull','stats_covariance',
+            'stats_dens_beta','stats_dens_cauchy','stats_dens_chisquare',
+            'stats_dens_exponential','stats_dens_f','stats_dens_gamma',
+            'stats_dens_laplace','stats_dens_logistic','stats_dens_normal',
+            'stats_dens_pmf_binomial','stats_dens_pmf_hypergeometric',
+            'stats_dens_pmf_negative_binomial','stats_dens_pmf_poisson',
+            'stats_dens_t','stats_dens_uniform','stats_dens_weibull',
+            'stats_harmonic_mean','stats_kurtosis','stats_rand_gen_beta',
+            'stats_rand_gen_chisquare','stats_rand_gen_exponential',
+            'stats_rand_gen_f','stats_rand_gen_funiform','stats_rand_gen_gamma',
+            'stats_rand_gen_ipoisson','stats_rand_gen_iuniform',
+            'stats_rand_gen_noncenral_f','stats_rand_gen_noncentral_chisquare',
+            'stats_rand_gen_noncentral_t','stats_rand_gen_normal',
+            'stats_rand_gen_t','stats_rand_getsd','stats_rand_ibinomial',
+            'stats_rand_ibinomial_negative','stats_rand_ignlgi',
+            'stats_rand_phrase_to_seeds','stats_rand_ranf','stats_rand_setall',
+            'stats_skew','stats_standard_deviation','stats_stat_binomial_coef',
+            'stats_stat_correlation','stats_stat_factorial',
+            'stats_stat_independent_t','stats_stat_innerproduct',
+            'stats_stat_paired_t','stats_stat_percentile','stats_stat_powersum',
+            'stats_variance','strcasecmp','strchr','strcmp','strcoll','strcspn',
+            'stream_bucket_append','stream_bucket_make_writeable',
+            'stream_bucket_new','stream_bucket_prepend','stream_context_create',
+            'stream_context_get_default','stream_context_get_options',
+            'stream_context_set_default','stream_context_set_option',
+            'stream_context_set_params','stream_copy_to_stream',
+            'stream_encoding','stream_filter_append','stream_filter_prepend',
+            'stream_filter_register','stream_filter_remove',
+            'stream_get_contents','stream_get_filters','stream_get_line',
+            'stream_get_meta_data','stream_get_transports',
+            'stream_get_wrappers','stream_is_local',
+            'stream_notification_callback','stream_register_wrapper',
+            'stream_resolve_include_path','stream_select','stream_set_blocking',
+            'stream_set_timeout','stream_set_write_buffer',
+            'stream_socket_accept','stream_socket_client',
+            'stream_socket_enable_crypto','stream_socket_get_name',
+            'stream_socket_pair','stream_socket_recvfrom',
+            'stream_socket_sendto','stream_socket_server',
+            'stream_socket_shutdown','stream_supports_lock',
+            'stream_wrapper_register','stream_wrapper_restore',
+            'stream_wrapper_unregister','strftime','stripcslashes','stripos',
+            'stripslashes','strip_tags','stristr','strlen','strnatcasecmp',
+            'strnatcmp','strpbrk','strncasecmp','strncmp','strpos','strrchr',
+            'strrev','strripos','strrpos','strspn','strstr','strtok',
+            'strtolower','strtotime','strtoupper','strtr','strval',
+            'str_ireplace','str_pad','str_repeat','str_replace','str_rot13',
+            'str_split','str_shuffle','str_word_count','substr',
+            'substr_compare','substr_count','substr_replace','svn_add',
+            'svn_auth_get_parameter','svn_auth_set_parameter','svn_cat',
+            'svn_checkout','svn_cleanup','svn_client_version','svn_commit',
+            'svn_diff','svn_export','svn_fs_abort_txn','svn_fs_apply_text',
+            'svn_fs_begin_txn2','svn_fs_change_node_prop','svn_fs_check_path',
+            'svn_fs_contents_changed','svn_fs_copy','svn_fs_delete',
+            'svn_fs_dir_entries','svn_fs_file_contents','svn_fs_file_length',
+            'svn_fs_is_dir','svn_fs_is_file','svn_fs_make_dir',
+            'svn_fs_make_file','svn_fs_node_created_rev','svn_fs_node_prop',
+            'svn_fs_props_changed','svn_fs_revision_prop',
+            'svn_fs_revision_root','svn_fs_txn_root','svn_fs_youngest_rev',
+            'svn_import','svn_info','svn_log','svn_ls','svn_repos_create',
+            'svn_repos_fs','svn_repos_fs_begin_txn_for_commit',
+            'svn_repos_fs_commit_txn','svn_repos_hotcopy','svn_repos_open',
+            'svn_repos_recover','svn_status','svn_update','symlink',
+            'sys_get_temp_dir','syslog','system','tan','tanh','tempnam',
+            'textdomain','thread_get','thread_include','thread_lock',
+            'thread_lock_try','thread_mutex_destroy','thread_mutex_init',
+            'thread_set','thread_start','thread_unlock','tidy_access_count',
+            'tidy_clean_repair','tidy_config_count','tidy_diagnose',
+            'tidy_error_count','tidy_get_body','tidy_get_config',
+            'tidy_get_error_buffer','tidy_get_head','tidy_get_html',
+            'tidy_get_html_ver','tidy_get_output','tidy_get_release',
+            'tidy_get_root','tidy_get_status','tidy_getopt','tidy_is_xhtml',
+            'tidy_is_xml','tidy_parse_file','tidy_parse_string',
+            'tidy_repair_file','tidy_repair_string','tidy_warning_count','time',
+            'timezone_abbreviations_list','timezone_identifiers_list',
+            'timezone_name_from_abbr','timezone_name_get','timezone_offset_get',
+            'timezone_open','timezone_transitions_get','tmpfile',
+            'token_get_all','token_name','touch','trigger_error',
+            'transliterate','transliterate_filters_get','trim','uasort',
+            'ucfirst','ucwords','uksort','umask','uniqid','unixtojd','unlink',
+            'unpack','unregister_tick_function','unserialize','unset',
+            'urldecode','urlencode','user_error','use_soap_error_handler',
+            'usleep','usort','utf8_decode','utf8_encode','var_dump',
+            'var_export','variant_abs','variant_add','variant_and',
+            'variant_cast','variant_cat','variant_cmp',
+            'variant_date_from_timestamp','variant_date_to_timestamp',
+            'variant_div','variant_eqv','variant_fix','variant_get_type',
+            'variant_idiv','variant_imp','variant_int','variant_mod',
+            'variant_mul','variant_neg','variant_not','variant_or',
+            'variant_pow','variant_round','variant_set','variant_set_type',
+            'variant_sub','variant_xor','version_compare','virtual','vfprintf',
+            'vprintf','vsprintf','wddx_add_vars','wddx_deserialize',
+            'wddx_packet_end','wddx_packet_start','wddx_serialize_value',
+            'wddx_serialize_vars','win_beep','win_browse_file',
+            'win_browse_folder','win_create_link','win_message_box',
+            'win_play_wav','win_shell_execute','win32_create_service',
+            'win32_delete_service','win32_get_last_control_message',
+            'win32_ps_list_procs','win32_ps_stat_mem','win32_ps_stat_proc',
+            'win32_query_service_status','win32_scheduler_delete_task',
+            'win32_scheduler_enum_tasks','win32_scheduler_get_task_info',
+            'win32_scheduler_run','win32_scheduler_set_task_info',
+            'win32_set_service_status','win32_start_service',
+            'win32_start_service_ctrl_dispatcher','win32_stop_service',
+            'wordwrap','xml_error_string','xml_get_current_byte_index',
+            'xml_get_current_column_number','xml_get_current_line_number',
+            'xml_get_error_code','xml_parse','xml_parser_create',
+            'xml_parser_create_ns','xml_parser_free','xml_parser_get_option',
+            'xml_parser_set_option','xml_parse_into_struct',
+            'xml_set_character_data_handler','xml_set_default_handler',
+            'xml_set_element_handler','xml_set_end_namespace_decl_handler',
+            'xml_set_external_entity_ref_handler',
+            'xml_set_notation_decl_handler','xml_set_object',
+            'xml_set_processing_instruction_handler',
+            'xml_set_start_namespace_decl_handler',
+            'xml_set_unparsed_entity_decl_handler','xmldoc','xmldocfile',
+            'xmlrpc_decode','xmlrpc_decode_request','xmlrpc_encode',
+            'xmlrpc_encode_request','xmlrpc_get_type','xmlrpc_is_fault',
+            'xmlrpc_parse_method_descriptions',
+            'xmlrpc_server_add_introspection_data','xmlrpc_server_call_method',
+            'xmlrpc_server_create','xmlrpc_server_destroy',
+            'xmlrpc_server_register_introspection_callback',
+            'xmlrpc_server_register_method','xmlrpc_set_type','xmltree',
+            'xmlwriter_end_attribute','xmlwriter_end_cdata',
+            'xmlwriter_end_comment','xmlwriter_end_document',
+            'xmlwriter_end_dtd','xmlwriter_end_dtd_attlist',
+            'xmlwriter_end_dtd_element','xmlwriter_end_dtd_entity',
+            'xmlwriter_end_element','xmlwriter_end_pi','xmlwriter_flush',
+            'xmlwriter_full_end_element','xmlwriter_open_memory',
+            'xmlwriter_open_uri','xmlwriter_output_memory',
+            'xmlwriter_set_indent','xmlwriter_set_indent_string',
+            'xmlwriter_start_attribute','xmlwriter_start_attribute_ns',
+            'xmlwriter_start_cdata','xmlwriter_start_comment',
+            'xmlwriter_start_document','xmlwriter_start_dtd',
+            'xmlwriter_start_dtd_attlist','xmlwriter_start_dtd_element',
+            'xmlwriter_start_dtd_entity','xmlwriter_start_element',
+            'xmlwriter_start_element_ns','xmlwriter_start_pi','xmlwriter_text',
+            'xmlwriter_write_attribute','xmlwriter_write_attribute_ns',
+            'xmlwriter_write_cdata','xmlwriter_write_comment',
+            'xmlwriter_write_dtd','xmlwriter_write_dtd_attlist',
+            'xmlwriter_write_dtd_element','xmlwriter_write_dtd_entity',
+            'xmlwriter_write_element','xmlwriter_write_element_ns',
+            'xmlwriter_write_pi','xmlwriter_write_raw','xpath_eval',
+            'xpath_eval_expression','xpath_new_context','xpath_register_ns',
+            'xpath_register_ns_auto','xptr_eval','xptr_new_context','yp_all',
+            'yp_cat','yp_errno','yp_err_string','yp_first',
+            'yp_get_default_domain','yp_master','yp_match','yp_next','yp_order',
+            'zend_current_obfuscation_level','zend_get_cfg_var','zend_get_id',
+            'zend_loader_current_file','zend_loader_enabled',
+            'zend_loader_file_encoded','zend_loader_file_licensed',
+            'zend_loader_install_license','zend_loader_version',
+            'zend_logo_guid','zend_match_hostmasks','zend_obfuscate_class_name',
+            'zend_obfuscate_function_name','zend_optimizer_version',
+            'zend_runtime_obfuscate','zend_version','zip_close',
+            'zip_entry_close','zip_entry_compressedsize',
+            'zip_entry_compressionmethod','zip_entry_filesize','zip_entry_name',
+            'zip_entry_open','zip_entry_read','zip_open','zip_read',
+            'zlib_get_coding_type'
+            ),
+        4 => array(
+            'DEFAULT_INCLUDE_PATH', 'DIRECTORY_SEPARATOR', 'E_ALL',
+            'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_CORE_ERROR',
+            'E_CORE_WARNING', 'E_ERROR', 'E_NOTICE', 'E_PARSE', 'E_STRICT',
+            'E_USER_ERROR', 'E_USER_NOTICE', 'E_USER_WARNING', 'E_WARNING',
+            'ENT_COMPAT','ENT_QUOTES','ENT_NOQUOTES',
+            'false', 'null', 'PEAR_EXTENSION_DIR', 'PEAR_INSTALL_DIR',
+            'PHP_BINDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_DATADIR',
+            'PHP_EXTENSION_DIR', 'PHP_LIBDIR',
+            'PHP_LOCALSTATEDIR', 'PHP_OS',
+            'PHP_OUTPUT_HANDLER_CONT', 'PHP_OUTPUT_HANDLER_END',
+            'PHP_OUTPUT_HANDLER_START', 'PHP_SYSCONFDIR',
+            'PHP_VERSION', 'true', '__CLASS__', '__FILE__', '__FUNCTION__',
+            '__LINE__', '__METHOD__'
             )
         ),
     'SYMBOLS' => array(
-        '(', ')', '[', ']', '{', '}',
-        '!', '@', '%', '&', '|', '/',
-        '<', '>',
-        '=', '-', '+', '*',
-        '.', ':', ',', ';'
+        1 => array(
+            '<'.'%', '<'.'%=', '%'.'>', '<'.'?', '<'.'?=', '?'.'>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
         1 => false,
         2 => false,
         3 => false,
+        4 => false
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
             1 => 'color: #b1b100;',
             2 => 'color: #000000; font-weight: bold;',
-            3 => 'color: #990000;'
+            3 => 'color: #990000;',
+            4 => 'color: #009900; font-weight: bold;'
             ),
         'COMMENTS' => array(
             1 => 'color: #666666; font-style: italic;',
             2 => 'color: #666666; font-style: italic;',
             3 => 'color: #0000cc; font-style: italic;',
-            4 => 'color: #0000ff; font-style: italic;',
+            4 => 'color: #009933; font-style: italic;',
             'MULTI' => 'color: #666666; font-style: italic;'
             ),
         'ESCAPE_CHAR' => array(
             0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #006699; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold; font-style: italic;',
+            6 => 'color: #009933; font-weight: bold;',
             'HARD' => 'color: #000099; font-weight: bold;'
             ),
         'BRACKETS' => array(
@@ -317,7 +1033,8 @@
             2 => 'color: #004000;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #339933;'
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
             ),
         'REGEXPS' => array(
             0 => 'color: #000088;'
@@ -334,7 +1051,8 @@
     'URLS' => array(
         1 => '',
         2 => '',
-        3 => 'http://www.php.net/{FNAMEL}'
+        3 => 'http://www.php.net/{FNAMEL}',
+        4 => ''
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
@@ -348,19 +1066,39 @@
     'STRICT_MODE_APPLIES' => GESHI_MAYBE,
     'SCRIPT_DELIMITERS' => array(
         0 => array(
-            ' '?>'
+            '<'.'?php' => '?'.'>'
             ),
         1 => array(
-            ' '?>'
+            '<'.'?' => '?'.'>'
             ),
         2 => array(
-            '<%' => '%>'
+            '<'.'%' => '%'.'>'
             ),
         3 => array(
             ''
             ),
-        4 => "/(<\?(?:php)?)(?:'[^']*?'|\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(\?>|\Z)/sm",
-        5 => "/(<%)(?:'[^']*?'|\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(%>|\Z)/sm"
+        4 => "/(?<\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?\w+)\s.*?\s\k".
+            ")*(?\\?>|\Z)/sm",
+        5 => "/(?<%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?\w+)\s.*?\s\k".
+            ")*(?%>)/sm",
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         0 => true,
@@ -373,4 +1111,4 @@
     'TAB_WIDTH' => 4
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/pic16.php dokuwiki-rc2009-12-02/inc/geshi/pic16.php
--- dokuwiki-2009-02-14/inc/geshi/pic16.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/pic16.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Phil Mattison (mattison@ohmikron.com)
  * Copyright: (c) 2008 Ohmikron Corp. (http://www.ohmikron.com/)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/07/30
  *
  * PIC16 Assembler language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/pixelbender.php dokuwiki-rc2009-12-02/inc/geshi/pixelbender.php
--- dokuwiki-2009-02-14/inc/geshi/pixelbender.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/pixelbender.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,176 @@
+ 'Pixel Bender 1.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'languageVersion', 'kernel'
+            ),
+        2 => array(
+            'import', 'parameter', 'dependent', 'const', 'input', 'output',
+            'evaluatePixel', 'evaluateDependents', 'needed', 'changed', 'generated'
+            ),
+        3 => array(
+            'bool', 'bool2', 'bool3', 'bool4', 'int', 'int2', 'int3', 'int4',
+            'float', 'float2', 'float3', 'float4', 'float2x2', 'float3x3', 'float4x4',
+            'pixel2', 'pixel3', 'pixel4', 'region', 'image1', 'image2', 'image3', 'image4',
+            'imageRef', 'void'
+            ),
+        4 => array(
+            'in', 'out', 'inout', 'if', 'else', 'for', 'while', 'do', 'break',
+            'continue', 'return'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'pow',
+            'exp', 'exp2', 'log', 'log2', 'sqrt', 'inverseSqrt', 'abs', 'sign', 'floor',
+            'ceil', 'fract', 'mod', 'min', 'max', 'step', 'clamp', 'mix', 'smoothStep',
+            'length', 'distance', 'dot', 'cross', 'normalize', 'matrixCompMult', 'lessThan',
+            'lessThanEqual', 'greaterThan', 'greaterThanEqual', 'equal', 'notEqual', 'any',
+            'all', 'not', 'nowhere', 'everywhere', 'transform', 'union', 'intersect',
+            'outset', 'inset', 'bounds', 'isEmpty', 'sample', 'sampleLinear', 'sampleNearest',
+            'outCoord', 'dod', 'pixelSize', 'pixelAspectRatio'
+            ),
+        6 => array(
+            'namespace', 'vendor', 'version', 'minValue', 'maxValue', 'defaultValue', 'description'
+            ),
+        7 => array(
+            '#if', '#endif', '#ifdef', '#elif', 'defined', '#define',
+            'AIF_ATI', 'AIF_NVIDIA', 'AIF_FLASH_TARGET'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '|', '+', '-', '*', '/', '=', '<', '>', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff;',
+            2 => 'color: #0033ff; font-weight: bold;',
+            3 => 'color: #0033ff;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #333333;',
+            6 => 'color: #666666;',
+            7 => 'color: #990000;',
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;',
+            'MULTI' => 'color: #3f5fbf;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/plsql.php dokuwiki-rc2009-12-02/inc/geshi/plsql.php
--- dokuwiki-2009-02-14/inc/geshi/plsql.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/plsql.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Victor Engmark 
  * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/10/26
  *
  * Oracle 9.2 PL/SQL language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/povray.php dokuwiki-rc2009-12-02/inc/geshi/povray.php
--- dokuwiki-2009-02-14/inc/geshi/povray.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/povray.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Carl Fürstenberg (azatoth@gmail.com)
  * Copyright: © 2007 Carl Fürstenberg
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/07/11
  *
  * Povray language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/powershell.php dokuwiki-rc2009-12-02/inc/geshi/powershell.php
--- dokuwiki-2009-02-14/inc/geshi/powershell.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/powershell.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Frode Aarebrot (frode@aarebrot.net)
  * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/06/20
  *
  * PowerShell language file for GeSHi.
@@ -47,7 +47,7 @@
  ************************************************************************************/
 
 $language_data = array (
-    'LANG_NAME' => 'posh',
+    'LANG_NAME' => 'PowerShell',
     'COMMENT_SINGLE' => array(1 => '#'),
     'COMMENT_MULTI' => array(),
     'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
@@ -139,6 +139,16 @@
             '-Body', '-BinaryPathName', '-Begin', '-BackgroundColor', '-Average', '-AutoSize', '-Audit',
             '-AsString', '-AsSecureString', '-AsPlainText', '-As', '-ArgumentList', '-AppendPath', '-Append',
             '-Adjust', '-Activity', '-AclObject'
+            ),
+        6 => array(
+            '_','args','DebugPreference','Error','ErrorActionPreference',
+            'foreach','Home','Host','Input','LASTEXITCODE','MaximumAliasCount',
+            'MaximumDriveCount','MaximumFunctionCount','MaximumHistoryCount',
+            'MaximumVariableCount','OFS','PsHome',
+            'ReportErrorShowExceptionClass','ReportErrorShowInnerException',
+            'ReportErrorShowSource','ReportErrorShowStackTrace',
+            'ShouldProcessPreference','ShouldProcessReturnPreference',
+            'StackTrace','VerbosePreference','WarningPreference','PWD'
             )
         ),
     'SYMBOLS' => array(
@@ -151,7 +161,8 @@
         2 => false,
         3 => false,
         4 => false,
-        5 => false
+        5 => false,
+        6 => true
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
@@ -160,6 +171,7 @@
             3 => 'color: #0000FF;',
             4 => 'color: #FF0000;',
             5 => 'color: #008080; font-style: italic;',
+            6 => 'color: #000080;'
             ),
         'COMMENTS' => array(
             1 => 'color: #008000;',
@@ -175,7 +187,7 @@
             0 => 'color: #800000;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #000000;'
+            0 => 'color: #804000;'
             ),
         'METHODS' => array(
             0 => 'color: pink;'
@@ -199,13 +211,12 @@
         3 => '',
         4 => '',
         5 => '',
+        6 => 'about:blank',
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
         ),
     'REGEXPS' => array(
-        // variables
-        0 => "[\\$][a-zA-Z0-9_]*",
         // special after pipe
         3 => array(
             GESHI_SEARCH => '(\[)(int|long|string|char|bool|byte|double|decimal|float|single|regex|array|xml|scriptblock|switch|hashtable|type|ref|psobject|wmi|wmisearcher|wmiclass|object)((\[.*\])?\])',
@@ -233,18 +244,34 @@
             ),
         // Special variables
         6 => array(
-            GESHI_SEARCH => '(\$)(\$|\?|\$\^|_|args|DebugPreference|Error|ErrorActionPreference|foreach|Home|Input|LASTEXITCODE|MaximumAliasCount|MaximumDriveCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|PsHome|Host|OFS|ReportErrorShowExceptionClass|ReportErrorShowInnerException|ReportErrorShowSource|ReportErrorShowStackTrace|ShouldProcessPreference|ShouldProcessReturnPreference|StackTrace|VerbosePreference|WarningPreference|PWD)',
+            GESHI_SEARCH => '(\$)(\$[_\^]?|\?)(?!\w)',
             GESHI_REPLACE => '\1\2',
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '',
-            GESHI_AFTER => '\3'
+            GESHI_AFTER => ''
             ),
+        // variables
+        //BenBE: Please note that changes here and in Keyword group 6 have to be synchronized in order to work properly.
+        //This Regexp must only match, if keyword group 6 doesn't. If this assumption fails
+        //Highlighting of the keywords will be incomplete or incorrect!
+        0 => "(?)[\\\$](\w+)(?=[^|\w])",
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
         ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' => '(?![a-zA-Z])',
+                'DISALLOWED_BEFORE' => ''
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?)\$'
+                )
+            )
+        )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/progress.php dokuwiki-rc2009-12-02/inc/geshi/progress.php
--- dokuwiki-2009-02-14/inc/geshi/progress.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/progress.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Marco Aurelio de Pasqual (marcop@hdi.com.br)
  * Copyright: (c) 2008 Marco Aurelio de Pasqual, Benny Baumann (http://qbnz.com/highlighter)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/07/11
  *
  * Progress language file for GeSHi.
@@ -51,7 +51,7 @@
         1 => array(
             'ACCUMULATE','APPLY','ASSIGN','BELL','QUERY',
             'BUFFER-COMPARE','BUFFER-COPY','CALL','CASE',
-            'CHOOSE','CLASS','CLEAR','CLOSE QUERY','each','WHERE',
+            'CHOOSE','CLASS','CLOSE QUERY','each','WHERE',
             'CLOSE STORED-PROCEDURE','COLOR','COMPILE','CONNECT',
             'CONSTRUCTOR','COPY-LOB','CREATE','CREATE ALIAS',
             'CREATE BROWSE','CREATE BUFFER','CREATE CALL','CREATE CLIENT-PRINCIPAL',
@@ -71,12 +71,12 @@
             'DISABLE','DISABLE TRIGGERS','DISCONNECT','DISPLAY',
             'DO','DOS','DOWN','DYNAMIC-CURRENT-VALUE',
             'ELSE','EMPTY TEMP-TABLE','ENABLE','END',
-            'ENTRY','EXPORT','FIND','AND',
+            'ENTRY','FIND','AND',
             'FIX-CODEPAGE','FOR','FORM','FRAME-VALUE',
             'GET','GET-KEY-VALUE','HIDE','IF',
             'IMPORT','INPUT CLEAR','INPUT CLOSE','INPUT FROM','input',
-            'INPUT THROUGH','INPUT-OUTPUT CLOSE','INPUT-OUTPUT THROUGH','INSERT',
-            'INTERFACE','LEAVE','LOAD','DELETE','BREAK',
+            'INPUT THROUGH','INPUT-OUTPUT CLOSE','INPUT-OUTPUT THROUGH',
+            'INTERFACE','LEAVE','BREAK',
             'LOAD-PICTURE','MESSAGE','method','NEXT','prev',
             'NEXT-PROMPT','ON','OPEN QUERY','OS-APPEND',
             'OS-COMMAND','OS-COPY','OS-CREATE-DIR','OS-DELETE',
@@ -97,7 +97,7 @@
             'system-DIALOG PRINTER-SETUP','system-HELP','THEN','THIS-object',
             'TRANSACTION-MODE AUTOMATIC','TRIGGER PROCEDURE','UNDERLINE','UNDO',
             'UNIX','UNLOAD','UNSUBSCRIBE','UP','STRING',
-            'UPDATE','USE','USING','VALIDATE','substr','SKIP','CLOSE',
+            'UPDATE','USE','USING','substr','SKIP','CLOSE',
             'VIEW','WAIT-FOR','MODULO','NE','AVAIL',
             'NOT','OR','&GLOBAL-DEFINE','&IF','UNFORMATTED','NO-PAUSE',
             '&THEN','&ELSEIF','&ELSE','&ENDIF','OPEN','NO-WAIT',
@@ -129,21 +129,21 @@
             'ADD-LIKE-FIELD','ADD-LIKE-INDEX','ADD-NEW-FIELD','ADD-NEW-INDEX',
             'ADD-RELATION','ADD-SCHEMA-LOCATION','ADD-SOURCE-BUFFER','ADD-SUPER-PROCEDURE',
             'APPEND-CHILD','APPLY-CALLBACK','ATTACH-DATA-SOURCE','AUTHENTICATION-FAILED',
-            'BEGIN-EVENT-GROUP','BUFFER-COMPARE','BUFFER-COPY','BUFFER-CREATE',
-            'BUFFER-DELETE','BUFFER-FIELD','BUFFER-RELEASE','BUFFER-VALIDATE',
+            'BEGIN-EVENT-GROUP','BUFFER-CREATE',
+            'BUFFER-DELETE','BUFFER-RELEASE','BUFFER-VALIDATE',
             'CANCEL-BREAK','CANCEL-REQUESTS','CLEAR','CLEAR-APPL-CONTEXT',
             'CLEAR-LOG','CLEAR-SELECTION','CLEAR-SORT-ARROWS','CLONE-NODE',
-            'CLOSE-LOG','CONNECT','CONNECTED','CONVERT-TO-OFFSET',
+            'CLOSE-LOG','CONNECTED','CONVERT-TO-OFFSET',
             'COPY-DATASET','COPY-SAX-attributeS','COPY-TEMP-TABLE','CREATE-LIKE',
             'CREATE-NODE','CREATE-NODE-NAMESPACE','CREATE-RESULT-LIST-ENTRY','DEBUG',
             'DECLARE-NAMESPACE','DELETE-CHAR','DELETE-CURRENT-ROW',
             'DELETE-HEADER-ENTRY','DELETE-LINE','DELETE-NODE','DELETE-RESULT-LIST-ENTRY',
             'DELETE-SELECTED-ROW','DELETE-SELECTED-ROWS','DESELECT-FOCUSED-ROW','DESELECT-ROWS',
-            'DESELECT-SELECTED-ROW','DETACH-DATA-SOURCE','DISABLE','DISABLE-CONNECTIONS',
-            'DISABLE-DUMP-TRIGGERS','DISABLE-LOAD-TRIGGERS','DISCONNECT','DISPLAY-MESSAGE',
+            'DESELECT-SELECTED-ROW','DETACH-DATA-SOURCE','DISABLE-CONNECTIONS',
+            'DISABLE-DUMP-TRIGGERS','DISABLE-LOAD-TRIGGERS','DISPLAY-MESSAGE',
             'DUMP-LOGGING-NOW','EDIT-CLEAR','EDIT-COPY','EDIT-CUT',
             'EDIT-PASTE','EDIT-UNDO','EMPTY-DATASET','EMPTY-TEMP-TABLE',
-            'ENABLE','ENABLE-CONNECTIONS','ENABLE-EVENTS','ENCRYPT-AUDIT-MAC-KEY',
+            'ENABLE-CONNECTIONS','ENABLE-EVENTS','ENCRYPT-AUDIT-MAC-KEY',
             'END-DOCUMENT','END-ELEMENT','END-EVENT-GROUP','END-FILE-DROP',
             'EXPORT','EXPORT-PRINCIPAL','FETCH-SELECTED-ROW',
             'FILL','FIND-BY-ROWID','FIND-CURRENT','FIND-FIRST',
@@ -164,7 +164,7 @@
             'GET-TEXT-WIDTH-CHARS','GET-TEXT-WIDTH-PIXELS','GET-TOP-BUFFER','GET-TYPE-BY-INDEX',
             'GET-TYPE-BY-NAMESPACE-NAME','GET-TYPE-BY-QNAME','GET-URI-BY-INDEX','GET-VALUE-BY-INDEX',
             'GET-VALUE-BY-NAMESPACE-NAME','GET-VALUE-BY-QNAME','GET-WAIT-STATE','IMPORT-NODE',
-            'IMPORT-PRINCIPAL','INCREMENT-EXCLUSIVE-ID','INDEX-INFORMATION','INITIALIZE-DOCUMENT-TYPE',
+            'IMPORT-PRINCIPAL','INCREMENT-EXCLUSIVE-ID','INITIALIZE-DOCUMENT-TYPE',
             'INITIATE','INSERT','INSERT-attribute','INSERT-BACKTAB',
             'INSERT-BEFORE','INSERT-FILE','INSERT-ROW','INSERT-STRING',
             'INSERT-TAB','INVOKE','IS-ROW-SELECTED','IS-SELECTED',
@@ -175,7 +175,7 @@
             'MEMPTR-TO-NODE-VALUE','MERGE-CHANGES','MERGE-ROW-CHANGES','MOVE-AFTER-TAB-ITEM',
             'MOVE-BEFORE-TAB-ITEM','MOVE-COLUMN','MOVE-TO-BOTTOM','MOVE-TO-EOF',
             'MOVE-TO-TOP','NODE-VALUE-TO-LONGCHAR','NODE-VALUE-TO-MEMPTR','NORMALIZE',
-            'QUERY-CLOSE','QUERY-OPEN','QUERY-PREPARE','RAW-TRANSFER',
+            'QUERY-CLOSE','QUERY-OPEN','QUERY-PREPARE',
             'READ','READ-FILE','READ-XML','READ-XMLSCHEMA',
             'REFRESH','REFRESH-AUDIT-POLICY','REGISTER-DOMAIN','REJECT-CHANGES',
             'REJECT-ROW-CHANGES','REMOVE-attribute','REMOVE-CHILD','REMOVE-EVENTS-PROCEDURE',
@@ -205,14 +205,14 @@
             'AMBIGUOUS','ASC','AUDIT-ENABLED','AVAILABLE',
             'BASE64-DECODE','BASE64-ENCODE','CAN-DO','CAN-FIND',
             'CAN-QUERY','CAN-SET','CAPS','CAST','OS-DIR',
-            'CHR','CODEPAGE-CONVERT','COMPARE','CONNECTED',
+            'CHR','CODEPAGE-CONVERT','COMPARE',
             'COUNT-OF','CURRENT-CHANGED','CURRENT-RESULT-ROW','DATASERVERS',
             'DATA-SOURCE-MODIFIED','DATETIME','DATETIME-TZ',
             'DAY','DBCODEPAGE','DBCOLLATION','DBNAME',
             'DBPARAM','DBRESTRICTIONS','DBTASKID','DBTYPE',
             'DBVERSION','DECIMAL','DECRYPT','DYNAMIC-function',
             'DYNAMIC-NEXT-VALUE','ENCODE','ENCRYPT','ENTERED',
-            'ERROR','ETIME','EXP','FILL','ENDKEY','END-error',
+            'ERROR','ETIME','EXP','ENDKEY','END-error',
             'FIRST-OF','FRAME-DB','FRAME-DOWN',
             'FRAME-FIELD','FRAME-FILE','FRAME-INDEX','FRAME-LINE',
             'GATEWAYS','GENERATE-PBE-KEY','GENERATE-PBE-SALT','GENERATE-RANDOM-KEY',
@@ -228,21 +228,21 @@
             'KEYWORD','KEYWORD-ALL','LASTKEY',
             'LAST-OF','LC','LDBNAME','LEFT-TRIM',
             'LIBRARY','LINE-COUNTER','LIST-EVENTS','LIST-QUERY-ATTRS',
-            'LIST-SET-ATTRS','LIST-widgetS','LOCKED','LOG',
-            'LOGICAL','LOOKUP','MAXIMUM','MD5-DIGEST',
+            'LIST-SET-ATTRS','LIST-widgetS','LOCKED',
+            'LOGICAL','MAXIMUM','MD5-DIGEST',
             'MEMBER','MESSAGE-LINES','MINIMUM','MONTH',
-            'MTIME','NEW','NEXT-VALUE','NORMALIZE','SHARED',
+            'MTIME','NEW','NEXT-VALUE','SHARED',
             'NOT ENTERED','NOW','NUM-ALIASES','NUM-DBS',
             'NUM-ENTRIES','NUM-RESULTS','OPSYS','OS-DRIVES',
             'OS-ERROR','OS-GETENV','PAGE-NUMBER','PAGE-SIZE',
             'PDBNAME','PROC-HANDLE','PROC-STATUS','PROGRAM-NAME',
             'PROGRESS','PROVERSION','QUERY-OFF-END','QUOTER',
             'RANDOM','RAW','RECID','REJECTED',
-            'REPLACE','RETRY','RETURN-VALUE','RGB-VALUE',
+            'RETRY','RETURN-VALUE','RGB-VALUE',
             'RIGHT-TRIM','R-INDEX','ROUND','ROWID','LENGTH',
-            'SDBNAME','SEARCH','SET-DB-CLIENT','SETUSERID',
+            'SDBNAME','SET-DB-CLIENT','SETUSERID',
             'SHA1-DIGEST','SQRT','SUBSTITUTE','VARIABLE',
-            'SUPER','TERMINAL','TIME','TIMEZONE','external','ENTRY',
+            'SUPER','TERMINAL','TIME','TIMEZONE','external',
             'TODAY','TO-ROWID','TRIM','TRUNCATE','return',
             'TYPE-OF','USERID','VALID-EVENT','VALID-HANDLE',
             'VALID-object','WEEKDAY','YEAR','BEGINS','VALUE',
@@ -396,8 +396,8 @@
             'WINDOW-system','WORD-WRAP','WORK-AREA-HEIGHT-PIXELS','WORK-AREA-WIDTH-PIXELS',
             'WORK-AREA-X','WORK-AREA-Y','WRITE-STATUS','X','widget-Handle',
             'X-DOCUMENT','XML-DATA-TYPE','XML-NODE-TYPE','XML-SCHEMA-PATH',
-            'XML-SUPPRESS-NAMESPACE-PROCESSING','Y','YEAR-OFFSET','CHARACTER','INTEGER','LOGICAL',
-            'LONGCHAR','MEMPTR','DECIMAL','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
+            'XML-SUPPRESS-NAMESPACE-PROCESSING','Y','YEAR-OFFSET','CHARACTER',
+            'LONGCHAR','MEMPTR','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
             )
         ),
     'SYMBOLS' => array(
@@ -471,9 +471,15 @@
     'PARSER_CONTROL' => array(
         'KEYWORDS' => array(
             'DISALLOWED_BEFORE' => "(?  "(?![\-a-zA-Z0-9_%])"
+            'DISALLOWED_AFTER' =>  "(?![\-a-zA-Z0-9_%])",
+            1 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            2 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
         )
-    )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/prolog.php dokuwiki-rc2009-12-02/inc/geshi/prolog.php
--- dokuwiki-2009-02-14/inc/geshi/prolog.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/prolog.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,143 @@
+ 'Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abolish','abs','arg','asserta','assertz','at_end_of_stream','atan',
+            'atom','atom_chars','atom_codes','atom_concat','atom_length',
+            'atomic','bagof','call','catch','ceiling','char_code',
+            'char_conversion','clause','close','compound','consult','copy_term',
+            'cos','current_char_conversion','current_input','current_op',
+            'current_output','current_predicate','current_prolog_flag',
+            'discontiguous','dynamic','ensure_loaded','exp','fail','findall',
+            'float','float_fractional_part','float_integer_part','floor',
+            'flush_output','functor','get_byte','get_char','get_code','halt',
+            'include','initialization','integer','is','listing','log','mod',
+            'multifile','nl','nonvar','notrace','number','number_chars',
+            'number_codes','once','op','open','peek_byte','peek_char',
+            'peek_code','put_byte','put_char','put_code','read','read_term',
+            'rem','repeat','retract','round','set_input','set_output',
+            'set_prolog_flag','set_stream_position','setof','sign','sin','sqrt',
+            'stream_property','sub_atom','throw','trace','true','truncate',
+            'unify_with_occurs_check','univ','var','write','write_canonical',
+            'write_term','writeq'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}',),
+        1 => array('?-', ':-', '=:='),
+        2 => array('\-', '\+', '\*', '\/'),
+        3 => array('-', '+', '*', '/'),
+        4 => array('.', ':', ',', ';'),
+        5 => array('!', '@', '&', '|'),
+        6 => array('<', '>', '=')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;',
+            2 => 'color: #339933;',
+            3 => 'color: #339933;',
+            4 => 'color: #339933;',
+            5 => 'color: #339933;',
+            6 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://pauillac.inria.fr/~deransar/prolog/bips.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "(? GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/providex.php dokuwiki-rc2009-12-02/inc/geshi/providex.php
--- dokuwiki-2009-02-14/inc/geshi/providex.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/providex.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,299 @@
+ 'ProvideX',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // Single-Line Comments using REM command
+        2 => "/\bREM\b.*?$/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Directives
+            '*break', '*continue', '*end', '*escape', '*next', '*proceed',
+            '*retry', '*return', '*same', 'accept', 'add index', 'addr',
+            'auto', 'begin', 'break', 'button', 'bye', 'call', 'case',
+            'chart', 'check_box', 'class', 'clear', 'clip_board', 'close',
+            'continue', 'control', 'create required', 'create table',
+            'cwdir', 'data', 'day_format', 'def', 'default', 'defctl',
+            'defprt', 'deftty', 'delete required', 'dictionary', 'dim', 'direct',
+            'directory', 'disable', 'drop', 'drop_box', 'dump', 'edit',
+            'else', 'enable', 'end switch', 'end', 'end_if', 'endtrace',
+            'enter', 'erase', 'error_handler', 'escape', 'event', 'execute',
+            'exit', 'exitto', 'extract', 'file', 'find', 'floating point',
+            'for', 'function', 'get_file_box', 'gosub', 'goto', 'grid',
+            'h_scrollbar', 'hide', 'if', 'index', 'indexed', 'input',
+            'insert', 'invoke', 'iolist', 'keyed', 'let', 'like',
+            'line_switch', 'list', 'list_box', 'load', 'local', 'lock',
+            'long_form', 'menu_bar', 'merge', 'message_lib', 'mnemonic',
+            'msgbox', 'multi_line', 'multi_media', 'next', 'object', 'obtain',
+            'on', 'open', 'password', 'perform', 'pop', 'popup_menu',
+            'precision', 'prefix', 'preinput', 'print', 'process', 'program',
+            'property', 'purge', 'quit', 'radio_button', 'randomize',
+            'read', 'record', 'redim', 'refile', 'release', 'rem', 'remove',
+            'rename', 'renumber', 'repeat', 'reset', 'restore', 'retry',
+            'return', 'round', 'run', 'save', 'select', 'serial', 'server',
+            'set_focus', 'set_nbf', 'set_param', 'setctl', 'setday', 'setdev',
+            'setdrive', 'seterr', 'setesc', 'setfid', 'setmouse', 'settime',
+            'settrace', 'short_form', 'show', 'sort', 'start', 'static',
+            'step', 'stop', 'switch', 'system_help', 'system_jrnl', 'table',
+            'then', 'to', 'translate', 'tristate_box', 'unlock', 'until',
+            'update', 'user_lex', 'v_scrollbar', 'vardrop_box', 'varlist_box',
+            'via', 'video_palette', 'wait', 'wend', 'while', 'winprt_setup',
+            'with', 'write'
+            ),
+        2 => array(
+            // System Functions
+            '@x', '@y', 'abs', 'acs', 'and', 'arg', 'asc', 'asn', 'ath',
+            'atn', 'bin', 'bsz', 'chg', 'chr', 'cmp', 'cos', 'cpl',
+            'crc', 'cse', 'ctl', 'cvs', 'dec', 'dir', 'dll', 'dsk',
+            'dte', 'env', 'ept', 'err', 'evn', 'evs', 'exp', 'ffn',
+            'fib', 'fid', 'fin', 'fpt', 'gap', 'gbl', 'gep', 'hsa',
+            'hsh', 'hta', 'hwn', 'i3e', 'ind', 'int', 'iol', 'ior',
+            'jul', 'jst', 'kec', 'kef', 'kel', 'ken', 'kep', 'key',
+            'kgn', 'lcs', 'len', 'lno', 'log', 'lrc', 'lst', 'max',
+            'mem', 'mid', 'min', 'mnm', 'mod', 'msg', 'msk', 'mxc',
+            'mxl', 'new', 'not', 'nul', 'num', 'obj', 'opt', 'pad',
+            'pck', 'pfx', 'pgm', 'pos', 'prc', 'prm', 'pth', 'pub',
+            'rcd', 'rdx', 'rec', 'ref', 'rnd', 'rno', 'sep', 'sgn',
+            'sin', 'sqr', 'srt', 'ssz', 'stk', 'stp', 'str', 'sub',
+            'swp', 'sys', 'tan', 'tbl', 'tcb', 'tmr', 'trx', 'tsk',
+            'txh', 'txw', 'ucp', 'ucs', 'upk', 'vin', 'vis', 'xeq',
+            'xfa', 'xor', '_obj'
+            ),
+        3 => array(
+            // System Variables
+            // Vars that are duplicates of functions
+            // 'ctl', 'err', 'pfx', 'prm', 'rnd', 'sep', 'sys',
+            'bkg', 'chn', 'day', 'dlm', 'dsz', 'eom', 'ers', 'esc',
+            'gfn', 'gid', 'hfn', 'hlp', 'hwd', 'lfa', 'lfo', 'lip',
+            'lpg', 'lwd', 'mse', 'msl', 'nar', 'nid', 'pgn', 'psz',
+            'quo', 'ret', 'sid', 'ssn', 'tim', 'tme', 'tms', 'tsm',
+            'uid', 'unt', 'who'
+
+            ),
+        4 => array(
+            // Nomads Variables
+            '%Flmaint_Lib$', '%Flmaint_Msg$', '%Nomads_Activation_Ok',
+            '%Nomads_Auto_Qry', '%Nomads_Disable_Debug',
+            '%Nomads_Disable_Trace', '%Nomads_Fkey_Handler$',
+            '%Nomads_Fkey_Tbl$', '%Nomads_Notest', '%Nomads_Onexit$',
+            '%Nomads_Post_Display', '%Nomads_Pre_Display$',
+            '%Nomads_Process$', '%Nomads_Trace_File$',
+            '%Nomad_Actv_Folder_Colors$', '%Nomad_Automation_Enabled',
+            '%Nomad_Auto_Close', '%Nomad_Center_Wdw', '%Nomad_Concurrent_Wdw',
+            '%Nomad_Custom_Define', '%Nomad_Custom_Dir$',
+            '%Nomad_Custom_Genmtc', '%Nomad_Custom_Skip_Definition',
+            '%Nomad_Def_Sfx$', '%Nomad_Enter_Tab', '%Nomad_Esc_Sel',
+            '%Nomad_Isjavx', '%Nomad_Iswindx', '%Nomad_Iswindx$',
+            '%Nomad_Menu$', '%Nomad_Menu_Leftedge_Clr$',
+            '%Nomad_Menu_Textbackground_Clr$', '%Nomad_Mln_Sep$',
+            '%Nomad_Msgmnt$', '%Nomad_Noplusw', '%Nomad_No_Customize',
+            '%Nomad_Object_Persistence', '%Nomad_Object_Resize',
+            '%Nomad_Open_Load', '%Nomad_Override_Font$',
+            '%Nomad_Palette_Loaded', '%Nomad_Panel_Info_Force',
+            '%Nomad_Panel_Info_Prog$', '%Nomad_Pnl_Def_Colour$',
+            '%Nomad_Pnl_Def_Font$', '%Nomad_Prg_Cache', '%Nomad_Qry_Attr$',
+            '%Nomad_Qry_Btn$', '%Nomad_Qry_Clear_Start', '%Nomad_Qry_Tip$',
+            '%Nomad_Qry_Wide', '%Nomad_Query_Clear_Status', '%Nomad_Query_Kno',
+            '%Nomad_Query_No_Gray', '%Nomad_Query_Odb_Ignore',
+            '%Nomad_Query_Retkno', '%Nomad_Query_Sbar_Max',
+            '%Nomad_Relative_Wdw', '%Nomad_Save_Qry_Path', '%Nomad_Script_Fn',
+            '%Nomad_Script_Log', '%Nomad_Script_Wdw',
+            '%Nomad_Skip_Change_Logic', '%Nomad_Skip_Onselect_Logic',
+            '%Nomad_Stk$', '%Nomad_Tab_Dir', '%Nomad_Timeout',
+            '%Nomad_Turbo_Off', '%Nomad_Visual_Effect',
+            '%Nomad_Visual_Override', '%Nomad_Win_Ver', '%Nomad_Xchar',
+            '%Nomad_Xmax', '%Nomad_Ychar', '%Nomad_Ymax', '%Scr_Def_Attr$',
+            '%Scr_Def_H_Fl$', '%Scr_Def_H_Id$', '%Scr_Lib', '%Scr_Lib$',
+            '%Z__Usr_Sec$', 'Alternate_Panel$', 'Alternate_Panel_Type$',
+            'Arg_1$', 'Arg_10$', 'Arg_11$', 'Arg_12$', 'Arg_13$', 'Arg_14$',
+            'Arg_15$', 'Arg_16$', 'Arg_17$', 'Arg_18$', 'Arg_19$', 'Arg_2$',
+            'Arg_20$', 'Arg_3$', 'Arg_4$', 'Arg_5$', 'Arg_6$', 'Arg_7$',
+            'Arg_8$', 'Arg_9$', 'Change_Flg', 'Cmd_Str$', 'Default_Prog$',
+            'Disp_Cmd$', 'Entire_Record$', 'Exit_Cmd$', 'Fldr_Default_Prog$',
+            'Folder_Id$', 'Id', 'Id$', 'Ignore_Exit', 'Initialize_Flg',
+            'Init_Text$', 'Init_Val$', 'Main_Scrn_K$', 'Mnu_Ln$',
+            'Next_Folder', 'Next_Id', 'Next_Id$', 'No_Flush', 'Prime_Key$',
+            'Prior_Val', 'Prior_Val$', 'Qry_Val$', 'Refresh_Flg',
+            'Replacement_Folder$', 'Replacement_Lib$', 'Replacement_Scrn$',
+            'Scrn_Id$', 'Scrn_K$', 'Scrn_Lib$', 'Tab_Table$', '_Eom$'
+            ),
+        5 => array(
+            // Mnemonics
+            "'!w'", "'*c'", "'*h'", "'*i'", "'*o'", "'*r'", "'*x'",
+            "'+b'", "'+d'", "'+e'", "'+f'", "'+i'", "'+n'",
+            "'+p'", "'+s'", "'+t'", "'+u'", "'+v'", "'+w'", "'+x'",
+            "'+z'", "'-b'", "'-d'", "'-e'", "'-f'", "'-i'",
+            "'-n'", "'-p'", "'-s'", "'-t'", "'-u'", "'-v'", "'-w'",
+            "'-x'", "'-z'", "'2d'", "'3d'", "'4d'", "'@@'", "'ab'",
+            "'arc'", "'at'", "'backgr'", "'bb'", "'be'", "'beep'",
+            "'bg'", "'bi'", "'bj'", "'bk'", "'black'", "'blue'",
+            "'bm'", "'bo'", "'box'", "'br'", "'bs'", "'bt'", "'bu'",
+            "'bw'", "'bx'", "'caption'", "'ce'", "'cf'", "'ch'",
+            "'ci'", "'circle'", "'cl'", "'colour'", "'cp'", "'cpi'",
+            "'cr'", "'cs'", "'cursor'", "'cyan''_cyan'", "'dc'",
+            "'default'", "'df'", "'dialogue'", "'dn'", "'do'",
+            "'drop'", "'eb'", "'ee'", "'ef'", "'eg'", "'ei'", "'ej'",
+            "'el'", "'em'", "'eo'", "'ep'", "'er'", "'es'", "'et'",
+            "'eu'", "'ew'", "'ff'", "'fill'", "'fl'", "'font'",
+            "'frame'", "'gd'", "'ge'", "'gf'", "'goto'", "'green'",
+            "'gs'", "'hide'", "'ic'", "'image'", "'jc'",
+            "'jd'", "'jl'", "'jn'", "'jr'", "'js'", "'l6'", "'l8'",
+            "'lc'", "'ld'", "'lf'", "'li'", "'line'", "'lm'",
+            "'lpi'", "'lt'", "'magenta'", "'maxsize'", "'me'",
+            "'message'", "'minsize'", "'mn'", "'mode'",
+            "'move'", "'mp'", "'ms'", "'ni'", "'offset'", "'option'",
+            "'pe'", "'pen'", "'picture'", "'pie'", "'pm'", "'polygon'",
+            "'pop'", "'ps'", "'push'", "'rb'", "'rc'", "'rectangle'",
+            "'red'", "'rl'", "'rm'", "'rp'", "'rs'", "'rt'", "'sb'",
+            "'scroll'", "'sd'", "'se'", "'sf'", "'show'", "'size'",
+            "'sl'", "'sn'", "'sp'", "'sr'", "'swap'", "'sx'", "'text'",
+            "'textwdw'", "'tr'", "'tw'", "'uc'", "'up'", "'vt'", "'wa'",
+            "'wc'", "'wd'", "'wg'", "'white'", "'window'", "'wm'",
+            "'wp'", "'wr'", "'wrap'", "'ws'", "'wx'", "'xp'", "'yellow'",
+            "'zx'", "'_black'", "'_blue'", "'_colour'", "'_green'",
+            "'_magenta'", "'_red'", "'_white'", "'_yellow'"
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-', '*', '/', '^', '|'),
+        1 => array('++', '--', '+=', '-=', '*=', '/=', '^=', '|='),
+        2 => array('<', '>', '='),
+        3 => array('(', ')', '[', ']', '{', '}'),
+        4 => array(',', '@', ';', '\\')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: navy;', // Directives
+            2 => 'color: blue;', // System Functions
+            3 => 'color: blue;', // System Variables
+            4 => 'color: #6A5ACD; font-style: italic;', // Nomads Global Variables
+            5 => 'color: #BDB76B;', // Mnemonics
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #0000C9;',
+            4 => 'color: #000099;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #006400; font-weight: bold',
+            2 => 'color: #6A5ACD;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.allbasic.info./wiki/index.php/PX:Directive_{FNAME}',
+        2 => 'http://www.allbasic.info./wiki/index.php/PX:System_function_{FNAME}',
+        3 => 'http://www.allbasic.info./wiki/index.php/PX:System_variable_{FNAME}',
+        4 => 'http://www.allbasic.info./wiki/index.php/PX:Nomads_{FNAME}',
+        5 => 'http://www.allbasic.info./wiki/index.php/PX:Mnemonic_{FNAMEU}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => "'"
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            // Line Labels
+            GESHI_SEARCH => '([[:space:]])([a-zA-Z_][a-zA-Z0-9_]+)(:)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        2 => array(
+            // Global String Variables
+            GESHI_SEARCH => '(\%)([a-zA-Z_][a-zA-Z0-9_]+)(\$)',
+            GESHI_REPLACE => '\\1\\2\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/python.php dokuwiki-rc2009-12-02/inc/geshi/python.php
--- dokuwiki-2009-02-14/inc/geshi/python.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/python.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,13 +4,15 @@
  * ----------
  * Author: Roberto Rossi (rsoftware@altervista.org)
  * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * Python language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2008/12/18
+ *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
  * 2005/05/26
  *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
  * 2004/11/27 (1.0.1)
@@ -58,7 +60,7 @@
         1 => array(
             'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
             'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
-            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print'
+            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', 'with', 'as'
             ),
 
         /*
@@ -87,7 +89,9 @@
             'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
             'RuntimeWarning', 'FutureWarning',
             // self: this is a common python convention (but not a reserved word)
-            'self'
+            'self',
+            // other
+            'any', 'all'
             ),
 
         /*
@@ -124,7 +128,9 @@
             'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
             'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
             'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
-            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib'
+            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib',
+            // Python 3.0
+            'bytes', 'bytearray'
             ),
 
         /*
diff -Naur dokuwiki-2009-02-14/inc/geshi/qbasic.php dokuwiki-rc2009-12-02/inc/geshi/qbasic.php
--- dokuwiki-2009-02-14/inc/geshi/qbasic.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/qbasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/20
  *
  * QBasic/QuickBASIC language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/rails.php dokuwiki-rc2009-12-02/inc/geshi/rails.php
--- dokuwiki-2009-02-14/inc/geshi/rails.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/rails.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------
  * Author: Moises Deniz
  * Copyright: (c) 2005 Moises Deniz
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/03/21
  *
  * Ruby (with Ruby on Rails Framework) language file for GeSHi.
@@ -38,228 +38,228 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-                'alias', 'and', 'begin', 'break', 'case', 'class',
-                'def', 'defined', 'do', 'else', 'elsif', 'end',
-                'ensure', 'for', 'if', 'in', 'module', 'while',
-                'next', 'not', 'or', 'redo', 'rescue', 'yield',
-                'retry', 'super', 'then', 'undef', 'unless',
-                'until', 'when', 'BEGIN', 'END', 'include'
+            'alias', 'and', 'begin', 'break', 'case', 'class',
+            'def', 'defined', 'do', 'else', 'elsif', 'end',
+            'ensure', 'for', 'if', 'in', 'module', 'while',
+            'next', 'not', 'or', 'redo', 'rescue', 'yield',
+            'retry', 'super', 'then', 'undef', 'unless',
+            'until', 'when', 'BEGIN', 'END', 'include'
             ),
         2 => array(
-                '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
-                'return'
+            '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
+            'return'
             ),
         3 => array(
-                'Array', 'Float', 'Integer', 'String', 'at_exit',
-                'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
-                'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
-                'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
-                'iterator?', 'lambda', 'load', 'local_variables', 'loop',
-                'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
-                'raise', 'rand', 'readline', 'readlines', 'require', 'select',
-                'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
-                'system', 'trace_var', 'trap', 'untrace_var'
+            'Array', 'Float', 'Integer', 'String', 'at_exit',
+            'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
+            'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
+            'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
+            'iterator?', 'lambda', 'load', 'local_variables', 'loop',
+            'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
+            'raise', 'rand', 'readline', 'readlines', 'require', 'select',
+            'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
+            'system', 'trace_var', 'trap', 'untrace_var'
             ),
         4 => array(
-                'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
-                'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
-                'CGI::HtmlExtension', 'CGI::QueryExtension',
-                'CGI::Session', 'CGI::Session::FileStore',
-                'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
-                'ConditionVariable', 'Continuation', 'Data',
-                'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
-                'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
-                'Exception', 'FalseClass', 'File',
-                'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
-                'FileUtils::DryRun', 'FileUtils::NoWrite',
-                'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
-                'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
-                'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
-                'Iconv::Failure', 'Iconv::IllegalSequence',
-                'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
-                'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
-                'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
-                'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
-                'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
-                'Logger::ShiftingError', 'Marshal', 'MatchData',
-                'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
-                'NameError::message', 'NilClass', 'NoMemoryError',
-                'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
-                'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
-                'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
-                'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
-                'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
-                'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
-                'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
-                'SingleForwardable', 'Singleton', 'SingletonClassMethods',
-                'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
-                'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
-                'SyncEnumerator', 'SyntaxError', 'SystemCallError',
-                'SystemExit', 'SystemStackError', 'Tempfile',
-                'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
-                'ThreadError', 'ThreadGroup',
-                'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
-                'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
-                'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
-                'URI::InvalidComponentError', 'URI::InvalidURIError',
-                'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
-                'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
-                'ZeroDivisionError', 'Zlib',
-                'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
-                'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
-                'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
-                'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
-                'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
-                'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
-                'Zlib::VersionError',
-                'Zlib::ZStream',
-                'ActionController::AbstractRequest',
-                'ActionController::Assertions::DomAssertions',
-                'ActionController::Assertions::ModelAssertions',
-                'ActionController::Assertions::ResponseAssertions',
-                'ActionController::Assertions::RoutingAssertions',
-                'ActionController::Assertions::SelectorAssertions',
-                'ActionController::Assertions::TagAssertions',
-                'ActionController::Base',
-                'ActionController::Benchmarking::ClassMethods',
-                'ActionController::Caching',
-                'ActionController::Caching::Actions',
-                'ActionController::Caching::Actions::ActionCachePath',
-                'ActionController::Caching::Fragments',
-                'ActionController::Caching::Pages',
-                'ActionController::Caching::Pages::ClassMethods',
-                'ActionController::Caching::Sweeping',
-                'ActionController::Components',
-                'ActionController::Components::ClassMethods',
-                'ActionController::Components::InstanceMethods',
-                'ActionController::Cookies',
-                'ActionController::Filters::ClassMethods',
-                'ActionController::Flash',
-                'ActionController::Flash::FlashHash',
-                'ActionController::Helpers::ClassMethods',
-                'ActionController::Integration::Session',
-                'ActionController::IntegrationTest',
-                'ActionController::Layout::ClassMethods',
-                'ActionController::Macros',
-                'ActionController::Macros::AutoComplete::ClassMethods',
-                'ActionController::Macros::InPlaceEditing::ClassMethods',
-                'ActionController::MimeResponds::InstanceMethods',
-                'ActionController::Pagination',
-                'ActionController::Pagination::ClassMethods',
-                'ActionController::Pagination::Paginator',
-                'ActionController::Pagination::Paginator::Page',
-                'ActionController::Pagination::Paginator::Window',
-                'ActionController::Rescue', 'ActionController::Resources',
-                'ActionController::Routing',
-                'ActionController::Scaffolding::ClassMethods',
-                'ActionController::SessionManagement::ClassMethods',
-                'ActionController::Streaming', 'ActionController::TestProcess',
-                'ActionController::TestUploadedFile',
-                'ActionController::UrlWriter',
-                'ActionController::Verification::ClassMethods',
-                'ActionMailer::Base', 'ActionView::Base',
-                'ActionView::Helpers::ActiveRecordHelper',
-                'ActionView::Helpers::AssetTagHelper',
-                'ActionView::Helpers::BenchmarkHelper',
-                'ActionView::Helpers::CacheHelper',
-                'ActionView::Helpers::CaptureHelper',
-                'ActionView::Helpers::DateHelper',
-                'ActionView::Helpers::DebugHelper',
-                'ActionView::Helpers::FormHelper',
-                'ActionView::Helpers::FormOptionsHelper',
-                'ActionView::Helpers::FormTagHelper',
-                'ActionView::Helpers::JavaScriptHelper',
-                'ActionView::Helpers::JavaScriptMacrosHelper',
-                'ActionView::Helpers::NumberHelper',
-                'ActionView::Helpers::PaginationHelper',
-                'ActionView::Helpers::PrototypeHelper',
-                'ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods',
-                'ActionView::Helpers::ScriptaculousHelper',
-                'ActionView::Helpers::TagHelper',
-                'ActionView::Helpers::TextHelper',
-                'ActionView::Helpers::UrlHelper', 'ActionView::Partials',
-                'ActionWebService::API::Method', 'ActionWebService::Base',
-                'ActionWebService::Client::Soap',
-                'ActionWebService::Client::XmlRpc',
-                'ActionWebService::Container::ActionController::ClassMethods',
-                'ActionWebService::Container::Delegated::ClassMethods',
-                'ActionWebService::Container::Direct::ClassMethods',
-                'ActionWebService::Invocation::ClassMethods',
-                'ActionWebService::Scaffolding::ClassMethods',
-                'ActionWebService::SignatureTypes', 'ActionWebService::Struct',
-                'ActiveRecord::Acts::List::ClassMethods',
-                'ActiveRecord::Acts::List::InstanceMethods',
-                'ActiveRecord::Acts::NestedSet::ClassMethods',
-                'ActiveRecord::Acts::NestedSet::InstanceMethods',
-                'ActiveRecord::Acts::Tree::ClassMethods',
-                'ActiveRecord::Acts::Tree::InstanceMethods',
-                'ActiveRecord::Aggregations::ClassMethods',
-                'ActiveRecord::Associations::ClassMethods',
-                'ActiveRecord::AttributeMethods::ClassMethods',
-                'ActiveRecord::Base',
-                'ActiveRecord::Calculations::ClassMethods',
-                'ActiveRecord::Callbacks',
-                'ActiveRecord::ConnectionAdapters::AbstractAdapter',
-                'ActiveRecord::ConnectionAdapters::Column',
-                'ActiveRecord::ConnectionAdapters::DB2Adapter',
-                'ActiveRecord::ConnectionAdapters::DatabaseStatements',
-                'ActiveRecord::ConnectionAdapters::FirebirdAdapter',
-                'ActiveRecord::ConnectionAdapters::FrontBaseAdapter',
-                'ActiveRecord::ConnectionAdapters::MysqlAdapter',
-                'ActiveRecord::ConnectionAdapters::OpenBaseAdapter',
-                'ActiveRecord::ConnectionAdapters::OracleAdapter',
-                'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
-                'ActiveRecord::ConnectionAdapters::Quoting',
-                'ActiveRecord::ConnectionAdapters::SQLServerAdapter',
-                'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
-                'ActiveRecord::ConnectionAdapters::SchemaStatements',
-                'ActiveRecord::ConnectionAdapters::SybaseAdapter::ColumnWithIdentity',
-                'ActiveRecord::ConnectionAdapters::SybaseAdapterContext',
-                'ActiveRecord::ConnectionAdapters::TableDefinition',
-                'ActiveRecord::Errors', 'ActiveRecord::Locking',
-                'ActiveRecord::Locking::Optimistic',
-                'ActiveRecord::Locking::Optimistic::ClassMethods',
-                'ActiveRecord::Locking::Pessimistic',
-                'ActiveRecord::Migration', 'ActiveRecord::Observer',
-                'ActiveRecord::Observing::ClassMethods',
-                'ActiveRecord::Reflection::ClassMethods',
-                'ActiveRecord::Reflection::MacroReflection',
-                'ActiveRecord::Schema', 'ActiveRecord::Timestamp',
-                'ActiveRecord::Transactions::ClassMethods',
-                'ActiveRecord::Validations',
-                'ActiveRecord::Validations::ClassMethods',
-                'ActiveRecord::XmlSerialization',
-                'ActiveSupport::CachingTools::HashCaching',
-                'ActiveSupport::CoreExtensions::Array::Conversions',
-                'ActiveSupport::CoreExtensions::Array::Grouping',
-                'ActiveSupport::CoreExtensions::Date::Conversions',
-                'ActiveSupport::CoreExtensions::Hash::Conversions',
-                'ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods',
-                'ActiveSupport::CoreExtensions::Hash::Diff',
-                'ActiveSupport::CoreExtensions::Hash::Keys',
-                'ActiveSupport::CoreExtensions::Hash::ReverseMerge',
-                'ActiveSupport::CoreExtensions::Integer::EvenOdd',
-                'ActiveSupport::CoreExtensions::Integer::Inflections',
-                'ActiveSupport::CoreExtensions::Numeric::Bytes',
-                'ActiveSupport::CoreExtensions::Numeric::Time',
-                'ActiveSupport::CoreExtensions::Pathname::CleanWithin',
-                'ActiveSupport::CoreExtensions::Range::Conversions',
-                'ActiveSupport::CoreExtensions::String::Access',
-                'ActiveSupport::CoreExtensions::String::Conversions',
-                'ActiveSupport::CoreExtensions::String::Inflections',
-                'ActiveSupport::CoreExtensions::String::Iterators',
-                'ActiveSupport::CoreExtensions::String::StartsEndsWith',
-                'ActiveSupport::CoreExtensions::String::Unicode',
-                'ActiveSupport::CoreExtensions::Time::Calculations',
-                'ActiveSupport::CoreExtensions::Time::Calculations::ClassMethods',
-                'ActiveSupport::CoreExtensions::Time::Conversions',
-                'ActiveSupport::Multibyte::Chars',
-                'ActiveSupport::Multibyte::Handlers::UTF8Handler', 'Binding',
-                'Breakpoint', 'Builder::BlankSlate', 'Builder::XmlMarkup',
-                'Enumerable', 'Fixtures',
-                'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
-                'Inflector::Inflections', 'Mime', 'Mime::Type',
-                'OCI8AutoRecover', 'Symbol', 'TimeZone', 'XmlSimple'
+            'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
+            'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
+            'CGI::HtmlExtension', 'CGI::QueryExtension',
+            'CGI::Session', 'CGI::Session::FileStore',
+            'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
+            'ConditionVariable', 'Continuation', 'Data',
+            'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
+            'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
+            'Exception', 'FalseClass', 'File',
+            'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
+            'FileUtils::DryRun', 'FileUtils::NoWrite',
+            'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
+            'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
+            'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
+            'Iconv::Failure', 'Iconv::IllegalSequence',
+            'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
+            'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
+            'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
+            'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
+            'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
+            'Logger::ShiftingError', 'Marshal', 'MatchData',
+            'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
+            'NameError::message', 'NilClass', 'NoMemoryError',
+            'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
+            'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
+            'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
+            'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
+            'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
+            'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
+            'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
+            'SingleForwardable', 'Singleton', 'SingletonClassMethods',
+            'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
+            'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
+            'SyncEnumerator', 'SyntaxError', 'SystemCallError',
+            'SystemExit', 'SystemStackError', 'Tempfile',
+            'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
+            'ThreadError', 'ThreadGroup',
+            'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
+            'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
+            'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
+            'URI::InvalidComponentError', 'URI::InvalidURIError',
+            'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
+            'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
+            'ZeroDivisionError', 'Zlib',
+            'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
+            'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
+            'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
+            'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
+            'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
+            'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
+            'Zlib::VersionError',
+            'Zlib::ZStream',
+            'ActionController::AbstractRequest',
+            'ActionController::Assertions::DomAssertions',
+            'ActionController::Assertions::ModelAssertions',
+            'ActionController::Assertions::ResponseAssertions',
+            'ActionController::Assertions::RoutingAssertions',
+            'ActionController::Assertions::SelectorAssertions',
+            'ActionController::Assertions::TagAssertions',
+            'ActionController::Base',
+            'ActionController::Benchmarking::ClassMethods',
+            'ActionController::Caching',
+            'ActionController::Caching::Actions',
+            'ActionController::Caching::Actions::ActionCachePath',
+            'ActionController::Caching::Fragments',
+            'ActionController::Caching::Pages',
+            'ActionController::Caching::Pages::ClassMethods',
+            'ActionController::Caching::Sweeping',
+            'ActionController::Components',
+            'ActionController::Components::ClassMethods',
+            'ActionController::Components::InstanceMethods',
+            'ActionController::Cookies',
+            'ActionController::Filters::ClassMethods',
+            'ActionController::Flash',
+            'ActionController::Flash::FlashHash',
+            'ActionController::Helpers::ClassMethods',
+            'ActionController::Integration::Session',
+            'ActionController::IntegrationTest',
+            'ActionController::Layout::ClassMethods',
+            'ActionController::Macros',
+            'ActionController::Macros::AutoComplete::ClassMethods',
+            'ActionController::Macros::InPlaceEditing::ClassMethods',
+            'ActionController::MimeResponds::InstanceMethods',
+            'ActionController::Pagination',
+            'ActionController::Pagination::ClassMethods',
+            'ActionController::Pagination::Paginator',
+            'ActionController::Pagination::Paginator::Page',
+            'ActionController::Pagination::Paginator::Window',
+            'ActionController::Rescue', 'ActionController::Resources',
+            'ActionController::Routing',
+            'ActionController::Scaffolding::ClassMethods',
+            'ActionController::SessionManagement::ClassMethods',
+            'ActionController::Streaming', 'ActionController::TestProcess',
+            'ActionController::TestUploadedFile',
+            'ActionController::UrlWriter',
+            'ActionController::Verification::ClassMethods',
+            'ActionMailer::Base', 'ActionView::Base',
+            'ActionView::Helpers::ActiveRecordHelper',
+            'ActionView::Helpers::AssetTagHelper',
+            'ActionView::Helpers::BenchmarkHelper',
+            'ActionView::Helpers::CacheHelper',
+            'ActionView::Helpers::CaptureHelper',
+            'ActionView::Helpers::DateHelper',
+            'ActionView::Helpers::DebugHelper',
+            'ActionView::Helpers::FormHelper',
+            'ActionView::Helpers::FormOptionsHelper',
+            'ActionView::Helpers::FormTagHelper',
+            'ActionView::Helpers::JavaScriptHelper',
+            'ActionView::Helpers::JavaScriptMacrosHelper',
+            'ActionView::Helpers::NumberHelper',
+            'ActionView::Helpers::PaginationHelper',
+            'ActionView::Helpers::PrototypeHelper',
+            'ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods',
+            'ActionView::Helpers::ScriptaculousHelper',
+            'ActionView::Helpers::TagHelper',
+            'ActionView::Helpers::TextHelper',
+            'ActionView::Helpers::UrlHelper', 'ActionView::Partials',
+            'ActionWebService::API::Method', 'ActionWebService::Base',
+            'ActionWebService::Client::Soap',
+            'ActionWebService::Client::XmlRpc',
+            'ActionWebService::Container::ActionController::ClassMethods',
+            'ActionWebService::Container::Delegated::ClassMethods',
+            'ActionWebService::Container::Direct::ClassMethods',
+            'ActionWebService::Invocation::ClassMethods',
+            'ActionWebService::Scaffolding::ClassMethods',
+            'ActionWebService::SignatureTypes', 'ActionWebService::Struct',
+            'ActiveRecord::Acts::List::ClassMethods',
+            'ActiveRecord::Acts::List::InstanceMethods',
+            'ActiveRecord::Acts::NestedSet::ClassMethods',
+            'ActiveRecord::Acts::NestedSet::InstanceMethods',
+            'ActiveRecord::Acts::Tree::ClassMethods',
+            'ActiveRecord::Acts::Tree::InstanceMethods',
+            'ActiveRecord::Aggregations::ClassMethods',
+            'ActiveRecord::Associations::ClassMethods',
+            'ActiveRecord::AttributeMethods::ClassMethods',
+            'ActiveRecord::Base',
+            'ActiveRecord::Calculations::ClassMethods',
+            'ActiveRecord::Callbacks',
+            'ActiveRecord::ConnectionAdapters::AbstractAdapter',
+            'ActiveRecord::ConnectionAdapters::Column',
+            'ActiveRecord::ConnectionAdapters::DB2Adapter',
+            'ActiveRecord::ConnectionAdapters::DatabaseStatements',
+            'ActiveRecord::ConnectionAdapters::FirebirdAdapter',
+            'ActiveRecord::ConnectionAdapters::FrontBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+            'ActiveRecord::ConnectionAdapters::OpenBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::OracleAdapter',
+            'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
+            'ActiveRecord::ConnectionAdapters::Quoting',
+            'ActiveRecord::ConnectionAdapters::SQLServerAdapter',
+            'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
+            'ActiveRecord::ConnectionAdapters::SchemaStatements',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapter::ColumnWithIdentity',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapterContext',
+            'ActiveRecord::ConnectionAdapters::TableDefinition',
+            'ActiveRecord::Errors', 'ActiveRecord::Locking',
+            'ActiveRecord::Locking::Optimistic',
+            'ActiveRecord::Locking::Optimistic::ClassMethods',
+            'ActiveRecord::Locking::Pessimistic',
+            'ActiveRecord::Migration', 'ActiveRecord::Observer',
+            'ActiveRecord::Observing::ClassMethods',
+            'ActiveRecord::Reflection::ClassMethods',
+            'ActiveRecord::Reflection::MacroReflection',
+            'ActiveRecord::Schema', 'ActiveRecord::Timestamp',
+            'ActiveRecord::Transactions::ClassMethods',
+            'ActiveRecord::Validations',
+            'ActiveRecord::Validations::ClassMethods',
+            'ActiveRecord::XmlSerialization',
+            'ActiveSupport::CachingTools::HashCaching',
+            'ActiveSupport::CoreExtensions::Array::Conversions',
+            'ActiveSupport::CoreExtensions::Array::Grouping',
+            'ActiveSupport::CoreExtensions::Date::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods',
+            'ActiveSupport::CoreExtensions::Hash::Diff',
+            'ActiveSupport::CoreExtensions::Hash::Keys',
+            'ActiveSupport::CoreExtensions::Hash::ReverseMerge',
+            'ActiveSupport::CoreExtensions::Integer::EvenOdd',
+            'ActiveSupport::CoreExtensions::Integer::Inflections',
+            'ActiveSupport::CoreExtensions::Numeric::Bytes',
+            'ActiveSupport::CoreExtensions::Numeric::Time',
+            'ActiveSupport::CoreExtensions::Pathname::CleanWithin',
+            'ActiveSupport::CoreExtensions::Range::Conversions',
+            'ActiveSupport::CoreExtensions::String::Access',
+            'ActiveSupport::CoreExtensions::String::Conversions',
+            'ActiveSupport::CoreExtensions::String::Inflections',
+            'ActiveSupport::CoreExtensions::String::Iterators',
+            'ActiveSupport::CoreExtensions::String::StartsEndsWith',
+            'ActiveSupport::CoreExtensions::String::Unicode',
+            'ActiveSupport::CoreExtensions::Time::Calculations',
+            'ActiveSupport::CoreExtensions::Time::Calculations::ClassMethods',
+            'ActiveSupport::CoreExtensions::Time::Conversions',
+            'ActiveSupport::Multibyte::Chars',
+            'ActiveSupport::Multibyte::Handlers::UTF8Handler',
+            'Breakpoint', 'Builder::BlankSlate', 'Builder::XmlMarkup',
+            'Fixtures',
+            'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+            'Inflector::Inflections', 'Mime', 'Mime::Type',
+            'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
             ),
         5 => array(
             'image_tag', 'link_to', 'link_to_remote', 'javascript_include_tag',
@@ -271,10 +271,10 @@
             'layout', 'flash', 'auto_complete_for', 'in_place_editor_for',
             'respond_to', 'paginate', 'current_page', 'each', 'first',
             'first_page', 'last_page', 'last', 'length', 'new', 'page_count',
-            'previous', 'next', 'scaffold', 'session', 'send_data',
+            'previous', 'scaffold', 'send_data',
             'send_file', 'deliver', 'receive', 'error_messages_for',
             'error_message_on', 'form', 'input', 'stylesheet_link_tag',
-            'stylesheet_path', 'content_for', 'select_date', 'select', 'ago',
+            'stylesheet_path', 'content_for', 'select_date', 'ago',
             'month', 'day', 'check_box', 'fields_for', 'file_field',
             'form_for', 'hidden_field', 'text_area', 'password_field',
             'collection_select', 'options_for_select',
@@ -282,7 +282,7 @@
             'form_for_tag', 'hidden_field_tag', 'text_area_tag',
             'password_field_tag', 'link_to_function', 'javascript_tag',
             'human_size', 'number_to_currency', 'pagination_links',
-            'form_remote_tag', 'form_remote_for', 'link_to_remote',
+            'form_remote_tag', 'form_remote_for',
             'submit_to_remote', 'remote_function', 'observe_form',
             'observe_field', 'remote_form_for', 'options_for_ajax', 'alert',
             'call', 'assign', 'show', 'hide', 'insert_html', 'sortable',
@@ -297,15 +297,15 @@
             'update', 'table_name', 'primary_key', 'sum', 'maximun', 'minimum',
             'count', 'size', 'after_save', 'after_create', 'before_save',
             'before_create', 'add_to_base', 'errors', 'add', 'validate',
-            'validate', 'validates_presence_of', 'validates_format_of',
-            'validates_numericality_of', 'validates_uniqueness_of',
-            'validates_length_of', 'validates_format_of', 'validates_size_of',
-            'to_a', 'to_s', 'to_xml', 'to_i'
+            'validates_presence_of', 'validates_numericality_of',
+            'validates_uniqueness_of', 'validates_length_of',
+            'validates_format_of', 'validates_size_of', 'to_a', 'to_s',
+            'to_xml', 'to_i'
             )
         ),
     'SYMBOLS' => array(
         '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
-        '+', '-', '=>', '=>', '<<'
+        '+', '-', '=>', '<<'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
diff -Naur dokuwiki-2009-02-14/inc/geshi/rebol.php dokuwiki-rc2009-12-02/inc/geshi/rebol.php
--- dokuwiki-2009-02-14/inc/geshi/rebol.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/rebol.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,196 @@
+ 'REBOL',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('rebol [' => ']', 'comment [' => ']'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'binary!','block!','char!','date!','decimal!','email!','file!',
+            'hash!','integer!','issue!','list!','logic!','money!','none!',
+            'object!','paren!','pair!','path!','string!','tag!','time!',
+            'tuple!','url!',
+            ),
+        2 => array(
+            'all','any','attempt','break','catch','compose','disarm','dispatch',
+            'do','do-events','does','either','else','exit','for','forall',
+            'foreach','forever','forskip','func','function','halt','has','if',
+            'launch','loop','next','quit','reduce','remove-each','repeat',
+            'return','secure','switch','throw','try','until','wait','while',
+            ),
+        3 => array(
+            'about','abs','absolute','add','alert','alias','alter','and',
+            'any-block?','any-function?','any-string?','any-type?','any-word?',
+            'append','arccosine','arcsine','arctangent','array','as-pair',
+            'ask','at','back','binary?','bind','bitset?','block?','brightness?',
+            'browse','build-tag','caret-to-offset','center-face','change',
+            'change-dir','char?','charset','checksum','choose','clean-path',
+            'clear','clear-fields','close','comment','complement','component?',
+            'compress','confirm','connected?','construct','context','copy',
+            'cosine','datatype?','date?','debase','decimal?','decode-cgi',
+            'decompress','dehex','delete','detab','difference','dir?','dirize',
+            'divide','dump-face','dump-obj','echo','email?','empty?','enbase',
+            'entab','equal?','error?','even?','event?','exclude','exists?',
+            'exp','extract','fifth','file?','find','first','flash','focus',
+            'form','found?','fourth','free','function?','get','get-modes',
+            'get-word?','greater-or-equal?','greater?','hash?','head','head?',
+            'help','hide','hide-popup','image?','import-email','in',
+            'in-window?','index?','info?','inform','input','input?','insert',
+            'integer?','intersect','issue?','join','last','layout','length?',
+            'lesser-or-equal?','lesser?','library?','license','link?',
+            'list-dir','list?','lit-path?','lit-word?','load','load-image',
+            'log-10','log-2','log-e','logic?','lowercase','make','make-dir',
+            'make-face','max','maximum','maximum-of','min','minimum',
+            'minimum-of','modified?','mold','money?','multiply','native?',
+            'negate','negative?','none?','not','not-equal?','now','number?',
+            'object?','odd?','offset-to-caret','offset?','op?','open','or',
+            'pair?','paren?','parse','parse-xml','path?','pick','poke','port?',
+            'positive?','power','prin','print','probe','protect',
+            'protect-system','query','random','read','read-io','recycle',
+            'refinement?','reform','rejoin','remainder','remold','remove',
+            'rename',
+            //'repeat',
+            'repend','replace','request','request-color','request-date',
+            'request-download','request-file','request-list','request-pass',
+            'request-text','resend','reverse','routine?','same?','save',
+            'script?','second','select','send','series?','set','set-modes',
+            'set-net','set-path?','set-word?','show','show-popup','sign?',
+            'sine','size-text','size?','skip','sort','source','span?',
+            'split-path','square-root','strict-equal?','strict-not-equal?',
+            'string?','struct?','stylize','subtract','suffix?','tag?','tail',
+            'tail?','tangent','third','time?','to','to-binary','to-bitset',
+            'to-block','to-char','to-date','to-decimal','to-email','to-file',
+            'to-get-word','to-hash','to-hex','to-idate','to-image','to-integer',
+            'to-issue','to-list','to-lit-path','to-lit-word','to-local-file',
+            'to-logic','to-money','to-pair','to-paren','to-path',
+            'to-rebol-file','to-refinement','to-set-path','to-set-word',
+            'to-string','to-tag','to-time','to-tuple','to-url','to-word',
+            'trace','trim','tuple?','type?','unfocus','union','unique',
+            'unprotect','unset','unset?','unview','update','upgrade',
+            'uppercase','url?','usage','use','value?','view','viewed?','what',
+            'what-dir','within?','word?','write','write-io','xor','zero?',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+//        2 => 'includes/dico_rebol.php?word={FNAME}',
+//        3 => 'includes/dico_rebol.php?word={FNAME}'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/reg.php dokuwiki-rc2009-12-02/inc/geshi/reg.php
--- dokuwiki-2009-02-14/inc/geshi/reg.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/reg.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Sean Hanna (smokingrope@gmail.com)
  * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 03/15/2006
  *
  * Microsoft Registry Editor language file for GeSHi.
@@ -116,10 +116,10 @@
         'SCRIPT' => array(
             ),
         'REGEXPS' => array(
-            0 => '',
+            0 => 'color: #00CCFF;',
             1 => 'color: #0000FF;',
             2 => '',
-            3 => '',
+            3 => 'color: #0000FF;',
             4 => 'color: #0000FF;',
             5 => '',
             6 => '',
@@ -142,8 +142,8 @@
             GESHI_REPLACE => '\\3',
             GESHI_MODIFIERS => '',
             GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\5',
-            GESHI_CLASS => 'kw1'
+            GESHI_AFTER => '\\5'
+//            GESHI_CLASS => 'kw1'
             ),
         // Highlight File Format Header Version 5
         1 => array(
@@ -169,8 +169,8 @@
             GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'm',
             GESHI_BEFORE => '\\1',
-            GESHI_AFTER => '\\3',
-            GESHI_CLASS => 'kw2'
+            GESHI_AFTER => '\\3'
+//            GESHI_CLASS => 'kw2'
             ),
         // Highlight variable names
         4 => array(
@@ -192,7 +192,7 @@
             ),
         // Highlight Hexadecimal Values (Single-Line and Multi-Line)
         6 => array(
-            GESHI_SEARCH => '(^\s*)(hex:[0-9a-fA-F]{2}(,(\\\s*\n\s*)?[0-9a-fA-F]{2})*)',
+            GESHI_SEARCH => '(=\s*\n?\s*)(hex:[0-9a-fA-F]{2}(,(\\\s*\n\s*)?[0-9a-fA-F]{2})*)',
             GESHI_REPLACE => '\\2',
             GESHI_MODIFIERS => 'm',
             GESHI_BEFORE => '\\1',
diff -Naur dokuwiki-2009-02-14/inc/geshi/robots.php dokuwiki-rc2009-12-02/inc/geshi/robots.php
--- dokuwiki-2009-02-14/inc/geshi/robots.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/robots.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Christian Lescuyer (cl@goelette.net)
  * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/02/17
  *
  * robots.txt language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/ruby.php dokuwiki-rc2009-12-02/inc/geshi/ruby.php
--- dokuwiki-2009-02-14/inc/geshi/ruby.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/ruby.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Moises Deniz
  * Copyright: (c) 2007 Moises Deniz
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/03/21
  *
  * Ruby language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/sas.php dokuwiki-rc2009-12-02/inc/geshi/sas.php
--- dokuwiki-2009-02-14/inc/geshi/sas.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/sas.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Galen Johnson (solitaryr@gmail.com)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/12/27
  *
  * SAS language file for GeSHi. Based on the sas vim file.
@@ -50,94 +50,79 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            '_NULL_', '_INFILE_', '_N_', '_WEBOUT_', '_NUMERIC_', '_CHARACTER_', '_ALL_'
+            '_ALL_','_CHARACTER_','_INFILE_','_N_','_NULL_','_NUMERIC_',
+            '_WEBOUT_'
             ),
         2 => array(
-            '%BQUOTE', '%NRBQUOTE', '%CMPRES', '%QCMPRES',
-            '%COMPSTOR', '%DATATYP', '%DISPLAY', '%DO',
-            '%ELSE', '%END', '%EVAL', '%GLOBAL',
-            '%GOTO', '%IF', '%INDEX', '%INPUT',
-            '%KEYDEF', '%LABEL', '%LEFT', '%LENGTH',
-            '%LET', '%LOCAL', '%LOWCASE', '%MACRO',
-            '%MEND', '%NRBQUOTE', '%NRQUOTE', '%NRSTR',
-            '%PUT', '%QCMPRES', '%QLEFT', '%QLOWCASE',
-            '%QSCAN', '%QSUBSTR', '%QSYSFUNC', '%QTRIM',
-            '%QUOTE', '%QUPCASE', '%SCAN', '%STR',
-            '%SUBSTR', '%SUPERQ', '%SYSCALL', '%SYSEVALF',
-            '%SYSEXEC', '%SYSFUNC', '%SYSGET', '%SYSLPUT',
-            '%SYSPROD', '%SYSRC', '%SYSRPUT', '%THEN',
-            '%TO', '%TRIM', '%UNQUOTE', '%UNTIL',
-            '%UPCASE', '%VERIFY', '%WHILE', '%WINDOW'
+            '%BQUOTE','%CMPRES','%COMPSTOR','%DATATYP','%DISPLAY','%DO','%ELSE',
+            '%END','%EVAL','%GLOBAL','%GOTO','%IF','%INDEX','%INPUT','%KEYDEF',
+            '%LABEL','%LEFT','%LENGTH','%LET','%LOCAL','%LOWCASE','%MACRO',
+            '%MEND','%NRBQUOTE','%NRQUOTE','%NRSTR','%PUT','%QCMPRES','%QLEFT',
+            '%QLOWCASE','%QSCAN','%QSUBSTR','%QSYSFUNC','%QTRIM','%QUOTE',
+            '%QUPCASE','%SCAN','%STR','%SUBSTR','%SUPERQ','%SYSCALL',
+            '%SYSEVALF','%SYSEXEC','%SYSFUNC','%SYSGET','%SYSLPUT','%SYSPROD',
+            '%SYSRC','%SYSRPUT','%THEN','%TO','%TRIM','%UNQUOTE','%UNTIL',
+            '%UPCASE','%VERIFY','%WHILE','%WINDOW'
             ),
         3 => array(
-            'ABS', 'ADDR', 'AIRY', 'ARCOS', 'ARSIN', 'ATAN', 'ATTRC', 'ATTRN',
-            'BAND', 'BETAINV', 'BLSHIFT', 'BNOT', 'BOR', 'BRSHIFT', 'BXOR',
-            'BYTE', 'CDF', 'CEIL', 'CEXIST', 'CINV', 'CLOSE', 'CNONCT', 'COLLATE',
-            'COMPBL', 'COMPOUND', 'COMPRESS', 'COSH', 'COS', 'CSS', 'CUROBS',
-            'CV', 'DACCDBSL', 'DACCDB', 'DACCSL', 'DACCSYD', 'DACCTAB',
-            'DAIRY', 'DATETIME', 'DATEJUL', 'DATEPART', 'DATE', 'DAY',
-            'DCLOSE', 'DEPDBSL', 'DEPDB', 'DEPSL',
-            'DEPSYD', 'DEPSYD', 'DEPTAB', 'DEPTAB', 'DEQUOTE', 'DHMS',
-            'DIF', 'DIGAMMA', 'DIM', 'DINFO', 'DNUM', 'DOPEN', 'DOPTNAME',
-            'DOPTNUM', 'DREAD', 'DROPNOTE', 'DSNAME', 'ERFC', 'ERF', 'EXIST',
-            'EXP', 'FAPPEND', 'FCLOSE', 'FCOL', 'FDELETE', 'FETCHOBS', 'FETCH',
-            'FEXIST', 'FGET', 'FILEEXIST', 'FILENAME', 'FILEREF', 'FINFO',
-            'FINV', 'FIPNAMEL', 'FIPNAME', 'FIPSTATE', 'FLOOR', 'FNONCT',
-            'FNOTE', 'FOPEN', 'FOPTNAME', 'FOPTNUM', 'FPOINT', 'FPOS',
-            'FPUT', 'FREAD', 'FREWIND', 'FRLEN', 'FSEP', 'FUZZ', 'FWRITE',
-            'GAMINV', 'GAMMA', 'GETOPTION', 'GETVARC', 'GETVARN', 'HBOUND',
-            'HMS', 'HOSTHELP', 'HOUR', 'IBESSEL', 'INDEXW', 'INDEXC',
-            'INDEX', 'INPUTN', 'INPUTC', 'INPUT', 'INTRR', 'INTCK', 'INTNX',
-            'INT', 'IRR', 'JBESSEL', 'JULDATE', 'KURTOSIS', 'LAG', 'LBOUND',
-            'LEFT', 'LENGTH', 'LGAMMA', 'LIBNAME', 'LIBREF', 'LOG10',
-            'LOG2', 'LOGPDF', 'LOGPMF', 'LOGSDF', 'LOG', 'LOWCASE', 'MAX', 'MDY',
-            'MEAN', 'MINUTE', 'MIN', 'MOD', 'MONTH', 'MOPEN', 'MORT',
-            'NETPV', 'NMISS', 'NORMAL', 'NPV', 'N', 'OPEN', 'ORDINAL',
-            'PATHNAME', 'PDF', 'PEEKC', 'PEEK', 'PMF', 'POINT', 'POISSON', 'POKE',
-            'PROBBETA', 'PROBBNML', 'PROBCHI', 'PROBF', 'PROBGAM',
-            'PROBHYPR', 'PROBIT', 'PROBNEGB', 'PROBNORM', 'PROBT', 'PUTN',
-            'PUTC', 'PUT', 'QTR', 'QUOTE', 'RANBIN', 'RANCAU', 'RANEXP',
-            'RANGAM', 'RANGE', 'RANK', 'RANNOR', 'RANPOI', 'RANTBL', 'RANTRI',
-            'RANUNI', 'REPEAT', 'RESOLVE', 'REVERSE', 'REWIND', 'RIGHT',
-            'ROUND', 'SAVING', 'SCAN', 'SDF', 'SECOND', 'SIGN', 'SINH', 'SIN',
-            'SKEWNESS', 'SOUNDEX', 'SPEDIS', 'SQRT', 'STDERR', 'STD', 'STFIPS',
-            'STNAME', 'STNAMEL', 'SUBSTR', 'SUM', 'SYMGET', 'SYSGET', 'SYSMSG',
-            'SYSPROD', 'SYSRC', 'SYSTEM', 'TANH', 'TAN', 'TIMEPART', 'TIME',
-            'TINV', 'TNONCT', 'TODAY', 'TRANSLATE', 'TRANWRD', 'TRIGAMMA',
-            'TRIMN', 'TRIM', 'TRUNC', 'UNIFORM', 'UPCASE', 'USS',
-            'VARFMT', 'VARINFMT', 'VARLABEL', 'VARLEN', 'VARNAME',
-            'VARNUM', 'VARRAYX', 'VARRAY', 'VARTYPE', 'VAR', 'VERIFY', 'VFORMATX',
-            'VFORMATDX', 'VFORMATD', 'VFORMATNX', 'VFORMATN', 'VFORMATWX',
-            'VFORMATW', 'VFORMAT', 'VINARRAYX', 'VINARRAY', 'VINFORMATX',
-            'VINFORMATDX', 'VINFORMATD', 'VINFORMATNX', 'VINFORMATN',
-            'VINFORMATWX', 'VINFORMATW', 'VINFORMAT', 'VLABELX',
-            'VLABEL', 'VLENGTHX', 'VLENGTH', 'VNAMEX', 'VNAME', 'VTYPEX',
-            'VTYPE', 'WEEKDAY', 'YEAR', 'YYQ', 'ZIPFIPS', 'ZIPNAME', 'ZIPNAMEL',
-            'ZIPSTATE'
+            'ABS','ADDR','AIRY','ARCOS','ARSIN','ATAN','ATTRC','ATTRN','BAND',
+            'BETAINV','BLSHIFT','BNOT','BOR','BRSHIFT','BXOR','BYTE','CDF',
+            'CEIL','CEXIST','CINV','CLOSE','CNONCT','COLLATE','COMPBL',
+            'COMPOUND','COMPRESS','COSH','COS','CSS','CUROBS','CV','DACCDBSL',
+            'DACCDB','DACCSL','DACCSYD','DACCTAB','DAIRY','DATETIME','DATEJUL',
+            'DATEPART','DATE','DAY','DCLOSE','DEPDBSL','DEPDB','DEPSL','DEPSYD',
+            'DEPTAB','DEQUOTE','DHMS','DIF','DIGAMMA','DIM','DINFO','DNUM',
+            'DOPEN','DOPTNAME','DOPTNUM','DREAD','DROPNOTE','DSNAME','ERFC',
+            'ERF','EXIST','EXP','FAPPEND','FCLOSE','FCOL','FDELETE','FETCHOBS',
+            'FETCH','FEXIST','FGET','FILEEXIST','FILENAME','FILEREF','FINFO',
+            'FINV','FIPNAMEL','FIPNAME','FIPSTATE','FLOOR','FNONCT','FNOTE',
+            'FOPEN','FOPTNAME','FOPTNUM','FPOINT','FPOS','FPUT','FREAD',
+            'FREWIND','FRLEN','FSEP','FUZZ','FWRITE','GAMINV','GAMMA',
+            'GETOPTION','GETVARC','GETVARN','HBOUND','HMS','HOSTHELP','HOUR',
+            'IBESSEL','INDEXW','INDEXC','INDEX','INPUTN','INPUTC','INPUT',
+            'INTRR','INTCK','INTNX','INT','IRR','JBESSEL','JULDATE','KURTOSIS',
+            'LAG','LBOUND','LEFT','LENGTH','LGAMMA','LIBNAME','LIBREF','LOG10',
+            'LOG2','LOGPDF','LOGPMF','LOGSDF','LOG','LOWCASE','MAX','MDY',
+            'MEAN','MINUTE','MIN','MOD','MONTH','MOPEN','MORT','NETPV','NMISS',
+            'NORMAL','NPV','N','OPEN','ORDINAL','PATHNAME','PDF','PEEKC','PEEK',
+            'PMF','POINT','POISSON','POKE','PROBBETA','PROBBNML','PROBCHI',
+            'PROBF','PROBGAM','PROBHYPR','PROBIT','PROBNEGB','PROBNORM','PROBT',
+            'PUTN','PUTC','PUT','QTR','QUOTE','RANBIN','RANCAU','RANEXP',
+            'RANGAM','RANGE','RANK','RANNOR','RANPOI','RANTBL','RANTRI',
+            'RANUNI','REPEAT','RESOLVE','REVERSE','REWIND','RIGHT','ROUND',
+            'SAVING','SCAN','SDF','SECOND','SIGN','SINH','SIN','SKEWNESS',
+            'SOUNDEX','SPEDIS','SQRT','STDERR','STD','STFIPS','STNAME',
+            'STNAMEL','SUBSTR','SUM','SYMGET','SYSGET','SYSMSG','SYSPROD',
+            'SYSRC','SYSTEM','TANH','TAN','TIMEPART','TIME','TINV','TNONCT',
+            'TODAY','TRANSLATE','TRANWRD','TRIGAMMA','TRIMN','TRIM','TRUNC',
+            'UNIFORM','UPCASE','USS','VARFMT','VARINFMT','VARLABEL','VARLEN',
+            'VARNAME','VARNUM','VARRAYX','VARRAY','VARTYPE','VAR','VERIFY',
+            'VFORMATX','VFORMATDX','VFORMATD','VFORMATNX','VFORMATN',
+            'VFORMATWX','VFORMATW','VFORMAT','VINARRAYX','VINARRAY',
+            'VINFORMATX','VINFORMATDX','VINFORMATD','VINFORMATNX','VINFORMATN',
+            'VINFORMATWX','VINFORMATW','VINFORMAT','VLABELX','VLABEL',
+            'VLENGTHX','VLENGTH','VNAMEX','VNAME','VTYPEX','VTYPE','WEEKDAY',
+            'YEAR','YYQ','ZIPFIPS','ZIPNAME','ZIPNAMEL','ZIPSTATE'
             ),
         4 => array(
-            'ABORT', 'ARRAY', 'ATTRIB', 'BY', 'CALL', 'CARDS4', 'CATNAME',
-            'CONTINUE', 'DATALINES4', 'DELETE', 'DISPLAY',
-            'DM', 'DROP', 'ENDSAS', 'FILENAME', 'FILE', 'FOOTNOTE',
-            'FORMAT', 'GOTO', 'INFILE', 'INFORMAT', 'INPUT', 'KEEP',
-            'LABEL', 'LEAVE', 'LENGTH', 'LIBNAME', 'LINK', 'LIST', 'LOSTCARD',
-            'MERGE', 'MISSING', 'MODIFY', 'OPTIONS', 'OUTPUT', 'PAGE',
-            'PUT', 'REDIRECT', 'REMOVE', 'RENAME', 'REPLACE', 'RETAIN',
-            'RETURN', 'SELECT', 'SET', 'SKIP', 'STARTSAS', 'STOP', 'TITLE',
-            'UPDATE', 'WAITSAS', 'WHERE', 'WINDOW', 'X', 'SYSTASK',
-            'ADD', 'AND', 'ALTER', 'AS', 'CASCADE', 'CHECK', 'CREATE',
-            'DELETE', 'DESCRIBE', 'DISTINCT', 'DROP', 'FOREIGN',
-            'FROM', 'GROUP', 'HAVING', 'INDEX', 'INSERT', 'INTO', 'IN',
-            'KEY', 'LIKE', 'MESSAGE', 'MODIFY', 'MSGTYPE', 'NOT',
-            'NULL', 'ON', 'OR', 'ORDER', 'PRIMARY', 'REFERENCES',
-            'RESET', 'RESTRICT', 'SELECT', 'SET', 'TABLE',
-            'UNIQUE', 'UPDATE', 'VALIDATE', 'VIEW', 'WHERE'
+            'ABORT','ADD','ALTER','AND','ARRAY','AS','ATTRIB','BY','CALL',
+            'CARDS4','CASCADE','CATNAME','CHECK','CONTINUE','CREATE',
+            'DATALINES4','DELETE','DESCRIBE','DISPLAY','DISTINCT','DM','DROP',
+            'ENDSAS','FILE','FOOTNOTE','FOREIGN','FORMAT','FROM',
+            'GOTO','GROUP','HAVING','IN','INFILE','INFORMAT',
+            'INSERT','INTO','KEEP','KEY','LABEL','LEAVE',
+            'LIKE','LINK','LIST','LOSTCARD','MERGE','MESSAGE','MISSING',
+            'MODIFY','MSGTYPE','NOT','NULL','ON','OPTIONS','OR','ORDER',
+            'OUTPUT','PAGE','PRIMARY','REDIRECT','REFERENCES','REMOVE',
+            'RENAME','REPLACE','RESET','RESTRICT','RETAIN','RETURN','SELECT',
+            'SET','SKIP','STARTSAS','STOP','SYSTASK','TABLE','TITLE','UNIQUE',
+            'UPDATE','VALIDATE','VIEW','WAITSAS','WHERE','WINDOW','X'
             ),
         5 => array(
-            'DO', 'ELSE', 'END', 'IF', 'THEN', 'UNTIL', 'WHILE'
+            'DO','ELSE','END','IF','THEN','UNTIL','WHILE'
             ),
         6 => array(
-            'RUN', 'QUIT', 'DATA'
+            'RUN','QUIT','DATA'
             ),
         7 => array(
             'ERROR'
diff -Naur dokuwiki-2009-02-14/inc/geshi/scala.php dokuwiki-rc2009-12-02/inc/geshi/scala.php
--- dokuwiki-2009-02-14/inc/geshi/scala.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/scala.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Franco Lombardo (franco@francolombardo.net)
  * Copyright: (c) 2008 Franco Lombardo, Benny Baumann
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/02/08
  *
  * Scala language file for GeSHi.
@@ -66,8 +66,8 @@
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
-        1 => false,
-        2 => false
+        1 => true,
+        2 => true
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/scheme.php dokuwiki-rc2009-12-02/inc/geshi/scheme.php
--- dokuwiki-2009-02-14/inc/geshi/scheme.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/scheme.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Jon Raphaelson (jonraphaelson@gmail.com)
  * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * Scheme language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/scilab.php dokuwiki-rc2009-12-02/inc/geshi/scilab.php
--- dokuwiki-2009-02-14/inc/geshi/scilab.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/scilab.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,295 @@
+ 'SciLab',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\)|\]|\w)'/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array(),
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'elseif', 'end', 'select', 'case', 'for', 'while', 'break'
+            ),
+        2 => array(
+            'STDIN', 'STDOUT', 'STDERR',
+            '%i', '%pi', '%e', '%eps', '%nan', '%inf', '%s', '%t', '%f',
+            'usual', 'polynomial', 'boolean', 'character', 'function', 'rational', 'state-space',
+            'sparse', 'boolean sparse', 'list', 'tlist', 'library', 'endfunction'
+            ),
+        3 => array(
+            '%asn', '%helps', '%k', '%sn', 'abcd', 'abinv', 'abort', 'about', 'About_M2SCI_tools',
+            'abs', 'acos', 'acosh', 'acoshm', 'acosm', 'AdCommunications', 'add_demo', 'add_edge',
+            'add_help_chapter', 'add_node', 'add_palette', 'addcolor', 'addf', 'addinter', 'addmenu',
+            'adj_lists', 'adj2sp', 'aff2ab', 'alufunctions', 'amell', 'analpf', 'analyze', 'and',
+            'ans', 'apropos', 'arc_graph', 'arc_number', 'arc_properties', 'argn', 'arhnk', 'arl2',
+            'arma', 'arma2p', 'armac', 'armax', 'armax1', 'arsimul', 'artest', 'articul', 'ascii',
+            'asciimat', 'asin', 'asinh', 'asinhm', 'asinm', 'assignation', 'atan', 'atanh', 'atanhm',
+            'atanm', 'augment', 'auread', 'auwrite', 'axes_properties', 'axis_properties', 'backslash',
+            'balanc', 'balreal', 'bandwr', 'banner','bar', 'barh', 'barhomogenize', 'basename', 'bdiag',
+            'beep', 'besselh', 'besseli', 'besselj', 'besselk', 'bessely', 'best_match', 'beta','bezout',
+            'bifish', 'bilin', 'binomial', 'black', 'bloc2exp', 'bloc2ss', 'bode', 'bool2s',
+            'boucle', 'brackets', 'browsevar', 'bsplin3val', 'bstap', 'buttmag', 'buttondialog',
+            'bvode', 'bvodeS', 'c_link', 'cainv', 'calendar', 'calerf', 'calfrq', 'call', 'canon', 'casc',
+            'cat', 'catch', 'ccontrg', 'cd', 'cdfbet', 'cdfbin', 'cdfchi', 'cdfchn', 'cdff', 'cdffnc',
+            'cdfgam', 'cdfnbn', 'cdfnor', 'cdfpoi', 'cdft', 'ceil', 'cell', 'cell2mat', 'cellstr', 'center',
+            'cepstrum', 'chain_struct', 'chaintest', 'champ', 'champ_properties', 'champ1', 'char', 'chart',
+            'chartooem', 'chdir', 'cheb1mag', 'cheb2mag', 'check_graph', 'chepol', 'chfact', 'chol', 'chsolve',
+            'circuit', 'classmarkov', 'clc', 'clean', 'clear', 'clear_pixmap', 'clearfun', 'clearglobal','clf',
+            'clipboard', 'close', 'cls2dls', 'cmb_lin', 'cmndred', 'cmoment', 'code2str', 'coeff', 'coff', 'coffg',
+            'colcomp', 'colcompr', 'colinout', 'colon', 'color', 'color_list', 'colorbar', 'colordef', 'colormap',
+            'colregul', 'comma', 'comments', 'comp', 'companion', 'comparison', 'Compound_properties', 'con_nodes',
+            'cond', 'config', 'configure_msvc', 'conj', 'connex', 'console', 'cont_frm', 'cont_mat', 'Contents',
+            'continue', 'contour', 'contour2d', 'contour2di', 'contourf', 'contr', 'contract_edge', 'contrss',
+            'convex_hull', 'convol', 'convstr', 'copfac', 'copy', 'corr', 'correl', 'cos', 'cosh', 'coshm',
+            'cosm', 'cotg', 'coth', 'cothm', 'covar', 'create_palette', 'cshep2d', 'csim', 'cspect', 'Cste',
+            'ctr_gram', 'cumprod', 'cumsum', 'cycle_basis', 'czt', 'dasrt', 'dassl', 'datafit', 'date', 'datenum',
+            'datevec', 'dbphi', 'dcf', 'ddp', 'debug', 'dec2hex', 'deff', 'definedfields', 'degree', 'delbpt',
+            'delete', 'delete_arcs', 'delete_nodes', 'delip', 'delmenu', 'demoplay', 'denom', 'derivat', 'derivative',
+            'des2ss', 'des2tf', 'det', 'determ', 'detr', 'detrend', 'dft', 'dhinf', 'dhnorm', 'diag', 'diary',
+            'diff', 'diophant', 'dir', 'dirname', 'disp', 'dispbpt', 'dispfiles', 'dlgamma', 'dnaupd', 'do', 'dot',
+            'double', 'dragrect', 'draw', 'drawaxis', 'drawlater', 'drawnow', 'driver', 'dsaupd', 'dscr',
+            'dsearch', 'dsimul', 'dt_ility', 'dtsi', 'edge_number', 'edit', 'edit_curv', 'edit_error',
+            'edit_graph', 'edit_graph_menus', 'editvar', 'eigenmarkov', 'ell1mag',
+            'empty', 'emptystr', 'eqfir', 'eqiir', 'equal', 'Equal', 'equil', 'equil1',
+            'ereduc', 'erf', 'erfc', 'erfcx', 'errbar', 'errcatch', 'errclear', 'error', 'error_table', 'etime',
+            'eval', 'eval_cshep2d', 'eval3d', 'eval3dp', 'evans', 'evstr', 'excel2sci', 'exec', 'execstr', 'exists',
+            'exit', 'exp', 'expm', 'external', 'extraction', 'eye', 'fac3d', 'factorial', 'factors', 'faurre', 'fchamp',
+            'fcontour', 'fcontour2d', 'fec', 'fec_properties', 'feedback', 'feval', 'ffilt', 'fft', 'fft2', 'fftshift',
+            'fgrayplot', 'figure', 'figure_properties', 'figure_style', 'file', 'fileinfo', 'fileparts', 'filter', 'find',
+            'find_freq', 'find_path', 'findABCD', 'findAC', 'findBD', 'findBDK', 'findm', 'findmsvccompiler', 'findobj',
+            'findR', 'findx0BD', 'firstnonsingleton', 'fit_dat', 'fix', 'floor', 'flts', 'foo', 'format',
+            'formatman', 'fort', 'fourplan', 'fplot2d', 'fplot3d', 'fplot3d1', 'fprintf', 'fprintfMat', 'frep2tf',
+            'freq', 'freson', 'frexp', 'frfit', 'frmag', 'fscanf', 'fscanfMat', 'fsfirlin', 'fsolve', 'fspecg',
+            'fstabst', 'fstair', 'ftest', 'ftuneq', 'full', 'fullfile', 'fullrf', 'fullrfk', 'fun2string', 'Funcall',
+            'funcprot', 'functions', 'funptr', 'fusee', 'G_make', 'g_margin', 'gainplot', 'gamitg',
+            'gamma', 'gammaln', 'gca', 'gcare', 'gcd', 'gce', 'gcf', 'gda', 'gdf', 'gen_net', 'genfac3d', 'genlib',
+            'genmarkov', 'geom3d', 'geomean', 'get', 'get_contents_infer', 'get_function_path', 'getcolor', 'getcwd',
+            'getd', 'getdate', 'getenv', 'getf', 'getfield', 'getfont', 'gethistory', 'getio', 'getlinestyle',
+            'getlongpathname', 'getmark', 'getmemory', 'getos', 'getpid', 'getscilabkeywords', 'getshell',
+            'getshortpathname', 'getsymbol', 'getvalue', 'getversion', 'gfare', 'gfrancis', 'girth', 'givens',
+            'glever', 'glist', 'global', 'GlobalProperty', 'glue', 'gmres', 'gpeche', 'gr_menu', 'graduate', 'grand',
+            'graph_2_mat', 'graph_center', 'graph_complement', 'graph_diameter', 'graph_power', 'graph_simp', 'graph_sum',
+            'graph_union', 'graphic', 'Graphics', 'graphics_entities', 'graph-list', 'graycolormap', 'grayplot',
+            'grayplot_properties', 'graypolarplot', 'great', 'grep', 'group', 'gschur', 'gsort', 'gspec', 'gstacksize',
+            'gtild', 'h_cl', 'h_inf', 'h_inf_st', 'h_norm', 'h2norm', 'halt', 'hamilton', 'hank', 'hankelsv', 'harmean',
+            'hat', 'havewindow', 'head_comments', 'help', 'help_skeleton', 'hermit', 'hess', 'hex2dec', 'hilb', 'hinf',
+            'hist3d', 'histplot', 'horner', 'host', 'hotcolormap', 'householder', 'hrmt', 'hsv2rgb', 'hsvcolormap',
+            'htrianr', 'hypermat', 'hypermatrices', 'iconvert', 'ieee', 'ifft', 'iir', 'iirgroup', 'iirlp',
+            'ilib_build', 'ilib_compile', 'ilib_for_link', 'ilib_gen_gateway', 'ilib_gen_loader', 'ilib_gen_Make',
+            'im_inv', 'imag', 'impl', 'imrep2ss', 'imult', 'ind2sub', 'Infer', 'inistate', 'input', 'insertion', 'int',
+            'int16', 'int2d', 'int32', 'int3d', 'int8', 'intc', 'intdec', 'integrate', 'interp', 'interp1', 'interp2d',
+            'interp3d', 'interpln', 'intersci', 'intersect', 'intg', 'intl', 'intppty', 'intsplin', 'inttrap', 'inttype',
+            'inv', 'inv_coeff', 'invr', 'invsyslin', 'iqr', 'is_connex', 'iscellstr', 'isdef', 'isdir', 'isempty',
+            'isequal', 'isequalbitwise', 'iserror', 'isglobal', 'isinf', 'isnan', 'isoview', 'isreal', 'javasci',
+            'jetcolormap', 'jmat', 'justify', 'kalm', 'karmarkar', 'kernel', 'keyboard', 'knapsack', 'kpure', 'krac2',
+            'kron', 'kroneck', 'label_properties', 'labostat', 'LANGUAGE', 'lasterror', 'lattn', 'lattp', 'lcf', 'lcm',
+            'lcmdiag', 'ldiv', 'ldivf', 'leastsq', 'left', 'legend', 'legend_properties', 'legendre', 'legends', 'length',
+            'leqr', 'less', 'lev', 'levin', 'lex_sort', 'lft', 'lgfft', 'lib', 'lin', 'lin2mu', 'lindquist',
+            'line_graph', 'linear_interpn', 'lines', 'LineSpec', 'linf', 'linfn', 'link', 'linmeq', 'linpro', 'linsolve',
+            'linspace', 'listfiles', 'listvarinfile', 'lmisolver', 'lmitool', 'load', 'load_graph', 'loadhistory',
+            'loadmatfile', 'loadplots', 'loadwave', 'locate', 'log', 'log10', 'log1p', 'log2', 'logm', 'logspace',
+            'lotest', 'lqe', 'lqg', 'lqg_ltr', 'lqg2stan', 'lqr', 'ls', 'lsq', 'lsq_splin', 'lsqrsolve', 'lsslist',
+            'lstcat', 'lstsize', 'ltitr', 'lu', 'ludel', 'lufact', 'luget', 'lusolve', 'lyap', 'm_circle', 'm2scideclare',
+            'macglov', 'macr2lst', 'macr2tree', 'macro', 'macrovar', 'mad', 'make_graph', 'make_index', 'makecell', 'man',
+            'manedit', 'mapsound', 'markp2ss', 'mat_2_graph', 'matfile2sci', 'Matlab-Scilab_character_strings', 'Matplot',
+            'Matplot_properties', 'Matplot1', 'matrices', 'matrix', 'max', 'max_cap_path', 'max_clique', 'max_flow',
+            'maxi', 'mcisendstring', 'mclearerr', 'mclose', 'mdelete', 'mean', 'meanf', 'median', 'menus', 'meof',
+            'merror', 'mese', 'mesh', 'mesh2d', 'meshgrid', 'mfft', 'mfile2sci', 'mfprintf', 'mfscanf', 'mget', 'mgeti',
+            'mgetl', 'mgetstr', 'milk_drop', 'min', 'min_lcost_cflow', 'min_lcost_flow1', 'min_lcost_flow2',
+            'min_qcost_flow', 'min_weight_tree', 'mine', 'mini', 'minreal', 'minss', 'minus', 'mkdir', 'mlist', 'mode',
+            'modulo', 'moment', 'mopen', 'move', 'mprintf', 'mps2linpro', 'mput', 'mputl', 'mputstr', 'mrfit', 'mscanf',
+            'msd', 'mseek', 'msprintf', 'msscanf', 'mstr2sci', 'mtell', 'mtlb_0', 'mtlb_a', 'mtlb_all', 'mtlb_any',
+            'mtlb_axis', 'mtlb_beta', 'mtlb_box', 'mtlb_close', 'mtlb_colordef', 'mtlb_conv', 'mtlb_cumprod', 'mtlb_cumsum',
+            'mtlb_dec2hex', 'mtlb_delete', 'mtlb_diag', 'mtlb_diff', 'mtlb_dir', 'mtlb_double', 'mtlb_e', 'mtlb_echo',
+            'mtlb_eig', 'mtlb_eval', 'mtlb_exist', 'mtlb_eye', 'mtlb_false', 'mtlb_fft', 'mtlb_fftshift', 'mtlb_find',
+            'mtlb_findstr', 'mtlb_fliplr', 'mtlb_fopen', 'mtlb_format', 'mtlb_fprintf', 'mtlb_fread', 'mtlb_fscanf',
+            'mtlb_full', 'mtlb_fwrite', 'mtlb_grid', 'mtlb_hold', 'mtlb_i', 'mtlb_ifft', 'mtlb_imp', 'mtlb_int16',
+            'mtlb_int32', 'mtlb_int8', 'mtlb_is', 'mtlb_isa', 'mtlb_isfield', 'mtlb_isletter', 'mtlb_isspace', 'mtlb_l',
+            'mtlb_legendre', 'mtlb_linspace', 'mtlb_load', 'mtlb_logic', 'mtlb_logical', 'mtlb_lower', 'mtlb_max',
+            'mtlb_min', 'mtlb_mode', 'mtlb_more', 'mtlb_num2str', 'mtlb_ones', 'mtlb_plot', 'mtlb_prod', 'mtlb_rand',
+            'mtlb_randn', 'mtlb_rcond', 'mtlb_realmax', 'mtlb_realmin', 'mtlb_repmat', 'mtlb_s', 'mtlb_save',
+            'mtlb_setstr', 'mtlb_size', 'mtlb_sort', 'mtlb_sparse', 'mtlb_strcmp', 'mtlb_strcmpi', 'mtlb_strfind',
+            'mtlb_strrep', 'mtlb_sum', 'mtlb_t', 'mtlb_toeplitz', 'mtlb_tril', 'mtlb_triu', 'mtlb_true', 'mtlb_uint16',
+            'mtlb_uint32', 'mtlb_uint8', 'mtlb_upper', 'mtlb_zeros', 'mu2lin', 'mucomp', 'mulf', 'mvvacov', 'name2rgb',
+            'names', 'nancumsum', 'nand2mean', 'nanmax', 'nanmean', 'nanmeanf', 'nanmedian', 'nanmin', 'nanstdev',
+            'nansum', 'narsimul', 'NDcost', 'ndgrid', 'ndims', 'nearfloat', 'nehari', 'neighbors', 'netclose', 'netwindow',
+            'netwindows', 'new', 'newaxes', 'newest', 'newfun', 'nextpow2', 'nf3d', 'nfreq', 'nlev', 'nnz', 'node_number',
+            'nodes_2_path', 'nodes_degrees', 'noisegen', 'norm', 'not', 'null', 'number_properties', 'numdiff', 'numer',
+            'nyquist', 'object_editor', 'obs_gram', 'obscont', 'obscont1', 'observer', 'obsv_mat', 'obsvss', 'ode',
+            'ode_discrete', 'ode_optional_output', 'ode_root', 'odedc', 'odeoptions', 'oemtochar', 'old_style',
+            'oldbesseli', 'oldbesselj', 'oldbesselk', 'oldbessely', 'oldload', 'oldplot', 'oldsave', 'ones',
+            'Operation', 'optim', 'or', 'orth', 'overloading', 'p_margin', 'param3d', 'param3d_properties',
+            'param3d1', 'paramfplot2d', 'parents', 'parrot', 'part', 'path_2_nodes', 'pathconvert', 'pause', 'pbig',
+            'pca', 'pcg', 'pdiv', 'pen2ea', 'pencan', 'penlaur', 'percent', 'perctl', 'perfect_match', 'perl',
+            'perms', 'permute', 'pertrans', 'pfss', 'phasemag', 'phc', 'pie', 'pinv', 'pipe_network', 'playsnd', 'plot',
+            'plot_graph', 'plot2d', 'plot2d_old_version', 'plot2d1', 'plot2d2', 'plot2d3', 'plot2d4', 'plot3d',
+            'plot3d_old_version', 'plot3d1', 'plot3d2', 'plot3d3', 'plotframe', 'plotprofile', 'plus', 'plzr',
+            'pmodulo', 'pol2des', 'pol2str', 'pol2tex', 'polar', 'polarplot', 'polfact', 'poly', 'polyline_properties',
+            'portr3d', 'portrait', 'power', 'ppol', 'prbs_a', 'predecessors', 'predef', 'print', 'printf',
+            'printf_conversion', 'printing', 'printsetupbox', 'prod', 'profile', 'progressionbar', 'proj', 'projsl',
+            'projspec', 'psmall', 'pspect', 'pvm', 'pvm_addhosts', 'pvm_barrier', 'pvm_bcast', 'pvm_bufinfo', 'pvm_config',
+            'pvm_delhosts', 'pvm_error', 'pvm_exit', 'pvm_f772sci', 'pvm_get_timer', 'pvm_getinst', 'pvm_gettid',
+            'pvm_gsize', 'pvm_halt', 'pvm_joingroup', 'pvm_kill', 'pvm_lvgroup', 'pvm_mytid', 'pvm_parent', 'pvm_probe',
+            'pvm_recv', 'pvm_reduce', 'pvm_sci2f77', 'pvm_send', 'pvm_set_timer', 'pvm_spawn', 'pvm_spawn_independent',
+            'pvm_start', 'pvm_tasks', 'pvm_tidtohost', 'pvmd3', 'pwd', 'qassign', 'qld', 'qmr', 'qr', 'quapro', 'quart',
+            'quaskro', 'quit', 'quote', 'rand', 'randpencil', 'range', 'rank', 'rankqr', 'rat',  'rcond',
+            'rdivf', 'read', 'read4b', 'readb', 'readc_', 'readmps', 'readxls', 'real', 'realtime', 'realtimeinit',
+            'rectangle_properties', 'recur', 'reglin', 'regress', 'remez', 'remezb', 'repfreq', 'replot', 'resethistory',
+            'residu', 'resume', 'return', 'rgb2name', 'ric_desc', 'ricc', 'riccati', 'rlist', 'rmdir', 'roots', 'rotate',
+            'round', 'routh_t', 'rowcomp', 'rowcompr', 'rowinout', 'rowregul', 'rowshuff', 'rpem', 'rref', 'rtitr',
+            'rubberbox', 'salesman', 'sample', 'samplef', 'samwr', 'save', 'save_format', 'save_graph', 'savehistory',
+            'savematfile', 'savewave', 'sca', 'scaling', 'scanf', 'scanf_conversion', 'scf', 'schur', 'sci_files',
+            'sci2exp', 'sci2for', 'sci2map', 'sciargs', 'SciComplex', 'SciComplexArray', 'SciDouble', 'SciDoubleArray',
+            'scilab', 'Scilab', 'ScilabEval', 'scilink', 'scipad', 'SciString', 'SciStringArray', 'sd2sci', 'sda', 'sdf',
+            'secto3d', 'segs_properties', 'semi', 'semicolon', 'semidef', 'sensi', 'set', 'set_posfig_dim',
+            'setbpt', 'setdiff', 'setenv', 'seteventhandler', 'setfield', 'sethomedirectory', 'setlanguage', 'setmenu',
+            'sfact', 'Sfgrayplot', 'Sgrayplot', 'sgrid', 'shortest_path', 'show_arcs', 'show_graph', 'show_nodes',
+            'show_pixmap', 'showprofile', 'sident', 'sign', 'Signal', 'signm', 'simp', 'simp_mode', 'sin', 'sinc',
+            'sincd', 'sinh', 'sinhm', 'sinm', 'size', 'slash', 'sleep', 'sm2des', 'sm2ss', 'smooth', 'solve',
+            'sorder', 'sort', 'sound', 'soundsec', 'sp2adj', 'spaninter', 'spanplus', 'spantwo', 'spchol',
+            'spcompack', 'spec', 'specfact', 'speye', 'spget', 'splin', 'splin2d', 'splin3d', 'split_edge', 'spones',
+            'sprand', 'sprintf', 'spzeros', 'sqroot', 'sqrt', 'sqrtm', 'square', 'squarewave', 'srfaur', 'srkf', 'ss2des',
+            'ss2ss', 'ss2tf', 'sscanf', 'sskf', 'ssprint', 'ssrand', 'st_deviation', 'st_ility', 'stabil', 'stacksize',
+            'star', 'startup', 'stdev', 'stdevf', 'str2code', 'strange', 'strcat', 'strindex', 'string', 'stringbox',
+            'strings', 'stripblanks', 'strong_con_nodes', 'strong_connex', 'strsplit', 'strsubst', 'struct', 'sub2ind',
+            'subf', 'subgraph', 'subplot', 'successors', 'sum', 'supernode', 'surf', 'surface_properties', 'sva',
+            'svd', 'svplot', 'sylm', 'sylv', 'symbols', 'sysconv', 'sysdiag', 'sysfact', 'syslin', 'syssize', 'system',
+            'systems', 'systmat', 'tabul', 'tan', 'tangent', 'tanh', 'tanhm', 'tanm', 'TCL_CreateSlave', 'TCL_DeleteInterp',
+            'TCL_EvalFile', 'TCL_EvalStr', 'TCL_ExistInterp', 'TCL_ExistVar', 'TCL_GetVar', 'TCL_GetVersion', 'TCL_SetVar',
+            'TCL_UnsetVar', 'TCL_UpVar', 'tdinit', 'testmatrix', 'texprint', 'text_properties', 'tf2des', 'tf2ss', 'then',
+            'thrownan', 'tic', 'tilda', 'time_id', 'timer', 'title', 'titlepage', 'TK_EvalFile', 'TK_EvalStr', 'tk_getdir',
+            'tk_getfile', 'TK_GetVar', 'tk_savefile', 'TK_SetVar',  'toc', 'toeplitz', 'tohome', 'tokenpos',
+            'tokens', 'toolbar', 'toprint', 'trace', 'trans', 'trans_closure', 'translatepaths', 'tree2code', 'trfmod',
+            'trianfml', 'tril', 'trimmean', 'trisolve', 'triu', 'try', 'trzeros', 'twinkle', 'type', 'Type', 'typename',
+            'typeof', 'ui_observer', 'uicontrol', 'uimenu', 'uint16', 'uint32', 'uint8', 'ulink', 'unglue', 'union',
+            'unique', 'unix', 'unix_g', 'unix_s', 'unix_w', 'unix_x', 'unobs', 'unsetmenu', 'unzoom', 'user', 'varargin',
+            'varargout', 'Variable', 'variance', 'variancef', 'varn', 'vectorfind', 'waitbar', 'warning', 'wavread',
+            'wavwrite', 'wcenter', 'wfir', 'what', 'where', 'whereami', 'whereis', 'who', 'who_user', 'whos',
+            'wiener', 'wigner', 'winclose', 'window', 'winlist', 'winopen', 'winqueryreg', 'winsid', 'with_atlas',
+            'with_gtk', 'with_javasci', 'with_pvm', 'with_texmacs', 'with_tk', 'writb', 'write', 'write4b', 'x_choices',
+            'x_choose', 'x_dialog', 'x_matrix', 'x_mdialog', 'x_message', 'x_message_modeless', 'xarc', 'xarcs', 'xarrows',
+            'xaxis', 'xbasc', 'xbasimp', 'xbasr', 'xchange', 'xclea', 'xclear', 'xclick', 'xclip', 'xdel', 'xend',
+            'xfarc', 'xfarcs', 'xfpoly', 'xfpolys', 'xfrect', 'xget', 'xgetech', 'xgetfile', 'xgetmouse', 'xgraduate',
+            'xgrid', 'xinfo', 'xinit', 'xlfont', 'xload', 'xls_open', 'xls_read', 'xmltohtml', 'xname', 'xnumb', 'xpause',
+            'xpoly', 'xpolys', 'xrect', 'xrects', 'xrpoly', 'xs2bmp', 'xs2emf', 'xs2eps', 'xs2fig', 'xs2gif', 'xs2ppm',
+            'xs2ps', 'xsave', 'xsegs', 'xselect', 'xset', 'xsetech', 'xsetm', 'xstring', 'xstringb', 'xstringl', 'xtape',
+            'xtitle', 'yulewalk', 'zeropen', 'zeros', 'zgrid', 'zoom_rect', 'zpbutt', 'zpch1', 'zpch2', 'zpell'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', ':', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => '',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            4 => 'color: #009999;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        2 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        3 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '->',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File Descriptor
+        4 => '<[a-zA-Z_][a-zA-Z0-9_]*>',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/sdlbasic.php dokuwiki-rc2009-12-02/inc/geshi/sdlbasic.php
--- dokuwiki-2009-02-14/inc/geshi/sdlbasic.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/sdlbasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ------------
  * Author: Roberto Rossi
  * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/08/19
  *
  * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/smalltalk.php dokuwiki-rc2009-12-02/inc/geshi/smalltalk.php
--- dokuwiki-2009-02-14/inc/geshi/smalltalk.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/smalltalk.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Bananeweizen (Bananeweizen@gmx.de)
  * Copyright: (c) 2005 Bananeweizen (www.bananeweizen.de)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/03/27
  *
  * Smalltalk language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/smarty.php dokuwiki-rc2009-12-02/inc/geshi/smarty.php
--- dokuwiki-2009-02-14/inc/geshi/smarty.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/smarty.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Alan Juden (alan@judenware.org)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/07/10
  *
  * Smarty template language file for GeSHi.
@@ -47,8 +47,8 @@
     'KEYWORDS' => array(
         1 => array(
             '$smarty', 'now', 'const', 'capture', 'config', 'section', 'foreach', 'template', 'version', 'ldelim', 'rdelim',
-            'config_load', 'foreachelse', 'include', 'include_php', 'insert', 'if', 'elseif', 'else', 'php',
-            'sectionelse', 'clear_all_cache', 'clear_cache', 'is_cached',
+            'foreachelse', 'include', 'include_php', 'insert', 'if', 'elseif', 'else', 'php',
+            'sectionelse', 'is_cached',
             ),
         2 => array(
             'capitalize', 'count_characters', 'cat', 'count_paragraphs', 'count_sentences', 'count_words', 'date_format',
@@ -56,7 +56,7 @@
             'strip', 'strip_tags', 'truncate', 'upper', 'wordwrap',
             ),
         3 => array(
-            'assign', 'counter', 'cycle', 'debug', 'eval', 'fetch', 'html_checkboxes', 'html_image', 'html_options',
+            'counter', 'cycle', 'debug', 'eval', 'html_checkboxes', 'html_image', 'html_options',
             'html_radios', 'html_select_date', 'html_select_time', 'html_table', 'math', 'mailto', 'popup_init',
             'popup', 'textformat'
             ),
@@ -72,7 +72,7 @@
         5 => array(
             'append', 'append_by_ref', 'assign', 'assign_by_ref', 'clear_all_assign', 'clear_all_cache',
             'clear_assign', 'clear_cache', 'clear_compiled_tpl', 'clear_config', 'config_load', 'display',
-            'fetch', 'get_config_vars', 'get_registered_object', 'get_template_vars', 'is_cached',
+            'fetch', 'get_config_vars', 'get_registered_object', 'get_template_vars',
             'load_filter', 'register_block', 'register_compiler_function', 'register_function',
             'register_modifier', 'register_object', 'register_outputfilter', 'register_postfilter',
             'register_prefilter', 'register_resource', 'trigger_error', 'template_exists', 'unregister_block',
@@ -80,7 +80,7 @@
             'unregister_outputfilter', 'unregister_postfilter', 'unregister_prefilter', 'unregister_resource'
             ),
         6 => array(
-            'name', 'assign', 'file', 'scope', 'global', 'key', 'once', 'script',
+            'name', 'file', 'scope', 'global', 'key', 'once', 'script',
             'loop', 'start', 'step', 'max', 'show', 'values', 'value', 'from', 'item'
             ),
         7 => array(
@@ -153,7 +153,8 @@
         4 => 'http://smarty.php.net/{FNAMEL}',
         5 => 'http://smarty.php.net/{FNAMEL}',
         6 => '',
-        7 => 'http://smarty.php.net/{FNAMEL}'
+        7 => 'http://smarty.php.net/{FNAMEL}',
+        8 => ''
         ),
     'OOLANG' => true,
     'OBJECT_SPLITTERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/sql.php dokuwiki-rc2009-12-02/inc/geshi/sql.php
--- dokuwiki-2009-02-14/inc/geshi/sql.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/sql.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * SQL language file for GeSHi.
@@ -58,30 +58,30 @@
     'ESCAPE_CHAR' => '\\',
     'KEYWORDS' => array(
         1 => array(
-            'ALL', 'ASC', 'AS',  'ALTER', 'AND', 'ADD', 'AUTO_INCREMENT',
-            'BETWEEN', 'BINARY', 'BOTH', 'BY', 'BOOLEAN',
-            'CHANGE', 'CHECK', 'COLUMNS', 'COLUMN', 'CROSS','CREATE',
-            'DATABASES', 'DATABASE', 'DATA', 'DELAYED', 'DESCRIBE', 'DESC',  'DISTINCT', 'DELETE', 'DROP', 'DEFAULT',
-            'ENCLOSED', 'ESCAPED', 'EXISTS', 'EXPLAIN',
-            'FIELDS', 'FIELD', 'FLUSH', 'FOR', 'FOREIGN', 'FUNCTION', 'FROM',
-            'GROUP', 'GRANT',
-            'HAVING',
-            'IGNORE', 'INDEX', 'INFILE', 'INSERT', 'INNER', 'INTO', 'IDENTIFIED', 'IN', 'IS', 'IF',
-            'JOIN',
-            'KEYS', 'KILL','KEY',
-            'LEADING', 'LIKE', 'LIMIT', 'LINES', 'LOAD', 'LOCAL', 'LOCK', 'LOW_PRIORITY', 'LEFT', 'LANGUAGE',
-            'MODIFY',
-            'NATURAL', 'NOT', 'NULL', 'NEXTVAL',
-            'OPTIMIZE', 'OPTION', 'OPTIONALLY', 'ORDER', 'OUTFILE', 'OR', 'OUTER', 'ON',
-            'PROCEEDURE','PROCEDURAL', 'PRIMARY',
-            'READ', 'REFERENCES', 'REGEXP', 'RENAME', 'REPLACE', 'RETURN', 'REVOKE', 'RLIKE', 'RIGHT',
-            'SHOW', 'SONAME', 'STATUS', 'STRAIGHT_JOIN', 'SELECT', 'SETVAL', 'SET',
-            'TABLES', 'TEMINATED', 'TO', 'TRAILING','TRUNCATE', 'TABLE', 'TEMPORARY', 'TRIGGER', 'TRUSTED',
-            'UNIQUE', 'UNLOCK', 'USE', 'USING', 'UPDATE', 'UNSIGNED',
-            'VALUES', 'VARIABLES', 'VIEW',
-            'WITH', 'WRITE', 'WHERE',
-            'ZEROFILL',
-            'XOR',
+            'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC',
+            'AUTO_INCREMENT', 'BETWEEN', 'BINARY', 'BOOLEAN',
+            'BOTH', 'BY', 'CHANGE', 'CHECK', 'COLUMN', 'COLUMNS',
+            'CREATE', 'CROSS', 'DATA', 'DATABASE', 'DATABASES',
+            'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE',
+            'DISTINCT', 'DROP', 'ENCLOSED', 'ESCAPED', 'EXISTS',
+            'EXPLAIN', 'FIELD', 'FIELDS', 'FLUSH', 'FOR',
+            'FOREIGN', 'FROM', 'FULL', 'FUNCTION', 'GRANT',
+            'GROUP', 'HAVING', 'IDENTIFIED', 'IF', 'IGNORE',
+            'IN', 'INDEX', 'INFILE', 'INNER', 'INSERT', 'INTO',
+            'IS', 'JOIN', 'KEY', 'KEYS', 'KILL', 'LANGUAGE',
+            'LEADING', 'LEFT', 'LIKE', 'LIMIT', 'LINES', 'LOAD',
+            'LOCAL', 'LOCK', 'LOW_PRIORITY', 'MODIFY', 'NATURAL',
+            'NEXTVAL', 'NOT', 'NULL', 'ON', 'OPTIMIZE', 'OPTION',
+            'OPTIONALLY', 'OR', 'ORDER', 'OUTER', 'OUTFILE',
+            'PRIMARY', 'PROCEDURAL', 'PROCEEDURE', 'READ',
+            'REFERENCES', 'REGEXP', 'RENAME', 'REPLACE',
+            'RETURN', 'REVOKE', 'RIGHT', 'RLIKE', 'SELECT',
+            'SET', 'SETVAL', 'SHOW', 'SONAME', 'STATUS',
+            'STRAIGHT_JOIN', 'TABLE', 'TABLES', 'TEMINATED',
+            'TEMPORARY', 'TO', 'TRAILING', 'TRIGGER', 'TRUNCATE',
+            'TRUSTED', 'UNION', 'UNIQUE', 'UNLOCK', 'UNSIGNED',
+            'UPDATE', 'USE', 'USING', 'VALUES', 'VARIABLES',
+            'VIEW', 'WHERE', 'WITH', 'WRITE', 'XOR', 'ZEROFILL'
             )
         ),
     'SYMBOLS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/tcl.php dokuwiki-rc2009-12-02/inc/geshi/tcl.php
--- dokuwiki-2009-02-14/inc/geshi/tcl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/tcl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------------------------------
  * Author: Reid van Melle (rvanmelle@gmail.com)
  * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/05/05
  *
  * TCL/iTCL language file for GeSHi.
@@ -84,8 +84,6 @@
             // list handling
             'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
             'lreplace', 'lsearch', 'lset', 'lsort', 'split',
-            // math
-            'expr',
             // procedures and output
             'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
             'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
@@ -97,7 +95,7 @@
             // library routines
             'enconding', 'http', 'msgcat',
             // system related
-            'cd', 'clock', 'exec', 'exit', 'glob', 'pid', 'pwd', 'time',
+            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
             // platform specified
             'dde', 'registry', 'resource',
             // special variables
@@ -111,8 +109,7 @@
          * Set 3: standard library
          */
         3 => array(
-            'comment', 'dde', 'filename', 'http', 'library', 'memory',
-            'packagens', 'registry', 'resource', 'tcltest', 'tclvars',
+            'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
             ),
 
         /*
diff -Naur dokuwiki-2009-02-14/inc/geshi/teraterm.php dokuwiki-rc2009-12-02/inc/geshi/teraterm.php
--- dokuwiki-2009-02-14/inc/geshi/teraterm.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/teraterm.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,317 @@
+ 'Tera Term Macro',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Commands */
+        1 => array(
+            'Beep',
+            'BplusRecv',
+            'BplusSend',
+            'Break',            // (version 4.53 or later)
+            'Call',
+            'CallMenu',         // (version 4.56 or later)
+            'ChangeDir',
+            'ClearScreen',
+            'Clipb2Var',        //(version 4.46 or later)
+            'ClosesBox',
+            'CloseTT',
+            'Code2Str',
+            'Connect',
+            'CRC32',            // (version 4.60 or later)
+            'CRC32File',        // (version 4.60 or later)
+            'CygConnect',       // (version 4.57 or later)
+            'DelPassword',
+            'Disconnect',
+            'Do',               // (version 4.56 or later)
+            'Else',
+            'EnableKeyb',
+            'End',
+            'EndIf',
+            'EndUntil',         // (version 4.56 or later)
+            'EndWhile',
+            'Exec',
+            'ExecCmnd',
+            'Exit',
+            'FileClose',
+            'FileConcat',
+            'FileCopy',
+            'FileCreate',
+            'FileDelete',
+            'FileMarkPtr',
+            'FilenameBox',      //(version 4.54 or later)
+            'FileOpen',
+            'FileRead',
+            'FileReadln',       // (version 4.48 or later)
+            'FileRename',
+            'FileSearch',
+            'FileSeek',
+            'FileSeekBack',
+            'FileStrSeek',
+            'FileStrSeek2',
+            'FileWrite',
+            'FileWriteln',
+            'FindOperations',
+            'FlushRecv',
+            'ForNext',
+            'GetDate',
+            'GetDir',           //(version 4.46 or later)
+            'GetEnv',
+            'GetPassword',
+            'GetTime',
+            'GetTitle',
+            'GetVer',           //(version 4.58 or later)
+            'GoTo',
+            'If',
+            'IfDefined',        // (version 4.46 or later)
+            'IfThenElseIf',
+            'Include',
+            'InputBox',
+            'Int2Str',
+            'KmtFinish',
+            'KmtGet',
+            'KmtRecv',
+            'KmtSend',
+            'LoadKeyMap',
+            'LogClose',
+            'LogOpen',
+            'LogPause',
+            'LogStart',
+            'LogWrite',
+            'Loop',             // (version 4.56 or later)
+            'MakePath',
+            'MessageBox',
+            'MPause',           // (version 4.27 or later)
+            'PasswordBox',
+            'Pause',
+            'QuickvanRecv',
+            'QuickvanSend',
+            'Random',           //(version 4.27 or later)
+            'Recvln',
+            'RestoreSetup',
+            'Return',
+            'RotateLeft',       //(version 4.54 or later)
+            'RotateRight',      //(version 4.54 or later)
+            'ScpRecv',          // (version 4.57 or later)
+            'ScpSend',          // (version 4.57 or later)
+            'Send',
+            'SendBreak',
+            'SendFile',
+            'SendKcode',
+            'Sendln',
+            'SetBaud',          // (version 4.58 or later)
+            'SetDate',
+            'SetDir',
+            'SetDlgPos',
+            'SetDTR',           // (version 4.59 or later)
+            'SetRTS',           // (version 4.59 or later)
+            'SetEnv',           // (version 4.54 or later)
+            'SetEcho',
+            'SetExitCode',
+            'SetSync',
+            'SetTime',
+            'SetTitle',
+            'Show',
+            'ShowTT',
+            'Sprintf',          // (version 4.52 or later)
+            'StatusBox',
+            'Str2Code',
+            'Str2Int',
+            'StrCompare',
+            'StrConcat',
+            'StrCopy',
+            'StrLen',
+            'StrMatch',         // (version 4.59 or later)
+            'StrScan',
+            'Testlink',
+            'Then',
+            'ToLower',          //(version 4.53 or later)
+            'ToUpper',          //(version 4.53 or later)
+            'Unlink',
+            'Until',            // (version 4.56 or later)
+            'Var2Clipb',        //(version 4.46 or later)
+            'Wait',
+            'WaitEvent',
+            'Waitln',
+            'WaitRecv',
+            'WaitRegex',        // (version 4.21 or later)
+            'While',
+            'XmodemRecv',
+            'XmodemSend',
+            'YesNoBox',
+            'ZmodemRecv',
+            'ZmodemSend'
+            ),
+        /* System Variables */
+        2 => array(
+            'groupmatchstr1',
+            'groupmatchstr2',
+            'groupmatchstr3',
+            'groupmatchstr4',
+            'groupmatchstr5',
+            'groupmatchstr6',
+            'groupmatchstr7',
+            'groupmatchstr8',
+            'groupmatchstr9',
+            'inputstr',
+            'matchstr',
+            'param2',
+            'param3',
+            'param4',
+            'param5',
+            'param6',
+            'param7',
+            'param8',
+            'param9',
+            'result',
+            'timeout'
+            ),
+        /* LogMeTT Key Words */
+        3 => array(
+            '$[1]',
+            '$[2]',
+            '$[3]',
+            '$[4]',
+            '$[5]',
+            '$[6]',
+            '$[7]',
+            '$[8]',
+            '$connection$',
+            '$email$',
+            '$logdir$',
+            '$logfilename$',
+            '$logit$',
+            '$mobile$',
+            '$name$',
+            '$pager$',
+            '$parent$',
+            '$phone$',
+            '$snippet$',
+            '$ttdir$',
+            '$user$',
+            '$windir$',
+            ),
+        /* Keyword Symbols */
+        4 => array(
+            'and',
+            'not',
+            'or',
+            'xor'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']',
+        '~', '!', '+', '-', '*', '/', '%', '>>', '<<', '<<<', '>>>', '&', '^', '|',
+        '<>', '<=', '>=', '=', '==', '<>', '!=', '&&', '||'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold!important;',
+            2 => 'color: #808000; font-weight: bold;',  // System Variables
+            3 => 'color: #ff0000; font-weight: bold;',  // LogMeTT Key Words
+            4 => 'color: #ff00ff; font-weight: bold;'   // Keyword Symbols
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array (
+            GESHI_SEARCH => '(\:[_a-zA-Z][_a-zA-Z0-9]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/text.php dokuwiki-rc2009-12-02/inc/geshi/text.php
--- dokuwiki-2009-02-14/inc/geshi/text.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/text.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Sean Hanna (smokingrope@gmail.com)
  * Copyright: (c) 2006 Sean Hanna
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 04/23/2006
  *
  * Standard Text File (No Syntax Highlighting).
diff -Naur dokuwiki-2009-02-14/inc/geshi/thinbasic.php dokuwiki-rc2009-12-02/inc/geshi/thinbasic.php
--- dokuwiki-2009-02-14/inc/geshi/thinbasic.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/thinbasic.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ------
  * Author: Eros Olmi (eros.olmi@thinbasic.com)
  * Copyright: (c) 2006 Eros Olmi (http://www.thinbasic.com), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/05/12
  *
  * thinBasic language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/tsql.php dokuwiki-rc2009-12-02/inc/geshi/tsql.php
--- dokuwiki-2009-02-14/inc/geshi/tsql.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/tsql.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Duncan Lock (dunc@dflock.co.uk)
  * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/11/22
  *
  * T-SQL language file for GeSHi.
@@ -92,14 +92,14 @@
 
             //Configuration Functions
             '@@DATEFIRST','@@OPTIONS','@@DBTS','@@REMSERVER','@@LANGID','@@SERVERNAME',
-            '@@LANGUAGE','@@SERVICENAME','@@LOCK_TIMEOUT','@@SPID','@@MAX_CONNECTIONS','@@TEXTSIZE',
-            '@@MAX_PRECISION','@@VERSION','@@NESTLEVEL',
+            '@@LANGUAGE','@@SERVICENAME','@@LOCK_TIMEOUT','@@SPID','@@MAX_CONNECTIONS',
+            '@@TEXTSIZE','@@MAX_PRECISION','@@VERSION','@@NESTLEVEL',
 
             //Cursor Functions
             '@@CURSOR_ROWS','@@FETCH_STATUS',
 
             //Date and Time Functions
-            'DATEADD','DATEDIFF','DATENAME','DATEPART','DAY','GETDATE','GETUTCDATE','MONTH','YEAR',
+            'DATEADD','DATEDIFF','DATENAME','DATEPART','GETDATE','GETUTCDATE',
 
             //Mathematical Functions
             'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
@@ -107,7 +107,7 @@
             'POWER','TAN','COT','RADIANS',
 
             //Meta Data Functions
-            'COL_LENGTH','fn_listextendedproperty','COL_NAME','FULLTEXTCATALOGPROPERTY',
+            'COL_LENGTH','COL_NAME','FULLTEXTCATALOGPROPERTY',
             'COLUMNPROPERTY','FULLTEXTSERVICEPROPERTY','DATABASEPROPERTY','INDEX_COL',
             'DATABASEPROPERTYEX','INDEXKEY_PROPERTY','DB_ID','INDEXPROPERTY','DB_NAME',
             'OBJECT_ID','FILE_ID','OBJECT_NAME','FILE_NAME','OBJECTPROPERTY','FILEGROUP_ID',
@@ -115,19 +115,16 @@
             'TYPEPROPERTY','FILEPROPERTY',
 
             //Security Functions
-            'fn_trace_geteventinfo','IS_SRVROLEMEMBER','fn_trace_getfilterinfo','SUSER_SID',
-            'fn_trace_getinfo','SUSER_SNAME','fn_trace_gettable','USER_ID','HAS_DBACCESS',
-            'IS_MEMBER',
+            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
+            'HAS_DBACCESS','IS_MEMBER',
 
             //String Functions
-            'ASCII','NCHAR','SOUNDEX','CHAR','PATINDEX','SPACE','CHARINDEX',
-            'REPLACE','STR','DIFFERENCE','QUOTENAME','STUFF','LEFT','REPLICATE',
-            'SUBSTRING','LEN','REVERSE','UNICODE','LOWER','RIGHT','UPPER','LTRIM',
-            'RTRIM',
+            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
+            'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
+            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
 
             //System Functions
-            'APP_NAME','COLLATIONPROPERTY','@@ERROR','fn_helpcollations',
-            'fn_servershareddrives','fn_virtualfilestats','FORMATMESSAGE',
+            'APP_NAME','COLLATIONPROPERTY','@@ERROR','FORMATMESSAGE',
             'GETANSINULL','HOST_ID','HOST_NAME','IDENT_CURRENT','IDENT_INCR',
             'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS',
             '@@ROWCOUNT','ROWCOUNT_BIG','SCOPE_IDENTITY','SERVERPROPERTY','SESSIONPROPERTY',
@@ -135,7 +132,7 @@
 
             //System Statistical Functions
             '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
-            'fn_virtualfilestats','@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
+            '@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
             '@@TOTAL_READ','@@PACKET_ERRORS','@@TOTAL_WRITE',
 
             //Text and Image Functions
@@ -143,7 +140,7 @@
 
             //Aggregate functions
             'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
-            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'GROUPING', 'VARP'
+            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
             ),
         3 => array(
             /*
@@ -169,8 +166,8 @@
 
             //Distributed Queries Procedures
             'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
-            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_serveroption', 'sp_columns_ex',
-            'sp_table_privileges_ex', 'sp_droplinkedsrvlogin', 'sp_tables_ex', 'sp_foreignkeys',
+            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_columns_ex',
+            'sp_table_privileges_ex', 'sp_tables_ex', 'sp_foreignkeys',
 
             //Full-Text Search Procedures
             'sp_fulltext_catalog', 'sp_help_fulltext_catalogs_cursor', 'sp_fulltext_column',
@@ -236,7 +233,7 @@
 
             //Security Procedures
             'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
-            'sp_addlinkedsrvlogin', 'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
+            'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
             'sp_grantlogin', 'sp_addrole', 'sp_helpdbfixedrole', 'sp_addrolemember', 'sp_helpgroup',
             'sp_addserver', 'sp_helplinkedsrvlogin', 'sp_addsrvrolemember', 'sp_helplogins', 'sp_adduser',
             'sp_helpntgroup', 'sp_approlepassword', 'sp_helpremotelogin', 'sp_changedbowner', 'sp_helprole',
@@ -306,7 +303,7 @@
             //Function/sp's higlighted brown.
             'fn_helpcollations', 'fn_listextendedproperty ', 'fn_servershareddrives',
             'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',
-            'fn_trace_gettable', 'fn_virtualfilestats',
+            'fn_trace_gettable', 'fn_virtualfilestats','fn_listextendedproperty',
             ),
         ),
     'SYMBOLS' => array(
@@ -375,4 +372,4 @@
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/typoscript.php dokuwiki-rc2009-12-02/inc/geshi/typoscript.php
--- dokuwiki-2009-02-14/inc/geshi/typoscript.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/typoscript.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Jan-Philipp Halle (typo3@jphalle.de)
  * Copyright: (c) 2005 Jan-Philipp Halle (http://www.jphalle.de/)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/07/29
  *
  * TypoScript language file for GeSHi.
@@ -49,7 +49,7 @@
     'QUOTEMARKS' => array(),
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
-        // Conditions: http://support.typo3.org/documentation/tsref/conditions/
+        // Conditions: http://documentation.typo3.org/documentation/tsref/conditions/
         1 => array(
             'browser', 'compatVersion', 'dayofmonth', 'dayofweek', 'device',
             'globalString', 'globalVars', 'hostname', 'hour',
@@ -59,7 +59,7 @@
             'usergroup', 'version'
             ),
 
-        // Functions: http://support.typo3.org/documentation/tsref/functions/
+        // Functions: http://documentation.typo3.org/documentation/tsref/functions/
         2 => array(
             'addParams', 'encapsLines', 'filelink', 'HTMLparser',
             'HTMLparser_tags', 'if', 'imageLinkWrap',
@@ -68,13 +68,13 @@
             'textStyle', 'typolink'
             ),
 
-        // Toplevel objects: http://support.typo3.org/documentation/tsref/tlo-objects/
+        // Toplevel objects: http://documentation.typo3.org/documentation/tsref/tlo-objects/
         3 => array(
             'CARRAY', 'CONFIG', 'CONSTANTS', 'FE_DATA', 'FE_TABLE', 'FRAME',
             'FRAMESET', 'META', 'PAGE', 'plugin'
             ),
 
-        // Content Objects (cObject) : http://support.typo3.org/documentation/tsref/cobjects/
+        // Content Objects (cObject) : http://documentation.typo3.org/documentation/tsref/cobjects/
         4 => array(
             'CASE', 'CLEARGIF', 'COA', 'COA_INT', 'COBJ_ARRAY', 'COLUMNS',
             'CONTENT', 'CTABLE', 'EDITPANEL', 'FILE', 'FORM',
@@ -86,12 +86,12 @@
             'USER_INT'
             ),
 
-        // GIFBUILDER toplevel link: http://support.typo3.org/documentation/tsref/gifbuilder/
+        // GIFBUILDER toplevel link: http://documentation.typo3.org/documentation/tsref/gifbuilder/
         5 => array(
             'GIFBUILDER',
             ),
 
-        // GIFBUILDER: http://support.typo3.org/documentation/tsref/gifbuilder/
+        // GIFBUILDER: http://documentation.typo3.org/documentation/tsref/gifbuilder/
         // skipped fields: IMAGE, TEXT
         // NOTE! the IMAGE and TEXT field already are linked in group 4, they
         // cannot be linked twice . . . . unfortunately
@@ -101,14 +101,14 @@
             'WORKAREA'
             ),
 
-        // MENU Objects: http://support.typo3.org/documentation/tsref/menu/
+        // MENU Objects: http://documentation.typo3.org/documentation/tsref/menu/
         7 => array(
             'GMENU', 'GMENU_FOLDOUT', 'GMENU_LAYERS', 'IMGMENU',
             'IMGMENUITEM', 'JSMENU', 'JSMENUITEM', 'TMENU',
             'TMENUITEM', 'TMENU_LAYERS'
             ),
 
-        // MENU common properties: http://support.typo3.org/documentation/tsref/menu/common-properties/
+        // MENU common properties: http://documentation.typo3.org/documentation/tsref/menu/common-properties/
         8 => array(
             'alternativeSortingField', 'begin', 'debugItemConf',
             'imgNameNotRandom', 'imgNamePrefix',
@@ -117,7 +117,7 @@
             'showAccessRestrictedPages', 'submenuObjSuffixes'
             ),
 
-        // MENU item states: http://support.typo3.org/documentation/tsref/menu/item-states/
+        // MENU item states: http://documentation.typo3.org/documentation/tsref/menu/item-states/
         9 => array(
             'ACT', 'ACTIFSUB', 'ACTIFSUBRO', 'ACTRO', 'CUR', 'CURIFSUB',
             'CURIFSUBRO', 'CURRO', 'IFSUB', 'IFSUBRO', 'NO',
@@ -204,15 +204,15 @@
             )
         ),
     'URLS' => array(
-        1 => 'http://support.typo3.org/documentation/tsref/conditions/{FNAME}/',
-        2 => 'http://support.typo3.org/documentation/tsref/functions/{FNAME}/',
-        3 => 'http://support.typo3.org/documentation/tsref/tlo-objects/{FNAME}/',
-        4 => 'http://support.typo3.org/documentation/tsref/cobjects/{FNAME}/',
-        5 => 'http://support.typo3.org/documentation/tsref/gifbuilder/',
-        6 => 'http://support.typo3.org/documentation/tsref/gifbuilder/{FNAME}/',
-        7 => 'http://support.typo3.org/documentation/tsref/menu/{FNAME}/',
-        8 => 'http://support.typo3.org/documentation/tsref/menu/common-properties/',
-        9 => 'http://support.typo3.org/documentation/tsref/menu/item-states/'
+        1 => 'http://documentation.typo3.org/documentation/tsref/conditions/{FNAME}/',
+        2 => 'http://documentation.typo3.org/documentation/tsref/functions/{FNAME}/',
+        3 => 'http://documentation.typo3.org/documentation/tsref/tlo-objects/{FNAME}/',
+        4 => 'http://documentation.typo3.org/documentation/tsref/cobjects/{FNAME}/',
+        5 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/',
+        6 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/{FNAME}/',
+        7 => 'http://documentation.typo3.org/documentation/tsref/menu/{FNAME}/',
+        8 => 'http://documentation.typo3.org/documentation/tsref/menu/common-properties/',
+        9 => 'http://documentation.typo3.org/documentation/tsref/menu/item-states/'
         ),
     'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
diff -Naur dokuwiki-2009-02-14/inc/geshi/vbnet.php dokuwiki-rc2009-12-02/inc/geshi/vbnet.php
--- dokuwiki-2009-02-14/inc/geshi/vbnet.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/vbnet.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ---------
  * Author: Alan Juden (alan@judenware.org)
  * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/06/04
  *
  * VB.NET language file for GeSHi.
@@ -67,9 +67,9 @@
         2 => array(
             'AndAlso', 'As', 'ADDHANDLER', 'ASSEMBLY', 'AUTO', 'Binary', 'ByRef', 'ByVal', 'BEGINEPILOGUE',
             'Else', 'ElseIf', 'Empty', 'Error', 'ENDPROLOGUE', 'EXTERNALSOURCE', 'ENVIRON', 'For',
-            'Friend', 'GET', 'HANDLES', 'Input', 'Is', 'IsNot', 'Len', 'Lock', 'Me', 'Mid', 'MUSTINHERIT',
+            'Friend', 'GET', 'HANDLES', 'Input', 'Is', 'IsNot', 'Len', 'Lock', 'Me', 'Mid', 'MUSTINHERIT', 'MustOverride',
             'MYBASE', 'MYCLASS', 'New', 'Next', 'Nothing', 'Null', 'NOTINHERITABLE',
-            'NOTOVERRIDABLE', 'OFF', 'On', 'Option', 'Optional', 'Overloads', 'OVERRIDABLE', 'ParamArray',
+            'NOTOVERRIDABLE', 'OFF', 'On', 'Option', 'Optional', 'Overloads', 'OVERRIDABLE', 'Overrides', 'ParamArray',
             'Print', 'Private', 'Property', 'Public', 'Resume', 'Return', 'Seek', 'Static', 'Step',
             'String', 'SHELL', 'SENDKEYS', 'SET', 'Shared', 'Then', 'Time', 'To', 'THROW', 'WithEvents'
             ),
diff -Naur dokuwiki-2009-02-14/inc/geshi/vb.php dokuwiki-rc2009-12-02/inc/geshi/vb.php
--- dokuwiki-2009-02-14/inc/geshi/vb.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/vb.php	2009-12-02 19:50:11.000000000 +0100
@@ -3,14 +3,19 @@
  * vb.php
  * ------
  * Author: Roberto Rossi (rsoftware@altervista.org)
- * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
- * Release Version: 1\.0\.8
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
+ *                     Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
  * Date Started: 2004/08/30
  *
  * Visual Basic language file for GeSHi.
  *
  * CHANGES
  * -------
+ * 2008/08/27 (1.0.8.1)
+ *  -  changed keyword list for better Visual Studio compliance
+ * 2008/08/26 (1.0.8.1)
+ *  -  Fixed multiline comments
  * 2004/11/27 (1.0.1)
  *  -  Added support for multiple object splitters
  * 2004/08/30 (1.0.0)
@@ -41,63 +46,37 @@
 
 $language_data = array (
     'LANG_NAME' => 'Visual Basic',
-    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_SINGLE' => array(),
     'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // Comments (either single or multiline with _
+        1 => '/\'.*(? GESHI_CAPS_NO_CHANGE,
     'QUOTEMARKS' => array('"'),
     'ESCAPE_CHAR' => '',
     'KEYWORDS' => array(
         1 => array(
-            'as', 'err', 'boolean', 'and', 'or', 'recordset', 'unload', 'to',
-            'integer','long','single','new','database','nothing','set','close',
-            'open','print','split','line','field','querydef','instrrev',
-            'abs','array','asc','ascb','ascw','atn','avg','me',
-            'cbool','cbyte','ccur','cdate','cdbl','cdec','choose','chr','chrb','chrw','cint','clng',
-            'command','cos','count','createobject','csng','cstr','curdir','cvar','cvdate','cverr',
-            'date','dateadd','datediff','datepart','dateserial','datevalue','day','ddb','dir','doevents',
-            'environ','eof','error','exp',
-            'fileattr','filedatetime','filelen','fix','format','freefile','fv',
-            'getallstrings','getattr','getautoserversettings','getobject','getsetting',
-            'hex','hour','iif','imestatus','input','inputb','inputbox','instr','instb','int','ipmt',
-            'isarray','isdate','isempty','iserror','ismissing','isnull','isnumeric','isobject',
-            'lbound','lcase','left','leftb','len','lenb','loadpicture','loc','lof','log','ltrim',
-            'max','mid','midb','min','minute','mirr','month','msgbox',
-            'now','nper','npv','oct','partition','pmt','ppmt','pv','qbcolor',
-            'rate','rgb','right','rightb','rnd','rtrim',
-            'second','seek','sgn','shell','sin','sln','space','spc','sqr','stdev','stdevp','str',
-            'strcomp','strconv','string','switch','sum','syd',
-            'tab','tan','time','timer','timeserial','timevalue','trim','typename',
-            'ubound','ucase','val','var','varp','vartype','weekday','year',
-            'appactivate','base','beep','call','case','chdir','chdrive','const',
-            'declare','defbool','defbyte','defcur','defdate','defdbl','defdec','defint',
-            'deflng','defobj','defsng','defstr','deftype','defvar','deletesetting','dim','do',
-            'else','elseif','end','enum','erase','event','exit','explicit',
-            'false','filecopy','for','foreach','friend','function','get','gosub','goto',
-            'if','implements','kill','let','lineinput','lock','loop','lset','mkdir','name','next','not',
-            'onerror','on','option','private','property','public','put','raiseevent','randomize',
-            'redim','rem','reset','resume','return','rmdir','rset',
-            'savepicture','savesetting','sendkeys','setattr','static','sub',
-            'then','true','type','unlock','wend','while','width','with','write',
-            'vbabort','vbabortretryignore','vbapplicationmodal','vbarray',
-            'vbbinarycompare','vbblack','vbblue','vbboolean','vbbyte','vbcancel',
-            'vbcr','vbcritical','vbcrlf','vbcurrency','vbcyan','vbdataobject',
-            'vbdate','vbdecimal','vbdefaultbutton1','vbdefaultbutton2',
-            'vbdefaultbutton3','vbdefaultbutton4','vbdouble','vbempty',
-            'vberror','vbexclamation','vbfirstfourdays','vbfirstfullweek',
-            'vbfirstjan1','vbformfeed','vbfriday','vbgeneraldate','vbgreen',
-            'vbignore','vbinformation','vbinteger','vblf','vblong','vblongdate',
-            'vblongtime','vbmagenta','vbmonday','vbnewline','vbno','vbnull',
-            'vbnullchar','vbnullstring','vbobject','vbobjecterror','vbok','vbokcancel',
-            'vbokonly','vbquestion','vbred','vbretry','vbretrycancel','vbsaturday',
-            'vbshortdate','vbshorttime','vbsingle','vbstring','vbsunday',
-            'vbsystemmodal','vbtab','vbtextcompare','vbthursday','vbtuesday',
-            'vbusesystem','vbusesystemdayofweek','vbvariant','vbverticaltab',
-            'vbwednesday','vbwhite','vbyellow','vbyes','vbyesno','vbyesnocancel',
-            'vbnormal','vbdirectory'
+            'AddressOf', 'Alias', 'And', 'Append', 'As', 'BF', 'Binary',
+            'Boolean', 'ByRef', 'Byte', 'ByVal', 'Call', 'Case', 'CBool',
+            'CByte', 'CCur', 'CDate', 'CDbl', 'CDec', 'CInt', 'CLng',
+            'Close', 'Collection', 'Const', 'Control', 'CSng', 'CStr',
+            'Currency', 'CVar', 'Date', 'Declare', 'Dim', 'Do', 'Double',
+            'Each', 'Else', 'ElseIf', 'End', 'Enum', 'Erase', 'Error',
+            'Event', 'Exit', 'Explicit', 'False', 'For', 'Friend',
+            'Function', 'Get', 'GoSub', 'Goto', 'If', 'Implements', 'In',
+            'Input', 'Integer', 'Is', 'LBound', 'Let', 'Lib', 'Like',
+            'Line', 'Long', 'Loop', 'Mod', 'New', 'Next', 'Not',
+            'Nothing', 'Object', 'On', 'Open', 'Option', 'Optional',
+            'Or', 'Output', 'ParamArray', 'Preserve', 'Print', 'Private',
+            'Property', 'Public', 'RaiseEvent', 'Random', 'ReDim',
+            'Resume', 'Select', 'Set', 'Single', 'Static', 'Step',
+            'Stop', 'String', 'Sub', 'Then', 'To', 'True', 'Type',
+            'TypeOf', 'UBound', 'Until', 'Variant', 'While', 'With',
+            'WithEvents', 'Xor'
             )
         ),
     'SYMBOLS' => array(
-        '(', ')'
         ),
     'CASE_SENSITIVE' => array(
         GESHI_COMMENTS => false,
@@ -105,28 +84,24 @@
         ),
     'STYLES' => array(
         'KEYWORDS' => array(
-            1 => 'color: #b1b100;'
+            1 => 'color: #000080;'
             ),
         'COMMENTS' => array(
-            1 => 'color: #808080;'
+            1 => 'color: #008000;'
             ),
         'BRACKETS' => array(
-            0 => 'color: #66cc66;'
             ),
         'STRINGS' => array(
-            0 => 'color: #ff0000;'
+            0 => 'color: #800000;'
             ),
         'NUMBERS' => array(
-            0 => 'color: #cc66cc;'
             ),
         'METHODS' => array(
-            1 => 'color: #66cc66;'
             ),
         'SYMBOLS' => array(
-            0 => 'color: #66cc66;'
             ),
         'ESCAPE_CHAR' => array(
-            0 => 'color: #000099;'
+            0 => 'color: #800000; font-weight: bold;'
             ),
         'SCRIPT' => array(
             ),
@@ -136,9 +111,8 @@
     'URLS' => array(
         1 => ''
         ),
-    'OOLANG' => true,
+    'OOLANG' => false,
     'OBJECT_SPLITTERS' => array(
-        1 => '.'
         ),
     'REGEXPS' => array(
         ),
@@ -146,7 +120,14 @@
     'SCRIPT_DELIMITERS' => array(
         ),
     'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
         )
 );
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/geshi/verilog.php dokuwiki-rc2009-12-02/inc/geshi/verilog.php
--- dokuwiki-2009-02-14/inc/geshi/verilog.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/verilog.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -----------
  * Author: G�nter Dannoritzer 
  * Copyright: (C) 2008 Guenter Dannoritzer
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/05/28
  *
  * Verilog language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/vhdl.php dokuwiki-rc2009-12-02/inc/geshi/vhdl.php
--- dokuwiki-2009-02-14/inc/geshi/vhdl.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/vhdl.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * --------
  * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
  * Copyright: (c) 2005 Alexander Krause
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2005/06/15
  *
  * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/vim.php dokuwiki-rc2009-12-02/inc/geshi/vim.php
--- dokuwiki-2009-02-14/inc/geshi/vim.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/vim.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,185 @@
+ 'Vim Script',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/^\".*$/m"
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'brea', 'break', 'call', 'cat', 'catc',
+            'catch', 'con', 'cont', 'conti',
+            'contin', 'continu', 'continue', 'ec', 'echo',
+            'echoe', 'echoer', 'echoerr', 'echoh',
+            'echohl', 'echom', 'echoms', 'echomsg', 'echon',
+            'el', 'els', 'else', 'elsei', 'elseif',
+            'en', 'end', 'endi', 'endif', 'endfo',
+            'endfor', 'endt', 'endtr', 'endtry', 'endw',
+            'endwh', 'endwhi', 'endwhil', 'endwhile', 'exe', 'exec', 'execu',
+            'execut', 'execute', 'fina', 'final', 'finall', 'finally', 'for',
+            'fun', 'func', 'funct', 'functi', 'functio', 'function', 'if', 'in',
+            'let', 'lockv', 'lockva', 'lockvar', 'retu', 'retur', 'return', 'th',
+            'thr', 'thro', 'throw', 'try', 'unl', 'unle', 'unlet', 'unlo', 'unloc',
+            'unlock', 'unlockv', 'unlockva', 'unlockvar', 'wh', 'whi', 'whil',
+            'while'
+            ),
+        2 => array(
+            'autocmd', 'com', 'comm', 'comma', 'comman', 'command', 'comc',
+            'comcl', 'comcle', 'comclea', 'comclear', 'delc', 'delco',
+            'delcom', 'delcomm', 'delcomma', 'delcomman', 'delcommand',
+            '-nargs' # TODO There are zillions of commands to be added here from http://vimdoc.sourceforge.net/htmldoc/usr_toc.html
+            ),
+        3 => array(
+            'abs', 'add', 'append', 'argc', 'argidx', 'argv', 'atan',
+            'browse', 'browsedir', 'bufexists', 'buflisted', 'bufloaded',
+            'bufname', 'bufnr', 'bufwinnr', 'byte2line', 'byteidx',
+            'ceil', 'changenr', 'char2nr', 'cindent', 'clearmatches',
+            'col', 'complete', 'complete_add', 'complete_check', 'confirm',
+            'copy', 'cos', 'count', 'cscope_connection', 'cursor',
+            'deepcopy', 'delete', 'did_filetype', 'diff_filler',
+            'diff_hlID', 'empty', 'escape', 'eval', 'eventhandler',
+            'executable', 'exists', 'extend', 'expand', 'feedkeys',
+            'filereadable', 'filewritable', 'filter', 'finddir',
+            'findfile', 'float2nr', 'floor', 'fnameescape', 'fnamemodify',
+            'foldclosed', 'foldclosedend', 'foldlevel', 'foldtext',
+            'foldtextresult', 'foreground', 'garbagecollect',
+            'get', 'getbufline', 'getbufvar', 'getchar', 'getcharmod',
+            'getcmdline', 'getcmdpos', 'getcmdtype', 'getcwd', 'getfperm',
+            'getfsize', 'getfontname', 'getftime', 'getftype', 'getline',
+            'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist',
+            'getreg', 'getregtype', 'gettabwinvar', 'getwinposx',
+            'getwinposy', 'getwinvar', 'glob', 'globpath', 'has',
+            'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel',
+            'histget', 'histnr', 'hlexists', 'hlID', 'hostname', 'iconv',
+            'indent', 'index', 'input', 'inputdialog', 'inputlist',
+            'inputrestore', 'inputsave', 'inputsecret', 'insert',
+            'isdirectory', 'islocked', 'items', 'join', 'keys', 'len',
+            'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent',
+            'localtime', 'log10', 'map', 'maparg', 'mapcheck', 'match',
+            'matchadd', 'matcharg', 'matchdelete', 'matchend', 'matchlist',
+            'matchstr', 'max', 'min', 'mkdir', 'mode', 'nextnonblank',
+            'nr2char', 'pathshorten', 'pow', 'prevnonblank', 'printf',
+            'pumvisible', 'range', 'readfile', 'reltime', 'reltimestr',
+            'remote_expr', 'remote_foreground', 'remote_peek',
+            'remote_read', 'remote_send', 'remove', 'rename', 'repeat',
+            'resolve', 'reverse', 'round', 'search', 'searchdecl',
+            'searchpair', 'searchpairpos', 'searchpos', 'server2client',
+            'serverlist', 'setbufvar', 'setcmdpos', 'setline',
+            'setloclist', 'setmatches', 'setpos', 'setqflist', 'setreg',
+            'settabwinvar', 'setwinvar', 'shellescape', 'simplify', 'sin',
+            'sort', 'soundfold', 'spellbadword', 'spellsuggest', 'split',
+            'sqrt', 'str2float', 'str2nr', 'strftime', 'stridx', 'string',
+            'strlen', 'strpart', 'strridx', 'strtrans', 'submatch',
+            'substitute', 'synID', 'synIDattr', 'synIDtrans', 'synstack',
+            'system', 'tabpagebuflist', 'tabpagenr', 'tabpagewinnr',
+            'taglist', 'tagfiles', 'tempname', 'tolower', 'toupper', 'tr',
+            'trunc', 'type', 'values', 'virtcol', 'visualmode', 'winbufnr',
+            'wincol', 'winheight', 'winline', 'winnr', 'winrestcmd',
+            'winrestview', 'winsaveview', 'winwidth', 'writefile'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>',
+        '^', '-', '+', '~', '?', ':', '$', '@', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #804040;',
+            2 => 'color: #668080;',
+            3 => 'color: #25BB4D;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #C5A22D;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false, //Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/visualfoxpro.php dokuwiki-rc2009-12-02/inc/geshi/visualfoxpro.php
--- dokuwiki-2009-02-14/inc/geshi/visualfoxpro.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/visualfoxpro.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------------
  * Author: Roberto Armellin (r.armellin@tin.it)
  * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/09/17
  *
  * Visual FoxPro language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/visualprolog.php dokuwiki-rc2009-12-02/inc/geshi/visualprolog.php
--- dokuwiki-2009-02-14/inc/geshi/visualprolog.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/visualprolog.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,129 @@
+ 'Visual Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'clauses','constants','constructors','delegate','domains','facts',
+            'goal','guards','inherits','monitor','namespace','open',
+            'predicates','properties','resolve','supports'
+            ),
+        2 => array(
+            'align','and','anyflow','as','bitsize','catch','determ','digits',
+            'div','do','else','elseif','erroneous','externally','failure',
+            'finally','from','language','mod','multi','nondeterm','or',
+            'procedure','quot','rem','single','then','to'
+            ),
+        3 => array(
+            '#bininclude','#else','#elseif','#endif','#error','#export',
+            '#externally','#if','#import','#include','#message','#options',
+            '#orrequires','#requires','#then','#warning'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '>', '<', '^', '!', ':', '(', ')', '{', '}', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            3 => 'color: #800080;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #AA77BD',
+            'MULTI' => 'color: #AA77BD'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00B7B7;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ':',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => "(?)[A-Z_]\w*(?!\w)",
+        1 => "\\b(end\\s+)?(implement|class|interface)\\b",
+        2 => "\\b(end\\s+)?(foreach|if|try)\\b",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/whitespace.php dokuwiki-rc2009-12-02/inc/geshi/whitespace.php
--- dokuwiki-2009-02-14/inc/geshi/whitespace.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/whitespace.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,121 @@
+ 'Whitespace',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        3 => "/[^\n\x20\x09]+/s"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            3 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            2 => 'background-color: #FF9999;',
+            3 => 'background-color: #9999FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        2 => array(
+            GESHI_SEARCH => "(? " ",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        3 => array(
+            GESHI_SEARCH => "\x09",
+            GESHI_REPLACE => "	",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+//            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
diff -Naur dokuwiki-2009-02-14/inc/geshi/winbatch.php dokuwiki-rc2009-12-02/inc/geshi/winbatch.php
--- dokuwiki-2009-02-14/inc/geshi/winbatch.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/winbatch.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ------------
  * Author: Craig Storey (storey.craig@gmail.com)
  * Copyright: (c) 2004 Craig Storey (craig.xcottawa.ca)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2006/05/19
  *
  * WinBatch language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/xml.php dokuwiki-rc2009-12-02/inc/geshi/xml.php
--- dokuwiki-2009-02-14/inc/geshi/xml.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/xml.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Nigel McNie (nigel@geshi.org)
  * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2004/09/01
  *
  * XML language file for GeSHi. Based on the idea/file by Christian Weiske
@@ -100,14 +100,14 @@
         ),
     'REGEXPS' => array(
         0 => array(//attribute names
-            GESHI_SEARCH => '([a-z0-9_\-:]+)(=)',
+            GESHI_SEARCH => '([a-z_:][\w\-\.:]*)(=)',
             GESHI_REPLACE => '\\1',
             GESHI_MODIFIERS => 'i',
             GESHI_BEFORE => '',
             GESHI_AFTER => '\\2'
             ),
         1 => array(//Initial header line
-            GESHI_SEARCH => '(<[\/?|(\?xml)]?[a-z0-9_\-:]*(\??>)?)',
+            GESHI_SEARCH => '(<[\/?|(\?xml)]?[a-z_:][\w\-\.:]*(\??>)?)',
             GESHI_REPLACE => '\\1',
             GESHI_MODIFIERS => 'i',
             GESHI_BEFORE => '',
diff -Naur dokuwiki-2009-02-14/inc/geshi/xorg_conf.php dokuwiki-rc2009-12-02/inc/geshi/xorg_conf.php
--- dokuwiki-2009-02-14/inc/geshi/xorg_conf.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/xorg_conf.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * ----------
  * Author: Milian Wolff (mail@milianw.de)
  * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
- * Release Version: 1.0.8
+ * Release Version: 1.0.8.4
  * Date Started: 2008/06/18
  *
  * xorg.conf language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/xpp.php dokuwiki-rc2009-12-02/inc/geshi/xpp.php
--- dokuwiki-2009-02-14/inc/geshi/xpp.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/xpp.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Simon Butcher (simon@butcher.name)
  * Copyright: (c) 2007 Simon Butcher (http://simon.butcher.name/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/02/27
  *
  * Axapta/Dynamics Ax X++ language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi/z80.php dokuwiki-rc2009-12-02/inc/geshi/z80.php
--- dokuwiki-2009-02-14/inc/geshi/z80.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi/z80.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,7 +4,7 @@
  * -------
  * Author: Benny Baumann (BenBE@omorphia.de)
  * Copyright: (c) 2007-2008 Benny Baumann (http://www.omorphia.de/)
- * Release Version: 1\.0\.8
+ * Release Version: 1.0.8.4
  * Date Started: 2007/02/06
  *
  * ZiLOG Z80 Assembler language file for GeSHi.
diff -Naur dokuwiki-2009-02-14/inc/geshi.php dokuwiki-rc2009-12-02/inc/geshi.php
--- dokuwiki-2009-02-14/inc/geshi.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/geshi.php	2009-12-02 19:50:11.000000000 +0100
@@ -41,7 +41,7 @@
 //
 
 /** The version of this GeSHi file */
-define('GESHI_VERSION', '1.0.8');
+define('GESHI_VERSION', '1.0.8.4');
 
 // Define the root directory for the GeSHi code tree
 if (!defined('GESHI_ROOT')) {
@@ -52,6 +52,11 @@
     @access private */
 define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . DIRECTORY_SEPARATOR);
 
+// Define if GeSHi should be paranoid about security
+if (!defined('GESHI_SECURITY_PARANOID')) {
+    /** Tells GeSHi to be paranoid about security settings */
+    define('GESHI_SECURITY_PARANOID', false);
+}
 
 // Line numbers - use with enable_line_numbers()
 /** Use no line numbers when building the result */
@@ -180,9 +185,14 @@
 /** some old PHP / PCRE subpatterns only support up to xxx subpatterns in
     regular expressions. Set this to false if your PCRE lib is up to date
     @see GeSHi->optimize_regexp_list()
-    TODO: are really the subpatterns the culprit or the overall length of the pattern?
     **/
 define('GESHI_MAX_PCRE_SUBPATTERNS', 500);
+/** it's also important not to generate too long regular expressions
+    be generous here... but keep in mind, that when reaching this limit we
+    still have to close open patterns. 12k should do just fine on a 16k limit.
+    @see GeSHi->optimize_regexp_list()
+    **/
+define('GESHI_MAX_PCRE_LENGTH', 12288);
 
 //Number format specification
 /** Basic number format for integers */
@@ -435,7 +445,7 @@
      *  The style for the actual code
      * @var string
      */
-    var $code_style = 'font-family: monospace; font-weight: normal; font-style: normal; margin:0; padding:0; background:inherit;';
+    var $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
 
     /**
      * The overall class for this code block
@@ -453,19 +463,19 @@
      * Line number styles
      * @var string
      */
-    var $line_style1 = 'font-weight: normal;';
+    var $line_style1 = 'font-weight: normal; vertical-align:top;';
 
     /**
      * Line number styles for fancy lines
      * @var string
      */
-    var $line_style2 = 'font-weight: bold;';
+    var $line_style2 = 'font-weight: bold; vertical-align:top;';
 
     /**
      * Style for line numbers when GESHI_HEADER_PRE_TABLE is chosen
      * @var string
      */
-    var $table_linenumber_style = 'width:1px;font-weight: normal;text-align:right;margin:0;padding:0 2px;';
+    var $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
 
     /**
      * Flag for how line numbers are displayed
@@ -691,9 +701,31 @@
      *             so this method will disappear in 1.2.0.
      */
     function set_language_path($path) {
+        if(strpos($path,':')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            if(DIRECTORY_SEPARATOR == "\\") {
+                if(!preg_match('#^[a-zA-Z]:#', $path) || false !== strpos($path, ':', 2)) {
+                    return;
+                }
+            } else {
+                return;
+            }
+        }
+        if(preg_match('#[^/a-zA-Z0-9_\.\-\\\s:]#', $path)) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '/.')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '..')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
         if ($path) {
             $this->language_path = ('/' == $path[strlen($path) - 1]) ? $path : $path . '/';
-            $this->set_language($this->language);        // otherwise set_language_path has no effect
+            $this->set_language($this->language); // otherwise set_language_path has no effect
         }
     }
 
@@ -951,11 +983,11 @@
      *                to overwrite them
      * @since 1.0.0
      */
-    function set_escape_characters_style($style, $preserve_defaults = false) {
+    function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
         if (!$preserve_defaults) {
-            $this->language_data['STYLES']['ESCAPE_CHAR'][0] = $style;
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style;
         } else {
-            $this->language_data['STYLES']['ESCAPE_CHAR'][0] .= $style;
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] .= $style;
         }
     }
 
@@ -1073,6 +1105,26 @@
     }
 
     /**
+     * Sets the styles for strict code blocks. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the script blocks
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of script blocks for which style should be set.
+     * @since 1.0.8.4
+     */
+    function set_script_style($style, $preserve_defaults = false, $group = 0) {
+        // Update the style of symbols
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['SCRIPT'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['SCRIPT'][$group] .= $style;
+        }
+    }
+
+    /**
      * Sets the styles for numbers. If $preserve_defaults is
      * true, then styles are merged with the default styles, with the
      * user defined styles having priority
@@ -1297,47 +1349,72 @@
     function get_language_name_from_extension( $extension, $lookup = array() ) {
         if ( !is_array($lookup) || empty($lookup)) {
             $lookup = array(
+                'abap' => array('abap'),
                 'actionscript' => array('as'),
                 'ada' => array('a', 'ada', 'adb', 'ads'),
                 'apache' => array('conf'),
-                'asm' => array('ash', 'asm'),
+                'asm' => array('ash', 'asm', 'inc'),
                 'asp' => array('asp'),
                 'bash' => array('sh'),
+                'bf' => array('bf'),
                 'c' => array('c', 'h'),
                 'c_mac' => array('c', 'h'),
                 'caddcl' => array(),
                 'cadlisp' => array(),
                 'cdfg' => array('cdfg'),
                 'cobol' => array('cbl'),
-                'cpp' => array('cpp', 'h', 'hpp'),
-                'csharp' => array(),
+                'cpp' => array('cpp', 'hpp', 'C', 'H', 'CPP', 'HPP'),
+                'csharp' => array('cs'),
                 'css' => array('css'),
+                'd' => array('d'),
                 'delphi' => array('dpk', 'dpr', 'pp', 'pas'),
+                'diff' => array('diff', 'patch'),
                 'dos' => array('bat', 'cmd'),
                 'gettext' => array('po', 'pot'),
+                'gml' => array('gml'),
+                'gnuplot' => array('plt'),
+                'groovy' => array('groovy'),
+                'haskell' => array('hs'),
                 'html4strict' => array('html', 'htm'),
+                'ini' => array('ini', 'desktop'),
                 'java' => array('java'),
                 'javascript' => array('js'),
                 'klonec' => array('kl1'),
                 'klonecpp' => array('klx'),
+                'latex' => array('tex'),
                 'lisp' => array('lisp'),
                 'lua' => array('lua'),
+                'matlab' => array('m'),
                 'mpasm' => array(),
+                'mysql' => array('sql'),
                 'nsis' => array(),
                 'objc' => array(),
                 'oobas' => array(),
                 'oracle8' => array(),
-                'pascal' => array(),
+                'oracle10' => array(),
+                'pascal' => array('pas'),
                 'perl' => array('pl', 'pm'),
                 'php' => array('php', 'php5', 'phtml', 'phps'),
+                'povray' => array('pov'),
+                'providex' => array('pvc', 'pvx'),
+                'prolog' => array('pl'),
                 'python' => array('py'),
                 'qbasic' => array('bi'),
+                'reg' => array('reg'),
+                'ruby' => array('rb'),
                 'sas' => array('sas'),
+                'scala' => array('scala'),
+                'scheme' => array('scm'),
+                'scilab' => array('sci'),
+                'smalltalk' => array('st'),
                 'smarty' => array(),
+                'tcl' => array('tcl'),
                 'vb' => array('bas'),
                 'vbnet' => array(),
                 'visualfoxpro' => array(),
-                'xml' => array('xml')
+                'whitespace' => array('ws'),
+                'xml' => array('xml', 'svg', 'xrc'),
+                'z80' => array('z80', 'asm', 'inc')
             );
         }
 
@@ -1473,6 +1550,25 @@
     function optimize_keyword_group($key) {
         $this->language_data['CACHED_KEYWORD_LISTS'][$key] =
             $this->optimize_regexp_list($this->language_data['KEYWORDS'][$key]);
+        $space_as_whitespace = false;
+        if(isset($this->language_data['PARSER_CONTROL'])) {
+            if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'])) {
+                    $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'];
+                }
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                    if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                        $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'];
+                    }
+                }
+            }
+        }
+        if($space_as_whitespace) {
+            foreach($this->language_data['CACHED_KEYWORD_LISTS'][$key] as $rxk => $rxv) {
+                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$rxk] =
+                    str_replace(" ", "\\s+", $rxv);
+            }
+        }
     }
 
     /**
@@ -1561,7 +1657,7 @@
         if (!$target) {
             $this->link_target = '';
         } else {
-            $this->link_target = ' target="' . $target . '" ';
+            $this->link_target = ' target="' . $target . '"';
         }
     }
 
@@ -1812,12 +1908,14 @@
             //
             //Now we need to rewrite our array to get a search string that
             $symbol_preg = array();
-            if (!empty($symbol_preg_single)) {
-                $symbol_preg[] = '[' . implode('', $symbol_preg_single) . ']';
-            }
             if (!empty($symbol_preg_multi)) {
+                rsort($symbol_preg_multi);
                 $symbol_preg[] = implode('|', $symbol_preg_multi);
             }
+            if (!empty($symbol_preg_single)) {
+                rsort($symbol_preg_single);
+                $symbol_preg[] = '[' . implode('', $symbol_preg_single) . ']';
+            }
             $this->language_data['SYMBOL_SEARCH'] = implode("|", $symbol_preg);
         }
 
@@ -1868,9 +1966,9 @@
             //All this formats are matched case-insensitively!
             static $numbers_format = array(
                 GESHI_NUMBER_INT_BASIC =>
-                    '(?
-                    '(?
                     '(?
@@ -1914,7 +2012,7 @@
                 }
 
                 $this->language_data['NUMBERS_RXCACHE'][$key] =
-                    "/(?)($regexp)(?!\|>)/i";
+                    "/(?)($regexp)(?!\|>)(?![^\"\|\>\<]+<)/i";
             }
         }
 
@@ -2033,13 +2131,24 @@
                         if(!GESHI_PHP_PRE_433 && //Needs proper rewrite to work with PHP >=4.3.0; 4.3.3 is guaranteed to work.
                             preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
                             //We got a match ...
-                            $matches[$dk] = array(
-                                'next_match' => $matches_rx[1][1],
-                                'dk' => $dk,
+                            if(isset($matches_rx['start']) && isset($matches_rx['end']))
+                            {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx['start'][1],
+                                    'dk' => $dk,
 
-                                'close_strlen' => strlen($matches_rx[2][0]),
-                                'close_pos' => $matches_rx[2][1],
-                                );
+                                    'close_strlen' => strlen($matches_rx['end'][0]),
+                                    'close_pos' => $matches_rx['end'][1],
+                                    );
+                            } else {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx[1][1],
+                                    'dk' => $dk,
+
+                                    'close_strlen' => strlen($matches_rx[2][0]),
+                                    'close_pos' => $matches_rx[2][1],
+                                    );
+                            }
                         } else {
                             // no match for this delimiter ever
                             unset($delim_copy[$dk]);
@@ -2052,6 +2161,7 @@
                         }
                     }
                 }
+
                 // non-highlightable text
                 $parts[$k] = array(
                     1 => substr($code, $i, $next_match_pos - $i)
@@ -2233,7 +2343,7 @@
                 // parse_non_string_part).
 
                 // cache comment regexps incrementally
-                $comment_regexp_cache = array();
+                $next_comment_regexp_key = '';
                 $next_comment_regexp_pos = -1;
                 $next_comment_multi_pos = -1;
                 $next_comment_single_pos = -1;
@@ -2242,6 +2352,9 @@
                 $comment_single_cache_per_key = array();
                 $next_open_comment_multi = '';
                 $next_comment_single_key = '';
+                $escape_regexp_cache_per_key = array();
+                $next_escape_regexp_key = '';
+                $next_escape_regexp_pos = -1;
 
                 $length = strlen($part);
                 for ($i = 0; $i < $length; ++$i) {
@@ -2249,6 +2362,50 @@
                     $char = $part[$i];
                     $char_len = 1;
 
+                    // update regexp comment cache if needed
+                    if (isset($this->language_data['COMMENT_REGEXP']) && $next_comment_regexp_pos < $i) {
+                        $next_comment_regexp_pos = $length;
+                        foreach ($this->language_data['COMMENT_REGEXP'] as $comment_key => $regexp) {
+                            $match_i = false;
+                            if (isset($comment_regexp_cache_per_key[$comment_key]) &&
+                                ($comment_regexp_cache_per_key[$comment_key]['pos'] >= $i ||
+                                 $comment_regexp_cache_per_key[$comment_key]['pos'] === false)) {
+                                // we have already matched something
+                                if ($comment_regexp_cache_per_key[$comment_key]['pos'] === false) {
+                                    // this comment is never matched
+                                    continue;
+                                }
+                                $match_i = $comment_regexp_cache_per_key[$comment_key]['pos'];
+                            } else if (
+                                //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
+                                (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
+                                ) {
+                                $match_i = $match[0][1];
+                                if (GESHI_PHP_PRE_433) {
+                                    $match_i += $i;
+                                }
+
+                                $comment_regexp_cache_per_key[$comment_key] = array(
+                                    'key' => $comment_key,
+                                    'length' => strlen($match[0][0]),
+                                    'pos' => $match_i
+                                );
+                            } else {
+                                $comment_regexp_cache_per_key[$comment_key]['pos'] = false;
+                                continue;
+                            }
+
+                            if ($match_i !== false && $match_i < $next_comment_regexp_pos) {
+                                $next_comment_regexp_pos = $match_i;
+                                $next_comment_regexp_key = $comment_key;
+                                if ($match_i === $i) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
                     $string_started = false;
 
                     if (isset($is_string_starter[$char])) {
@@ -2278,7 +2435,7 @@
                         $char_len = strlen($char);
                     }
 
-                    if ($string_started) {
+                    if ($string_started && ($i != $next_comment_regexp_pos)) {
                         // Hand out the correct style information for this string
                         $string_key = array_search($char, $this->language_data['QUOTEMARKS']);
                         if (!isset($this->language_data['STYLES']['STRINGS'][$string_key]) ||
@@ -2286,70 +2443,123 @@
                             $string_key = 0;
                         }
 
+                        // parse the stuff before this
+                        $result .= $this->parse_non_string_part($stuff_to_parse);
+                        $stuff_to_parse = '';
+
                         if (!$this->use_classes) {
                             $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][$string_key] . '"';
-                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][$string_key] . '"';
                         } else {
                             $string_attributes = ' class="st'.$string_key.'"';
-                            $escape_char_attributes = ' class="es'.$string_key.'"';
                         }
 
-                        // parse the stuff before this
-                        $result .= $this->parse_non_string_part($stuff_to_parse);
-                        $stuff_to_parse = '';
-
                         // now handle the string
-                        $string = '';
+                        $string = "" . GeSHi::hsc($char);
+                        $start = $i + $char_len;
+                        $string_open = true;
 
-                        // look for closing quote
-                        $start = $i;
-                        while ($close_pos = strpos($part, $char, $start + $char_len)) {
-                            $start = $close_pos;
-                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['ESCAPE_CHAR']) {
-                                // check wether this quote is escaped or if it is something like '\\'
-                                $escape_char_pos = $close_pos - 1;
-                                while ($escape_char_pos > 0 &&
-                                        $part[$escape_char_pos - 1] == $this->language_data['ESCAPE_CHAR']) {
-                                    --$escape_char_pos;
+                        if(empty($this->language_data['ESCAPE_REGEXP'])) {
+                            $next_escape_regexp_pos = $length;
+                        }
+
+                        do {
+                            //Get the regular ending pos ...
+                            $close_pos = strpos($part, $char, $start);
+                            if(false === $close_pos) {
+                                $close_pos = $length;
+                            }
+
+                            if($this->lexic_permissions['ESCAPE_CHAR']) {
+                                // update escape regexp cache if needed
+                                if (isset($this->language_data['ESCAPE_REGEXP']) && $next_escape_regexp_pos < $start) {
+                                    $next_escape_regexp_pos = $length;
+                                    foreach ($this->language_data['ESCAPE_REGEXP'] as $escape_key => $regexp) {
+                                        $match_i = false;
+                                        if (isset($escape_regexp_cache_per_key[$escape_key]) &&
+                                            ($escape_regexp_cache_per_key[$escape_key]['pos'] >= $start ||
+                                             $escape_regexp_cache_per_key[$escape_key]['pos'] === false)) {
+                                            // we have already matched something
+                                            if ($escape_regexp_cache_per_key[$escape_key]['pos'] === false) {
+                                                // this comment is never matched
+                                                continue;
+                                            }
+                                            $match_i = $escape_regexp_cache_per_key[$escape_key]['pos'];
+                                        } else if (
+                                            //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                            (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $start), $match, PREG_OFFSET_CAPTURE)) ||
+                                            (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start))
+                                            ) {
+                                            $match_i = $match[0][1];
+                                            if (GESHI_PHP_PRE_433) {
+                                                $match_i += $start;
+                                            }
+
+                                            $escape_regexp_cache_per_key[$escape_key] = array(
+                                                'key' => $escape_key,
+                                                'length' => strlen($match[0][0]),
+                                                'pos' => $match_i
+                                            );
+                                        } else {
+                                            $escape_regexp_cache_per_key[$escape_key]['pos'] = false;
+                                            continue;
+                                        }
+
+                                        if ($match_i !== false && $match_i < $next_escape_regexp_pos) {
+                                            $next_escape_regexp_pos = $match_i;
+                                            $next_escape_regexp_key = $escape_key;
+                                            if ($match_i === $start) {
+                                                break;
+                                            }
+                                        }
+                                    }
                                 }
-                                if (($close_pos - $escape_char_pos) & 1) {
-                                    // uneven number of escape chars => this quote is escaped
-                                    continue;
+
+                                //Find the next simple escape position
+                                if('' != $this->language_data['ESCAPE_CHAR']) {
+                                    $simple_escape = strpos($part, $this->language_data['ESCAPE_CHAR'], $start);
+                                    if(false === $simple_escape) {
+                                        $simple_escape = $length;
+                                    }
+                                } else {
+                                    $simple_escape = $length;
                                 }
+                            } else {
+                                $next_escape_regexp_pos = $length;
+                                $simple_escape = $length;
                             }
 
-                            // found closing quote
-                            break;
-                        }
+                            if($simple_escape < $next_escape_regexp_pos &&
+                                $simple_escape < $length &&
+                                $simple_escape < $close_pos) {
+                                //The nexxt escape sequence is a simple one ...
+                                $es_pos = $simple_escape;
 
-                        //Found the closing delimiter?
-                        if (!$close_pos) {
-                            // span till the end of this $part when no closing delimiter is found
-                            $close_pos = $length;
-                        }
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
 
-                        //Get the actual string
-                        $string = substr($part, $i, $close_pos - $i + $char_len);
-                        $i = $close_pos + $char_len - 1;
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es0"';
+                                }
 
-                        // handle escape chars and encode html chars
-                        // (special because when we have escape chars within our string they may not be escaped)
-                        if ($this->lexic_permissions['ESCAPE_CHAR'] && $this->language_data['ESCAPE_CHAR']) {
-                            $start = 0;
-                            $new_string = '';
-                            while ($es_pos = strpos($string, $this->language_data['ESCAPE_CHAR'], $start)) {
-                                $new_string .= $this->hsc(substr($string, $start, $es_pos - $start))
-                                              . "" . $escaped_escape_char;
-                                $es_char = $string[$es_pos + 1];
+                                //Add the style for the escape char ...
+                                $string .= "" .
+                                    GeSHi::hsc($this->language_data['ESCAPE_CHAR']);
+
+                                //Get the byte AFTER the ESCAPE_CHAR we just found
+                                $es_char = $part[$es_pos + 1];
                                 if ($es_char == "\n") {
                                     // don't put a newline around newlines
-                                    $new_string .= "\n";
+                                    $string .= "\n";
+                                    $start = $es_pos + 2;
                                 } else if (ord($es_char) >= 128) {
                                     //This is an non-ASCII char (UTF8 or single byte)
                                     //This code tries to work around SF#2037598 ...
                                     if(function_exists('mb_substr')) {
-                                        $es_char_m = mb_substr(substr($string, $es_pos+1, 16), 0, 1, $this->encoding);
-                                        $new_string .= $es_char_m . '';
+                                        $es_char_m = mb_substr(substr($part, $es_pos+1, 16), 0, 1, $this->encoding);
+                                        $string .= $es_char_m . '';
                                     } else if (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) {
                                         if(preg_match("/[\xC2-\xDF][\x80-\xBF]".
                                             "|\xE0[\xA0-\xBF][\x80-\xBF]".
@@ -2358,26 +2568,50 @@
                                             "|\xF0[\x90-\xBF][\x80-\xBF]{2}".
                                             "|[\xF1-\xF3][\x80-\xBF]{3}".
                                             "|\xF4[\x80-\x8F][\x80-\xBF]{2}/s",
-                                            $string, $es_char_m, null, $es_pos + 1)) {
+                                            $part, $es_char_m, null, $es_pos + 1)) {
                                             $es_char_m = $es_char_m[0];
                                         } else {
                                             $es_char_m = $es_char;
                                         }
-                                        $new_string .= $this->hsc($es_char_m) . '';
+                                        $string .= $this->hsc($es_char_m) . '';
                                     } else {
                                         $es_char_m = $this->hsc($es_char);
                                     }
-                                    $es_pos += strlen($es_char_m) - 1;
+                                    $start = $es_pos + strlen($es_char_m) + 1;
                                 } else {
-                                    $new_string .= $this->hsc($es_char) . '';
+                                    $string .= $this->hsc($es_char) . '';
+                                    $start = $es_pos + 2;
                                 }
-                                $start = $es_pos + 2;
+                            } else if ($next_escape_regexp_pos < $length &&
+                                $next_escape_regexp_pos < $close_pos) {
+                                $es_pos = $next_escape_regexp_pos;
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
+
+                                //Get the key and length of this match ...
+                                $escape = $escape_regexp_cache_per_key[$next_escape_regexp_key];
+                                $escape_str = substr($part, $es_pos, $escape['length']);
+                                $escape_key = $escape['key'];
+
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][$escape_key] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es' . $escape_key . '"';
+                                }
+
+                                //Add the style for the escape char ...
+                                $string .= "" .
+                                    $this->hsc($escape_str) . '';
+
+                                $start = $es_pos + $escape['length'];
+                            } else {
+                                //Copy the remainder of the string ...
+                                $string .= $this->hsc(substr($part, $start, $close_pos - $start + $char_len)) . '';
+                                $start = $close_pos + $char_len;
+                                $string_open = false;
                             }
-                            $string = $new_string . $this->hsc(substr($string, $start));
-                            $new_string = '';
-                        } else {
-                            $string = $this->hsc($string);
-                        }
+                        } while($string_open);
 
                         if ($check_linenumbers) {
                             // Are line numbers used? If, we should end the string before
@@ -2388,15 +2622,16 @@
                             $string = str_replace("\n", "\n", $string);
                         }
 
-                        $result .= "" . $string . '';
+                        $result .= $string;
                         $string = '';
+                        $i = $start - 1;
                         continue;
                     } else if ($this->lexic_permissions['STRINGS'] && $hq && $hq[0] == $char &&
-                        substr($part, $i, $hq_strlen) == $hq) {
+                        substr($part, $i, $hq_strlen) == $hq && ($i != $next_comment_regexp_pos)) {
                         // The start of a hard quoted string
                         if (!$this->use_classes) {
-                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS']['HARDQUOTE'] . '"';
-                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARDESCAPE'] . '"';
+                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS']['HARD'] . '"';
+                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARD'] . '"';
                         } else {
                             $string_attributes = ' class="st_h"';
                             $escape_char_attributes = ' class="es_h"';
@@ -2412,14 +2647,14 @@
                         $start = $i + $hq_strlen;
                         while ($close_pos = strpos($part, $this->language_data['HARDQUOTE'][1], $start)) {
                             $start = $close_pos + 1;
-                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['ESCAPE_CHAR']) {
+                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR']) {
                                 // make sure this quote is not escaped
                                 foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
                                     if (substr($part, $close_pos - 1, strlen($hardescape)) == $hardescape) {
                                         // check wether this quote is escaped or if it is something like '\\'
                                         $escape_char_pos = $close_pos - 1;
                                         while ($escape_char_pos > 0
-                                                && $part[$escape_char_pos - 1] == $this->language_data['ESCAPE_CHAR']) {
+                                                && $part[$escape_char_pos - 1] == $this->language_data['HARDCHAR']) {
                                             --$escape_char_pos;
                                         }
                                         if (($close_pos - $escape_char_pos) & 1) {
@@ -2499,48 +2734,10 @@
                         $string = '';
                         continue;
                     } else {
-                        // update regexp comment cache if needed
-                        if (isset($this->language_data['COMMENT_REGEXP']) && $next_comment_regexp_pos < $i) {
-                            $next_comment_regexp_pos = $length;
-                            foreach ($this->language_data['COMMENT_REGEXP'] as $comment_key => $regexp) {
-                                $match_i = false;
-                                if (isset($comment_regexp_cache_per_key[$comment_key]) &&
-                                    $comment_regexp_cache_per_key[$comment_key] >= $i) {
-                                    // we have already matched something
-                                    $match_i = $comment_regexp_cache_per_key[$comment_key];
-                                } else if (
-                                    //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
-                                    (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
-                                    (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
-                                    ) {
-                                    $match_i = $match[0][1];
-                                    if (GESHI_PHP_PRE_433) {
-                                        $match_i += $i;
-                                    }
-
-                                    $comment_regexp_cache[$match_i] = array(
-                                        'key' => $comment_key,
-                                        'length' => strlen($match[0][0]),
-                                    );
-
-                                    $comment_regexp_cache_per_key[$comment_key] = $match_i;
-                                } else {
-                                    $comment_regexp_cache_per_key[$comment_key] = false;
-                                    continue;
-                                }
-
-                                if ($match_i !== false && $match_i < $next_comment_regexp_pos) {
-                                    $next_comment_regexp_pos = $match_i;
-                                    if ($match_i === $i) {
-                                        break;
-                                    }
-                                }
-                            }
-                        }
                         //Have a look for regexp comments
                         if ($i == $next_comment_regexp_pos) {
                             $COMMENT_MATCHED = true;
-                            $comment = $comment_regexp_cache[$next_comment_regexp_pos];
+                            $comment = $comment_regexp_cache_per_key[$next_comment_regexp_key];
                             $test_str = $this->hsc(substr($part, $i, $comment['length']));
 
                             //@todo If remove important do remove here
@@ -2578,8 +2775,13 @@
                                 foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) {
                                     $match_i = false;
                                     if (isset($comment_multi_cache_per_key[$open]) &&
-                                        $comment_multi_cache_per_key[$open] >= $i) {
+                                        ($comment_multi_cache_per_key[$open] >= $i ||
+                                         $comment_multi_cache_per_key[$open] === false)) {
                                         // we have already matched something
+                                        if ($comment_multi_cache_per_key[$open] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
                                         $match_i = $comment_multi_cache_per_key[$open];
                                     } else if (($match_i = stripos($part, $open, $i)) !== false) {
                                         $comment_multi_cache_per_key[$open] = $match_i;
@@ -2670,8 +2872,13 @@
                                 foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) {
                                     $match_i = false;
                                     if (isset($comment_single_cache_per_key[$comment_key]) &&
-                                        $comment_single_cache_per_key[$comment_key] >= $i) {
+                                        ($comment_single_cache_per_key[$comment_key] >= $i ||
+                                         $comment_single_cache_per_key[$comment_key] === false)) {
                                         // we have already matched something
+                                        if ($comment_single_cache_per_key[$comment_key] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
                                         $match_i = $comment_single_cache_per_key[$comment_key];
                                     } else if (
                                         // case sensitive comments
@@ -2948,9 +3155,16 @@
 
                 $before = '<|UR1|"' .
                     str_replace(
-                        array('{FNAME}', '{FNAMEL}', '{FNAMEU}', '.'),
-                        array($this->hsc($word), $this->hsc(strtolower($word)),
-                            $this->hsc(strtoupper($word)), ''),
+                        array(
+                            '{FNAME}',
+                            '{FNAMEL}',
+                            '{FNAMEU}',
+                            '.'),
+                        array(
+                            str_replace('+', '%20', urlencode($this->hsc($word))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtolower($word)))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtoupper($word)))),
+                            ''),
                         $this->language_data['URLS'][$k]
                     ) . '">';
                 $after = '';
@@ -3021,55 +3235,6 @@
     function parse_non_string_part($stuff_to_parse) {
         $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
 
-        // Regular expressions
-        foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
-            if ($this->lexic_permissions['REGEXPS'][$key]) {
-                if (is_array($regexp)) {
-                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                        // produce valid HTML when we match multiple lines
-                        $this->_hmr_replace = $regexp[GESHI_REPLACE];
-                        $this->_hmr_before = $regexp[GESHI_BEFORE];
-                        $this->_hmr_key = $key;
-                        $this->_hmr_after = $regexp[GESHI_AFTER];
-                        $stuff_to_parse = preg_replace_callback(
-                            "/" . $regexp[GESHI_SEARCH] . "/{$regexp[GESHI_MODIFIERS]}",
-                            array($this, 'handle_multiline_regexps'),
-                            $stuff_to_parse);
-                        $this->_hmr_replace = false;
-                        $this->_hmr_before = '';
-                        $this->_hmr_after = '';
-                    } else {
-                        $stuff_to_parse = preg_replace(
-                            '/' . $regexp[GESHI_SEARCH] . '/' . $regexp[GESHI_MODIFIERS],
-                            $regexp[GESHI_BEFORE] . '<|!REG3XP'. $key .'!>' . $regexp[GESHI_REPLACE] . '|>' . $regexp[GESHI_AFTER],
-                            $stuff_to_parse);
-                    }
-                } else {
-                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
-                        // produce valid HTML when we match multiple lines
-                        $this->_hmr_key = $key;
-                        $stuff_to_parse = preg_replace_callback( "/(" . $regexp . ")/",
-                                              array($this, 'handle_multiline_regexps'), $stuff_to_parse);
-                        $this->_hmr_key = '';
-                    } else {
-                        $stuff_to_parse = preg_replace( "/(" . $regexp . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
-                    }
-                }
-            }
-        }
-
-        // Highlight numbers. As of 1.0.8 we support diffent types of numbers
-        $numbers_found = false;
-        if ($this->lexic_permissions['NUMBERS'] && preg_match('#\d#', $stuff_to_parse )) {
-            $numbers_found = true;
-
-            //For each of the formats ...
-            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
-                //Check if it should be highlighted ...
-                $stuff_to_parse = preg_replace($regexp, "<|/NUM!$id/>\\1|>", $stuff_to_parse);
-            }
-        }
-
         // Highlight keywords
         $disallowed_before = "(?|^&";
         $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
@@ -3097,17 +3262,9 @@
             }
         }
 
-        // if this is changed, don't forget to change it below
-//        if (!empty($disallowed_before)) {
-//            $disallowed_before = "(?language_data['KEYWORDS']) as $k) {
             if (!isset($this->lexic_permissions['KEYWORDS'][$k]) ||
-                $this->lexic_permissions['KEYWORDS'][$k]) {
+            $this->lexic_permissions['KEYWORDS'][$k]) {
 
                 $case_sensitive = $this->language_data['CASE_SENSITIVE'][$k];
                 $modifiers = $case_sensitive ? '' : 'i';
@@ -3145,6 +3302,55 @@
             }
         }
 
+        // Regular expressions
+        foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+            if ($this->lexic_permissions['REGEXPS'][$key]) {
+                if (is_array($regexp)) {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_replace = $regexp[GESHI_REPLACE];
+                        $this->_hmr_before = $regexp[GESHI_BEFORE];
+                        $this->_hmr_key = $key;
+                        $this->_hmr_after = $regexp[GESHI_AFTER];
+                        $stuff_to_parse = preg_replace_callback(
+                            "/" . $regexp[GESHI_SEARCH] . "/{$regexp[GESHI_MODIFIERS]}",
+                            array($this, 'handle_multiline_regexps'),
+                            $stuff_to_parse);
+                        $this->_hmr_replace = false;
+                        $this->_hmr_before = '';
+                        $this->_hmr_after = '';
+                    } else {
+                        $stuff_to_parse = preg_replace(
+                            '/' . $regexp[GESHI_SEARCH] . '/' . $regexp[GESHI_MODIFIERS],
+                            $regexp[GESHI_BEFORE] . '<|!REG3XP'. $key .'!>' . $regexp[GESHI_REPLACE] . '|>' . $regexp[GESHI_AFTER],
+                            $stuff_to_parse);
+                    }
+                } else {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_key = $key;
+                        $stuff_to_parse = preg_replace_callback( "/(" . $regexp . ")/",
+                                              array($this, 'handle_multiline_regexps'), $stuff_to_parse);
+                        $this->_hmr_key = '';
+                    } else {
+                        $stuff_to_parse = preg_replace( "/(" . $regexp . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
+                    }
+                }
+            }
+        }
+
+        // Highlight numbers. As of 1.0.8 we support different types of numbers
+        $numbers_found = false;
+        if ($this->lexic_permissions['NUMBERS'] && preg_match('#\d#', $stuff_to_parse )) {
+            $numbers_found = true;
+
+            //For each of the formats ...
+            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
+                //Check if it should be highlighted ...
+                $stuff_to_parse = preg_replace($regexp, "<|/NUM!$id/>\\1|>", $stuff_to_parse);
+            }
+        }
+
         //
         // Now that's all done, replace /[number]/ with the correct styles
         //
@@ -3162,19 +3368,19 @@
         if ($numbers_found) {
             // Put number styles in
             foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
-//Commented out for now, as this needs some review ...
-//                if ($numbers_permissions & $id) {
-                    //Get the appropriate style ...
-                        //Checking for unset styles is done by the style cache builder ...
-                    if (!$this->use_classes) {
-                        $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][$id] . '"';
-                    } else {
-                        $attributes = ' class="nu'.$id.'"';
-                    }
+                //Commented out for now, as this needs some review ...
+                //                if ($numbers_permissions & $id) {
+                //Get the appropriate style ...
+                //Checking for unset styles is done by the style cache builder ...
+                if (!$this->use_classes) {
+                    $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][$id] . '"';
+                } else {
+                    $attributes = ' class="nu'.$id.'"';
+                }
 
-                    //Set in the correct styles ...
-                    $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse);
-//                }
+                //Set in the correct styles ...
+                $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse);
+                //                }
             }
         }
 
@@ -3231,8 +3437,13 @@
                 if (strpos($symbol_match, '<') !== false || strpos($symbol_match, '>') !== false) {
                     // already highlighted blocks _must_ include either < or >
                     // so if this conditional applies, we have to skip this match
-                    continue;
+                    // BenBE: UNLESS the block contains  or 
+                    if(strpos($symbol_match, '') === false &&
+                        strpos($symbol_match, '') === false) {
+                        continue;
+                    }
                 }
+
                 // if we reach this point, we have a valid match which needs to be highlighted
 
                 $symbol_length = strlen($symbol_match);
@@ -3278,7 +3489,6 @@
                     $symbol_hl .= $symbol_match . '|>';
                 }
 
-
                 $stuff_to_parse = substr_replace($stuff_to_parse, $symbol_hl, $symbol_offset + $global_offset, $symbol_length);
 
                 // since we replace old text with something of different size,
@@ -3472,6 +3682,12 @@
             unset($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS']);
         }
 
+        //Fix: Problem where hardescapes weren't handled if no ESCAPE_CHAR was given
+        //You need to set one for HARDESCAPES only in this case.
+        if(!isset($this->language_data['HARDCHAR'])) {
+            $this->language_data['HARDCHAR'] = $this->language_data['ESCAPE_CHAR'];
+        }
+
         //NEW in 1.0.8: Allow styles to be loaded from a separate file to override defaults
         $style_filename = substr($file_name, 0, -4) . '.style.php';
         if (is_readable($style_filename)) {
@@ -3489,9 +3705,6 @@
                     $this->merge_arrays($this->language_data['STYLES'], $style_data);
             }
         }
-
-        // Set default class for CSS
-        $this->overall_class = $this->language;
     }
 
     /**
@@ -3635,17 +3848,50 @@
                     } else {
                         $attrs = ' style="'. $this->table_linenumber_style .'"';
                     }
-                    $parsed_code .= '
';
+                    $parsed_code .= '';
                     // get linenumbers
                     // we don't merge it with the for below, since it should be better for
                     // memory consumption this way
-                    for ($i = 1; $i <= $n; ++$i) {
-                        $parsed_code .= $i;
-                        if ($i != $n) {
+                    // @todo: but... actually it would still be somewhat nice to merge the two loops
+                    //        the mem peaks are at different positions
+                    for ($i = 0; $i < $n; ++$i) {
+                        $close = 0;
+                        // fancy lines
+                        if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                            $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                            // Set the attributes to style the line
+                            if ($this->use_classes) {
+                                $parsed_code .= '';
+                            } else {
+                                // This style "covers up" the special styles set for special lines
+                                // so that styles applied to special lines don't apply to the actual
+                                // code on that line
+                                $parsed_code .= ''
+                                                  .'';
+                            }
+                            $close += 2;
+                        }
+                        //Is this some line with extra styles???
+                        if (in_array($i + 1, $this->highlight_extra_lines)) {
+                            if ($this->use_classes) {
+                                if (isset($this->highlight_extra_lines_styles[$i])) {
+                                    $parsed_code .= "";
+                                } else {
+                                    $parsed_code .= "";
+                                }
+                            } else {
+                                $parsed_code .= "get_line_style($i) . "\">";
+                            }
+                            ++$close;
+                        }
+                        $parsed_code .= $this->line_numbers_start + $i;
+                        if ($close) {
+                            $parsed_code .= str_repeat('', $close);
+                        } else if ($i != $n) {
                             $parsed_code .= "\n";
                         }
                     }
-                    $parsed_code .= '
';
+                    $parsed_code .= '
';
                 }
                 $parsed_code .= '';
             }
@@ -3810,7 +4056,7 @@
             } else {
                 $attr = " style=\"{$this->footer_content_style}\"";
             }
-            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->linenumbers != GESHI_NO_LINE_NUMBERS) {
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
                 $footer = "$footer";
             } else {
                 $footer = "$footer";
@@ -4108,7 +4354,7 @@
         foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
             if ($styles != '' && (!$economy_mode || $this->lexic_permissions['ESCAPE_CHAR'])) {
                 // NEW: since 1.0.8 we have to handle hardescapes
-                if ($group == 'HARD') {
+                if ($group === 'HARD') {
                     $group = '_h';
                 }
                 $stylesheet .= "$selector.es$group {{$styles}}\n";
@@ -4221,7 +4467,15 @@
         $tokens = array();
         $prev_keys = array();
         // go through all entries of the list and generate the token list
+        $cur_len = 0;
         for ($i = 0, $i_max = count($list); $i < $i_max; ++$i) {
+            if ($cur_len > GESHI_MAX_PCRE_LENGTH) {
+                // seems like the length of this pcre is growing exorbitantly
+                $regexp_list[++$list_key] = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                $num_subpatterns = substr_count($regexp_list[$list_key], '(?:');
+                $tokens = array();
+                $cur_len = 0;
+            }
             $level = 0;
             $entry = preg_quote((string) $list[$i], $regexp_delimiter);
             $pointer = &$tokens;
@@ -4248,11 +4502,13 @@
                             // only part of the keys match
                             $new_key_part1 = substr($prev_keys[$level], 0, $char);
                             $new_key_part2 = substr($prev_keys[$level], $char);
+
                             if (in_array($new_key_part1[0], $regex_chars)
                                 || in_array($new_key_part2[0], $regex_chars)) {
                                 // this is bad, a regex char as first character
                                 $pointer[$entry] = array('' => true);
                                 array_splice($prev_keys, $level, count($prev_keys), $entry);
+                                $cur_len += strlen($entry);
                                 continue;
                             } else {
                                 // relocate previous tokens
@@ -4261,6 +4517,7 @@
                                 $pointer = &$pointer[$new_key_part1];
                                 // recreate key index
                                 array_splice($prev_keys, $level, count($prev_keys), array($new_key_part1, $new_key_part2));
+                                $cur_len += strlen($new_key_part2);
                             }
                         }
                         ++$level;
@@ -4284,10 +4541,13 @@
                         $num_subpatterns += $new_subpatterns;
                     }
                     $tokens = array();
+                    $cur_len = 0;
                 }
                 // no further common denominator found
                 $pointer[$entry] = array('' => true);
                 array_splice($prev_keys, $level, count($prev_keys), $entry);
+
+                $cur_len += strlen($entry);
                 break;
             }
             unset($list[$i]);
@@ -4381,4 +4641,4 @@
     }
 }
 
-?>
+?>
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/html.php dokuwiki-rc2009-12-02/inc/html.php
--- dokuwiki-2009-02-14/inc/html.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/html.php	2009-12-02 19:50:11.000000000 +0100
@@ -16,14 +16,13 @@
  *
  * @author Andreas Gohr 
  */
-function html_wikilink($id,$name=NULL,$search=''){
-  static $xhtml_renderer = NULL;
-  if(is_null($xhtml_renderer)){
-    require_once(DOKU_INC.'inc/parser/xhtml.php');
-    $xhtml_renderer = new Doku_Renderer_xhtml();
-  }
+function html_wikilink($id,$name=null,$search=''){
+    static $xhtml_renderer = null;
+    if(is_null($xhtml_renderer)){
+        $xhtml_renderer = p_get_renderer('xhtml');
+    }
 
-  return $xhtml_renderer->internallink($id,$name,$search,true,'navigation');
+    return $xhtml_renderer->internallink($id,$name,$search,true,'navigation');
 }
 
 /**
@@ -32,11 +31,11 @@
  * @author Andreas Gohr 
  */
 function html_attbuild($attributes){
-  $ret = '';
-  foreach ( $attributes as $key => $value ) {
-    $ret .= $key.'="'.formtext($value).'" ';
-  }
-  return trim($ret);
+    $ret = '';
+    foreach ( $attributes as $key => $value ) {
+        $ret .= $key.'="'.formText($value).'" ';
+    }
+    return trim($ret);
 }
 
 /**
@@ -45,40 +44,41 @@
  * @author   Andreas Gohr 
  */
 function html_login(){
-  global $lang;
-  global $conf;
-  global $ID;
-  global $auth;
-
-  print p_locale_xhtml('login');
-  print '
'.NL;
-  $form = new Doku_Form('dw__login');
-  $form->startFieldset($lang['btn_login']);
-  $form->addHidden('id', $ID);
-  $form->addHidden('do', 'login');
-  $form->addElement(form_makeTextField('u', ((!$_REQUEST['http_credentials']) ? $_REQUEST['u'] : ''), $lang['user'], 'focus__this', 'block'));
-  $form->addElement(form_makePasswordField('p', $lang['pass'], '', 'block'));
-  if($conf['rememberme']) {
-      $form->addElement(form_makeCheckboxField('r', '1', $lang['remember'], 'remember__me', 'simple'));
-  }
-  $form->addElement(form_makeButton('submit', '', $lang['btn_login']));
-  $form->endFieldset();
-  html_form('login', $form);
-
-  if($auth && $auth->canDo('addUser') && actionOK('register')){
-    print '
';
-    print $lang['reghere'];
-    print ': '.$lang['register'].'';
-    print '
';
-  }
-
-  if ($auth && $auth->canDo('modPass') && actionOK('resendpwd')) {
-    print '
';
-    print $lang['pwdforget'];
-    print ': '.$lang['btn_resendpwd'].'';
-    print '
';
-  }
-  print '
'.NL;
+    global $lang;
+    global $conf;
+    global $ID;
+    global $auth;
+
+    print p_locale_xhtml('login');
+    print '
'.NL;
+    $form = new Doku_Form(array('id' => 'dw__login'));
+    $form->startFieldset($lang['btn_login']);
+    $form->addHidden('id', $ID);
+    $form->addHidden('do', 'login');
+    $form->addElement(form_makeTextField('u', ((!$_REQUEST['http_credentials']) ? $_REQUEST['u'] : ''), $lang['user'], 'focus__this', 'block'));
+    $form->addElement(form_makePasswordField('p', $lang['pass'], '', 'block'));
+    if($conf['rememberme']) {
+        $form->addElement(form_makeCheckboxField('r', '1', $lang['remember'], 'remember__me', 'simple'));
+    }
+    $form->addElement(form_makeButton('submit', '', $lang['btn_login']));
+    $form->endFieldset();
+
+    if($auth && $auth->canDo('addUser') && actionOK('register')){
+        $form->addElement('
'
+                          . $lang['reghere']
+                          . ': '.$lang['register'].''
+                          . '
');
+    }
+
+    if ($auth && $auth->canDo('modPass') && actionOK('resendpwd')) {
+        $form->addElement('
'
+                          . $lang['pwdforget']
+                          . ': '.$lang['btn_resendpwd'].''
+                          . '
');
+    }
+
+    html_form('login', $form);
+    print '
'.NL;
 }
 
 /**
@@ -88,21 +88,21 @@
  * @author Andreas Gohr 
  */
 function html_secedit_button($matches){
-  global $ID;
-  global $INFO;
+    global $ID;
+    global $INFO;
 
-  $section = $matches[2];
-  $name = $matches[1];
+    $section = $matches[2];
+    $name = $matches[1];
 
-  $secedit  = '';
-  $secedit .= '
';
-  $secedit .= html_btn('secedit',$ID,'',
-                        array('do'      => 'edit',
-                              'lines'   => "$section",
-                              'rev' => $INFO['lastmod']),
-                              'post', $name);
-  $secedit .= '
';
-  return $secedit;
+    $secedit  = '';
+    $secedit .= '
';
+    $secedit .= html_btn('secedit',$ID,'',
+            array('do'      => 'edit',
+                'lines'   => "$section",
+                'rev' => $INFO['lastmod']),
+            'post', $name);
+    $secedit .= '
';
+    return $secedit;
 }
 
 /**
@@ -111,16 +111,16 @@
  * @author Andreas Gohr 
  */
 function html_secedit($text,$show=true){
-  global $INFO;
+    global $INFO;
 
-  if($INFO['writable'] && $show && !$INFO['rev']){
-    $text = preg_replace_callback('##',
-                         'html_secedit_button', $text);
-  }else{
-    $text = preg_replace('##','',$text);
-  }
+    if($INFO['writable'] && $show && !$INFO['rev']){
+        $text = preg_replace_callback('##',
+                'html_secedit_button', $text);
+    }else{
+        $text = preg_replace('##','',$text);
+    }
 
-  return $text;
+    return $text;
 }
 
 /**
@@ -129,12 +129,12 @@
  * @author Andreas Gohr 
  */
 function html_topbtn(){
-  global $lang;
+    global $lang;
 
-  $ret  = '';
-  $ret  = '';
+    $ret  = '';
+    $ret  = '';
 
-  return $ret;
+    return $ret;
 }
 
 /**
@@ -144,53 +144,53 @@
  * @author Andreas Gohr 
  */
 function html_btn($name,$id,$akey,$params,$method='get',$tooltip=''){
-  global $conf;
-  global $lang;
+    global $conf;
+    global $lang;
+
+    $label = $lang['btn_'.$name];
+
+    $ret = '';
+    $tip = '';
+
+    //filter id (without urlencoding)
+    $id = idfilter($id,false);
+
+    //make nice URLs even for buttons
+    if($conf['userewrite'] == 2){
+        $script = DOKU_BASE.DOKU_SCRIPT.'/'.$id;
+    }elseif($conf['userewrite']){
+        $script = DOKU_BASE.$id;
+    }else{
+        $script = DOKU_BASE.DOKU_SCRIPT;
+        $params['id'] = $id;
+    }
 
-  $label = $lang['btn_'.$name];
+    $ret .= '
';
 
-  $ret = '';
-  $tip = '';
+    if(is_array($params)){
+        reset($params);
+        while (list($key, $val) = each($params)) {
+            $ret .= '';
+        }
+    }
 
-  //filter id (without urlencoding)
-  $id = idfilter($id,false);
-
-  //make nice URLs even for buttons
-  if($conf['userewrite'] == 2){
-    $script = DOKU_BASE.DOKU_SCRIPT.'/'.$id;
-  }elseif($conf['userewrite']){
-    $script = DOKU_BASE.$id;
-  }else{
-    $script = DOKU_BASE.DOKU_SCRIPT;
-    $params['id'] = $id;
-  }
-
-  $ret .= '
';
-
-  if(is_array($params)){
-    reset($params);
-    while (list($key, $val) = each($params)) {
-      $ret .= '';
-    }
-  }
-
-  if ($tooltip!='') {
-      $tip = htmlspecialchars($tooltip);
-  }else{
-      $tip = htmlspecialchars($label);
-  }
-
-  $ret .= '
  */
 function html_show($txt=''){
-  global $ID;
-  global $REV;
-  global $HIGH;
-  global $INFO;
-  //disable section editing for old revisions or in preview
-  if($txt || $REV){
-    $secedit = false;
-  }else{
-    $secedit = true;
-  }
-
-  if ($txt){
-    //PreviewHeader
-    echo '
';
-    echo p_locale_xhtml('preview');
-    echo '
';
-    $html = html_secedit(p_render('xhtml',p_get_instructions($txt),$info),$secedit);
-    if($INFO['prependTOC']) $html = tpl_toc(true).$html;
-    echo $html;
-    echo '
';
-    echo '
';
+    global $ID;
+    global $REV;
+    global $HIGH;
+    global $INFO;
+    //disable section editing for old revisions or in preview
+    if($txt || $REV){
+        $secedit = false;
+    }else{
+        $secedit = true;
+    }
 
-  }else{
-    if ($REV) print p_locale_xhtml('showrev');
-    $html = p_wiki_xhtml($ID,$REV,true);
-    $html = html_secedit($html,$secedit);
-    if($INFO['prependTOC']) $html = tpl_toc(true).$html;
-    $html = html_hilight($html,$HIGH);
-    echo $html;
-  }
+    if ($txt){
+        //PreviewHeader
+        echo '
';
+        echo p_locale_xhtml('preview');
+        echo '
';
+        $html = html_secedit(p_render('xhtml',p_get_instructions($txt),$info),$secedit);
+        if($INFO['prependTOC']) $html = tpl_toc(true).$html;
+        echo $html;
+        echo '
';
+        echo '
';
+
+    }else{
+        if ($REV) print p_locale_xhtml('showrev');
+        $html = p_wiki_xhtml($ID,$REV,true);
+        $html = html_secedit($html,$secedit);
+        if($INFO['prependTOC']) $html = tpl_toc(true).$html;
+        $html = html_hilight($html,$HIGH);
+        echo $html;
+    }
 }
 
 /**
@@ -237,25 +237,25 @@
  * @author Andreas Gohr 
  */
 function html_draft(){
-  global $INFO;
-  global $ID;
-  global $lang;
-  global $conf;
-  $draft = unserialize(io_readFile($INFO['draft'],false));
-  $text  = cleanText(con($draft['prefix'],$draft['text'],$draft['suffix'],true));
-
-  print p_locale_xhtml('draft');
-  $form = new Doku_Form('dw__editform');
-  $form->addHidden('id', $ID);
-  $form->addHidden('date', $draft['date']);
-  $form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
-  $form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
-  $form->addElement($lang['draftdate'].' '. strftime($conf['dformat'],filemtime($INFO['draft'])));
-  $form->addElement(form_makeCloseTag('div'));
-  $form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
-  $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
-  $form->addElement(form_makeButton('submit', 'show', $lang['btn_cancel'], array('tabindex'=>'3')));
-  html_form('draft', $form);
+    global $INFO;
+    global $ID;
+    global $lang;
+    global $conf;
+    $draft = unserialize(io_readFile($INFO['draft'],false));
+    $text  = cleanText(con($draft['prefix'],$draft['text'],$draft['suffix'],true));
+
+    print p_locale_xhtml('draft');
+    $form = new Doku_Form(array('id' => 'dw__editform'));
+    $form->addHidden('id', $ID);
+    $form->addHidden('date', $draft['date']);
+    $form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
+    $form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
+    $form->addElement($lang['draftdate'].' '. dformat(filemtime($INFO['draft'])));
+    $form->addElement(form_makeCloseTag('div'));
+    $form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
+    $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
+    $form->addElement(form_makeButton('submit', 'show', $lang['btn_cancel'], array('tabindex'=>'3')));
+    html_form('draft', $form);
 }
 
 /**
@@ -265,11 +265,12 @@
  * @author Harry Fuecks 
  */
 function html_hilight($html,$phrases){
-  $regex = join('|',array_map('preg_quote_cb',array_filter((array) $phrases)));
+    $phrases = array_filter((array) $phrases);
+    $regex = join('|',array_map('preg_quote_cb',$phrases));
 
-  if ($regex === '') return $html;
-  $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
-  return $html;
+    if ($regex === '') return $html;
+    $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
+    return $html;
 }
 
 /**
@@ -278,11 +279,11 @@
  * @author Harry Fuecks 
  */
 function html_hilight_callback($m) {
-  $hlight = unslash($m[0]);
-  if ( !isset($m[2])) {
-    $hlight = ''.$hlight.'';
-  }
-  return $hlight;
+    $hlight = unslash($m[0]);
+    if ( !isset($m[2])) {
+        $hlight = ''.$hlight.'';
+    }
+    return $hlight;
 }
 
 /**
@@ -291,86 +292,83 @@
  * @author Andreas Gohr 
  */
 function html_search(){
-  require_once(DOKU_INC.'inc/search.php');
-  require_once(DOKU_INC.'inc/fulltext.php');
-  global $conf;
-  global $QUERY;
-  global $ID;
-  global $lang;
-
-  print p_locale_xhtml('searchpage');
-  flush();
-
-  //check if search is restricted to namespace
-  if(preg_match('/([^@]*)@([^@]*)/',$QUERY,$match)) {
-      $id = cleanID($match[1]);
-      if(empty($id)) {
+    require_once(DOKU_INC.'inc/search.php');
+    require_once(DOKU_INC.'inc/fulltext.php');
+    global $conf;
+    global $QUERY;
+    global $ID;
+    global $lang;
+
+    print p_locale_xhtml('searchpage');
+    flush();
+
+    //check if search is restricted to namespace
+    if(preg_match('/@([^@]*)/',$QUERY,$match)) {
+        $id = cleanID($match[1]);
+    } else {
+        $id = cleanID($QUERY);
+    }
+
+    //show progressbar
+    print '
'.NL;
+    print ''.NL;
+    print '
'.NL;
+    flush();
+
+    //do quick pagesearch
+    $data = array();
+
+    if($id) $data = ft_pageLookup($id);
+    if(count($data)){
+        print '
';
+        print '
'.$lang['quickhits'].':
';
+        print '
    ';
+        foreach($data as $id){
+            print '
  •  ';
+            $ns = getNS($id);
+            if($ns){
+                $name = shorten(noNS($id), ' ('.$ns.')',30);
+            }else{
+                $name = $id;
+            }
+            print html_wikilink(':'.$id,$name);
+            print '
    •  ';
+        }
+        print '
 ';
+        //clear float (see http://www.complexspiral.com/publications/containing-floats/)
+        print '
 
';
+        print '
';
+    }
+    flush();
+
+    //do fulltext search
+    $data = ft_pageSearch($QUERY,$regex);
+    if(count($data)){
+        $num = 1;
+        foreach($data as $id => $cnt){
+            print '
';
+            print html_wikilink(':'.$id,useHeading('navigation')?null:$id,$regex);
+            if($cnt !== 0){
+                print ': '.$cnt.' '.$lang['hits'].'
';
+                if($num < 15){ // create snippets for the first number of matches only #FIXME add to conf ?
+                    print '
'.ft_snippet($id,$regex).'
';
+                }
+                $num++;
+            }
+            print '
';
+            flush();
+        }
+    }else{
         print '
'.$lang['nothingfound'].'
';
-        flush();
-        return;
-      }
-  } else {
-      $id = cleanID($QUERY);
-  }
-
-  //show progressbar
-  print '
'.NL;
-  print ''.NL;
-  print '
'.NL;
-  flush();
-
-  //do quick pagesearch
-  $data = array();
-
-  $data = ft_pageLookup($id);
-  if(count($data)){
-    print '
';
-    print '
'.$lang['quickhits'].':
';
-    print '
    ';
-    foreach($data as $id){
-      print '
  •  ';
-      $ns = getNS($id);
-      if($ns){
-        $name = shorten(noNS($id), ' ('.$ns.')',30);
-      }else{
-        $name = $id;
-      }
-      print html_wikilink(':'.$id,$name);
-      print '
    •  ';
-    }
-    print '
 ';
-    //clear float (see http://www.complexspiral.com/publications/containing-floats/)
-    print '
 
';
-    print '
';
-  }
-  flush();
+    }
 
-  //do fulltext search
-  $data = ft_pageSearch($QUERY,$regex);
-  if(count($data)){
-    $num = 1;
-    foreach($data as $id => $cnt){
-      print '
';
-      print html_wikilink(':'.$id,useHeading('navigation')?NULL:$id,$regex);
-      print ': '.$cnt.' '.$lang['hits'].'
';
-      if($num < 15){ // create snippets for the first number of matches only #FIXME add to conf ?
-        print '
'.ft_snippet($id,$regex).'
';
-      }
-      print '
';
-      flush();
-      $num++;
-    }
-  }else{
-    print '
'.$lang['nothingfound'].'
';
-  }
-
-  //hide progressbar
-  print ''.NL;
-  flush();
+    //hide progressbar
+    print ''.NL;
+    flush();
 }
 
 /**
@@ -379,20 +377,20 @@
  * @author Andreas Gohr 
  */
 function html_locked(){
-  global $ID;
-  global $conf;
-  global $lang;
-  global $INFO;
-
-  $locktime = filemtime(wikiLockFN($ID));
-  $expire = @strftime($conf['dformat'], $locktime + $conf['locktime'] );
-  $min    = round(($conf['locktime'] - (time() - $locktime) )/60);
-
-  print p_locale_xhtml('locked');
-  print '
    ';
-  print '
  • '.$lang['lockedby'].': '.$INFO['locked'].'
    • ';
-  print '
  • '.$lang['lockexpire'].': '.$expire.' ('.$min.' min)
    • ';
-  print '
';
+    global $ID;
+    global $conf;
+    global $lang;
+    global $INFO;
+
+    $locktime = filemtime(wikiLockFN($ID));
+    $expire = dformat($locktime + $conf['locktime']);
+    $min    = round(($conf['locktime'] - (time() - $locktime) )/60);
+
+    print p_locale_xhtml('locked');
+    print '
    ';
+    print '
  • '.$lang['lockedby'].': '.editorinfo($INFO['locked']).'
    • ';
+    print '
  • '.$lang['lockexpire'].': '.$expire.' ('.$min.' min)
    • ';
+    print '
';
 }
 
 /**
@@ -402,159 +400,159 @@
  * @author Ben Coburn 
  */
 function html_revisions($first=0){
-  global $ID;
-  global $INFO;
-  global $conf;
-  global $lang;
-  /* we need to get one additionally log entry to be able to
-   * decide if this is the last page or is there another one.
-   * see html_recent()
-   */
-  $revisions = getRevisions($ID, $first, $conf['recent']+1);
-  if(count($revisions)==0 && $first!=0){
-    $first=0;
-    $revisions = getRevisions($ID, $first, $conf['recent']+1);;
-  }
-  $hasNext = false;
-  if (count($revisions)>$conf['recent']) {
-    $hasNext = true;
-    array_pop($revisions); // remove extra log entry
-  }
-
-  $date = @strftime($conf['dformat'],$INFO['lastmod']);
-
-  print p_locale_xhtml('revisions');
-
-  $form = new Doku_Form('page__revisions', wl($ID));
-  $form->addElement(form_makeOpenTag('ul'));
-  if($INFO['exists'] && $first==0){
-    if (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'));
-    $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
-    $form->addElement(form_makeTag('input', array(
-      'type' => 'checkbox',
-      'name' => 'rev2[]',
-      'value' => 'current')));
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
-    $form->addElement($date);
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeTag('img', array(
-      'src' =>  DOKU_BASE.'lib/images/blank.gif',
-      'width' => '15',
-      'height' => '11',
-      'alt'    => '')));
-
-    $form->addElement(form_makeOpenTag('a', array(
-      'class' => 'wikilink1',
-      'href'  => wl($ID))));
-    $form->addElement($ID);
-    $form->addElement(form_makeCloseTag('a'));
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-    $form->addElement(' – ');
-    $form->addElement(htmlspecialchars($INFO['sum']));
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
-    $form->addElement((empty($INFO['editor']))?('('.$lang['external_edit'].')'):editorinfo($INFO['editor']));
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement('('.$lang['current'].')');
-    $form->addElement(form_makeCloseTag('div'));
-    $form->addElement(form_makeCloseTag('li'));
-  }
-
-  foreach($revisions as $rev){
-    $date   = strftime($conf['dformat'],$rev);
-    $info   = getRevisionInfo($ID,$rev,true);
-    $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'));
-    $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
-    if($exists){
-      $form->addElement(form_makeTag('input', array(
-        'type' => 'checkbox',
-        'name' => 'rev2[]',
-        'value' => $rev)));
-    }else{
-      $form->addElement(form_makeTag('img', array(
-        'src' => DOKU_BASE.'lib/images/blank.gif',
-        'width' => 14,
-        'height' => 11,
-        'alt' => '')));
-    }
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
-    $form->addElement($date);
-    $form->addElement(form_makeCloseTag('span'));
-
-    if($exists){
-      $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
-      $form->addElement(form_makeTag('img', array(
-        'src'    => DOKU_BASE.'lib/images/diff.png',
-        'width'  => 15,
-        'height' => 11,
-        'title'  => $lang['diff'],
-        'alt'    => $lang['diff'])));
-      $form->addElement(form_makeCloseTag('a'));
-
-      $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
-      $form->addElement($ID);
-      $form->addElement(form_makeCloseTag('a'));
-    }else{
-      $form->addElement(form_makeTag('img', array(
-        'src' => DOKU_BASE.'lib/images/blank.gif',
-        'width' => '15',
-        'height' => '11',
-        'alt'   => '')));
-      $form->addElement($ID);
-    }
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
-    $form->addElement(' – ');
-    $form->addElement(htmlspecialchars($info['sum']));
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
-    if($info['user']){
-      $form->addElement(editorinfo($info['user']));
-      if(auth_ismanager()){
-        $form->addElement(' ('.$info['ip'].')');
-      }
-    }else{
-      $form->addElement($info['ip']);
+    global $ID;
+    global $INFO;
+    global $conf;
+    global $lang;
+    /* we need to get one additionally log entry to be able to
+     * decide if this is the last page or is there another one.
+     * see html_recent()
+     */
+    $revisions = getRevisions($ID, $first, $conf['recent']+1);
+    if(count($revisions)==0 && $first!=0){
+        $first=0;
+        $revisions = getRevisions($ID, $first, $conf['recent']+1);;
+    }
+    $hasNext = false;
+    if (count($revisions)>$conf['recent']) {
+        $hasNext = true;
+        array_pop($revisions); // remove extra log entry
+    }
+
+    $date = dformat($INFO['lastmod']);
+
+    print p_locale_xhtml('revisions');
+
+    $form = new Doku_Form(array('id' => 'page__revisions'));
+    $form->addElement(form_makeOpenTag('ul'));
+    if($INFO['exists'] && $first==0){
+        if (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'));
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+        $form->addElement(form_makeTag('input', array(
+                        'type' => 'checkbox',
+                        'name' => 'rev2[]',
+                        'value' => 'current')));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeTag('img', array(
+                        'src' =>  DOKU_BASE.'lib/images/blank.gif',
+                        'width' => '15',
+                        'height' => '11',
+                        'alt'    => '')));
+
+        $form->addElement(form_makeOpenTag('a', array(
+                        'class' => 'wikilink1',
+                        'href'  => wl($ID))));
+        $form->addElement($ID);
+        $form->addElement(form_makeCloseTag('a'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+        $form->addElement(' – ');
+        $form->addElement(htmlspecialchars($INFO['sum']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        $form->addElement((empty($INFO['editor']))?('('.$lang['external_edit'].')'):editorinfo($INFO['editor']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement('('.$lang['current'].')');
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+
+    foreach($revisions as $rev){
+        $date   = dformat($rev);
+        $info   = getRevisionInfo($ID,$rev,true);
+        $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'));
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+        if($exists){
+            $form->addElement(form_makeTag('input', array(
+                            'type' => 'checkbox',
+                            'name' => 'rev2[]',
+                            'value' => $rev)));
+        }else{
+            $form->addElement(form_makeTag('img', array(
+                            'src' => DOKU_BASE.'lib/images/blank.gif',
+                            'width' => 14,
+                            'height' => 11,
+                            'alt' => '')));
+        }
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        if($exists){
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
+            $form->addElement(form_makeTag('img', array(
+                            'src'    => DOKU_BASE.'lib/images/diff.png',
+                            'width'  => 15,
+                            'height' => 11,
+                            'title'  => $lang['diff'],
+                            'alt'    => $lang['diff'])));
+            $form->addElement(form_makeCloseTag('a'));
+
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
+            $form->addElement($ID);
+            $form->addElement(form_makeCloseTag('a'));
+        }else{
+            $form->addElement(form_makeTag('img', array(
+                            'src' => DOKU_BASE.'lib/images/blank.gif',
+                            'width' => '15',
+                            'height' => '11',
+                            'alt'   => '')));
+            $form->addElement($ID);
+        }
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+        $form->addElement(' – ');
+        $form->addElement(htmlspecialchars($info['sum']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        if($info['user']){
+            $form->addElement(editorinfo($info['user']));
+            if(auth_ismanager()){
+                $form->addElement(' ('.$info['ip'].')');
+            }
+        }else{
+            $form->addElement($info['ip']);
+        }
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+    $form->addElement(form_makeCloseTag('ul'));
+    $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    html_form('revisions', $form);
+
+    print '
';
+    $last = $first + $conf['recent'];
+    if ($first > 0) {
+        $first -= $conf['recent'];
+        if ($first < 0) $first = 0;
+        print '
';
+        print html_btn('newer',$ID,"p",array('do' => 'revisions', 'first' => $first));
+        print '
';
+    }
+    if ($hasNext) {
+        print '
';
+        print html_btn('older',$ID,"n",array('do' => 'revisions', 'first' => $last));
+        print '
';
     }
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeCloseTag('div'));
-    $form->addElement(form_makeCloseTag('li'));
-  }
-  $form->addElement(form_makeCloseTag('ul'));
-  $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
-  html_form('revisions', $form);
-
-  print '
';
-  $last = $first + $conf['recent'];
-  if ($first > 0) {
-    $first -= $conf['recent'];
-    if ($first < 0) $first = 0;
-    print '
';
-    print html_btn('newer',$ID,"p",array('do' => 'revisions', 'first' => $first));
-    print '
';
-  }
-  if ($hasNext) {
-    print '
';
-    print html_btn('older',$ID,"n",array('do' => 'revisions', 'first' => $last));
     print '
';
-  }
-  print '
';
 
 }
 
@@ -566,120 +564,120 @@
  * @author Ben Coburn 
  */
 function html_recent($first=0){
-  global $conf;
-  global $lang;
-  global $ID;
-  /* we need to get one additionally log entry to be able to
-   * decide if this is the last page or is there another one.
-   * This is the cheapest solution to get this information.
-   */
-  $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
-  if(count($recents) == 0 && $first != 0){
-    $first=0;
+    global $conf;
+    global $lang;
+    global $ID;
+    /* we need to get one additionally log entry to be able to
+     * decide if this is the last page or is there another one.
+     * This is the cheapest solution to get this information.
+     */
     $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
-  }
-  $hasNext = false;
-  if (count($recents)>$conf['recent']) {
-    $hasNext = true;
-    array_pop($recents); // remove extra log entry
-  }
-
-  print p_locale_xhtml('recent');
-
-  if (getNS($ID) != '')
-    print '
' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '
';
-
-  $form = new Doku_Form('dw__recent', script(), 'get');
-  $form->addHidden('sectok', null);
-  $form->addHidden('do', 'recent');
-  $form->addHidden('id', $ID);
-  $form->addElement(form_makeOpenTag('ul'));
-
-  foreach($recents as $recent){
-    $date = strftime($conf['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'));
-
-    $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
-
-    $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
-    $form->addElement($date);
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => wl($recent['id'],"do=diff", false, '&'))));
-    $form->addElement(form_makeTag('img', array(
-      'src'   => DOKU_BASE.'lib/images/diff.png',
-      'width' => 15,
-      'height'=> 11,
-      'title' => $lang['diff'],
-      'alt'   => $lang['diff']
-    )));
-    $form->addElement(form_makeCloseTag('a'));
-
-    $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => wl($recent['id'],"do=revisions",false,'&'))));
-    $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']
-    )));
-    $form->addElement(form_makeCloseTag('a'));
-
-    $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(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'].')');
-      }
-    }else{
-      $form->addElement($recent['ip']);
+    if(count($recents) == 0 && $first != 0){
+        $first=0;
+        $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
+    }
+    $hasNext = false;
+    if (count($recents)>$conf['recent']) {
+        $hasNext = true;
+        array_pop($recents); // remove extra log entry
+    }
+
+    print p_locale_xhtml('recent');
+
+    if (getNS($ID) != '')
+        print '
' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '
';
+
+    $form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET'));
+    $form->addHidden('sectok', null);
+    $form->addHidden('do', 'recent');
+    $form->addHidden('id', $ID);
+    $form->addElement(form_makeOpenTag('ul'));
+
+    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'));
+
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => wl($recent['id'],"do=diff", false, '&'))));
+        $form->addElement(form_makeTag('img', array(
+                        'src'   => DOKU_BASE.'lib/images/diff.png',
+                        'width' => 15,
+                        'height'=> 11,
+                        'title' => $lang['diff'],
+                        'alt'   => $lang['diff']
+                        )));
+        $form->addElement(form_makeCloseTag('a'));
+
+        $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => wl($recent['id'],"do=revisions",false,'&'))));
+        $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']
+                        )));
+        $form->addElement(form_makeCloseTag('a'));
+
+        $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(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'].')');
+            }
+        }else{
+            $form->addElement($recent['ip']);
+        }
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+    $form->addElement(form_makeCloseTag('ul'));
+
+    $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav')));
+    $last = $first + $conf['recent'];
+    if ($first > 0) {
+        $first -= $conf['recent'];
+        if ($first < 0) $first = 0;
+        $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-prev')));
+        $form->addElement(form_makeTag('input', array(
+                    'type'  => 'submit',
+                    'name'  => 'first['.$first.']',
+                    'value' => $lang['btn_newer'],
+                    'accesskey' => 'n',
+                    'title' => $lang['btn_newer'].' [N]',
+                    'class' => 'button'
+                    )));
+        $form->addElement(form_makeCloseTag('div'));
+    }
+    if ($hasNext) {
+        $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-next')));
+        $form->addElement(form_makeTag('input', array(
+                        'type'  => 'submit',
+                        'name'  => 'first['.$last.']',
+                        'value' => $lang['btn_older'],
+                        'accesskey' => 'p',
+                        'title' => $lang['btn_older'].' [P]',
+                        'class' => 'button'
+                        )));
+        $form->addElement(form_makeCloseTag('div'));
     }
-    $form->addElement(form_makeCloseTag('span'));
-
-    $form->addElement(form_makeCloseTag('div'));
-    $form->addElement(form_makeCloseTag('li'));
-  }
-  $form->addElement(form_makeCloseTag('ul'));
-
-  $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav')));
-  $last = $first + $conf['recent'];
-  if ($first > 0) {
-    $first -= $conf['recent'];
-    if ($first < 0) $first = 0;
-    $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-prev')));
-    $form->addElement(form_makeTag('input', array(
-      'type'  => 'submit',
-      'name'  => 'first['.$first.']',
-      'value' => $lang['btn_newer'],
-      'accesskey' => 'n',
-      'title' => $lang['btn_newer'].' [N]',
-      'class' => 'button'
-    )));
     $form->addElement(form_makeCloseTag('div'));
-  }
-  if ($hasNext) {
-    $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-next')));
-    $form->addElement(form_makeTag('input', array(
-      'type'  => 'submit',
-      'name'  => 'first['.$last.']',
-      'value' => $lang['btn_older'],
-      'accesskey' => 'p',
-      'title' => $lang['btn_older'].' [P]',
-      'class' => 'button'
-    )));
-    $form->addElement(form_makeCloseTag('div'));
-  }
-  $form->addElement(form_makeCloseTag('div'));
-  html_form('recent', $form);
+    html_form('recent', $form);
 }
 
 /**
@@ -688,26 +686,26 @@
  * @author Andreas Gohr 
  */
 function html_index($ns){
-  require_once(DOKU_INC.'inc/search.php');
-  global $conf;
-  global $ID;
-  $dir = $conf['datadir'];
-  $ns  = cleanID($ns);
-  #fixme use appropriate function
-  if(empty($ns)){
-    $ns = dirname(str_replace(':','/',$ID));
-    if($ns == '.') $ns ='';
-  }
-  $ns  = utf8_encodeFN(str_replace(':','/',$ns));
-
-  echo p_locale_xhtml('index');
-  echo '
';
-
-  $data = array();
-  search($data,$conf['datadir'],'search_index',array('ns' => $ns));
-  echo html_buildlist($data,'idx','html_list_index','html_li_index');
+    require_once(DOKU_INC.'inc/search.php');
+    global $conf;
+    global $ID;
+    $dir = $conf['datadir'];
+    $ns  = cleanID($ns);
+    #fixme use appropriate function
+    if(empty($ns)){
+        $ns = dirname(str_replace(':','/',$ID));
+        if($ns == '.') $ns ='';
+    }
+    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    echo p_locale_xhtml('index');
+    echo '
';
+
+    $data = array();
+    search($data,$conf['datadir'],'search_index',array('ns' => $ns));
+    echo html_buildlist($data,'idx','html_list_index','html_li_index');
 
-  echo '
';
+    echo '
';
 }
 
 /**
@@ -718,18 +716,18 @@
  * @author Andreas Gohr 
  */
 function html_list_index($item){
-  global $ID;
-  $ret = '';
-  $base = ':'.$item['id'];
-  $base = substr($base,strrpos($base,':')+1);
-  if($item['type']=='d'){
-    $ret .= '';
-    $ret .= $base;
-    $ret .= '';
-  }else{
-    $ret .= html_wikilink(':'.$item['id']);
-  }
-  return $ret;
+    global $ID;
+    $ret = '';
+    $base = ':'.$item['id'];
+    $base = substr($base,strrpos($base,':')+1);
+    if($item['type']=='d'){
+        $ret .= '';
+        $ret .= $base;
+        $ret .= '';
+    }else{
+        $ret .= html_wikilink(':'.$item['id']);
+    }
+    return $ret;
 }
 
 /**
@@ -742,13 +740,13 @@
  * @author Andreas Gohr 
  */
 function html_li_index($item){
-  if($item['type'] == "f"){
-    return '
  • ';
-  }elseif($item['open']){
-    return '
  • ';
-  }else{
-    return '
  • ';
-  }
+    if($item['type'] == "f"){
+        return '
  • ';
+    }elseif($item['open']){
+        return '
  • ';
+    }else{
+        return '
  • ';
+    }
 }
 
 /**
@@ -757,7 +755,7 @@
  * @author Andreas Gohr 
  */
 function html_li_default($item){
-  return '
  • ';
+    return '
  • ';
 }
 
 /**
@@ -776,47 +774,47 @@
  * @author Andreas Gohr 
  */
 function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
-  $level = 0;
-  $opens = 0;
-  $ret   = '';
-
-  foreach ($data as $item){
-
-    if( $item['level'] > $level ){
-      //open new list
-      for($i=0; $i<($item['level'] - $level); $i++){
-        if ($i) $ret .= "
  • \n";
-        $ret .= "\n
      \n";
-      }
-    }elseif( $item['level'] < $level ){
-      //close last item
-      $ret .= "\n";
-      for ($i=0; $i<($level - $item['level']); $i++){
-        //close higher lists
-        $ret .= "
    \n
    • \n";
-      }
-    }else{
-      //close last item
-      $ret .= "\n";
+    $level = 0;
+    $opens = 0;
+    $ret   = '';
+
+    foreach ($data as $item){
+
+        if( $item['level'] > $level ){
+            //open new list
+            for($i=0; $i<($item['level'] - $level); $i++){
+                if ($i) $ret .= "
  • \n";
+                $ret .= "\n
      \n";
+            }
+        }elseif( $item['level'] < $level ){
+            //close last item
+            $ret .= "\n";
+            for ($i=0; $i<($level - $item['level']); $i++){
+                //close higher lists
+                $ret .= "
    \n
    • \n";
+            }
+        }else{
+            //close last item
+            $ret .= "\n";
+        }
+
+        //remember current level
+        $level = $item['level'];
+
+        //print item
+        $ret .= call_user_func($lifunc,$item);
+        $ret .= '
    ';
+
+        $ret .= call_user_func($func,$item);
+        $ret .= '
    ';
+    }
+
+    //close remaining items and lists
+    for ($i=0; $i < $level; $i++){
+        $ret .= "\n";
     }
 
-    //remember current level
-    $level = $item['level'];
-
-    //print item
-    $ret .= call_user_func($lifunc,$item);
-    $ret .= '
    ';
-
-    $ret .= call_user_func($func,$item);
-    $ret .= '
    ';
-  }
-
-  //close remaining items and lists
-  for ($i=0; $i < $level; $i++){
-    $ret .= "\n";
-  }
-
-  return $ret;
+    return $ret;
 }
 
 /**
@@ -826,26 +824,26 @@
  * @author Michael Klier 
  */
 function html_backlinks(){
-  require_once(DOKU_INC.'inc/fulltext.php');
-  global $ID;
-  global $conf;
-  global $lang;
-
-  print p_locale_xhtml('backlinks');
-
-  $data = ft_backlinks($ID);
-
-  if(!empty($data)) {
-      print '
      ';
-      foreach($data as $blink){
-        print '
    • ';
-        print html_wikilink(':'.$blink,useHeading('navigation')?NULL:$blink);
-        print '
      • ';
-      }
-      print '
    ';
-  } else {
-      print '
    ' . $lang['nothingfound'] . '
    ';
-  }
+    require_once(DOKU_INC.'inc/fulltext.php');
+    global $ID;
+    global $conf;
+    global $lang;
+
+    print p_locale_xhtml('backlinks');
+
+    $data = ft_backlinks($ID);
+
+    if(!empty($data)) {
+        print '
      ';
+        foreach($data as $blink){
+            print '
    • ';
+            print html_wikilink(':'.$blink,useHeading('navigation')?null:$blink);
+            print '
      • ';
+        }
+        print '
    ';
+    } else {
+        print '
    ' . $lang['nothingfound'] . '
    ';
+    }
 }
 
 /**
@@ -854,131 +852,140 @@
  * @author Andreas Gohr 
  */
 function html_diff($text='',$intro=true){
-  require_once(DOKU_INC.'inc/DifferenceEngine.php');
-  global $ID;
-  global $REV;
-  global $lang;
-  global $conf;
-
-  // we're trying to be clever here, revisions to compare can be either
-  // given as rev and rev2 parameters, with rev2 being optional. Or in an
-  // array in rev2.
-  $rev1 = $REV;
-
-  if(is_array($_REQUEST['rev2'])){
-    $rev1 = (int) $_REQUEST['rev2'][0];
-    $rev2 = (int) $_REQUEST['rev2'][1];
-
-    if(!$rev1){
-        $rev1 = $rev2;
-        unset($rev2);
-    }
-  }else{
-    $rev2 = (int) $_REQUEST['rev2'];
-  }
-
-  if($text){                      // compare text to the most current revision
-    $l_rev   = '';
-    $l_text  = rawWiki($ID,'');
-    $l_head  = ''.
-               $ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).' '.
-               $lang['current'];
-
-    $r_rev   = '';
-    $r_text  = cleanText($text);
-    $r_head  = $lang['yours'];
-  }else{
-    if($rev1 && $rev2){            // two specific revisions wanted
-      // make sure order is correct (older on the left)
-      if($rev1 < $rev2){
-        $l_rev = $rev1;
-        $r_rev = $rev2;
-      }else{
-        $l_rev = $rev2;
-        $r_rev = $rev1;
-      }
-    }elseif($rev1){                // single revision given, compare to current
-      $r_rev = '';
-      $l_rev = $rev1;
-    }else{                        // no revision was given, compare previous to current
-      $r_rev = '';
-      $revs = getRevisions($ID, 0, 1);
-      $l_rev = $revs[0];
-    }
-
-    // when both revisions are empty then the page was created just now
-    if(!$l_rev && !$r_rev){
-      $l_text = '';
-    }else{
-      $l_text = rawWiki($ID,$l_rev);
-    }
-    $r_text = rawWiki($ID,$r_rev);
-
+    require_once(DOKU_INC.'inc/DifferenceEngine.php');
+    global $ID;
+    global $REV;
+    global $lang;
+    global $conf;
 
-    if(!$l_rev){
-      $l_head = '—';
-    }else{
-      $l_info   = getRevisionInfo($ID,$l_rev,true);
-      if($l_info['user']){ $l_user = editorinfo($l_info['user']);
-        if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
-      } else { $l_user = $l_info['ip']; }
-      $l_user  = ''.$l_user.'';
-      $l_sum   = ($l_info['sum']) ? ''.hsc($l_info['sum']).'' : '';
-      if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
-
-      $l_head = ''.
-                $ID.' ['.strftime($conf['dformat'],$l_rev).']'.
-                '
    '.$l_user.' '.$l_sum;
-    }
-
-    if($r_rev){
-      $r_info   = getRevisionInfo($ID,$r_rev,true);
-      if($r_info['user']){ $r_user = editorinfo($r_info['user']);
-        if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
-      } else { $r_user = $r_info['ip']; }
-      $r_user = ''.$r_user.'';
-      $r_sum  = ($r_info['sum']) ? ''.hsc($r_info['sum']).'' : '';
-      if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-      $r_head = ''.
-                $ID.' ['.strftime($conf['dformat'],$r_rev).']'.
-                '
    '.$r_user.' '.$r_sum;
-    }elseif($_rev = @filemtime(wikiFN($ID))){
-      $_info   = getRevisionInfo($ID,$_rev,true);
-      if($_info['user']){ $_user = editorinfo($_info['user']);
-        if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
-      } else { $_user = $_info['ip']; }
-      $_user = ''.$_user.'';
-      $_sum  = ($_info['sum']) ? ''.hsc($_info['sum']).'' : '';
-      if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
-
-      $r_head  = ''.
-               $ID.' ['.strftime($conf['dformat'],$_rev).'] '.
-               '('.$lang['current'].')'.
-                '
    '.$_user.' '.$_sum;
+    // we're trying to be clever here, revisions to compare can be either
+    // given as rev and rev2 parameters, with rev2 being optional. Or in an
+    // array in rev2.
+    $rev1 = $REV;
+
+    if(is_array($_REQUEST['rev2'])){
+        $rev1 = (int) $_REQUEST['rev2'][0];
+        $rev2 = (int) $_REQUEST['rev2'][1];
+
+        if(!$rev1){
+            $rev1 = $rev2;
+            unset($rev2);
+        }
     }else{
-      $r_head = '— ('.$lang['current'].')';
+        $rev2 = (int) $_REQUEST['rev2'];
     }
-  }
 
-  $df = new Diff(explode("\n",htmlspecialchars($l_text)),
-                 explode("\n",htmlspecialchars($r_text)));
-
-  $tdf = new TableDiffFormatter();
-  if($intro) print p_locale_xhtml('diff');
-  ?>
+    if($text){                      // compare text to the most current revision
+        $l_rev   = '';
+        $l_text  = rawWiki($ID,'');
+        $l_head  = ''.
+            $ID.' '.dformat((int) @filemtime(wikiFN($ID))).' '.
+            $lang['current'];
+
+        $r_rev   = '';
+        $r_text  = cleanText($text);
+        $r_head  = $lang['yours'];
+    }else{
+        if($rev1 && $rev2){            // two specific revisions wanted
+            // make sure order is correct (older on the left)
+            if($rev1 < $rev2){
+                $l_rev = $rev1;
+                $r_rev = $rev2;
+            }else{
+                $l_rev = $rev2;
+                $r_rev = $rev1;
+            }
+        }elseif($rev1){                // single revision given, compare to current
+            $r_rev = '';
+            $l_rev = $rev1;
+        }else{                        // no revision was given, compare previous to current
+            $r_rev = '';
+            $revs = getRevisions($ID, 0, 1);
+            $l_rev = $revs[0];
+            $REV = $l_rev; // store revision back in $REV
+        }
+
+        // when both revisions are empty then the page was created just now
+        if(!$l_rev && !$r_rev){
+            $l_text = '';
+        }else{
+            $l_text = rawWiki($ID,$l_rev);
+        }
+        $r_text = rawWiki($ID,$r_rev);
+
+        if(!$l_rev){
+            $l_head = '—';
+        }else{
+            $l_info   = getRevisionInfo($ID,$l_rev,true);
+            if($l_info['user']){
+                $l_user = editorinfo($l_info['user']);
+                if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
+            } else {
+                $l_user = $l_info['ip'];
+            }
+            $l_user  = ''.$l_user.'';
+            $l_sum   = ($l_info['sum']) ? ''.hsc($l_info['sum']).'' : '';
+            if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
+
+            $l_head = ''.
+            $ID.' ['.dformat($l_rev).']'.
+            '
    '.$l_user.' '.$l_sum;
+        }
+
+        if($r_rev){
+            $r_info   = getRevisionInfo($ID,$r_rev,true);
+            if($r_info['user']){
+                $r_user = editorinfo($r_info['user']);
+                if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
+            } else {
+                $r_user = $r_info['ip'];
+            }
+            $r_user = ''.$r_user.'';
+            $r_sum  = ($r_info['sum']) ? ''.hsc($r_info['sum']).'' : '';
+            if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+            $r_head = ''.
+            $ID.' ['.dformat($r_rev).']'.
+            '
    '.$r_user.' '.$r_sum;
+        }elseif($_rev = @filemtime(wikiFN($ID))){
+            $_info   = getRevisionInfo($ID,$_rev,true);
+            if($_info['user']){
+                $_user = editorinfo($_info['user']);
+                if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
+            } else {
+                $_user = $_info['ip'];
+            }
+            $_user = ''.$_user.'';
+            $_sum  = ($_info['sum']) ? ''.hsc($_info['sum']).'' : '';
+            if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+            $r_head  = ''.
+            $ID.' ['.dformat($_rev).'] '.
+            '('.$lang['current'].')'.
+            '
    '.$_user.' '.$_sum;
+        }else{
+            $r_head = '— ('.$lang['current'].')';
+        }
+    }
+
+    $df = new Diff(explode("\n",htmlspecialchars($l_text)),
+        explode("\n",htmlspecialchars($r_text)));
+
+    $tdf = new TableDiffFormatter();
+    if($intro) print p_locale_xhtml('diff');
+    ?>
     
-      
-        
-        
-      
-      format($df)?>
+    
+    
+    
+    
+    format($df)?>
     
    >
-          
-        >
-          
-        
    >
+    
+    >
+    
+    
    
-  
  */
 function html_conflict($text,$summary){
-  global $ID;
-  global $lang;
+    global $ID;
+    global $lang;
 
-  print p_locale_xhtml('conflict');
-  $form = new Doku_Form('dw__editform');
-  $form->addHidden('id', $ID);
-  $form->addHidden('wikitext', $text);
-  $form->addHidden('summary', $summary);
-  $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('accesskey'=>'s')));
-  $form->addElement(form_makeButton('submit', 'cancel', $lang['btn_cancel']));
-  html_form('conflict', $form);
-  print '



    '.NL;
+    print p_locale_xhtml('conflict');
+    $form = new Doku_Form(array('id' => 'dw__editform'));
+    $form->addHidden('id', $ID);
+    $form->addHidden('wikitext', $text);
+    $form->addHidden('summary', $summary);
+    $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('accesskey'=>'s')));
+    $form->addElement(form_makeButton('submit', 'cancel', $lang['btn_cancel']));
+    html_form('conflict', $form);
+    print '



    '.NL;
 }
 
 /**
@@ -1027,28 +1034,28 @@
  * @author Andreas Gohr 
  */
 function html_register(){
-  global $lang;
-  global $conf;
-  global $ID;
-
-  print p_locale_xhtml('register');
-  print '
    '.NL;
-  $form = new Doku_Form('dw__register', wl($ID));
-  $form->startFieldset($lang['register']);
-  $form->addHidden('do', 'register');
-  $form->addHidden('save', '1');
-  $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], null, 'block', array('size'=>'50')));
-  if (!$conf['autopasswd']) {
-    $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50')));
-    $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
-  }
-  $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', array('size'=>'50')));
-  $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', array('size'=>'50')));
-  $form->addElement(form_makeButton('submit', '', $lang['register']));
-  $form->endFieldset();
-  html_form('register', $form);
+    global $lang;
+    global $conf;
+    global $ID;
 
-  print '
    '.NL;
+    print p_locale_xhtml('register');
+    print '
    '.NL;
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['register']);
+    $form->addHidden('do', 'register');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], null, 'block', array('size'=>'50')));
+    if (!$conf['autopasswd']) {
+        $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50')));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
+    }
+    $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', array('size'=>'50')));
+    $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', array('size'=>'50')));
+    $form->addElement(form_makeButton('submit', '', $lang['register']));
+    $form->endFieldset();
+    html_form('register', $form);
+
+    print '
    '.NL;
 }
 
 /**
@@ -1058,42 +1065,42 @@
  * @author Andreas Gohr 
  */
 function html_updateprofile(){
-  global $lang;
-  global $conf;
-  global $ID;
-  global $INFO;
-  global $auth;
-
-  print p_locale_xhtml('updateprofile');
-
-  if (empty($_POST['fullname'])) $_POST['fullname'] = $INFO['userinfo']['name'];
-  if (empty($_POST['email'])) $_POST['email'] = $INFO['userinfo']['mail'];
-  print '
    '.NL;
-  $form = new Doku_Form('dw__register', wl($ID));
-  $form->startFieldset($lang['profile']);
-  $form->addHidden('do', 'profile');
-  $form->addHidden('save', '1');
-  $form->addElement(form_makeTextField('fullname', $_SERVER['REMOTE_USER'], $lang['user'], '', 'block', array('size'=>'50', 'disabled'=>'disabled')));
-  $attr = array('size'=>'50');
-  if (!$auth->canDo('modName')) $attr['disabled'] = 'disabled';
-  $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', $attr));
-  $attr = array('size'=>'50');
-  if (!$auth->canDo('modMail')) $attr['disabled'] = 'disabled';
-  $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', $attr));
-  $form->addElement(form_makeTag('br'));
-  if ($auth->canDo('modPass')) {
-    $form->addElement(form_makePasswordField('newpass', $lang['newpass'], '', 'block', array('size'=>'50')));
-    $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
-  }
-  if ($conf['profileconfirm']) {
+    global $lang;
+    global $conf;
+    global $ID;
+    global $INFO;
+    global $auth;
+
+    print p_locale_xhtml('updateprofile');
+
+    if (empty($_POST['fullname'])) $_POST['fullname'] = $INFO['userinfo']['name'];
+    if (empty($_POST['email'])) $_POST['email'] = $INFO['userinfo']['mail'];
+    print '
    '.NL;
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['profile']);
+    $form->addHidden('do', 'profile');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('fullname', $_SERVER['REMOTE_USER'], $lang['user'], '', 'block', array('size'=>'50', 'disabled'=>'disabled')));
+    $attr = array('size'=>'50');
+    if (!$auth->canDo('modName')) $attr['disabled'] = 'disabled';
+    $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', $attr));
+    $attr = array('size'=>'50');
+    if (!$auth->canDo('modMail')) $attr['disabled'] = 'disabled';
+    $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', $attr));
     $form->addElement(form_makeTag('br'));
-    $form->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50')));
-  }
-  $form->addElement(form_makeButton('submit', '', $lang['btn_save']));
-  $form->addElement(form_makeButton('reset', '', $lang['btn_reset']));
-  $form->endFieldset();
-  html_form('updateprofile', $form);
-  print '
    '.NL;
+    if ($auth->canDo('modPass')) {
+        $form->addElement(form_makePasswordField('newpass', $lang['newpass'], '', 'block', array('size'=>'50')));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
+    }
+    if ($conf['profileconfirm']) {
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50')));
+    }
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save']));
+    $form->addElement(form_makeButton('reset', '', $lang['btn_reset']));
+    $form->endFieldset();
+    html_form('updateprofile', $form);
+    print '
    '.NL;
 }
 
 /**
@@ -1105,147 +1112,142 @@
  * @author   Andreas Gohr 
  */
 function html_edit($text=null,$include='edit'){ //FIXME: include needed?
-  global $ID;
-  global $REV;
-  global $DATE;
-  global $RANGE;
-  global $PRE;
-  global $SUF;
-  global $INFO;
-  global $SUM;
-  global $lang;
-  global $conf;
-  global $license;
-
-  //set summary default
-  if(!$SUM){
-    if($REV){
-      $SUM = $lang['restored'];
-    }elseif(!$INFO['exists']){
-      $SUM = $lang['created'];
-    }
-  }
-
-  //no text? Load it!
-  if(!isset($text)){
-    $pr = false; //no preview mode
-    if($INFO['exists']){
-      if($RANGE){
-        list($PRE,$text,$SUF) = rawWikiSlices($RANGE,$ID,$REV);
-      }else{
-        $text = rawWiki($ID,$REV);
-      }
-      $check = md5($text);
-      $mod = false;
+    global $ID;
+    global $REV;
+    global $DATE;
+    global $RANGE;
+    global $PRE;
+    global $SUF;
+    global $INFO;
+    global $SUM;
+    global $lang;
+    global $conf;
+    global $license;
+
+    //set summary default
+    if(!$SUM){
+        if($REV){
+            $SUM = $lang['restored'];
+        }elseif(!$INFO['exists']){
+            $SUM = $lang['created'];
+        }
+    }
+
+    //no text? Load it!
+    if(!isset($text)){
+        $pr = false; //no preview mode
+        if($INFO['exists']){
+            if($RANGE){
+                list($PRE,$text,$SUF) = rawWikiSlices($RANGE,$ID,$REV);
+            }else{
+                $text = rawWiki($ID,$REV);
+            }
+            $check = md5($text);
+            $mod = false;
+        }else{
+            //try to load a pagetemplate
+            $data = array($ID);
+            $text = trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
+            $check = md5('');
+            $mod = $text!=='';
+        }
     }else{
-      //try to load a pagetemplate
-      $data = array($ID);
-      $text = trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
-      $check = md5('');
-      $mod = $text!=='';
-    }
-  }else{
-    $pr = true; //preview mode
-    if (isset($_REQUEST['changecheck'])) {
-      $check = $_REQUEST['changecheck'];
-      $mod = md5($text)!==$check;
-    } else {
-      // Why? Assume default text is unmodified.
-      $check = md5($text);
-      $mod = false;
-    }
-  }
-
-  $wr = $INFO['writable'] && !$INFO['locked'];
-  if($wr){
-    if ($REV) print p_locale_xhtml('editrev');
-    print p_locale_xhtml($include);
-  }else{
-    // check pseudo action 'source'
-    if(!actionOK('source')){
-      msg('Command disabled: source',-1);
-      return;
-    }
-    print p_locale_xhtml('read');
-  }
-  if(!$DATE) $DATE = $INFO['lastmod'];
-
-
-?>
-  
    
-
-   
    
-      
    
-      
    
-
-      
-      
-      
-      
    
-      
-   
    
-   
    
-addHidden('id', $ID);
-  $form->addHidden('rev', $REV);
-  $form->addHidden('date', $DATE);
-  $form->addHidden('prefix', $PRE);
-  $form->addHidden('suffix', $SUF);
-  $form->addHidden('changecheck', $check);
-  $attr = array('tabindex'=>'1');
-  if (!$wr) $attr['readonly'] = 'readonly';
-  $form->addElement(form_makeWikiText($text, $attr));
-  $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
-  $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
-  $form->addElement(form_makeCloseTag('div'));
-  if ($wr) {
-    $form->addElement(form_makeOpenTag('div', array('class'=>'editButtons')));
-    $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('id'=>'edbtn__save', 'accesskey'=>'s', 'tabindex'=>'4')));
-    $form->addElement(form_makeButton('submit', 'preview', $lang['btn_preview'], array('id'=>'edbtn__preview', 'accesskey'=>'p', 'tabindex'=>'5')));
-    $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
-    $form->addElement(form_makeCloseTag('div'));
-    $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
-    $form->addElement(form_makeTextField('summary', $SUM, $lang['summary'], 'edit__summary', 'nowrap', array('size'=>'50', 'tabindex'=>'2')));
-    $elem = html_minoredit();
-    if ($elem) $form->addElement($elem);
-    $form->addElement(form_makeCloseTag('div'));
-  }
-  $form->addElement(form_makeCloseTag('div'));
-  if($conf['license']){
-    $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
-    $out  = $lang['licenseok'];
-    $out .= '';
-    $form->addElement($out);
-    $form->addElement(form_makeCloseTag('div'));
-  }
-  html_form('edit', $form);
-  print '
    '.NL;
+        $pr = true; //preview mode
+        if (isset($_REQUEST['changecheck'])) {
+            $check = $_REQUEST['changecheck'];
+            $mod = md5($text)!==$check;
+        } else {
+            // Why? Assume default text is unmodified.
+            $check = md5($text);
+            $mod = false;
+        }
+    }
+
+    $wr = $INFO['writable'] && !$INFO['locked'];
+    if($wr){
+        if ($REV) print p_locale_xhtml('editrev');
+        print p_locale_xhtml($include);
+    }else{
+        // check pseudo action 'source'
+        if(!actionOK('source')){
+            msg('Command disabled: source',-1);
+            return;
+        }
+        print p_locale_xhtml('read');
+    }
+    if(!$DATE) $DATE = $INFO['lastmod'];
+    ?>
+        
    
+
+        
    
+        
    
+        
    
+
+            
+                
+            
+        
    
+         'dw__editform'));
+        $form->addHidden('id', $ID);
+        $form->addHidden('rev', $REV);
+        $form->addHidden('date', $DATE);
+        $form->addHidden('prefix', $PRE);
+        $form->addHidden('suffix', $SUF);
+        $form->addHidden('changecheck', $check);
+        $attr = array('tabindex'=>'1');
+        if (!$wr) $attr['readonly'] = 'readonly';
+        $form->addElement(form_makeWikiText($text, $attr));
+        $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
+        $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
+        $form->addElement(form_makeCloseTag('div'));
+        if ($wr) {
+            $form->addElement(form_makeOpenTag('div', array('class'=>'editButtons')));
+            $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('id'=>'edbtn__save', 'accesskey'=>'s', 'tabindex'=>'4')));
+            $form->addElement(form_makeButton('submit', 'preview', $lang['btn_preview'], array('id'=>'edbtn__preview', 'accesskey'=>'p', 'tabindex'=>'5')));
+            $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
+            $form->addElement(form_makeCloseTag('div'));
+            $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
+            $form->addElement(form_makeTextField('summary', $SUM, $lang['summary'], 'edit__summary', 'nowrap', array('size'=>'50', 'tabindex'=>'2')));
+            $elem = html_minoredit();
+            if ($elem) $form->addElement($elem);
+            $form->addElement(form_makeCloseTag('div'));
+        }
+        $form->addElement(form_makeCloseTag('div'));
+        if($wr && $conf['license']){
+            $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
+            $out  = $lang['licenseok'];
+            $out .= '';
+            $form->addElement($out);
+            $form->addElement(form_makeCloseTag('div'));
+        }
+        html_form('edit', $form);
+        print '
    '.NL;
 }
 
 /**
  * Adds a checkbox for minor edits for logged in users
  *
- * @author Andrea Gohr 
+ * @author Andreas Gohr 
  */
 function html_minoredit(){
-  global $conf;
-  global $lang;
-  // minor edits are for logged in users only
-  if(!$conf['useacl'] || !$_SERVER['REMOTE_USER']){
-    return false;
-  }
-
-  $p = array();
-  $p['tabindex'] = 3;
-  if(!empty($_REQUEST['minor'])) $p['checked']='checked';
-  return form_makeCheckboxField('minor', '1', $lang['minoredit'], 'minoredit', 'nowrap', $p);
+    global $conf;
+    global $lang;
+    // minor edits are for logged in users only
+    if(!$conf['useacl'] || !$_SERVER['REMOTE_USER']){
+        return false;
+    }
+
+    $p = array();
+    $p['tabindex'] = 3;
+    if(!empty($_REQUEST['minor'])) $p['checked']='checked';
+    return form_makeCheckboxField('minor', '1', $lang['minoredit'], 'minoredit', 'nowrap', $p);
 }
 
 /**
@@ -1254,117 +1256,179 @@
  * @author Andreas Gohr 
  */
 function html_debug(){
-  global $conf;
-  global $lang;
-  global $auth;
-  global $INFO;
-
-  //remove sensitive data
-  $cnf = $conf;
-  debug_guard($cnf);
-  $nfo = $INFO;
-  debug_guard($nfo);
-  $ses = $_SESSION;
-  debug_guard($ses);
-
-  print '';
-
-  print '
    When reporting bugs please send all the following ';
-  print 'output as a mail to andi@splitbrain.org ';
-  print 'The best way to do this is to save this page in your browser
    ';
-
-  print '$INFO:
    ';
-  print_r($nfo);
-  print '
    ';
-
-  print '$_SERVER:
    ';
-  print_r($_SERVER);
-  print '
    ';
-
-  print '$conf:
    ';
-  print_r($cnf);
-  print '
    ';
-
-  print 'DOKU_BASE:
    ';
-  print DOKU_BASE;
-  print '
    ';
-
-  print 'abs DOKU_BASE:
    ';
-  print DOKU_URL;
-  print '
    ';
-
-  print 'rel DOKU_BASE:
    ';
-  print dirname($_SERVER['PHP_SELF']).'/';
-  print '
    ';
-
-  print 'PHP Version:
    ';
-  print phpversion();
-  print '
    ';
-
-  print 'locale:
    ';
-  print setlocale(LC_ALL,0);
-  print '
    ';
-
-  print 'encoding:
    ';
-  print $lang['encoding'];
-  print '
    ';
-
-  if($auth){
-    print 'Auth backend capabilities:
    ';
-    print_r($auth->cando);
+    global $conf;
+    global $lang;
+    global $auth;
+    global $INFO;
+
+    //remove sensitive data
+    $cnf = $conf;
+    debug_guard($cnf);
+    $nfo = $INFO;
+    debug_guard($nfo);
+    $ses = $_SESSION;
+    debug_guard($ses);
+
+    print '';
+
+    print '
    When reporting bugs please send all the following ';
+    print 'output as a mail to andi@splitbrain.org ';
+    print 'The best way to do this is to save this page in your browser
    ';
+
+    print '$INFO:
    ';
+    print_r($nfo);
+    print '
    ';
+
+    print '$_SERVER:
    ';
+    print_r($_SERVER);
+    print '
    ';
+
+    print '$conf:
    ';
+    print_r($cnf);
+    print '
    ';
+
+    print 'DOKU_BASE:
    ';
+    print DOKU_BASE;
+    print '
    ';
+
+    print 'abs DOKU_BASE:
    ';
+    print DOKU_URL;
+    print '
    ';
+
+    print 'rel DOKU_BASE:
    ';
+    print dirname($_SERVER['PHP_SELF']).'/';
+    print '
    ';
+
+    print 'PHP Version:
    ';
+    print phpversion();
+    print '
    ';
+
+    print 'locale:
    ';
+    print setlocale(LC_ALL,0);
+    print '
    ';
+
+    print 'encoding:
    ';
+    print $lang['encoding'];
+    print '
    ';
+
+    if($auth){
+        print 'Auth backend capabilities:
    ';
+        print_r($auth->cando);
+        print '
    ';
+    }
+
+    print '$_SESSION:
    ';
+    print_r($ses);
     print '
    ';
-  }
 
-  print '$_SESSION:
    ';
-  print_r($ses);
-  print '
    ';
-
-  print 'Environment:
    ';
-  print_r($_ENV);
-  print '
    ';
-
-  print 'PHP settings:
    ';
-  $inis = ini_get_all();
-  print_r($inis);
-  print '
    ';
+    print 'Environment:
    ';
+    print_r($_ENV);
+    print '
    ';
+
+    print 'PHP settings:
    ';
+    $inis = ini_get_all();
+    print_r($inis);
+    print '
    ';
 
-  print '';
+    print '';
 }
 
+/**
+ * List available Administration Tasks
+ *
+ * @author Andreas Gohr 
+ * @author HÃ¥kan Sandell 
+ */
 function html_admin(){
-  global $ID;
-  global $INFO;
-  global $lang;
-  global $conf;
-
-  print p_locale_xhtml('admin');
-
-  // build menu of admin functions from the plugins that handle them
-  $pluginlist = plugin_list('admin');
-  $menu = array();
-  foreach ($pluginlist as $p) {
-    if($obj =& plugin_load('admin',$p) === NULL) continue;
-
-    // check permissions
-    if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
-
-    $menu[] = array('plugin' => $p,
-                    'prompt' => $obj->getMenuText($conf['lang']),
-                    'sort' => $obj->getMenuSort()
-                   );
-  }
-
-  usort($menu, 'p_sort_modes');
-
-  // output the menu
-  ptln('    ');
+    // build menu of admin functions from the plugins that handle them
+    $pluginlist = plugin_list('admin');
+    $menu = array();
+    foreach ($pluginlist as $p) {
+        if($obj =& plugin_load('admin',$p) === null) continue;
+
+        // check permissions
+        if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
+
+        $menu[$p] = array('plugin' => $p,
+                'prompt' => $obj->getMenuText($conf['lang']),
+                'sort' => $obj->getMenuSort()
+                );
+    }
+
+    print p_locale_xhtml('admin');
+
+    // Admin Tasks
+    if($INFO['isadmin']){
+        ptln('');
+
+    // Manager Tasks
+    ptln('');
+
+    // print the rest as sorted list
+    if(count($menu)){
+        usort($menu, 'p_sort_modes');
+        // output the menu
+        ptln('
    ');
+        print p_locale_xhtml('adminplugins');
+        ptln('
      ');
+        foreach ($menu as $item) {
+            if (!$item['prompt']) continue;
+            ptln('  
    • '.$item['prompt'].'
      • ');
+        }
+        ptln('
    ');
+    }
 }
 
 /**
@@ -1373,24 +1437,24 @@
  * @author Benoit Chesneau 
  */
 function html_resendpwd() {
-  global $lang;
-  global $conf;
-  global $ID;
-
-  print p_locale_xhtml('resendpwd');
-  print '
    '.NL;
-  $form = new Doku_Form('dw__resendpwd', wl($ID));
-  $form->startFieldset($lang['resendpwd']);
-  $form->addHidden('do', 'resendpwd');
-  $form->addHidden('save', '1');
-  $form->addElement(form_makeTag('br'));
-  $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block'));
-  $form->addElement(form_makeTag('br'));
-  $form->addElement(form_makeTag('br'));
-  $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
-  $form->endFieldset();
-  html_form('resendpwd', $form);
-  print '
    '.NL;
+    global $lang;
+    global $conf;
+    global $ID;
+
+    print p_locale_xhtml('resendpwd');
+    print '
    '.NL;
+    $form = new Doku_Form(array('id' => 'dw__resendpwd'));
+    $form->startFieldset($lang['resendpwd']);
+    $form->addHidden('do', 'resendpwd');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block'));
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
+    $form->endFieldset();
+    html_form('resendpwd', $form);
+    print '
    '.NL;
 }
 
 /**
@@ -1410,20 +1474,21 @@
     $out .= html_buildlist($toc,'toc','html_list_toc');
     $out .= '
    '.DOKU_LF.'
    '.DOKU_LF;
     $out .= ''.DOKU_LF;
-    return $out;                                                                                                }
+    return $out;
+}
 
 /**
  * Callback for html_buildlist
  */
 function html_list_toc($item){
-    if($item['hid']){
+    if(isset($item['hid'])){
         $link = '#'.$item['hid'];
     }else{
         $link = $item['link'];
     }
 
     return ''.
-           hsc($item['title']).'';
+        hsc($item['title']).'';
 }
 
 /**
@@ -1439,9 +1504,9 @@
 function html_mktocitem($link, $text, $level, $hash='#'){
     global $conf;
     return  array( 'link'  => $hash.$link,
-                   'title' => $text,
-                   'type'  => 'ul',
-                   'level' => $level);
+            'title' => $text,
+            'type'  => 'ul',
+            'level' => $level);
 }
 
 /**
@@ -1451,9 +1516,9 @@
  * @author Tom N Harris 
  */
 function html_form($name, &$form) {
-  // Safety check in case the caller forgets.
-  $form->endFieldset();
-  trigger_event('HTML_'.strtoupper($name).'FORM_OUTPUT', $form, 'html_form_output', false);
+    // Safety check in case the caller forgets.
+    $form->endFieldset();
+    trigger_event('HTML_'.strtoupper($name).'FORM_OUTPUT', $form, 'html_form_output', false);
 }
 
 /**
@@ -1461,7 +1526,7 @@
  * Just calls printForm() on the data object.
  */
 function html_form_output($data) {
-  $data->printForm();
+    $data->printForm();
 }
 
 /**
@@ -1541,4 +1606,3 @@
     return $out;
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/HTTPClient.php dokuwiki-rc2009-12-02/inc/HTTPClient.php
--- dokuwiki-2009-02-14/inc/HTTPClient.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/HTTPClient.php	2009-12-02 19:50:11.000000000 +0100
@@ -35,6 +35,29 @@
         $this->proxy_pass = conf_decodeString($conf['proxy']['pass']);
         $this->proxy_ssl  = $conf['proxy']['ssl'];
     }
+
+
+    /**
+     * Wraps an event around the parent function
+     *
+     * @triggers HTTPCLIENT_REQUEST_SEND
+     * @author   Andreas Gohr 
+     */
+    function sendRequest($url,$data='',$method='GET'){
+        $httpdata = array('url'    => $url,
+                          'data'   => $data,
+                          'method' => $method);
+        $evt = new Doku_Event('HTTPCLIENT_REQUEST_SEND',$httpdata);
+        if($evt->advise_before()){
+            $url    = $httpdata['url'];
+            $data   = $httpdata['data'];
+            $method = $httpdata['method'];
+        }
+        $evt->advise_after();
+        unset($evt);
+        return parent::sendRequest($url,$data,$method);
+    }
+
 }
 
 /**
@@ -83,6 +106,9 @@
     var $proxy_pass;
     var $proxy_ssl; //boolean set to true if your proxy needs SSL
 
+    // what we use as boundary on multipart/form-data posts
+    var $boundary = '---DokuWikiHTTPClient--4523452351';
+
     /**
      * Constructor.
      *
@@ -158,6 +184,13 @@
         $this->error  = '';
         $this->status = 0;
 
+        // don't accept gzip if truncated bodies might occur
+        if($this->max_bodysize &&
+           !$this->max_bodysize_abort &&
+           $this->headers['Accept-encoding'] == 'gzip'){
+            unset($this->headers['Accept-encoding']);
+        }
+
         // parse URL into bits
         $uri = parse_url($url);
         $server = $uri['host'];
@@ -165,8 +198,8 @@
         if(empty($path)) $path = '/';
         if(!empty($uri['query'])) $path .= '?'.$uri['query'];
         $port = $uri['port'];
-        if($uri['user']) $this->user = $uri['user'];
-        if($uri['pass']) $this->pass = $uri['pass'];
+        if(isset($uri['user'])) $this->user = $uri['user'];
+        if(isset($uri['pass'])) $this->pass = $uri['pass'];
 
         // proxy setup
         if($this->proxy_host){
@@ -191,8 +224,13 @@
         $headers['Connection'] = 'Close';
         if($method == 'POST'){
             if(is_array($data)){
-                $headers['Content-Type']   = 'application/x-www-form-urlencoded';
-                $data = $this->_postEncode($data);
+                if($headers['Content-Type'] == 'multipart/form-data'){
+                    $headers['Content-Type']   = 'multipart/form-data; boundary='.$this->boundary;
+                    $data = $this->_postMultipartEncode($data);
+                }else{
+                    $headers['Content-Type']   = 'application/x-www-form-urlencoded';
+                    $data = $this->_postEncode($data);
+                }
             }
             $headers['Content-Length'] = strlen($data);
             $rmethod = 'POST';
@@ -278,9 +316,17 @@
         // handle headers and cookies
         $this->resp_headers = $this->_parseHeaders($r_headers);
         if(isset($this->resp_headers['set-cookie'])){
-            foreach ((array) $this->resp_headers['set-cookie'] as $c){
-                list($key, $value, $foo) = split('=', $cookie);
-                $this->cookies[$key] = $value;
+            foreach ((array) $this->resp_headers['set-cookie'] as $cookie){
+                list($cookie)   = explode(';',$cookie,2);
+                list($key,$val) = explode('=',$cookie,2);
+                $key = trim($key);
+                if($val == 'deleted'){
+                    if(isset($this->cookies[$key])){
+                        unset($this->cookies[$key]);
+                    }
+                }elseif($key){
+                    $this->cookies[$key] = $val;
+                }
             }
         }
 
@@ -297,9 +343,15 @@
             }else{
                 $this->redirect_count++;
                 $this->referer = $url;
+                // handle non-RFC-compliant relative redirects
                 if (!preg_match('/^http/i', $this->resp_headers['location'])){
-                    $this->resp_headers['location'] = $uri['scheme'].'://'.$uri['host'].
-                                                      $this->resp_headers['location'];
+                    if($this->resp_headers['location'][0] != '/'){
+                        $this->resp_headers['location'] = $uri['scheme'].'://'.$uri['host'].':'.$uri['port'].
+                                                          dirname($uri['path']).'/'.$this->resp_headers['location'];
+                    }else{
+                        $this->resp_headers['location'] = $uri['scheme'].'://'.$uri['host'].':'.$uri['port'].
+                                                          $this->resp_headers['location'];
+                    }
                 }
                 // perform redirected request, always via GET (required by RFC)
                 return $this->sendRequest($this->resp_headers['location'],array(),'GET');
@@ -314,7 +366,7 @@
 
         //read body (with chunked encoding if needed)
         $r_body    = '';
-        if(preg_match('/transfer\-(en)?coding:\s*chunked\r\n/i',$r_header)){
+        if(preg_match('/transfer\-(en)?coding:\s*chunked\r\n/i',$r_headers)){
             do {
                 unset($chunk_size);
                 do {
@@ -364,7 +416,8 @@
                     else
                         break;
                 }
-                if($this->resp_headers['content-length'] && !$this->resp_headers['transfer-encoding'] &&
+                if(isset($this->resp_headers['content-length']) &&
+                   !isset($this->resp_headers['transfer-encoding']) &&
                    $this->resp_headers['content-length'] == $r_size){
                     // we read the content-length, finish here
                     break;
@@ -377,8 +430,10 @@
         fclose($socket);
 
         // decode gzip if needed
-        if($this->resp_headers['content-encoding'] == 'gzip'){
-            $this->resp_body = gzinflate(substr($r_body, 10));
+        if(isset($this->resp_headers['content-encoding']) &&
+           $this->resp_headers['content-encoding'] == 'gzip' &&
+           strlen($r_body) > 10 && substr($r_body,0,3)=="\x1f\x8b\x08"){
+            $this->resp_body = @gzinflate(substr($r_body, 10));
         }else{
             $this->resp_body = $r_body;
         }
@@ -461,19 +516,18 @@
      * @author Andreas Goetz 
      */
     function _getCookies(){
+        $headers = '';
         foreach ($this->cookies as $key => $val){
-            if ($headers) $headers .= '; ';
-            $headers .= $key.'='.$val;
+            $headers .= "$key=$val; ";
         }
-
-        if ($headers) $headers = "Cookie: $headers".HTTP_NL;
+        $headers = substr($headers, 0, -2);
+        if ($headers !== '') $headers = "Cookie: $headers".HTTP_NL;
         return $headers;
     }
 
     /**
      * Encode data for posting
      *
-     * @todo handle mixed encoding for file upoads
      * @author Andreas Gohr 
      */
     function _postEncode($data){
@@ -483,6 +537,37 @@
         }
         return $url;
     }
+
+    /**
+     * Encode data for posting using multipart encoding
+     *
+     * @fixme use of urlencode might be wrong here
+     * @author Andreas Gohr 
+     */
+    function _postMultipartEncode($data){
+        $boundary = '--'.$this->boundary;
+        $out = '';
+        foreach($data as $key => $val){
+            $out .= $boundary.HTTP_NL;
+            if(!is_array($val)){
+                $out .= 'Content-Disposition: form-data; name="'.urlencode($key).'"'.HTTP_NL;
+                $out .= HTTP_NL; // end of headers
+                $out .= $val;
+                $out .= HTTP_NL;
+            }else{
+                $out .= 'Content-Disposition: form-data; name="'.urlencode($key).'"';
+                if($val['filename']) $out .= '; filename="'.urlencode($val['filename']).'"';
+                $out .= HTTP_NL;
+                if($val['mimetype']) $out .= 'Content-Type: '.$val['mimetype'].HTTP_NL;
+                $out .= HTTP_NL; // end of headers
+                $out .= $val['body'];
+                $out .= HTTP_NL;
+            }
+        }
+        $out .= "$boundary--".HTTP_NL;
+        return $out;
+    }
+
 }
 
 //Setup VIM: ex: et ts=4 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/httputils.php dokuwiki-rc2009-12-02/inc/httputils.php
--- dokuwiki-2009-02-14/inc/httputils.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/httputils.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,199 @@
+
+ */
+
+define('HTTP_MULTIPART_BOUNDARY','D0KuW1K1B0uNDARY');
+define('HTTP_HEADER_LF',"\r\n");
+define('HTTP_CHUNK_SIZE',16*1024);
+
+/**
+ * Checks and sets HTTP headers for conditional HTTP requests
+ *
+ * @author   Simon Willison 
+ * @link     http://simon.incutio.com/archive/2003/04/23/conditionalGet
+ * @param    timestamp $timestamp lastmodified time of the cache file
+ * @returns  void or exits with previously header() commands executed
+ */
+function http_conditionalRequest($timestamp){
+    // A PHP implementation of conditional get, see
+    //   http://fishbowl.pastiche.org/archives/001132.html
+    $last_modified = substr(gmdate('r', $timestamp), 0, -5).'GMT';
+    $etag = '"'.md5($last_modified).'"';
+    // Send the headers
+    header("Last-Modified: $last_modified");
+    header("ETag: $etag");
+    // See if the client has provided the required headers
+    if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+        $if_modified_since = stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+    }else{
+        $if_modified_since = false;
+    }
+
+    if (isset($_SERVER['HTTP_IF_NONE_MATCH'])){
+        $if_none_match = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+    }else{
+        $if_none_match = false;
+    }
+
+    if (!$if_modified_since && !$if_none_match){
+        return;
+    }
+
+    // At least one of the headers is there - check them
+    if ($if_none_match && $if_none_match != $etag) {
+        return; // etag is there but doesn't match
+    }
+
+    if ($if_modified_since && $if_modified_since != $last_modified) {
+        return; // if-modified-since is there but doesn't match
+    }
+
+    // Nothing has changed since their last request - serve a 304 and exit
+    header('HTTP/1.0 304 Not Modified');
+
+    // don't produce output, even if compression is on
+    @ob_end_clean();
+    exit;
+}
+
+/**
+ * Let the webserver send the given file vi x-sendfile method
+ *
+ * @author Chris Smith 
+ * @returns  void or exits with previously header() commands executed
+ */
+function http_sendfile($file) {
+    global $conf;
+
+    //use x-sendfile header to pass the delivery to compatible webservers
+    if($conf['xsendfile'] == 1){
+        header("X-LIGHTTPD-send-file: $file");
+        ob_end_clean();
+        exit;
+    }elseif($conf['xsendfile'] == 2){
+        header("X-Sendfile: $file");
+        ob_end_clean();
+        exit;
+    }elseif($conf['xsendfile'] == 3){
+        header("X-Accel-Redirect: $file");
+        ob_end_clean();
+        exit;
+    }
+
+    return false;
+}
+
+/**
+ * Send file contents supporting rangeRequests
+ *
+ * This function exits the running script
+ *
+ * @param ressource $fh - file handle for an already open file
+ * @param int $size     - size of the whole file
+ * @param int $mime     - MIME type of the file
+ *
+ * @author Andreas Gohr 
+ */
+function http_rangeRequest($fh,$size,$mime){
+    $ranges  = array();
+    $isrange = false;
+
+    header('Accept-Ranges: bytes');
+
+    if(!isset($_SERVER['HTTP_RANGE'])){
+        // no range requested - send the whole file
+        $ranges[] = array(0,$size,$size);
+    }else{
+        $t = explode('=', $_SERVER['HTTP_RANGE']);
+        if (!$t[0]=='bytes') {
+            // we only understand byte ranges - send the whole file
+            $ranges[] = array(0,$size,$size);
+        }else{
+            $isrange = true;
+            // handle multiple ranges
+            $r = explode(',',$t[1]);
+            foreach($r as $x){
+                $p = explode('-', $x);
+                $start = (int)$p[0];
+                $end   = (int)$p[1];
+                if (!$end) $end = $size - 1;
+                if ($start > $end || $start > $size || $end > $size){
+                    header('HTTP/1.1 416 Requested Range Not Satisfiable');
+                    print 'Bad Range Request!';
+                    exit;
+                }
+                $len = $end - $start + 1;
+                $ranges[] = array($start,$end,$len);
+            }
+        }
+    }
+    $parts = count($ranges);
+
+    // now send the type and length headers
+    if(!$isrange){
+        header("Content-Type: $mime",true);
+    }else{
+        header('HTTP/1.1 206 Partial Content');
+        if($parts == 1){
+            header("Content-Type: $mime",true);
+        }else{
+            header('Content-Type: multipart/byteranges; boundary='.HTTP_MULTIPART_BOUNDARY,true);
+        }
+    }
+
+    // send all ranges
+    for($i=0; $i<$parts; $i++){
+        list($start,$end,$len) = $ranges[$i];
+
+        // multipart or normal headers
+        if($parts > 1){
+            echo HTTP_HEADER_LF.'--'.HTTP_MULTIPART_BOUNDARY.HTTP_HEADER_LF;
+            echo "Content-Type: $mime".HTTP_HEADER_LF;
+            echo "Content-Range: bytes $start-$end/$size".HTTP_HEADER_LF;
+            echo HTTP_HEADER_LF;
+        }else{
+            header("Content-Length: $len");
+            if($isrange){
+                header("Content-Range: bytes $start-$end/$size");
+            }
+        }
+
+        // send file content
+        fseek($fh,$start); //seek to start of range
+        $chunk = ($len > HTTP_CHUNK_SIZE) ? HTTP_CHUNK_SIZE : $len;
+        while (!feof($fh) && $chunk > 0) {
+            @set_time_limit(30); // large files can take a lot of time
+            print fread($fh, $chunk);
+            flush();
+            $len -= $chunk;
+            $chunk = ($len > HTTP_CHUNK_SIZE) ? HTTP_CHUNK_SIZE : $len;
+        }
+    }
+    if($parts > 1){
+        echo HTTP_HEADER_LF.'--'.HTTP_MULTIPART_BOUNDARY.'--'.HTTP_HEADER_LF;
+    }
+
+    // everything should be done here, exit
+    exit;
+}
+
+/**
+ * Check for a gzipped version and create if necessary
+ *
+ * return true if there exists a gzip version of the uncompressed file
+ * (samepath/samefilename.sameext.gz) created after the uncompressed file
+ *
+ * @author Chris Smith 
+ */
+function http_gzip_valid($uncompressed_file) {
+    $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);
+    }
+
+    return true;
+}
diff -Naur dokuwiki-2009-02-14/inc/indexer.php dokuwiki-rc2009-12-02/inc/indexer.php
--- dokuwiki-2009-02-14/inc/indexer.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/indexer.php	2009-12-02 19:50:11.000000000 +0100
@@ -74,7 +74,7 @@
         fwrite($fh,$line);
     }
     fclose($fh);
-    if($conf['fperm']) chmod($fn.'.tmp', $conf['fperm']);
+    if(isset($conf['fperm'])) chmod($fn.'.tmp', $conf['fperm']);
     io_rename($fn.'.tmp', $fn.'.idx');
     return true;
 }
@@ -227,18 +227,18 @@
     // ensure the deaccented or romanised page names of internal links are added to the token array
     // (this is necessary for the backlink function -- there maybe a better way!)
     if ($conf['deaccent']) {
-      $links = p_get_metadata($page,'relation references');
+        $links = p_get_metadata($page,'relation references');
 
-      if (!empty($links)) {
-        $tmp = join(' ',array_keys($links));                // make a single string
-        $tmp = strtr($tmp, ':', ' ');                       // replace namespace separator with a space
-        $link_tokens = array_unique(explode(' ', $tmp));    // break into tokens
-
-        foreach ($link_tokens as $link_token) {
-          if (isset($tokens[$link_token])) continue;
-          $tokens[$link_token] = 1;
+        if (!empty($links)) {
+            $tmp = join(' ',array_keys($links));                // make a single string
+            $tmp = strtr($tmp, ':', ' ');                       // replace namespace separator with a space
+            $link_tokens = array_unique(explode(' ', $tmp));    // break into tokens
+
+            foreach ($link_tokens as $link_token) {
+                if (isset($tokens[$link_token])) continue;
+                $tokens[$link_token] = 1;
+            }
         }
-      }
     }
 
     $words = array();
@@ -537,7 +537,7 @@
             }
         }
     }
-  return $wids;
+    return $wids;
 }
 
 /**
@@ -574,12 +574,16 @@
 
     // merge found pages into final result array
     $final = array();
-    foreach(array_keys($result) as $word){
+    foreach($result as $word => $res){
         $final[$word] = array();
-        foreach($result[$word] as $wid){
+        foreach($res as $wid){
             $hits = &$docs[$wid];
             foreach ($hits as $hitkey => $hitcnt) {
-                $final[$word][$hitkey] = $hitcnt + $final[$word][$hitkey];
+                if (!isset($final[$word][$hitkey])) {
+                    $final[$word][$hitkey] = $hitcnt;
+                } else {
+                    $final[$word][$hitkey] += $hitcnt;
+                }
             }
         }
     }
@@ -664,7 +668,9 @@
     if (empty($page_idx)) return;
     $pagewords = array();
     $len = count($page_idx);
-    for ($n=0;$n<$len;$n++) $pagewords[] = array();
+    for ($n=0;$n<$len;$n++){
+        $pagewords[] = array();
+    }
     unset($page_idx);
 
     $n=0;
diff -Naur dokuwiki-2009-02-14/inc/infoutils.php dokuwiki-rc2009-12-02/inc/infoutils.php
--- dokuwiki-2009-02-14/inc/infoutils.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/infoutils.php	2009-12-02 19:50:11.000000000 +0100
@@ -44,30 +44,57 @@
 
 
 /**
- * Return DokuWikis version
+ * Return DokuWiki's version (split up in date and type)
  *
  * @author Andreas Gohr 
  */
+function getVersionData(){
+    $version = array();
+    //import version string
+    if(@file_exists(DOKU_INC.'VERSION')){
+        //official release
+        $version['date'] = trim(io_readfile(DOKU_INC.'VERSION'));
+        $version['type'] = 'Release';
+        return $version;
+    }elseif(is_dir(DOKU_INC.'_darcs')){
+        if(is_file(DOKU_INC.'_darcs/inventory')){
+            $inventory = DOKU_INC.'_darcs/inventory';
+        }elseif(is_file(DOKU_INC.'_darcs/hashed_inventory')){
+            $inventory = DOKU_INC.'_darcs/hashed_inventory';
+        }else{
+            $version['date'] = 'unknown';
+            $version['type'] = 'Darcs';
+            return $version;
+        }
+
+        //darcs checkout - read last 2000 bytes of inventory
+        $sz   = filesize($inventory);
+        $seek = max(0,$sz-2000);
+        $fh   = fopen($inventory,'rb');
+        fseek($fh,$seek);
+        $chunk = fread($fh,2000);
+        fclose($fh);
+        $inv = preg_grep('#\*\*\d{14}[\]$]#',explode("\n",$chunk));
+        $cur = array_pop($inv);
+        preg_match('#\*\*(\d{4})(\d{2})(\d{2})#',$cur,$matches);
+        $version['date'] = $matches[1].'-'.$matches[2].'-'.$matches[3];
+        $version['type'] = 'Darcs';
+        return $version;
+    }else{
+        $version['date'] = 'unknown';
+        $version['type'] = 'snapshot?';
+        return $version;
+    }
+}
+
+/**
+ * Return DokuWiki's version (as a string)
+ *
+ * @author Anika Henke 
+ */
 function getVersion(){
-  //import version string
-  if(@file_exists(DOKU_INC.'VERSION')){
-    //official release
-    return 'Release '.trim(io_readfile(DOKU_INC.'VERSION'));
-  }elseif(is_dir(DOKU_INC.'_darcs')){
-    //darcs checkout - read last 2000 bytes of inventory
-    $sz   = filesize(DOKU_INC.'_darcs/inventory');
-    $seek = max(0,$sz-2000);
-    $fh   = fopen(DOKU_INC.'_darcs/inventory','rb');
-    fseek($fh,$seek);
-    $chunk = fread($fh,2000);
-    fclose($fh);
-    $inv = preg_grep('#\*\*\d{14}[\]$]#',explode("\n",$chunk));
-    $cur = array_pop($inv);
-    preg_match('#\*\*(\d{4})(\d{2})(\d{2})#',$cur,$matches);
-    return 'Darcs '.$matches[1].'-'.$matches[2].'-'.$matches[3];
-  }else{
-    return 'snapshot?';
-  }
+    $version = getVersionData();
+    return $version['type'].' '.$version['date'];
 }
 
 /**
@@ -76,150 +103,147 @@
  * @author Andreas Gohr 
  */
 function check(){
-  global $conf;
-  global $INFO;
+    global $conf;
+    global $INFO;
 
-  msg('DokuWiki version: '.getVersion(),1);
+    msg('DokuWiki version: '.getVersion(),1);
 
-  if(version_compare(phpversion(),'4.3.3','<')){
-    msg('Your PHP version is too old ('.phpversion().' vs. 4.3.3+ recommended)',-1);
-  }elseif(version_compare(phpversion(),'4.3.10','<')){
-    msg('Consider upgrading PHP to 4.3.10 or higher for security reasons (your version: '.phpversion().')',0);
-  }else{
-    msg('PHP version '.phpversion(),1);
-  }
-
-  $mem = (int) php_to_byte(ini_get('memory_limit'));
-  if($mem){
-    if($mem < 16777216){
-        msg('PHP is limited to less than 16MB RAM ('.$mem.' bytes). Increase memory_limit in php.ini',-1);
-    }elseif($mem < 20971520){
-        msg('PHP is limited to less than 20MB RAM ('.$mem.' bytes), you might encounter problems with bigger pages. Increase memory_limit in php.ini',-1);
-    }elseif($mem < 33554432){
-        msg('PHP is limited to less than 32MB RAM ('.$mem.' bytes), but that should be enough in most cases. If not, increase memory_limit in php.ini',0);
-    }else{
-        msg('More than 32MB RAM ('.$mem.' bytes) available.',1);
-    }
-  }
-
-
-  if(is_writable($conf['changelog'])){
-    msg('Changelog is writable',1);
-  }else{
-    if (@file_exists($conf['changelog'])) {
-      msg('Changelog is not writable',-1);
-    }
-  }
-
-  if (isset($conf['changelog_old']) && @file_exists($conf['changelog_old'])) {
-    msg('Old changelog exists', 0);
-  }
-
-  if (@file_exists($conf['changelog'].'_failed')) {
-    msg('Importing old changelog failed', -1);
-  } else if (@file_exists($conf['changelog'].'_importing')) {
-    msg('Importing old changelog now.', 0);
-  } else if (@file_exists($conf['changelog'].'_import_ok')) {
-    msg('Old changelog imported', 1);
-    if (!plugin_isdisabled('importoldchangelog')) {
-      msg('Importoldchangelog plugin not disabled after import', -1);
-    }
-  }
-
-  if(is_writable($conf['datadir'])){
-    msg('Datadir is writable',1);
-  }else{
-    msg('Datadir is not writable',-1);
-  }
-
-  if(is_writable($conf['olddir'])){
-    msg('Attic is writable',1);
-  }else{
-    msg('Attic is not writable',-1);
-  }
-
-  if(is_writable($conf['mediadir'])){
-    msg('Mediadir is writable',1);
-  }else{
-    msg('Mediadir is not writable',-1);
-  }
-
-  if(is_writable($conf['cachedir'])){
-    msg('Cachedir is writable',1);
-  }else{
-    msg('Cachedir is not writable',-1);
-  }
-
-  if(is_writable($conf['lockdir'])){
-    msg('Lockdir is writable',1);
-  }else{
-    msg('Lockdir is not writable',-1);
-  }
-
-  if($conf['authtype'] == 'plain'){
-    if(is_writable(DOKU_CONF.'users.auth.php')){
-      msg('conf/users.auth.php is writable',1);
-    }else{
-      msg('conf/users.auth.php is not writable',0);
-    }
-  }
-
-  if(function_exists('mb_strpos')){
-    if(defined('UTF8_NOMBSTRING')){
-      msg('mb_string extension is available but will not be used',0);
-    }else{
-      msg('mb_string extension is available and will be used',1);
-      if(ini_get('mbstring.func_overload') != 0){
-        msg('mb_string function overloading is enabled, this will cause problems and should be disabled',-1);
-      }
-    }
-  }else{
-    msg('mb_string extension not available - PHP only replacements will be used',0);
-  }
-
-  if($conf['allowdebug']){
-    msg('Debugging support is enabled. If you don\'t need it you should set $conf[\'allowdebug\'] = 0',-1);
-  }else{
-    msg('Debugging support is disabled',1);
-  }
-
-  if($INFO['userinfo']['name']){
-    msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0);
-    msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0);
-  }else{
-    msg('You are currently not logged in',0);
-  }
-
-  msg('Your current permission for this page is '.$INFO['perm'],0);
-
-  if(is_writable($INFO['filepath'])){
-    msg('The current page is writable by the webserver',0);
-  }else{
-    msg('The current page is not writable by the webserver',0);
-  }
-
-  if($INFO['writable']){
-    msg('The current page is writable by you',0);
-  }else{
-    msg('The current page is not writable by you',0);
-  }
-
-  require_once(DOKU_INC.'inc/HTTPClient.php');
-  $check = wl('','',true).'data/_dummy';
-  $http = new DokuHTTPClient();
-  $http->timeout = 6;
-  $res = $http->get($check);
-  if(strpos($res,'data directory') !== false){
-    msg('It seems like the data directory is accessible from the web.
-         Make sure this directory is properly protected
-         (See security)',-1);
-  }elseif($http->status == 404 || $http->status == 403){
-    msg('The data directory seems to be properly protected',1);
-  }else{
-    msg('Failed to check if the data directory is accessible from the web.
-         Make sure this directory is properly protected
-         (See security)',-1);
-  }
+    if(version_compare(phpversion(),'5.1.2','<')){
+        msg('Your PHP version is too old ('.phpversion().' vs. 5.1.2+ needed)',-1);
+    }else{
+        msg('PHP version '.phpversion(),1);
+    }
+
+    $mem = (int) php_to_byte(ini_get('memory_limit'));
+    if($mem){
+        if($mem < 16777216){
+            msg('PHP is limited to less than 16MB RAM ('.$mem.' bytes). Increase memory_limit in php.ini',-1);
+        }elseif($mem < 20971520){
+            msg('PHP is limited to less than 20MB RAM ('.$mem.' bytes), you might encounter problems with bigger pages. Increase memory_limit in php.ini',-1);
+        }elseif($mem < 33554432){
+            msg('PHP is limited to less than 32MB RAM ('.$mem.' bytes), but that should be enough in most cases. If not, increase memory_limit in php.ini',0);
+        }else{
+            msg('More than 32MB RAM ('.$mem.' bytes) available.',1);
+        }
+    }
+
+    if(is_writable($conf['changelog'])){
+        msg('Changelog is writable',1);
+    }else{
+        if (@file_exists($conf['changelog'])) {
+            msg('Changelog is not writable',-1);
+        }
+    }
+
+    if (isset($conf['changelog_old']) && @file_exists($conf['changelog_old'])) {
+        msg('Old changelog exists', 0);
+    }
+
+    if (@file_exists($conf['changelog'].'_failed')) {
+        msg('Importing old changelog failed', -1);
+    } else if (@file_exists($conf['changelog'].'_importing')) {
+        msg('Importing old changelog now.', 0);
+    } else if (@file_exists($conf['changelog'].'_import_ok')) {
+        msg('Old changelog imported', 1);
+        if (!plugin_isdisabled('importoldchangelog')) {
+            msg('Importoldchangelog plugin not disabled after import', -1);
+        }
+    }
+
+    if(is_writable($conf['datadir'])){
+        msg('Datadir is writable',1);
+    }else{
+        msg('Datadir is not writable',-1);
+    }
+
+    if(is_writable($conf['olddir'])){
+        msg('Attic is writable',1);
+    }else{
+        msg('Attic is not writable',-1);
+    }
+
+    if(is_writable($conf['mediadir'])){
+        msg('Mediadir is writable',1);
+    }else{
+        msg('Mediadir is not writable',-1);
+    }
+
+    if(is_writable($conf['cachedir'])){
+        msg('Cachedir is writable',1);
+    }else{
+        msg('Cachedir is not writable',-1);
+    }
+
+    if(is_writable($conf['lockdir'])){
+        msg('Lockdir is writable',1);
+    }else{
+        msg('Lockdir is not writable',-1);
+    }
+
+    if($conf['authtype'] == 'plain'){
+        if(is_writable(DOKU_CONF.'users.auth.php')){
+            msg('conf/users.auth.php is writable',1);
+        }else{
+            msg('conf/users.auth.php is not writable',0);
+        }
+    }
+
+    if(function_exists('mb_strpos')){
+        if(defined('UTF8_NOMBSTRING')){
+            msg('mb_string extension is available but will not be used',0);
+        }else{
+            msg('mb_string extension is available and will be used',1);
+            if(ini_get('mbstring.func_overload') != 0){
+                msg('mb_string function overloading is enabled, this will cause problems and should be disabled',-1);
+            }
+        }
+    }else{
+        msg('mb_string extension not available - PHP only replacements will be used',0);
+    }
+
+    if($conf['allowdebug']){
+        msg('Debugging support is enabled. If you don\'t need it you should set $conf[\'allowdebug\'] = 0',-1);
+    }else{
+        msg('Debugging support is disabled',1);
+    }
+
+    if($INFO['userinfo']['name']){
+        msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0);
+        msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0);
+    }else{
+        msg('You are currently not logged in',0);
+    }
+
+    msg('Your current permission for this page is '.$INFO['perm'],0);
+
+    if(is_writable($INFO['filepath'])){
+        msg('The current page is writable by the webserver',0);
+    }else{
+        msg('The current page is not writable by the webserver',0);
+    }
+
+    if($INFO['writable']){
+        msg('The current page is writable by you',0);
+    }else{
+        msg('The current page is not writable by you',0);
+    }
+
+    require_once(DOKU_INC.'inc/HTTPClient.php');
+    $check = wl('','',true).'data/_dummy';
+    $http = new DokuHTTPClient();
+    $http->timeout = 6;
+    $res = $http->get($check);
+    if(strpos($res,'data directory') !== false){
+        msg('It seems like the data directory is accessible from the web.
+                Make sure this directory is properly protected
+                (See security)',-1);
+    }elseif($http->status == 404 || $http->status == 403){
+        msg('The data directory seems to be properly protected',1);
+    }else{
+        msg('Failed to check if the data directory is accessible from the web.
+                Make sure this directory is properly protected
+                (See security)',-1);
+    }
 }
 
 /**
@@ -240,26 +264,26 @@
  * @see    html_msgarea
  */
 function msg($message,$lvl=0,$line='',$file=''){
-  global $MSG;
-  $errors[-1] = 'error';
-  $errors[0]  = 'info';
-  $errors[1]  = 'success';
-  $errors[2]  = 'notify';
-
-  if($line || $file) $message.=' ['.basename($file).':'.$line.']';
-
-  if(!headers_sent()){
-    if(!isset($MSG)) $MSG = array();
-    $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
-  }else{
-    $MSG = array();
-    $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
-    if(function_exists('html_msgarea')){
-      html_msgarea();
+    global $MSG;
+    $errors[-1] = 'error';
+    $errors[0]  = 'info';
+    $errors[1]  = 'success';
+    $errors[2]  = 'notify';
+
+    if($line || $file) $message.=' ['.basename($file).':'.$line.']';
+
+    if(!headers_sent()){
+        if(!isset($MSG)) $MSG = array();
+        $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
     }else{
-      print "ERROR($lvl) $message";
+        $MSG = array();
+        $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+        if(function_exists('html_msgarea')){
+            html_msgarea();
+        }else{
+            print "ERROR($lvl) $message";
+        }
     }
-  }
 }
 
 /**
@@ -270,9 +294,9 @@
  * @author Andreas Gohr 
  */
 function dbg($msg,$hidden=false){
-  (!$hidden) ? print '
    ' : print "";
+    (!$hidden) ? print '
    ' : print "";
 }
 
 /**
@@ -280,18 +304,20 @@
  *
  * @author Andreas Gohr 
  */
-function dbglog($msg){
-  global $conf;
-  if(is_object($msg) || is_array($msg)){
-    $msg = print_r($msg,true);
-  }
-
-  $file = $conf['cachedir'].'/debug.log';
-  $fh = fopen($file,'a');
-  if($fh){
-    fwrite($fh,date('H:i:s ').$_SERVER['REMOTE_ADDR'].': '.$msg."\n");
-    fclose($fh);
-  }
+function dbglog($msg,$header=''){
+    global $conf;
+    if(is_object($msg) || is_array($msg)){
+        $msg = print_r($msg,true);
+    }
+
+    if($header) $msg = "$header\n$msg";
+
+    $file = $conf['cachedir'].'/debug.log';
+    $fh = fopen($file,'a');
+    if($fh){
+        fwrite($fh,date('H:i:s ').$_SERVER['REMOTE_ADDR'].': '.$msg."\n");
+        fclose($fh);
+    }
 }
 
 /**
@@ -300,44 +326,44 @@
  * @author Gary Owen 
  */
 function dbg_backtrace(){
-  // Get backtrace
-  $backtrace = debug_backtrace();
+    // Get backtrace
+    $backtrace = debug_backtrace();
 
-  // Unset call to debug_print_backtrace
-  array_shift($backtrace);
+    // Unset call to debug_print_backtrace
+    array_shift($backtrace);
 
-  // Iterate backtrace
-  $calls = array();
-  $depth = count($backtrace) - 1;
-  foreach ($backtrace as $i => $call) {
-    $location = $call['file'] . ':' . $call['line'];
-    $function = (isset($call['class'])) ?
-    $call['class'] . $call['type'] . $call['function'] : $call['function'];
-
-    $params = array();
-    if (isset($call['args'])){
-        foreach($call['args'] as $arg){
-            if(is_object($arg)){
-                $params[] = '[Object '.get_class($arg).']';
-            }elseif(is_array($arg)){
-                $params[] = '[Array]';
-            }elseif(is_null($arg)){
-                $param[] = '[NULL]';
-            }else{
-                $params[] = (string) '"'.$arg.'"';
+    // Iterate backtrace
+    $calls = array();
+    $depth = count($backtrace) - 1;
+    foreach ($backtrace as $i => $call) {
+        $location = $call['file'] . ':' . $call['line'];
+        $function = (isset($call['class'])) ?
+            $call['class'] . $call['type'] . $call['function'] : $call['function'];
+
+        $params = array();
+        if (isset($call['args'])){
+            foreach($call['args'] as $arg){
+                if(is_object($arg)){
+                    $params[] = '[Object '.get_class($arg).']';
+                }elseif(is_array($arg)){
+                    $params[] = '[Array]';
+                }elseif(is_null($arg)){
+                    $param[] = '[NULL]';
+                }else{
+                    $params[] = (string) '"'.$arg.'"';
+                }
             }
         }
-    }
-    $params = implode(', ',$params);
+        $params = implode(', ',$params);
 
-    $calls[$depth - $i] = sprintf('%s(%s) called at %s',
-                          $function,
-                          str_replace("\n", '\n', $params),
-                          $location);
-  }
-  ksort($calls);
+        $calls[$depth - $i] = sprintf('%s(%s) called at %s',
+                $function,
+                str_replace("\n", '\n', $params),
+                $location);
+    }
+    ksort($calls);
 
-  return implode("\n", $calls);
+    return implode("\n", $calls);
 }
 
 /**
diff -Naur dokuwiki-2009-02-14/inc/init.php dokuwiki-rc2009-12-02/inc/init.php
--- dokuwiki-2009-02-14/inc/init.php	2009-05-26 16:54:37.000000000 +0200
+++ dokuwiki-rc2009-12-02/inc/init.php	2009-12-02 19:50:11.000000000 +0100
@@ -3,292 +3,300 @@
  * Initialize some defaults needed for DokuWiki
  */
 
-  // start timing Dokuwiki execution
-  function delta_time($start=0) {
+// start timing Dokuwiki execution
+function delta_time($start=0) {
     list($usec, $sec) = explode(" ", microtime());
     return ((float)$usec+(float)$sec)-((float)$start);
-  }
-  define('DOKU_START_TIME', delta_time());
+}
+define('DOKU_START_TIME', delta_time());
 
-  global $config_cascade;
-  $config_cascade = '';
+global $config_cascade;
+$config_cascade = '';
 
-  // if available load a preload config file
-  $preload = fullpath(dirname(__FILE__)).'/preload.php';
-  if (@file_exists($preload)) include($preload);
+// if available load a preload config file
+$preload = fullpath(dirname(__FILE__)).'/preload.php';
+if (@file_exists($preload)) include($preload);
 
-  // define the include path
-  if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+// define the include path
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
 
-  // define config path (packagers may want to change this to /etc/dokuwiki/)
-  if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+// define config path (packagers may want to change this to /etc/dokuwiki/)
+if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
 
-  // check for error reporting override or set error reporting to sane values
-  if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
+// check for error reporting override or set error reporting to sane values
+if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
     define('DOKU_E_LEVEL', E_ALL);
-  }
-  if (!defined('DOKU_E_LEVEL')) {
+}
+if (!defined('DOKU_E_LEVEL')) {
     if(defined('E_DEPRECATED')){ // since php 5.3
-      error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
     }else{
-      error_reporting(E_ALL ^ E_NOTICE);
+        error_reporting(E_ALL ^ E_NOTICE);
     }
-  } else {
+} else {
     error_reporting(DOKU_E_LEVEL);
-  }
+}
 
-  // init memory caches
-  global $cache_revinfo;  $cache_revinfo = array();
-  global $cache_wikifn;   $cache_wikifn = array();
-  global $cache_cleanid;  $cache_cleanid = array();
-  global $cache_authname; $cache_authname = array();
-  global $cache_metadata; $cache_metadata = array();
+// init memory caches
+global $cache_revinfo;
+       $cache_revinfo = array();
+global $cache_wikifn;
+       $cache_wikifn = array();
+global $cache_cleanid;
+       $cache_cleanid = array();
+global $cache_authname;
+       $cache_authname = array();
+global $cache_metadata;
+       $cache_metadata = array();
 
-  //set the configuration cascade - but only if its not already been set in preload.php
-  if (empty($config_cascade)) {
+//set the configuration cascade - but only if its not already been set in preload.php
+if (empty($config_cascade)) {
     $config_cascade = array(
-      'main' => array(
-        'default'   => array(DOKU_CONF.'dokuwiki.php'),
-        'local'     => array(DOKU_CONF.'local.php'),
-        'protected' => array(DOKU_CONF.'local.protected.php'),
-      ),
-      'acronyms'  => array(
-        'default'   => array(DOKU_CONF.'acronyms.conf'),
-        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
-      ),
-      'entities'  => array(
-        'default'   => array(DOKU_CONF.'entities.conf'),
-        'local'     => array(DOKU_CONF.'entities.local.conf'),
-      ),
-      'interwiki' => array(
-        'default'   => array(DOKU_CONF.'interwiki.conf'),
-        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
-      ),
-      'license' => array(
-        'default'   => array(DOKU_CONF.'license.php'),
-        'local'     => array(DOKU_CONF.'license.local.php'),
-      ),
-      'mediameta' => array(
-        'default'   => array(DOKU_CONF.'mediameta.php'),
-        'local'     => array(DOKU_CONF.'mediameta.local.php'),
-      ),
-      'mime'      => array(
-        'default'   => array(DOKU_CONF.'mime.conf'),
-        'local'     => array(DOKU_CONF.'mime.local.conf'),
-      ),
-      'scheme'    => array(
-        'default'   => array(DOKU_CONF.'scheme.conf'),
-        'local'     => array(DOKU_CONF.'scheme.local.conf'),
-      ),
-      'smileys'   => array(
-        'default'   => array(DOKU_CONF.'smileys.conf'),
-        'local'     => array(DOKU_CONF.'smileys.local.conf'),
-      ),
-      'wordblock' => array(
-        'default'   => array(DOKU_CONF.'wordblock.conf'),
-        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
-      ),
-    );
-  }
-
-  //prepare config array()
-  global $conf;
-  $conf = array();
+            'main' => array(
+                'default'   => array(DOKU_CONF.'dokuwiki.php'),
+                'local'     => array(DOKU_CONF.'local.php'),
+                'protected' => array(DOKU_CONF.'local.protected.php'),
+                ),
+            'acronyms'  => array(
+                'default'   => array(DOKU_CONF.'acronyms.conf'),
+                'local'     => array(DOKU_CONF.'acronyms.local.conf'),
+                ),
+            'entities'  => array(
+                'default'   => array(DOKU_CONF.'entities.conf'),
+                'local'     => array(DOKU_CONF.'entities.local.conf'),
+                ),
+            'interwiki' => array(
+                'default'   => array(DOKU_CONF.'interwiki.conf'),
+                'local'     => array(DOKU_CONF.'interwiki.local.conf'),
+                ),
+            'license' => array(
+                'default'   => array(DOKU_CONF.'license.php'),
+                'local'     => array(DOKU_CONF.'license.local.php'),
+                ),
+            'mediameta' => array(
+                    'default'   => array(DOKU_CONF.'mediameta.php'),
+                    'local'     => array(DOKU_CONF.'mediameta.local.php'),
+                    ),
+            'mime'      => array(
+                    'default'   => array(DOKU_CONF.'mime.conf'),
+                    'local'     => array(DOKU_CONF.'mime.local.conf'),
+                    ),
+            'scheme'    => array(
+                    'default'   => array(DOKU_CONF.'scheme.conf'),
+                    'local'     => array(DOKU_CONF.'scheme.local.conf'),
+                    ),
+            'smileys'   => array(
+                    'default'   => array(DOKU_CONF.'smileys.conf'),
+                    'local'     => array(DOKU_CONF.'smileys.local.conf'),
+                    ),
+            'wordblock' => array(
+                    'default'   => array(DOKU_CONF.'wordblock.conf'),
+                    'local'     => array(DOKU_CONF.'wordblock.local.conf'),
+                    ),
+            );
+}
+
+//prepare config array()
+global $conf;
+$conf = array();
 
-  // load the global config file(s)
-  foreach (array('default','local','protected') as $config_group) {
+// load the global config file(s)
+foreach (array('default','local','protected') as $config_group) {
     if (empty($config_cascade['main'][$config_group])) continue;
     foreach ($config_cascade['main'][$config_group] as $config_file) {
-      if (@file_exists($config_file)) {
-        include($config_file);
-      }
-    }
-  }
-
-  //prepare language array
-  global $lang;
-  $lang = array();
-
-  //load the language files
-  require_once(DOKU_INC.'inc/lang/en/lang.php');
-  if ( $conf['lang'] && $conf['lang'] != 'en' ) {
+        if (@file_exists($config_file)) {
+            include($config_file);
+        }
+    }
+}
+
+//prepare language array
+global $lang;
+$lang = array();
+
+//load the language files
+require_once(DOKU_INC.'inc/lang/en/lang.php');
+if ( $conf['lang'] && $conf['lang'] != 'en' ) {
     require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
-  }
+}
 
-  //prepare license array()
-  global $license;
-  $license = array();
+//prepare license array()
+global $license;
+$license = array();
 
-  // load the license file(s)
-  foreach (array('default','local') as $config_group) {
+// load the license file(s)
+foreach (array('default','local') as $config_group) {
     if (empty($config_cascade['license'][$config_group])) continue;
     foreach ($config_cascade['license'][$config_group] as $config_file) {
-      if(@file_exists($config_file)){
-        include($config_file);
-      }
-    }
-  }
-
-  // define baseURL
-  if(!defined('DOKU_REL')) define('DOKU_REL',getBaseURL(false));
-  if(!defined('DOKU_URL')) define('DOKU_URL',getBaseURL(true));
-  if(!defined('DOKU_BASE')){
+        if(@file_exists($config_file)){
+            include($config_file);
+        }
+    }
+}
+
+// set timezone (as in pre 5.3.0 days)
+date_default_timezone_set(@date_default_timezone_get());
+
+// define baseURL
+if(!defined('DOKU_REL')) define('DOKU_REL',getBaseURL(false));
+if(!defined('DOKU_URL')) define('DOKU_URL',getBaseURL(true));
+if(!defined('DOKU_BASE')){
     if($conf['canonical']){
-      define('DOKU_BASE',DOKU_URL);
+        define('DOKU_BASE',DOKU_URL);
     }else{
-      define('DOKU_BASE',DOKU_REL);
+        define('DOKU_BASE',DOKU_REL);
     }
-  }
+}
 
-  // define whitespace
-  if(!defined('DOKU_LF')) define ('DOKU_LF',"\n");
-  if(!defined('DOKU_TAB')) define ('DOKU_TAB',"\t");
+// define whitespace
+if(!defined('DOKU_LF')) define ('DOKU_LF',"\n");
+if(!defined('DOKU_TAB')) define ('DOKU_TAB',"\t");
 
-  // define cookie and session id
-  if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL));
+// define cookie and session id, append server port when securecookie is configured FS#1664
+if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL.(($conf['securecookie'])?$_SERVER['SERVER_PORT']:'')));
 
-  // define Plugin dir
-  if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+// define Plugin dir
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
 
-  // define main script
-  if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');
+// define main script
+if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');
 
-  // define Template baseURL
-  if(!defined('DOKU_TPL')) define('DOKU_TPL',
-                                  DOKU_BASE.'lib/tpl/'.$conf['template'].'/');
+// define Template baseURL
+if(!defined('DOKU_TPL')) define('DOKU_TPL',
+        DOKU_BASE.'lib/tpl/'.$conf['template'].'/');
 
-  // define real Template directory
-  if(!defined('DOKU_TPLINC')) define('DOKU_TPLINC',
-                                  DOKU_INC.'lib/tpl/'.$conf['template'].'/');
+// define real Template directory
+if(!defined('DOKU_TPLINC')) define('DOKU_TPLINC',
+        DOKU_INC.'lib/tpl/'.$conf['template'].'/');
 
-  // make session rewrites XHTML compliant
-  @ini_set('arg_separator.output', '&');
+// make session rewrites XHTML compliant
+@ini_set('arg_separator.output', '&');
 
-  // make sure global zlib does not interfere FS#1132
-  @ini_set('zlib.output_compression', 'off');
+// make sure global zlib does not interfere FS#1132
+@ini_set('zlib.output_compression', 'off');
 
-  // increase PCRE backtrack limit
-  @ini_set('pcre.backtrack_limit', '20971520');
+// increase PCRE backtrack limit
+@ini_set('pcre.backtrack_limit', '20971520');
 
-  // enable gzip compression if supported
-  $conf['gzip_output'] &= (strpos($_SERVER['HTTP_ACCEPT_ENCODING'],'gzip') !== false);
-  if ($conf['gzip_output'] &&
-      !defined('DOKU_DISABLE_GZIP_OUTPUT') &&
-      function_exists('ob_gzhandler')) {
+// enable gzip compression if supported
+$conf['gzip_output'] &= (strpos($_SERVER['HTTP_ACCEPT_ENCODING'],'gzip') !== false);
+if ($conf['gzip_output'] &&
+        !defined('DOKU_DISABLE_GZIP_OUTPUT') &&
+        function_exists('ob_gzhandler')) {
     ob_start('ob_gzhandler');
-  }
+}
 
-  // init session
-  if (!headers_sent() && !defined('NOSESSION')){
+// init session
+if (!headers_sent() && !defined('NOSESSION')){
     session_name("DokuWiki");
     if (version_compare(PHP_VERSION, '5.2.0', '>')) {
-      session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
     }else{
-      session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
     }
     session_start();
 
     // load left over messages
     if(isset($_SESSION[DOKU_COOKIE]['msg'])){
-      $MSG = $_SESSION[DOKU_COOKIE]['msg'];
-      unset($_SESSION[DOKU_COOKIE]['msg']);
+        $MSG = $_SESSION[DOKU_COOKIE]['msg'];
+        unset($_SESSION[DOKU_COOKIE]['msg']);
     }
-  }
+}
 
-  // kill magic quotes
-  if (get_magic_quotes_gpc() && !defined('MAGIC_QUOTES_STRIPPED')) {
+// kill magic quotes
+if (get_magic_quotes_gpc() && !defined('MAGIC_QUOTES_STRIPPED')) {
     if (!empty($_GET))    remove_magic_quotes($_GET);
     if (!empty($_POST))   remove_magic_quotes($_POST);
     if (!empty($_COOKIE)) remove_magic_quotes($_COOKIE);
     if (!empty($_REQUEST)) remove_magic_quotes($_REQUEST);
     @ini_set('magic_quotes_gpc', 0);
     define('MAGIC_QUOTES_STRIPPED',1);
-  }
-  @set_magic_quotes_runtime(0);
-  @ini_set('magic_quotes_sybase',0);
+}
+@set_magic_quotes_runtime(0);
+@ini_set('magic_quotes_sybase',0);
 
-  // don't let cookies ever interfere with request vars
-  $_REQUEST = array_merge($_GET,$_POST);
+// don't let cookies ever interfere with request vars
+$_REQUEST = array_merge($_GET,$_POST);
 
-  // we don't want a purge URL to be digged
-  if($_REQUEST['purge'] && $_SERVER['HTTP_REFERER']) unset($_REQUEST['purge']);
+// we don't want a purge URL to be digged
+if(isset($_REQUEST['purge']) && $_SERVER['HTTP_REFERER']) unset($_REQUEST['purge']);
 
-  // disable gzip if not available
-  if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
+// disable gzip if not available
+if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
     $conf['compression'] = 'gz';
-  }
-  if($conf['compression'] == 'gz' && !function_exists('gzopen')){
+}
+if($conf['compression'] == 'gz' && !function_exists('gzopen')){
     $conf['compression'] = 0;
-  }
+}
 
-  // fix dateformat for upgraders
-  if(strpos($conf['dformat'],'%') === false){
+// fix dateformat for upgraders
+if(strpos($conf['dformat'],'%') === false){
     $conf['dformat'] = '%Y/%m/%d %H:%M';
-  }
+}
 
-  // precalculate file creation modes
-  init_creationmodes();
+// precalculate file creation modes
+init_creationmodes();
 
-  // make real paths and check them
-  init_paths();
-  init_files();
-
-  // automatic upgrade to script versions of certain files
-  scriptify(DOKU_CONF.'users.auth');
-  scriptify(DOKU_CONF.'acl.auth');
+// make real paths and check them
+init_paths();
+init_files();
+
+// automatic upgrade to script versions of certain files
+scriptify(DOKU_CONF.'users.auth');
+scriptify(DOKU_CONF.'acl.auth');
 
 
 /**
  * Checks paths from config file
  */
 function init_paths(){
-  global $conf;
+    global $conf;
 
-  $paths = array('datadir'   => 'pages',
-                 'olddir'    => 'attic',
-                 'mediadir'  => 'media',
-                 'metadir'   => 'meta',
-                 'cachedir'  => 'cache',
-                 'indexdir'  => 'index',
-                 'lockdir'   => 'locks',
-                 'tmpdir'    => 'tmp');
-
-  foreach($paths as $c => $p){
-    if(empty($conf[$c]))  $conf[$c] = $conf['savedir'].'/'.$p;
-    $conf[$c]             = init_path($conf[$c]);
-    if(empty($conf[$c]))  nice_die("The $c ('$p') does not exist, isn't accessible or writable.
-                               You should check your config and permission settings.
-                               Or maybe you want to run the
-                               installer?");
-  }
-
-  // path to old changelog only needed for upgrading
-  $conf['changelog_old'] = init_path((isset($conf['changelog']))?($conf['changelog']):($conf['savedir'].'/changes.log'));
-  if ($conf['changelog_old']=='') { unset($conf['changelog_old']); }
-  // hardcoded changelog because it is now a cache that lives in meta
-  $conf['changelog'] = $conf['metadir'].'/_dokuwiki.changes';
-  $conf['media_changelog'] = $conf['metadir'].'/_media.changes';
+    $paths = array('datadir'   => 'pages',
+            'olddir'    => 'attic',
+            'mediadir'  => 'media',
+            'metadir'   => 'meta',
+            'cachedir'  => 'cache',
+            'indexdir'  => 'index',
+            'lockdir'   => 'locks',
+            'tmpdir'    => 'tmp');
+
+    foreach($paths as $c => $p){
+        if(empty($conf[$c]))  $conf[$c] = $conf['savedir'].'/'.$p;
+        $conf[$c]             = init_path($conf[$c]);
+        if(empty($conf[$c]))  nice_die("The $c ('$p') does not exist, isn't accessible or writable.
+                You should check your config and permission settings.
+                Or maybe you want to run the
+                installer?");
+    }
+
+    // path to old changelog only needed for upgrading
+    $conf['changelog_old'] = init_path((isset($conf['changelog']))?($conf['changelog']):($conf['savedir'].'/changes.log'));
+    if ($conf['changelog_old']=='') { unset($conf['changelog_old']); }
+    // hardcoded changelog because it is now a cache that lives in meta
+    $conf['changelog'] = $conf['metadir'].'/_dokuwiki.changes';
+    $conf['media_changelog'] = $conf['metadir'].'/_media.changes';
 }
 
 /**
  * Checks the existance of certain files and creates them if missing.
  */
 function init_files(){
-  global $conf;
+    global $conf;
 
-  $files = array( $conf['indexdir'].'/page.idx');
+    $files = array( $conf['indexdir'].'/page.idx');
 
-  foreach($files as $file){
-    if(!@file_exists($file)){
-      $fh = @fopen($file,'a');
-      if($fh){
-        fclose($fh);
-        if($conf['fperm']) chmod($file, $conf['fperm']);
-      }else{
-        nice_die("$file is not writable. Check your permissions settings!");
-      }
+    foreach($files as $file){
+        if(!@file_exists($file)){
+            $fh = @fopen($file,'a');
+            if($fh){
+                fclose($fh);
+                if($conf['fperm']) chmod($file, $conf['fperm']);
+            }else{
+                nice_die("$file is not writable. Check your permissions settings!");
+            }
+        }
     }
-  }
 }
 
 /**
@@ -300,26 +308,26 @@
  * @author Andreas Gohr 
  */
 function init_path($path){
-  // check existance
-  $p = fullpath($path);
-  if(!@file_exists($p)){
-    $p = fullpath(DOKU_INC.$path);
+    // check existance
+    $p = fullpath($path);
     if(!@file_exists($p)){
-      return '';
+        $p = fullpath(DOKU_INC.$path);
+        if(!@file_exists($p)){
+            return '';
+        }
     }
-  }
 
-  // check writability
-  if(!@is_writable($p)){
-    return '';
-  }
+    // check writability
+    if(!@is_writable($p)){
+        return '';
+    }
 
-  // check accessability (execute bit) for directories
-  if(@is_dir($p) && !@file_exists("$p/.")){
-    return '';
-  }
+    // check accessability (execute bit) for directories
+    if(@is_dir($p) && !@file_exists("$p/.")){
+        return '';
+    }
 
-  return $p;
+    return $p;
 }
 
 /**
@@ -329,28 +337,28 @@
  * setting the values only if needed.
  */
 function init_creationmodes(){
-  global $conf;
+    global $conf;
 
-  // Legacy support for old umask/dmask scheme
-  unset($conf['dmask']);
-  unset($conf['fmask']);
-  unset($conf['umask']);
-  unset($conf['fperm']);
-  unset($conf['dperm']);
-
-  // get system umask, fallback to 0 if none available
-  $umask = @umask();
-  if(!$umask) $umask = 0000;
-
-  // check what is set automatically by the system on file creation
-  // and set the fperm param if it's not what we want
-  $auto_fmode = 0666 & ~$umask;
-  if($auto_fmode != $conf['fmode']) $conf['fperm'] = $conf['fmode'];
-
-  // check what is set automatically by the system on file creation
-  // and set the dperm param if it's not what we want
-  $auto_dmode = $conf['dmode'] & ~$umask;
-  if($auto_dmode != $conf['dmode']) $conf['dperm'] = $conf['dmode'];
+    // Legacy support for old umask/dmask scheme
+    unset($conf['dmask']);
+    unset($conf['fmask']);
+    unset($conf['umask']);
+    unset($conf['fperm']);
+    unset($conf['dperm']);
+
+    // get system umask, fallback to 0 if none available
+    $umask = @umask();
+    if(!$umask) $umask = 0000;
+
+    // check what is set automatically by the system on file creation
+    // and set the fperm param if it's not what we want
+    $auto_fmode = 0666 & ~$umask;
+    if($auto_fmode != $conf['fmode']) $conf['fperm'] = $conf['fmode'];
+
+    // check what is set automatically by the system on file creation
+    // and set the dperm param if it's not what we want
+    $auto_dmode = $conf['dmode'] & ~$umask;
+    if($auto_dmode != $conf['dmode']) $conf['dperm'] = $conf['dmode'];
 }
 
 /**
@@ -359,22 +367,22 @@
  * @author Andreas Gohr 
  */
 function remove_magic_quotes(&$array) {
-  foreach (array_keys($array) as $key) {
-      // handle magic quotes in keynames (breaks order)
-      $sk = stripslashes($key);
-      if($sk != $key){
-          $array[$sk] = $array[$key];
-          unset($array[$key]);
-          $key = $sk;
-      }
-
-      // do recursion if needed
-      if (is_array($array[$key])) {
-          remove_magic_quotes($array[$key]);
-      }else {
-          $array[$key] = stripslashes($array[$key]);
-      }
-  }
+    foreach (array_keys($array) as $key) {
+        // handle magic quotes in keynames (breaks order)
+        $sk = stripslashes($key);
+        if($sk != $key){
+            $array[$sk] = $array[$key];
+            unset($array[$key]);
+            $key = $sk;
+        }
+
+        // do recursion if needed
+        if (is_array($array[$key])) {
+            remove_magic_quotes($array[$key]);
+        }else {
+            $array[$key] = stripslashes($array[$key]);
+        }
+    }
 }
 
 /**
@@ -384,59 +392,63 @@
  * @author Andreas Gohr 
  */
 function getBaseURL($abs=null){
-  global $conf;
-  //if canonical url enabled always return absolute
-  if(is_null($abs)) $abs = $conf['canonical'];
-
-  if($conf['basedir']){
-    $dir = $conf['basedir'];
-  }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
-    $dir = dirname($_SERVER['SCRIPT_NAME']);
-  }elseif(substr($_SERVER['PHP_SELF'],-4) == '.php'){
-    $dir = dirname($_SERVER['PHP_SELF']);
-  }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
-    $dir = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
-                         $_SERVER['SCRIPT_FILENAME']);
-    $dir = dirname('/'.$dir);
-  }else{
-    $dir = '.'; //probably wrong
-  }
-
-  $dir = str_replace('\\','/',$dir);             // bugfix for weird WIN behaviour
-  $dir = preg_replace('#//+#','/',"/$dir/");     // ensure leading and trailing slashes
-
-  //handle script in lib/exe dir
-  $dir = preg_replace('!lib/exe/$!','',$dir);
-
-  //handle script in lib/plugins dir
-  $dir = preg_replace('!lib/plugins/.*$!','',$dir);
-
-  //finish here for relative URLs
-  if(!$abs) return $dir;
-
-  //use config option if available, trim any slash from end of baseurl to avoid multiple consecutive slashes in the path
-  if($conf['baseurl']) return rtrim($conf['baseurl'],'/').$dir;
-
-  //split hostheader into host and port
-  list($host,$port) = explode(':',$_SERVER['HTTP_HOST']);
-  if(!$port)  $port = $_SERVER['SERVER_PORT'];
-  if(!$port)  $port = 80;
-
-  if(!is_ssl()){
-    $proto = 'http://';
-    if ($port == '80') {
-      $port='';
-    }
-  }else{
-    $proto = 'https://';
-    if ($port == '443') {
-      $port='';
+    global $conf;
+    //if canonical url enabled always return absolute
+    if(is_null($abs)) $abs = $conf['canonical'];
+
+    if($conf['basedir']){
+        $dir = $conf['basedir'];
+    }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
+        $dir = dirname($_SERVER['SCRIPT_NAME']);
+    }elseif(substr($_SERVER['PHP_SELF'],-4) == '.php'){
+        $dir = dirname($_SERVER['PHP_SELF']);
+    }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
+        $dir = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                $_SERVER['SCRIPT_FILENAME']);
+        $dir = dirname('/'.$dir);
+    }else{
+        $dir = '.'; //probably wrong
+    }
+
+    $dir = str_replace('\\','/',$dir);             // bugfix for weird WIN behaviour
+    $dir = preg_replace('#//+#','/',"/$dir/");     // ensure leading and trailing slashes
+
+    //handle script in lib/exe dir
+    $dir = preg_replace('!lib/exe/$!','',$dir);
+
+    //handle script in lib/plugins dir
+    $dir = preg_replace('!lib/plugins/.*$!','',$dir);
+
+    //finish here for relative URLs
+    if(!$abs) return $dir;
+
+    //use config option if available, trim any slash from end of baseurl to avoid multiple consecutive slashes in the path
+    if($conf['baseurl']) return rtrim($conf['baseurl'],'/').$dir;
+
+    //split hostheader into host and port
+    $addr = explode(':',$_SERVER['HTTP_HOST']);
+    $host = $addr[0];
+    $port = '';
+    if (isset($addr[1])) {
+        $port = $addr[1];
+    } elseif (isset($_SERVER['SERVER_PORT'])) {
+        $port = $_SERVER['SERVER_PORT'];
+    }
+    if(!is_ssl()){
+        $proto = 'http://';
+        if ($port == '80') {
+            $port = '';
+        }
+    }else{
+        $proto = 'https://';
+        if ($port == '443') {
+            $port = '';
+        }
     }
-  }
 
-  if($port) $port = ':'.$port;
+    if($port !== '') $port = ':'.$port;
 
-  return $proto.$host.$port.$dir;
+    return $proto.$host.$port.$dir;
 }
 
 /**
@@ -448,7 +460,8 @@
  * @returns bool true when SSL is active
  */
 function is_ssl(){
-    if (preg_match('/^(|off|false|disabled)$/i',$_SERVER['HTTPS'])){
+    if (!isset($_SERVER['HTTPS']) ||
+        preg_match('/^(|off|false|disabled)$/i',$_SERVER['HTTPS'])){
         return false;
     }else{
         return true;
@@ -465,52 +478,52 @@
  * @author Jan Decaluwe 
  */
 function scriptify($file) {
-  // checks
-  if (!is_readable($file)) {
-    return;
-  }
-  $fn = $file.'.php';
-  if (@file_exists($fn)) {
-    return;
-  }
-  $fh = fopen($fn, 'w');
-  if (!$fh) {
-    nice_die($fn.' is not writable. Check your permission settings!');
-  }
-  // write php exit hack first
-  fwrite($fh, "# $fn\n");
-  fwrite($fh, '# '."\n");
-  fwrite($fh, "# Don't modify the lines above\n");
-  fwrite($fh, "#\n");
-  // copy existing lines
-  $lines = file($file);
-  foreach ($lines as $line){
-    fwrite($fh, $line);
-  }
-  fclose($fh);
-  //try to rename the old file
-  io_rename($file,"$file.old");
+    // checks
+    if (!is_readable($file)) {
+        return;
+    }
+    $fn = $file.'.php';
+    if (@file_exists($fn)) {
+        return;
+    }
+    $fh = fopen($fn, 'w');
+    if (!$fh) {
+        nice_die($fn.' is not writable. Check your permission settings!');
+    }
+    // write php exit hack first
+    fwrite($fh, "# $fn\n");
+    fwrite($fh, '# '."\n");
+    fwrite($fh, "# Don't modify the lines above\n");
+    fwrite($fh, "#\n");
+    // copy existing lines
+    $lines = file($file);
+    foreach ($lines as $line){
+        fwrite($fh, $line);
+    }
+    fclose($fh);
+    //try to rename the old file
+    io_rename($file,"$file.old");
 }
 
 /**
  * print a nice message even if no styles are loaded yet.
  */
 function nice_die($msg){
-  echo<<
-  
-    DokuWiki Setup Error
-    
-      
    
-      
    DokuWiki Setup Error
    
-      
    $msg
    
-      
    
-    
-  
+    echo<<
+
+DokuWiki Setup Error
+
+    
    
+        
    DokuWiki Setup Error
    
+        
    $msg
    
+    
    
+
+
 EOT;
-  exit;
+    exit;
 }
 
 
@@ -525,7 +538,7 @@
  * @link   http://de3.php.net/manual/en/function.realpath.php#75992
  */
 function fullpath($path,$exists=false){
-    static $run = 0; 
+    static $run = 0;
     $root  = '';
     $iswin = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' || @$GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS']);
 
@@ -560,9 +573,9 @@
     $newpath=array();
     foreach($path as $p) {
         if ($p === '' || $p === '.') continue;
-           if ($p==='..') {
-              array_pop($newpath);
-              continue;
+        if ($p==='..') {
+            array_pop($newpath);
+            continue;
         }
         array_push($newpath, $p);
     }
@@ -577,4 +590,3 @@
 
 
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/io.php dokuwiki-rc2009-12-02/inc/io.php
--- dokuwiki-2009-02-14/inc/io.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/io.php	2009-12-02 19:50:11.000000000 +0100
@@ -28,26 +28,26 @@
  * @author Ben Coburn 
  */
 function io_sweepNS($id,$basedir='datadir'){
-  global $conf;
-  $types = array ('datadir'=>'pages', 'mediadir'=>'media');
-  $ns_type = (isset($types[$basedir])?$types[$basedir]:false);
-
-  $delone = false;
-
-  //scan all namespaces
-  while(($id = getNS($id)) !== false){
-    $dir = $conf[$basedir].'/'.utf8_encodeFN(str_replace(':','/',$id));
-
-    //try to delete dir else return
-    if(@rmdir($dir)) {
-      if ($ns_type!==false) {
-        $data = array($id, $ns_type);
-        $delone = true; // we deleted at least one dir
-        trigger_event('IO_NAMESPACE_DELETED', $data);
-      }
-    } else { return $delone; }
-  }
-  return $delone;
+    global $conf;
+    $types = array ('datadir'=>'pages', 'mediadir'=>'media');
+    $ns_type = (isset($types[$basedir])?$types[$basedir]:false);
+
+    $delone = false;
+
+    //scan all namespaces
+    while(($id = getNS($id)) !== false){
+        $dir = $conf[$basedir].'/'.utf8_encodeFN(str_replace(':','/',$id));
+
+        //try to delete dir else return
+        if(@rmdir($dir)) {
+            if ($ns_type!==false) {
+                $data = array($id, $ns_type);
+                $delone = true; // we deleted at least one dir
+                trigger_event('IO_NAMESPACE_DELETED', $data);
+            }
+        } else { return $delone; }
+    }
+    return $delone;
 }
 
 /**
@@ -94,35 +94,35 @@
  * @author  Andreas Gohr 
  */
 function io_readFile($file,$clean=true){
-  $ret = '';
-  if(@file_exists($file)){
-    if(substr($file,-3) == '.gz'){
-      $ret = join('',gzfile($file));
-    }else if(substr($file,-4) == '.bz2'){
-      $ret = bzfile($file);
+    $ret = '';
+    if(@file_exists($file)){
+        if(substr($file,-3) == '.gz'){
+            $ret = join('',gzfile($file));
+        }else if(substr($file,-4) == '.bz2'){
+            $ret = bzfile($file);
+        }else{
+            $ret = file_get_contents($file);
+        }
+    }
+    if($clean){
+        return cleanText($ret);
     }else{
-      $ret = file_get_contents($file);
+        return $ret;
     }
-  }
-  if($clean){
-    return cleanText($ret);
-  }else{
-    return $ret;
-  }
 }
 /**
-* Returns the content of a .bz2 compressed file as string
-* @author marcel senf 
-*/
+ * Returns the content of a .bz2 compressed file as string
+ * @author marcel senf 
+ */
 
 function bzfile($file){
-  $bz = bzopen($file,"r");
-  while (!feof($bz)){
-    //8192 seems to be the maximum buffersize?
-    $str = $str . bzread($bz,8192);
-  }
-  bzclose($bz);
-  return $str;
+    $bz = bzopen($file,"r");
+    while (!feof($bz)){
+        //8192 seems to be the maximum buffersize?
+        $str = $str . bzread($bz,8192);
+    }
+    bzclose($bz);
+    return $str;
 }
 
 
@@ -174,44 +174,44 @@
  * @return bool true on success
  */
 function io_saveFile($file,$content,$append=false){
-  global $conf;
-  $mode = ($append) ? 'ab' : 'wb';
+    global $conf;
+    $mode = ($append) ? 'ab' : 'wb';
 
-  $fileexists = @file_exists($file);
-  io_makeFileDir($file);
-  io_lock($file);
-  if(substr($file,-3) == '.gz'){
-    $fh = @gzopen($file,$mode.'9');
-    if(!$fh){
-      msg("Writing $file failed",-1);
-      io_unlock($file);
-      return false;
-    }
-    gzwrite($fh, $content);
-    gzclose($fh);
-  }else if(substr($file,-4) == '.bz2'){
-    $fh = @bzopen($file,$mode{0});
-    if(!$fh){
-      msg("Writing $file failed", -1);
-      io_unlock($file);
-      return false;
-    }
-    bzwrite($fh, $content);
-    bzclose($fh);
-  }else{
-    $fh = @fopen($file,$mode);
-    if(!$fh){
-      msg("Writing $file failed",-1);
-      io_unlock($file);
-      return false;
+    $fileexists = @file_exists($file);
+    io_makeFileDir($file);
+    io_lock($file);
+    if(substr($file,-3) == '.gz'){
+        $fh = @gzopen($file,$mode.'9');
+        if(!$fh){
+            msg("Writing $file failed",-1);
+            io_unlock($file);
+            return false;
+        }
+        gzwrite($fh, $content);
+        gzclose($fh);
+    }else if(substr($file,-4) == '.bz2'){
+        $fh = @bzopen($file,$mode{0});
+        if(!$fh){
+            msg("Writing $file failed", -1);
+            io_unlock($file);
+            return false;
+        }
+        bzwrite($fh, $content);
+        bzclose($fh);
+    }else{
+        $fh = @fopen($file,$mode);
+        if(!$fh){
+            msg("Writing $file failed",-1);
+            io_unlock($file);
+            return false;
+        }
+        fwrite($fh, $content);
+        fclose($fh);
     }
-    fwrite($fh, $content);
-    fclose($fh);
-  }
 
-  if(!$fileexists and !empty($conf['fperm'])) chmod($file, $conf['fperm']);
-  io_unlock($file);
-  return true;
+    if(!$fileexists and !empty($conf['fperm'])) chmod($file, $conf['fperm']);
+    io_unlock($file);
+    return true;
 }
 
 /**
@@ -227,55 +227,55 @@
  * @return bool true on success
  */
 function io_deleteFromFile($file,$badline,$regex=false){
-  if (!@file_exists($file)) return true;
+    if (!@file_exists($file)) return true;
 
-  io_lock($file);
+    io_lock($file);
 
-  // load into array
-  if(substr($file,-3) == '.gz'){
-    $lines = gzfile($file);
-  }else{
-    $lines = file($file);
-  }
-
-  // remove all matching lines
-  if ($regex) {
-    $lines = preg_grep($badline,$lines,PREG_GREP_INVERT);
-  } else {
-    $pos = array_search($badline,$lines); //return null or false if not found
-    while(is_int($pos)){
-      unset($lines[$pos]);
-      $pos = array_search($badline,$lines);
+    // load into array
+    if(substr($file,-3) == '.gz'){
+        $lines = gzfile($file);
+    }else{
+        $lines = file($file);
     }
-  }
 
-  if(count($lines)){
-    $content = join('',$lines);
-    if(substr($file,-3) == '.gz'){
-      $fh = @gzopen($file,'wb9');
-      if(!$fh){
-        msg("Removing content from $file failed",-1);
-        io_unlock($file);
-        return false;
-      }
-      gzwrite($fh, $content);
-      gzclose($fh);
+    // remove all matching lines
+    if ($regex) {
+        $lines = preg_grep($badline,$lines,PREG_GREP_INVERT);
+    } else {
+        $pos = array_search($badline,$lines); //return null or false if not found
+        while(is_int($pos)){
+            unset($lines[$pos]);
+            $pos = array_search($badline,$lines);
+        }
+    }
+
+    if(count($lines)){
+        $content = join('',$lines);
+        if(substr($file,-3) == '.gz'){
+            $fh = @gzopen($file,'wb9');
+            if(!$fh){
+                msg("Removing content from $file failed",-1);
+                io_unlock($file);
+                return false;
+            }
+            gzwrite($fh, $content);
+            gzclose($fh);
+        }else{
+            $fh = @fopen($file,'wb');
+            if(!$fh){
+                msg("Removing content from $file failed",-1);
+                io_unlock($file);
+                return false;
+            }
+            fwrite($fh, $content);
+            fclose($fh);
+        }
     }else{
-      $fh = @fopen($file,'wb');
-      if(!$fh){
-        msg("Removing content from $file failed",-1);
-        io_unlock($file);
-        return false;
-      }
-      fwrite($fh, $content);
-      fclose($fh);
-    }
-  }else{
-    @unlink($file);
-  }
+        @unlink($file);
+    }
 
-  io_unlock($file);
-  return true;
+    io_unlock($file);
+    return true;
 }
 
 /**
@@ -290,24 +290,24 @@
  * @author Andreas Gohr 
  */
 function io_lock($file){
-  global $conf;
-  // no locking if safemode hack
-  if($conf['safemodehack']) return;
-
-  $lockDir = $conf['lockdir'].'/'.md5($file);
-  @ignore_user_abort(1);
-
-  $timeStart = time();
-  do {
-    //waited longer than 3 seconds? -> stale lock
-    if ((time() - $timeStart) > 3) break;
-    $locked = @mkdir($lockDir, $conf['dmode']);
-    if($locked){
-      if(!empty($conf['dperm'])) chmod($lockDir, $conf['dperm']);
-      break;
-    }
-    usleep(50);
-  } while ($locked === false);
+    global $conf;
+    // no locking if safemode hack
+    if($conf['safemodehack']) return;
+
+    $lockDir = $conf['lockdir'].'/'.md5($file);
+    @ignore_user_abort(1);
+
+    $timeStart = time();
+    do {
+        //waited longer than 3 seconds? -> stale lock
+        if ((time() - $timeStart) > 3) break;
+        $locked = @mkdir($lockDir, $conf['dmode']);
+        if($locked){
+            if(!empty($conf['dperm'])) chmod($lockDir, $conf['dperm']);
+            break;
+        }
+        usleep(50);
+    } while ($locked === false);
 }
 
 /**
@@ -316,13 +316,13 @@
  * @author Andreas Gohr 
  */
 function io_unlock($file){
-  global $conf;
-  // no locking if safemode hack
-  if($conf['safemodehack']) return;
-
-  $lockDir = $conf['lockdir'].'/'.md5($file);
-  @rmdir($lockDir);
-  @ignore_user_abort(0);
+    global $conf;
+    // no locking if safemode hack
+    if($conf['safemodehack']) return;
+
+    $lockDir = $conf['lockdir'].'/'.md5($file);
+    @rmdir($lockDir);
+    @ignore_user_abort(0);
 }
 
 /**
@@ -370,12 +370,12 @@
  * @author  Andreas Gohr 
  */
 function io_makeFileDir($file){
-  global $conf;
+    global $conf;
 
-  $dir = dirname($file);
-  if(!@is_dir($dir)){
-    io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);
-  }
+    $dir = dirname($file);
+    if(!@is_dir($dir)){
+        io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);
+    }
 }
 
 /**
@@ -386,21 +386,21 @@
  * @author  Andreas Gohr 
  */
 function io_mkdir_p($target){
-  global $conf;
-  if (@is_dir($target)||empty($target)) return 1; // best case check first
-  if (@file_exists($target) && !is_dir($target)) return 0;
-  //recursion
-  if (io_mkdir_p(substr($target,0,strrpos($target,'/')))){
-    if($conf['safemodehack']){
-      $dir = preg_replace('/^'.preg_quote(fullpath($conf['ftp']['root']),'/').'/','', $target);
-      return io_mkdir_ftp($dir);
-    }else{
-      $ret = @mkdir($target,$conf['dmode']); // crawl back up & create dir tree
-      if($ret && $conf['dperm']) chmod($target, $conf['dperm']);
-      return $ret;
+    global $conf;
+    if (@is_dir($target)||empty($target)) return 1; // best case check first
+    if (@file_exists($target) && !is_dir($target)) return 0;
+    //recursion
+    if (io_mkdir_p(substr($target,0,strrpos($target,'/')))){
+        if($conf['safemodehack']){
+            $dir = preg_replace('/^'.preg_quote(fullpath($conf['ftp']['root']),'/').'/','', $target);
+            return io_mkdir_ftp($dir);
+        }else{
+            $ret = @mkdir($target,$conf['dmode']); // crawl back up & create dir tree
+            if($ret && $conf['dperm']) chmod($target, $conf['dperm']);
+            return $ret;
+        }
     }
-  }
-  return 0;
+    return 0;
 }
 
 /**
@@ -411,31 +411,31 @@
  * @author 
  */
 function io_mkdir_ftp($dir){
-  global $conf;
+    global $conf;
 
-  if(!function_exists('ftp_connect')){
-    msg("FTP support not found - safemode workaround not usable",-1);
-    return false;
-  }
-
-  $conn = @ftp_connect($conf['ftp']['host'],$conf['ftp']['port'],10);
-  if(!$conn){
-    msg("FTP connection failed",-1);
-    return false;
-  }
-
-  if(!@ftp_login($conn, $conf['ftp']['user'], conf_decodeString($conf['ftp']['pass']))){
-    msg("FTP login failed",-1);
-    return false;
-  }
-
-  //create directory
-  $ok = @ftp_mkdir($conn, $dir);
-  //set permissions
-  @ftp_site($conn,sprintf("CHMOD %04o %s",$conf['dmode'],$dir));
+    if(!function_exists('ftp_connect')){
+        msg("FTP support not found - safemode workaround not usable",-1);
+        return false;
+    }
 
-  @ftp_close($conn);
-  return $ok;
+    $conn = @ftp_connect($conf['ftp']['host'],$conf['ftp']['port'],10);
+    if(!$conn){
+        msg("FTP connection failed",-1);
+        return false;
+    }
+
+    if(!@ftp_login($conn, $conf['ftp']['user'], conf_decodeString($conf['ftp']['pass']))){
+        msg("FTP login failed",-1);
+        return false;
+    }
+
+    //create directory
+    $ok = @ftp_mkdir($conn, $dir);
+    //set permissions
+    @ftp_site($conn,sprintf("CHMOD %04o %s",$conf['dmode'],$dir));
+
+    @ftp_close($conn);
+    return $ok;
 }
 
 /**
@@ -464,7 +464,7 @@
  * if $useAttachment is false,
  * - $file is the full filename to save the file, incl. path
  * - if successful will return true, false otherwise
-
+ *
  * if $useAttachment is true,
  * - $file is the directory where the file should be saved
  * - if successful will return the name used for the saved file, false otherwise
@@ -473,43 +473,43 @@
  * @author Chris Smith 
  */
 function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=2097152){
-  global $conf;
-  $http = new DokuHTTPClient();
-  $http->max_bodysize = $maxSize;
-  $http->timeout = 25; //max. 25 sec
-
-  $data = $http->get($url);
-  if(!$data) return false;
-
-  if ($useAttachment) {
-    $name = '';
-      if (isset($http->resp_headers['content-disposition'])) {
-      $content_disposition = $http->resp_headers['content-disposition'];
-      $match=array();
-      if (is_string($content_disposition) &&
-          preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match)) {
-
-          $name = basename($match[1]);
-      }
-
-    }
-
-    if (!$name) {
-        if (!$defaultName) return false;
-        $name = $defaultName;
-    }
-
-    $file = $file.$name;
-  }
-
-  $fileexists = @file_exists($file);
-  $fp = @fopen($file,"w");
-  if(!$fp) return false;
-  fwrite($fp,$data);
-  fclose($fp);
-  if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
-  if ($useAttachment) return $name;
-  return true;
+    global $conf;
+    $http = new DokuHTTPClient();
+    $http->max_bodysize = $maxSize;
+    $http->timeout = 25; //max. 25 sec
+
+    $data = $http->get($url);
+    if(!$data) return false;
+
+    if ($useAttachment) {
+        $name = '';
+        if (isset($http->resp_headers['content-disposition'])) {
+            $content_disposition = $http->resp_headers['content-disposition'];
+            $match=array();
+            if (is_string($content_disposition) &&
+                    preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match)) {
+
+                $name = basename($match[1]);
+        }
+
+        }
+
+        if (!$name) {
+            if (!$defaultName) return false;
+            $name = $defaultName;
+        }
+
+        $file = $file.$name;
+    }
+
+    $fileexists = @file_exists($file);
+    $fp = @fopen($file,"w");
+    if(!$fp) return false;
+    fwrite($fp,$data);
+    fclose($fp);
+    if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
+    if ($useAttachment) return $name;
+    return true;
 }
 
 /**
@@ -519,16 +519,16 @@
  * this function will use copy/unlink instead
  */
 function io_rename($from,$to){
-  global $conf;
-  if(!@rename($from,$to)){
-    if(@copy($from,$to)){
-      if($conf['fperm']) chmod($to, $conf['fperm']);
-      @unlink($from);
-      return true;
-    }
-    return false;
-  }
-  return true;
+    global $conf;
+    if(!@rename($from,$to)){
+        if(@copy($from,$to)){
+            if($conf['fperm']) chmod($to, $conf['fperm']);
+            @unlink($from);
+            return true;
+        }
+        return false;
+    }
+    return true;
 }
 
 
@@ -540,14 +540,14 @@
  * @deprecated
  */
 function io_runcmd($cmd){
-  $fh = popen($cmd, "r");
-  if(!$fh) return false;
-  $ret = '';
-  while (!feof($fh)) {
-    $ret .= fread($fh, 8192);
-  }
-  pclose($fh);
-  return $ret;
+    $fh = popen($cmd, "r");
+    if(!$fh) return false;
+    $ret = '';
+    while (!feof($fh)) {
+        $ret .= fread($fh, 8192);
+    }
+    pclose($fh);
+    return $ret;
 }
 
 /**
@@ -565,30 +565,29 @@
  * @return matching lines or backref, false on error
  */
 function io_grep($file,$pattern,$max=0,$backref=false){
-  $fh = @fopen($file,'r');
-  if(!$fh) return false;
-  $matches = array();
-
-  $cnt  = 0;
-  $line = '';
-  while (!feof($fh)) {
-    $line .= fgets($fh, 4096);  // read full line
-    if(substr($line,-1) != "\n") continue;
-
-    // check if line matches
-    if(preg_match($pattern,$line,$match)){
-      if($backref){
-        $matches[] = $match;
-      }else{
-        $matches[] = $line;
-      }
-      $cnt++;
-    }
-    if($max && $max == $cnt) break;
+    $fh = @fopen($file,'r');
+    if(!$fh) return false;
+    $matches = array();
+
+    $cnt  = 0;
     $line = '';
-  }
-  fclose($fh);
-  return $matches;
+    while (!feof($fh)) {
+        $line .= fgets($fh, 4096);  // read full line
+        if(substr($line,-1) != "\n") continue;
+
+        // check if line matches
+        if(preg_match($pattern,$line,$match)){
+            if($backref){
+                $matches[] = $match;
+            }else{
+                $matches[] = $line;
+            }
+            $cnt++;
+        }
+        if($max && $max == $cnt) break;
+        $line = '';
+    }
+    fclose($fh);
+    return $matches;
 }
 
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/IXR_Library.php dokuwiki-rc2009-12-02/inc/IXR_Library.php
--- dokuwiki-2009-02-14/inc/IXR_Library.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/IXR_Library.php	2009-12-02 19:50:11.000000000 +0100
@@ -521,16 +521,22 @@
             return false;
         }
 
+        // Check HTTP Response code
+        if($this->status < 200 || $this->status > 206){
+            $this->xmlerror = new IXR_Error(-32300, 'transport error - HTTP status '.$this->status);
+            return false;
+        }
+
         // Now parse what we've got back
         $this->message = new IXR_Message($this->resp_body);
         if (!$this->message->parse()) {
             // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
+            $this->xmlerror = new IXR_Error(-32700, 'parse error. not well formed');
             return false;
         }
         // Is the message a fault?
         if ($this->message->messageType == 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+            $this->xmlerror = new IXR_Error($this->message->faultCode, $this->message->faultString);
             return false;
         }
         // Message must be OK
@@ -600,20 +606,20 @@
         }
     }
     function parseTimestamp($timestamp) {
-        $this->year = date('Y', $timestamp);
-        $this->month = date('m', $timestamp);
-        $this->day = date('d', $timestamp);
-        $this->hour = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
+        $this->year = gmdate('Y', $timestamp);
+        $this->month = gmdate('m', $timestamp);
+        $this->day = gmdate('d', $timestamp);
+        $this->hour = gmdate('H', $timestamp);
+        $this->minute = gmdate('i', $timestamp);
+        $this->second = gmdate('s', $timestamp);
     }
     function parseIso($iso) {
         $this->year = substr($iso, 0, 4);
-        $this->month = substr($iso, 4, 2);
-        $this->day = substr($iso, 6, 2);
-        $this->hour = substr($iso, 9, 2);
-        $this->minute = substr($iso, 12, 2);
-        $this->second = substr($iso, 15, 2);
+        $this->month = substr($iso, 5, 2);
+        $this->day = substr($iso, 8, 2);
+        $this->hour = substr($iso, 11, 2);
+        $this->minute = substr($iso, 14, 2);
+        $this->second = substr($iso, 17, 2);
     }
     function getIso() {
         return $this->year.'-'.$this->month.'-'.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
@@ -622,7 +628,7 @@
         return ''.$this->getIso().'';
     }
     function getTimestamp() {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+        return gmmktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
     }
 }
 
@@ -805,4 +811,3 @@
     }
 }
 
-?>
diff -Naur dokuwiki-2009-02-14/inc/JSON.php dokuwiki-rc2009-12-02/inc/JSON.php
--- dokuwiki-2009-02-14/inc/JSON.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/JSON.php	2009-12-02 19:50:11.000000000 +0100
@@ -622,4 +622,3 @@
 
 }
 
-?>
diff -Naur dokuwiki-2009-02-14/inc/lang/af/lang.php dokuwiki-rc2009-12-02/inc/lang/af/lang.php
--- dokuwiki-2009-02-14/inc/lang/af/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/af/lang.php	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,75 @@
+%s     is nie beskibaar nie. Miskien is dit af gehaal.';
+$lang['mu_toobig']             = 'te groet';
+$lang['mu_done']               = 'klaar';
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/conflict.txt dokuwiki-rc2009-12-02/inc/lang/ar/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/ar/conflict.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/conflict.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,5 +1,5 @@
 ====== يوجد نسخة أحدث ======
 
-يوجد نسخة أحدث من هذه الصÙحة. يحدث هذا عندما يحرر مشترك آخر الصÙحة أثناء تعديلك لها. 
+يوجد نسخة أحدث من هذه الصÙحة. يحدث هذا عندما يحرر مشترك آخر الصÙحة أثناء تعديلك لها.
 
 اÙحص الاختلاÙات جيداً، ثم حدد أية نسخة تحÙظ. بالضغط على "Ø­Ùظ" ستحÙظ نسختك. أما بالضغط على "إلغاء" ÙستحاÙظ على النسخة الحالية.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/lang.php dokuwiki-rc2009-12-02/inc/lang/ar/lang.php
--- dokuwiki-2009-02-14/inc/lang/ar/lang.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/lang.php	2009-12-02 19:50:11.000000000 +0100
@@ -4,6 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Mostafa Hussein 
+ * @author Yaman Hokan 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -44,6 +45,7 @@
 $lang['btn_draft']             = 'تحرير المسوّدة';
 $lang['btn_recover']           = 'استعادة المسوّدة';
 $lang['btn_draftdel']          = 'حذ٠المسوّدة';
+$lang['btn_revert']            = 'إعادة';
 $lang['loggedinas']            = 'دخول باسم';
 $lang['user']                  = 'اسم المشترك';
 $lang['pass']                  = 'كلمة المرور';
@@ -79,13 +81,14 @@
 $lang['resendpwdbadauth']      = 'عذراً، رمز التÙعيل هذا غير صحيح. نأكد أنك استخدمت كامل وصلة التأكيد';
 $lang['resendpwdconfirm']      = 'تم إرسال وصلة تأكيد إلى بريدك الإلكتروني';
 $lang['resendpwdsuccess']      = 'كلمة مرورك الجديدة تم إرسالها عبر البريد الإلكتروني';
+$lang['searchmedia']           = 'البحث عن اسم المل٠: ';
 $lang['txt_upload']            = 'اختر ملÙاً للتحميل';
 $lang['txt_filename']          = 'تحميل باسم - اختياري';
 $lang['txt_overwrt']           = 'الكتابة على مل٠موجود بنÙس الاسم مسموحة';
 $lang['lockedby']              = 'حالياً مقÙول بواسطة';
 $lang['lockexpire']            = 'سينتهي القÙÙ„ ÙÙŠ';
 $lang['willexpire']            = 'سينتهي Ù‚ÙÙ„ تحرير هذه الصÙحه خلال دقيقة. لتجنب التعارض استخدم زر استعراض لبدأ القÙÙ„ من جديد';
-$lang['notsavedyet']           = 'التعديلات التي لم تحÙظ ستÙقد. أمواÙق؟';
+$lang['notsavedyet']           = 'التعديلات التي لم تحÙظ ستÙقد. أمواÙÙ‚ ØŸ';
 $lang['rssfailed']             = 'خطأ ما حدث أثناء جلب مل٠التغذية:';
 $lang['nothingfound']          = 'لا يوجد شيء';
 $lang['mediaselect']           = 'ملÙات الوسائط المتعددة';
@@ -97,13 +100,19 @@
 $lang['uploadbadcontent']      = 'المحتوى المحمّل لم يتطابق مع نوع المل٠%s';
 $lang['uploadspam']            = 'التحميل محجوب بواسطة القائمة السوداء لبرنامج تقÙÙŠ التطÙÙ„';
 $lang['uploadxss']             = 'التحميل محجوب لمنع المحتويات الخبيثة';
+$lang['uploadsize']            = 'المل٠الذي تم رÙعه كبير جدا . ( الحد الأقصى %s )';
 $lang['deletesucc']            = 'تم حذ٠المل٠"%s"';
 $lang['deletefail']            = 'لا يمكن حذ٠"%s"، تأكد من تراخيصك';
 $lang['mediainuse']            = 'لم يحذ٠المل٠"%s"، مازال موجوداً';
 $lang['namespaces']            = 'Ùضاء التسمية';
 $lang['mediafiles']            = 'ملÙات موجودة ÙÙŠ';
+$lang['js']['searchmedia']     = 'البحث عن الملÙات';
 $lang['js']['keepopen']        = 'أبقي الناÙذة Ù…Ùتوحة أثناء الاختيار';
 $lang['js']['hidedetails']     = 'إخÙاء التÙاصيل';
+$lang['js']['nosmblinks']      = 'الروابط لمجلدات ويندوز المشاركة تعمل Ùقط مع متصÙØ­ مايكروسÙت Internet Explorer.  ما زال بإمكانك قص Ùˆ لصق الرابط.';
+$lang['js']['linkto']          = 'الرابط إلى :';
+$lang['js']['del_confirm']     = 'هل حقاً تريد حذ٠البنود المختارة؟';
+$lang['js']['mu_btn']          = 'رÙع عدة ملÙات ÙÙŠ وقت واحد';
 $lang['mediausage']            = 'استخدم هذه الصياغة للدلالة على هذا الملÙ:';
 $lang['mediaview']             = 'عرض المل٠الأصلي';
 $lang['mediaroot']             = 'الجذر';
@@ -133,8 +142,6 @@
 $lang['mail_changed']          = 'تعديل صÙحة:';
 $lang['mail_new_user']         = 'مشترك جديد';
 $lang['mail_upload']           = 'تحميل ملÙ:';
-$lang['js']['nosmblinks']            = "الروابط لمجلدات ويندوز المشاركة تعمل Ùقط مع متصÙØ­ مايكروسÙت Internet Explorer.  ما زال بإمكانك قص Ùˆ لصق الرابط.";
-$lang['qb_alert']              = 'يرجى إدخال النص المراد صياغتة. سيتم إضاÙته ÙÙ‰ نهاية المستند';
 $lang['qb_bold']               = 'نص عريض';
 $lang['qb_italic']             = 'نص مائل';
 $lang['qb_underl']             = 'نص مسطر';
@@ -154,7 +161,6 @@
 $lang['qb_sig']                = 'أض٠توقيعك';
 $lang['qb_smileys']            = 'الابتسامات';
 $lang['qb_chars']              = 'محار٠خاصة';
-$lang['del_confirm']           = 'هل حقاً تريد حذ٠البنود المختارة؟';
 $lang['admin_register']        = 'إضاÙØ© مشترك جديد';
 $lang['metaedit']              = 'تحرير البيانات الشمولية ';
 $lang['metasaveerr']           = 'Ùشلت عملية كتابة البيانات الشمولية';
@@ -188,7 +194,7 @@
 $lang['i_funcna']              = 'دالة PHP التالية غير متوÙرة.
 %s
 قد يكون مزود خدمة الاستÙادة قد حجبها لسبب ما.';
-$lang['i_phpver']              = 'نسخة PHP التي لديك هي 
+$lang['i_phpver']              = 'نسخة PHP التي لديك هي
 %s
 وهي أقل من النسخة المطلوبة
 %s
@@ -196,7 +202,7 @@
 $lang['i_permfail']            = 'إن %s غير قابل للكتابة بواسطة دوكي ويكي، عليك تعديل إعدادات الصلاحيات لهذا المجلد!';
 $lang['i_confexists']          = 'إن %s موجود أصلاً';
 $lang['i_writeerr']            = 'لا يمكن إنشاء %s، عليك التأكد من صلاحيات المل٠أو المجلد وإنشاء المل٠يدوياً.';
-$lang['i_badhash']             = 'المل٠dokuwiki.php غير مصن٠أو قد تم تعديله 
+$lang['i_badhash']             = 'المل٠dokuwiki.php غير مصن٠أو قد تم تعديله
 (hash=%s)';
 $lang['i_badval']              = 'القيمة %s غير شرعية أو Ùارغة';
 $lang['i_success']             = 'الإعدادات تمت بنجاح، يرجى حذ٠المل٠install.php الآن.
@@ -207,3 +213,11 @@
 $lang['i_pol1']                = 'ويكي عامة؛ أي القراءة للجميع ولكن الكتابة والتحميل للمشتركين المسجلين Ùقط';
 $lang['i_pol2']                = 'ويكي مغلقة؛ أي القراءة والكتابة والتحميل للمشتركين المسجلين Ùقط';
 $lang['i_retry']               = 'إعادة المحاولة';
+$lang['mu_gridname']           = 'اسم الملÙ';
+$lang['mu_gridsize']           = 'الحجم';
+$lang['mu_gridstat']           = 'الحالة';
+$lang['mu_toobig']             = 'كبير جدا';
+$lang['mu_ready']              = 'جاهز للرÙع';
+$lang['mu_done']               = 'اكتمل';
+$lang['mu_fail']               = 'Ùشل';
+$lang['mu_info']               = 'تم رÙع الملÙات';
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ar/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ar/newpage.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/newpage.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
-======لا يوجد هذا الموضوع بعد======
+====== لا يوجد هذا الموضوع بعد ======
 
 لقد تابعت رابط لموضوع غير متواجد بعد. يمكنك إنشائة بالضعط على زر "انشيء هذه الصÙحة".
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/norev.txt dokuwiki-rc2009-12-02/inc/lang/ar/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ar/norev.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/norev.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
-======لا توجد تلك النسخة======
+====== لا توجد تلك النسخة ======
 
 النسخة المختارة ليست موجودة. أسبخدم زر "نسخ قديمة" لعرض قائمة بالنسخ القديمة من هذه الصÙحة.
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/preview.txt dokuwiki-rc2009-12-02/inc/lang/ar/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ar/preview.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/preview.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
-======عرض التعديلات======
+====== عرض التعديلات ======
 
 هذا عرض لما سيصبح علية نص الصÙحة. تذكر أن التعديلات **لم تحÙظ** بعد!
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ar/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ar/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/pwconfirm.txt	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,8 @@
+مرحبا @ الاسم الكامل @
+
+شخص ما طلب كلمة سر جديدة لـحسابك @ المعر٠@ ÙÙŠ @ DOKUWIURL @
+إذا لم تكن قد طلبت كلمة سر جديدة رجاء قم بتجاهل هذه الرسالة .
+لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط ÙÙŠ الأسÙÙ„ . 
+@ التأكيد @ 
+ -- 
+لقد تم عمل هذه الرسالة من قبل DokuWiki .. ÙÙŠ @ DOKUWIKIURL @
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/recent.txt dokuwiki-rc2009-12-02/inc/lang/ar/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ar/recent.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/recent.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
-======احدث التغييرات======
+====== احدث التغييرات ======
 
 تم تعديل الصÙحات التالية حديثا.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/ar/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/ar/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/resendpwd.txt	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,3 @@
+==== إرسال رقم سري جديد ====
+
+رجاء اكتب اسم المستخدم ÙÙŠ الاستمارة الموجودة ÙÙŠ الأسÙÙ„ ليتم طلب رقم سري جديد لحسابك ÙÙŠ هذا الويكي . سيتم إرسال رابط لتأكيد طلبك إلى بريدك الإلكتروني المسجل .
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ar/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ar/revisions.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/revisions.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,2 +1,2 @@
-======النسخ القديمة======
+====== النسخ القديمة ======
 النسخ القديمة للصÙحة الحالية. لإستعادة نسخة قديمة: أخترها من المعروض، ثم إضغط على زر "عدل هذه الصÙحة" Ùˆ أحÙظها.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ar/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ar/searchpage.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/searchpage.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,5 +1,5 @@
-======بحث======
+====== بحث ======
 
 نتائج البحث . إن لم تجد ما تبحث عنه، يمكنك إنشاء صÙحة جديدة بعنوان ما تبحث عنة بالضغط على زر "حرر هذه الصÙحة".
 
-=====نتائج البحث=====
\ Brak znaku nowej linii na końcu pliku
+===== نتائج البحث =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/ar/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/ar/updateprofile.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/updateprofile.txt	2009-12-02 19:50:11.000000000 +0100
@@ -0,0 +1,3 @@
+==== تحديث بيانات حسابك ====
+
+عليك Ùقط أن تكمل كتابة الحقول التي تريد أن تغيرها . لا تستطيع تغيير اسم المستخدم .
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ar/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ar/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ar/wordblock.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ar/wordblock.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======SPAM blocked======
-
-Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/bg/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/bg/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Допълнителни ПриÑтавки =====
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/denied.txt dokuwiki-rc2009-12-02/inc/lang/bg/denied.txt
--- dokuwiki-2009-02-14/inc/lang/bg/denied.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/denied.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,4 +1,4 @@
-======ДоÑтъпът отказан======
+====== ДоÑтъпът отказан ======
 
 ÐÑмате доÑтатъчно права да продължите. Може би Ñте забравили да влезете?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/lang.php dokuwiki-rc2009-12-02/inc/lang/bg/lang.php
--- dokuwiki-2009-02-14/inc/lang/bg/lang.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -5,198 +5,240 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Nikolay Vladimirov 
  */
-$lang['encoding']                = 'utf-8';
-$lang['direction']               = 'ltr';
-$lang['doublequoteopening']      = '“';
-$lang['doublequoteclosing']      = 'â€';
-$lang['singlequoteopening']      = '‘';
-$lang['singlequoteclosing']      = '’';
-$lang['btn_edit']                = 'Редактиране';
-$lang['btn_source']              = 'Показване на кода на Ñтраницата';
-$lang['btn_show']                = 'Показване на Ñтраницата';
-$lang['btn_create']              = 'Създаване на Ñтраницата';
-$lang['btn_search']              = 'ТърÑене';
-$lang['btn_save']                = 'ЗапиÑ';
-$lang['btn_preview']             = 'Преглед';
-$lang['btn_top']                 = 'Към началото';
-$lang['btn_newer']               = '<< по-нови';
-$lang['btn_older']               = 'по-Ñтари >>';
-$lang['btn_revs']                = 'ИÑториÑ';
-$lang['btn_recent']              = 'ПоÑледни промени';
-$lang['btn_upload']              = 'Качване';
-$lang['btn_cancel']              = 'Отказ';
-$lang['btn_index']               = 'ИндекÑ';
-$lang['btn_secedit']             = 'Редактиране';
-$lang['btn_login']               = 'Вход';
-$lang['btn_logout']              = 'Изход';
-$lang['btn_admin']               = 'ÐаÑтройки';
-$lang['btn_update']              = 'ОбновÑване';
-$lang['btn_delete']              = 'Изтриване';
-$lang['btn_back']                = 'Ðазад';
-$lang['btn_backlink']            = 'Обратни връзки';
-$lang['btn_backtomedia']         = 'Ðазад към избор на медиен файл';
-$lang['btn_subscribe']           = 'Ðбониране за Промени';
-$lang['btn_unsubscribe']         = 'ОтпиÑване от Промени';
-$lang['btn_profile']             = 'Профил';
-$lang['btn_reset']               = 'ИзчиÑтване';
-$lang['btn_resendpwd']           = 'Пращане на нова парола';
-$lang['btn_draft']               = 'Редактиране на чернова';
-$lang['btn_recover']             = 'ВъзÑтановÑване на чернова';
-$lang['btn_draftdel']            = 'Изтриване на чернова';
-$lang['loggedinas']              = 'Влезли Ñте като';
-$lang['user']                    = 'Потребител';
-$lang['pass']                    = 'Парола';
-$lang['newpass']                 = 'Ðова парола';
-$lang['oldpass']                 = 'Потвърждение на текуща парола';
-$lang['passchk']                 = 'oтново';
-$lang['remember']                = 'Запомни ме';
-$lang['fullname']                = 'Пълно име';
-$lang['email']                   = 'Е-Поща';
-$lang['register']                = 'РегиÑтрациÑ';
-$lang['profile']                 = 'ПотребителÑки профил';
-$lang['badlogin']                = 'ПотребителÑкото име или паролата Ñа грешни';
-$lang['minoredit']               = 'Леки промени';
-$lang['draftdate']               = 'Черновата бе автоматично запиÑана на';
-$lang['regmissing']              = 'МолÑ, попълнете вÑички полета.';
-$lang['reguexists']              = 'Потребител Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име вече ÑъщеÑтвува.';
-$lang['regsuccess']              = 'ПотребителÑÑ‚ бе Ñъздаден и паролата е пратена по електронната поща.';
-$lang['regsuccess2']             = 'ПотребителÑÑ‚ бе Ñъздаден.';
-$lang['regmailfail']             = 'Изглежда, че има проблем Ñ Ð¿Ñ€Ð°Ñ‰Ð°Ð½ÐµÑ‚Ð¾ на пиÑмото Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð°. МолÑ, Ñвържете Ñе Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора.';
-$lang['regbadmail']              = 'ДадениÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° невалиден, ако миÑлите, че това е грешка - Ñвържете Ñе ÑÑŠÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора.';
-$lang['regbadpass']              = 'Двете дадени пароли не Ñа идентични, Ð¼Ð¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново';
-$lang['regpwmail']               = 'DokuWiki parola';
-$lang['reghere']                 = 'Ð’Ñе още нÑмате профил? ПроÑто Ñи направете';
-$lang['profna']                  = 'Това уики не поддържа промÑна на профила';
-$lang['profnochange']            = 'ÐÑма промени.';
-$lang['profnoempty']             = 'Празни име или електронна поща не Ñа позволени.';
-$lang['profchanged']             = 'ПотребителÑкиÑÑ‚ профил бе уÑпешно обновен.';
-$lang['pwdforget']               = 'Забравили Ñте Ñи паролата? Вземете нова';
-$lang['resendna']                = 'Това уики не поддържа повторно пращане на парола';
-$lang['resendpwd']               = 'Пращане нова парола за';
-$lang['resendpwdmissing']        = 'МолÑ, попълнете вÑички полета.';
-$lang['resendpwdnouser']         = 'ПотребителÑÑ‚ не бе намерен в базата данни.';
-$lang['resendpwdbadauth']        = 'Този код за потвърждение не е валиден. Проверете дали Ñте използвали целиÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ð·Ð° потвърждение.';
-$lang['resendpwdconfirm']        = 'ÐÐ´Ñ€ÐµÑ Ð·Ð° потвърждение бе пратен по електронната поща.';
-$lang['resendpwdsuccess']        = 'Паролата ви бе пратена на електронната поща.';
-$lang['txt_upload']              = 'Изберете файл за качване ';
-$lang['txt_filename']            = 'Качване като(незадължително)';
-$lang['txt_overwrt']             = 'Ð—Ð°Ð¿Ð¸Ñ Ð²ÑŠÑ€Ñ…Ñƒ ÑъщеÑтвуващ файл';
-$lang['lockedby']                = 'В момента е заключено от';
-$lang['lockexpire']              = 'ЗатварÑнето изтича в';
-$lang['willexpire']              = 'ЗатварÑнето на Ñтраницата за редактиране изтича Ñлед минута.\nЗа да избегнете Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð¾Ñ€ÐµÑ‡Ð¸Ñ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ бутонът, за да реÑтартирате броÑчът за затварÑне.';
-$lang['notsavedyet']             = 'Ðезапазените промени ще бъдат загубени.\nИÑкате ли да продължите?';
-$lang['rssfailed']               = 'Имаше грешка при вземането на този източник(feed): ';
-$lang['nothingfound']            = 'Ðищо не бе намерено.';
-$lang['mediaselect']             = 'Медийни файлове';
-$lang['fileupload']              = 'Качване на медийни файлове';
-$lang['uploadsucc']              = 'Качването бе уÑпешно';
-$lang['uploadfail']              = 'Качването бе неуÑпешно.Може би грешни права?';
-$lang['uploadwrong']             = 'Качването бе отказано. Това файлово разширение е забранено!';
-$lang['uploadexist']             = 'Файлът вече ÑъщеÑтвува. Ðищо не бе направено.';
-$lang['uploadbadcontent']        = 'Каченото Ñъдържание на ÑъответÑтва на файлово разширение %s .';
-$lang['uploadspam']              = 'Качването бе блокирано от черниÑÑ‚ ÑпиÑък за Ñпам.';
-$lang['uploadxss']               = 'Качването бе блокирано, заради възможно обидно Ñъдържание.';
-$lang['deletesucc']              = 'Файлът "%s" бе изтрит.';
-$lang['deletefail']              = '"%s" не бе изтрит, проверете правата';
-$lang['mediainuse']              = 'Файлът "%s" не бе изтрит - вÑе още Ñе ползва.';
-$lang['namespaces']              = 'ИменнипроÑтранÑва';
-$lang['mediafiles']              = 'ДоÑтъпни файлове в';
-$lang['js']['keepopen']          = 'Задържане на прозореца отворен при избор';
-$lang['js']['hidedetails']       = 'Скриване на детайлите';
-$lang['mediausage']              = 'Използвайте ÑледниÑÑ‚ ÑинтакÑÐ¸Ñ Ð·Ð° да упоменете файлът:';
-$lang['mediaview']               = 'Преглед на оригиналниÑÑ‚ файл';
-$lang['mediaroot']               = 'root';
-$lang['mediaupload']             = 'Качете файл в текущото именнопроÑтранÑтво тук. За да Ñъздадете подименнипроÑтранÑтва, добавете ги в началото на  "Качи като" име на файл разделени от двоеточие.';
-$lang['mediaextchange']          = 'Разширението на файлът бе Ñменено от .%s на .%s!';
-$lang['reference']               = 'References for';
-$lang['ref_inuse']               = 'Файлът не може да бъде изтрит защото вÑе още Ñе ползва от Ñледните Ñтраници:';
-$lang['ref_hidden']              = 'ÐÑкои препратки Ñа към Ñтраници, които нÑмате права да четете';
-$lang['hits']                    = 'СъвпадениÑ';
-$lang['quickhits']               = 'Съвпадащи имена на Ñтраници';
-$lang['toc']                     = 'Съдържание';
-$lang['current']                 = 'текущо';
-$lang['yours']                   = 'Вашата верÑиÑ';
-$lang['diff']                    = 'преглед на разликите Ñ Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ‚Ð° верÑиÑ';
-$lang['line']                    = 'Ред';
-$lang['breadcrumb']              = 'Следа';
-$lang['youarehere']              = 'Вие Ñте тук';
-$lang['lastmod']                 = 'ПоÑледна промÑна';
-$lang['by']                      = 'от';
-$lang['deleted']                 = 'изтриване';
-$lang['created']                 = 'Ñъздаване';
-$lang['restored']                = 'Ñтарата верÑÐ¸Ñ Ð²ÑŠÐ·Ñтановена';
-$lang['external_edit']           = 'външна редакциÑ';
-$lang['summary']                 = 'Обобщение';
-$lang['mail_newpage']            = 'dobavena stranica:';
-$lang['mail_changed']            = 'promenenta stranica:';
-$lang['mail_new_user']           = 'Nov potrebitel:';
-$lang['mail_upload']             = 'kachen fail:';
-$lang['js']['nosmblinks']              = "Връзките към Windows shares работÑÑ‚ Ñамо под Internet Explorer.\nМожете да копирате и поÑтавите връзката.";
-$lang['qb_alert']                = 'ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ текÑÑ‚ за форматиране.\nЩе бъде добавен в ÐºÑ€Ð°Ñ Ð½Ð° документа.';
-$lang['qb_bold']                 = 'Получер текÑÑ‚';
-$lang['qb_italic']               = 'КурÑив текÑÑ‚';
-$lang['qb_underl']               = 'Подчертан текÑÑ‚';
-$lang['qb_code']                 = 'Код';
-$lang['qb_strike']               = 'Зачеркнат текÑÑ‚';
-$lang['qb_h1']                   = 'Заглавие ниво 1';
-$lang['qb_h2']                   = 'Заглавие ниво 2';
-$lang['qb_h3']                   = 'Заглавие ниво 3';
-$lang['qb_h4']                   = 'Заглавие ниво 4';
-$lang['qb_h5']                   = 'Заглавие ниво 5';
-$lang['qb_link']                 = 'Вътрешна препратка';
-$lang['qb_extlink']              = 'Външна препратка';
-$lang['qb_hr']                   = 'Хоризонтална линиÑ';
-$lang['qb_ol']                   = 'Подреден ÑпиÑък';
-$lang['qb_ul']                   = 'Ðеподреден ÑпиÑък';
-$lang['qb_media']                = 'ДобавÑне на картинки и други файлове';
-$lang['qb_sig']                  = 'Вмъкване на подпиÑ';
-$lang['qb_smileys']              = 'УÑмивчици';
-$lang['qb_chars']                = 'Специални знаци';
-$lang['del_confirm']             = 'Да бъдат ли изтрити избраните елементи?';
-$lang['admin_register']          = 'ДобабÑне на нов потребител';
-$lang['metaedit']                = 'Редактиране на метаданните';
-$lang['metasaveerr']             = 'Запазването на метаданните не бе уÑпешно';
-$lang['metasaveok']              = 'Метаданните запазени';
-$lang['img_backto']              = 'Ðазад към';
-$lang['img_title']               = 'Заглавие';
-$lang['img_caption']             = 'ОпиÑание';
-$lang['img_date']                = 'Дата';
-$lang['img_fname']               = 'Име на файл';
-$lang['img_fsize']               = 'Размер';
-$lang['img_artist']              = 'Фотограф';
-$lang['img_copyr']               = 'Копирайт';
-$lang['img_format']              = 'Формат';
-$lang['img_camera']              = 'Камера';
-$lang['img_keywords']            = 'Ключови думи';
-$lang['subscribe_success']       = '%s бе добавен към абонамента за %s';
-$lang['subscribe_error']         = 'Имаше грешка при добавÑнето на абонамента на %s за %s';
-$lang['subscribe_noaddress']     = 'ÐÑма Ð°Ð´Ñ€ÐµÑ Ñвързан Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÑ‚,не може да Ñе абонирате';
-$lang['unsubscribe_success']     = 'Ðбонаментът %s бе премахнат от ÑпиÑъка за %s';
-$lang['unsubscribe_error']       = 'Имаше грешка при Ñпирането на абонамента на %s от ÑпиÑъка %s';
-$lang['authmodfailed']           = 'Лоша наÑтройка на опознаването. МолÑ, уведомете админиÑтратора.';
-$lang['authtempfail']            = 'Опознаването на потребителите е временно недоÑтъпно. Ðко това продължи дълго, Ð¼Ð¾Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼ÐµÑ‚Ðµ админиÑтратора.';
-$lang['i_chooselang']            = 'Избор на език';
-$lang['i_installer']             = 'ИнÑталатор на DokuWiki';
-$lang['i_wikiname']              = 'Име на уикито ';
-$lang['i_enableacl']             = 'Включване на ÑпиÑъци за доÑтъп(ACL) (препоръчително)';
-$lang['i_superuser']             = 'Суперпотребител';
-$lang['i_problems']              = 'ИнÑталатора намери проблеми указани по-долу. Ðе може да продължите докато не ги оправите';
-$lang['i_modified']              = 'Поради мерки за ÑигурноÑÑ‚ този Ñкрипт ще работи Ñамо Ñ Ð½Ð¾Ð²Ð° и непроменена Dokuwiki инÑталациÑ.
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = 'â€';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['btn_edit']              = 'Редактиране';
+$lang['btn_source']            = 'Показване на кода на Ñтраницата';
+$lang['btn_show']              = 'Показване на Ñтраницата';
+$lang['btn_create']            = 'Създаване на Ñтраницата';
+$lang['btn_search']            = 'ТърÑене';
+$lang['btn_save']              = 'ЗапиÑ';
+$lang['btn_preview']           = 'Преглед';
+$lang['btn_top']               = 'Към началото';
+$lang['btn_newer']             = '<< по-нови';
+$lang['btn_older']             = 'по-Ñтари >>';
+$lang['btn_revs']              = 'ИÑториÑ';
+$lang['btn_recent']            = 'ПоÑледни промени';
+$lang['btn_upload']            = 'Качване';
+$lang['btn_cancel']            = 'Отказ';
+$lang['btn_index']             = 'ИндекÑ';
+$lang['btn_secedit']           = 'Редактиране';
+$lang['btn_login']             = 'Вход';
+$lang['btn_logout']            = 'Изход';
+$lang['btn_admin']             = 'ÐаÑтройки';
+$lang['btn_update']            = 'ОбновÑване';
+$lang['btn_delete']            = 'Изтриване';
+$lang['btn_back']              = 'Ðазад';
+$lang['btn_backlink']          = 'Обратни връзки';
+$lang['btn_backtomedia']       = 'Ðазад към избор на медиен файл';
+$lang['btn_subscribe']         = 'Ðбониране за Промени';
+$lang['btn_unsubscribe']       = 'ОтпиÑване от Промени';
+$lang['btn_subscribens']       = 'Ðбониране към Промени на Именното проÑтранÑтво';
+$lang['btn_unsubscribens']     = 'ОтпиÑване от Промени на Именното проÑтранÑтво';
+$lang['btn_profile']           = 'Профил';
+$lang['btn_reset']             = 'ИзчиÑтване';
+$lang['btn_resendpwd']         = 'Пращане на нова парола';
+$lang['btn_draft']             = 'Редактиране на чернова';
+$lang['btn_recover']           = 'ВъзÑтановÑване на чернова';
+$lang['btn_draftdel']          = 'Изтриване на чернова';
+$lang['btn_revert']            = 'ВъзÑтановÑване';
+$lang['loggedinas']            = 'Влезли Ñте като';
+$lang['user']                  = 'Потребител';
+$lang['pass']                  = 'Парола';
+$lang['newpass']               = 'Ðова парола';
+$lang['oldpass']               = 'Потвърждение на текуща парола';
+$lang['passchk']               = 'oтново';
+$lang['remember']              = 'Запомни ме';
+$lang['fullname']              = 'Пълно име';
+$lang['email']                 = 'Е-Поща';
+$lang['register']              = 'РегиÑтрациÑ';
+$lang['profile']               = 'ПотребителÑки профил';
+$lang['badlogin']              = 'ПотребителÑкото име или паролата Ñа грешни';
+$lang['minoredit']             = 'Леки промени';
+$lang['draftdate']             = 'Черновата бе автоматично запиÑана на';
+$lang['regmissing']            = 'МолÑ, попълнете вÑички полета.';
+$lang['reguexists']            = 'Потребител Ñ Ñ‚Ð°ÐºÐ¾Ð²Ð° име вече ÑъщеÑтвува.';
+$lang['regsuccess']            = 'ПотребителÑÑ‚ бе Ñъздаден и паролата е пратена по електронната поща.';
+$lang['regsuccess2']           = 'ПотребителÑÑ‚ бе Ñъздаден.';
+$lang['regmailfail']           = 'Изглежда, че има проблем Ñ Ð¿Ñ€Ð°Ñ‰Ð°Ð½ÐµÑ‚Ð¾ на пиÑмото Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°Ñ‚Ð°. МолÑ, Ñвържете Ñе Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора.';
+$lang['regbadmail']            = 'ДадениÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ð¸Ð·Ð³Ð»ÐµÐ¶Ð´Ð° невалиден, ако миÑлите, че това е грешка - Ñвържете Ñе ÑÑŠÑ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора.';
+$lang['regbadpass']            = 'Двете дадени пароли не Ñа идентични, Ð¼Ð¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново';
+$lang['regpwmail']             = 'DokuWiki parola';
+$lang['reghere']               = 'Ð’Ñе още нÑмате профил? ПроÑто Ñи направете';
+$lang['profna']                = 'Това уики не поддържа промÑна на профила';
+$lang['profnochange']          = 'ÐÑма промени.';
+$lang['profnoempty']           = 'Празни име или електронна поща не Ñа позволени.';
+$lang['profchanged']           = 'ПотребителÑкиÑÑ‚ профил бе уÑпешно обновен.';
+$lang['pwdforget']             = 'Забравили Ñте Ñи паролата? Вземете нова';
+$lang['resendna']              = 'Това уики не поддържа повторно пращане на парола';
+$lang['resendpwd']             = 'Пращане нова парола за';
+$lang['resendpwdmissing']      = 'МолÑ, попълнете вÑички полета.';
+$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['lockedby']              = 'В момента е заключено от';
+$lang['lockexpire']            = 'ЗатварÑнето изтича в';
+$lang['willexpire']            = 'ЗатварÑнето на Ñтраницата за редактиране изтича Ñлед минута.\nЗа да избегнете Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð¾Ñ€ÐµÑ‡Ð¸Ñ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ бутонът, за да реÑтартирате броÑчът за затварÑне.';
+$lang['notsavedyet']           = 'Ðезапазените промени ще бъдат загубени.\nИÑкате ли да продължите?';
+$lang['rssfailed']             = 'Имаше грешка при вземането на този източник(feed): ';
+$lang['nothingfound']          = 'Ðищо не бе намерено.';
+$lang['mediaselect']           = 'Медийни файлове';
+$lang['fileupload']            = 'Качване на медийни файлове';
+$lang['uploadsucc']            = 'Качването бе уÑпешно';
+$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['mediafiles']            = 'ДоÑтъпни файлове в';
+$lang['js']['searchmedia']     = 'ТърÑене на файлове';
+$lang['js']['keepopen']        = 'Задържане на прозореца отворен при избор';
+$lang['js']['hidedetails']     = 'Скриване на детайлите';
+$lang['js']['nosmblinks']      = 'Връзките към Windows shares работÑÑ‚ Ñамо под Internet Explorer.
+Можете да копирате и поÑтавите връзката.';
+$lang['js']['linkwiz']         = 'МагьоÑник за Връзки';
+$lang['js']['linkto']          = 'Връзка към:';
+$lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
+$lang['js']['mu_btn']          = 'Качване на множеÑтво файлове наведнъж';
+$lang['mediausage']            = 'Използвайте ÑледниÑÑ‚ ÑинтакÑÐ¸Ñ Ð·Ð° да упоменете файлът:';
+$lang['mediaview']             = 'Преглед на оригиналниÑÑ‚ файл';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Качете файл в текущото именнопроÑтранÑтво тук. За да Ñъздадете подименнипроÑтранÑтва, добавете ги в началото на  "Качи като" име на файл разделени от двоеточие.';
+$lang['mediaextchange']        = 'Разширението на файлът бе Ñменено от .%s на .%s!';
+$lang['reference']             = 'References for';
+$lang['ref_inuse']             = 'Файлът не може да бъде изтрит защото вÑе още Ñе ползва от Ñледните Ñтраници:';
+$lang['ref_hidden']            = 'ÐÑкои препратки Ñа към Ñтраници, които нÑмате права да четете';
+$lang['hits']                  = 'СъвпадениÑ';
+$lang['quickhits']             = 'Съвпадащи имена на Ñтраници';
+$lang['toc']                   = 'Съдържание';
+$lang['current']               = 'текущо';
+$lang['yours']                 = 'Вашата верÑиÑ';
+$lang['diff']                  = 'Преглед на разликите Ñ Ñ‚ÐµÐºÑƒÑ‰Ð°Ñ‚Ð° верÑиÑ';
+$lang['diff2']                 = 'Преглед на разликите между избраните верÑии';
+$lang['line']                  = 'Ред';
+$lang['breadcrumb']            = 'Следа';
+$lang['youarehere']            = 'Вие Ñте тук';
+$lang['lastmod']               = 'ПоÑледна промÑна';
+$lang['by']                    = 'от';
+$lang['deleted']               = 'изтриване';
+$lang['created']               = 'Ñъздаване';
+$lang['restored']              = 'Ñтарата верÑÐ¸Ñ Ð²ÑŠÐ·Ñтановена';
+$lang['external_edit']         = 'външна редакциÑ';
+$lang['summary']               = 'Обобщение';
+$lang['noflash']               = 'Adobe Flash ПриÑтавката е нужна за показването на това Ñъдържание.';
+$lang['download']              = 'СвалÑне на Парченце';
+$lang['mail_newpage']          = 'dobavena stranica:';
+$lang['mail_changed']          = 'promenenta stranica:';
+$lang['mail_new_user']         = 'Nov potrebitel:';
+$lang['mail_upload']           = 'kachen fail:';
+$lang['qb_bold']               = 'Получер текÑÑ‚';
+$lang['qb_italic']             = 'КурÑив текÑÑ‚';
+$lang['qb_underl']             = 'Подчертан текÑÑ‚';
+$lang['qb_code']               = 'Код';
+$lang['qb_strike']             = 'Зачеркнат текÑÑ‚';
+$lang['qb_h1']                 = 'Заглавие ниво 1';
+$lang['qb_h2']                 = 'Заглавие ниво 2';
+$lang['qb_h3']                 = 'Заглавие ниво 3';
+$lang['qb_h4']                 = 'Заглавие ниво 4';
+$lang['qb_h5']                 = 'Заглавие ниво 5';
+$lang['qb_h']                  = 'Заглавие';
+$lang['qb_hs']                 = 'Избор на Заглавие';
+$lang['qb_hplus']              = 'По-главно Заглавие';
+$lang['qb_hminus']             = 'По-ниÑко Заглавие';
+$lang['qb_hequal']             = 'Заглавие от Ñъщото ниво';
+$lang['qb_link']               = 'Вътрешна препратка';
+$lang['qb_extlink']            = 'Външна препратка';
+$lang['qb_hr']                 = 'Хоризонтална линиÑ';
+$lang['qb_ol']                 = 'Подреден ÑпиÑък';
+$lang['qb_ul']                 = 'Ðеподреден ÑпиÑък';
+$lang['qb_media']              = 'ДобавÑне на картинки и други файлове';
+$lang['qb_sig']                = 'Вмъкване на подпиÑ';
+$lang['qb_smileys']            = 'УÑмивчици';
+$lang['qb_chars']              = 'Специални знаци';
+$lang['upperns']               = 'към горното именно проÑтранÑтво';
+$lang['admin_register']        = 'ДобабÑне на нов потребител';
+$lang['metaedit']              = 'Редактиране на метаданните';
+$lang['metasaveerr']           = 'Запазването на метаданните не бе уÑпешно';
+$lang['metasaveok']            = 'Метаданните запазени';
+$lang['img_backto']            = 'Ðазад към';
+$lang['img_title']             = 'Заглавие';
+$lang['img_caption']           = 'ОпиÑание';
+$lang['img_date']              = 'Дата';
+$lang['img_fname']             = 'Име на файл';
+$lang['img_fsize']             = 'Размер';
+$lang['img_artist']            = 'Фотограф';
+$lang['img_copyr']             = 'Копирайт';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Камера';
+$lang['img_keywords']          = 'Ключови думи';
+$lang['subscribe_success']     = '%s бе добавен към абонамента за %s';
+$lang['subscribe_error']       = 'Имаше грешка при добавÑнето на абонамента на %s за %s';
+$lang['subscribe_noaddress']   = 'ÐÑма Ð°Ð´Ñ€ÐµÑ Ñвързан Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»ÑÑ‚,не може да Ñе абонирате';
+$lang['unsubscribe_success']   = 'Ðбонаментът %s бе премахнат от ÑпиÑъка за %s';
+$lang['unsubscribe_error']     = 'Имаше грешка при Ñпирането на абонамента на %s от ÑпиÑъка %s';
+$lang['authmodfailed']         = 'Лоша наÑтройка на опознаването. МолÑ, уведомете админиÑтратора.';
+$lang['authtempfail']          = 'Опознаването на потребителите е временно недоÑтъпно. Ðко това продължи дълго, Ð¼Ð¾Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼ÐµÑ‚Ðµ админиÑтратора.';
+$lang['i_chooselang']          = 'Избор на език';
+$lang['i_installer']           = 'ИнÑталатор на DokuWiki';
+$lang['i_wikiname']            = 'Име на уикито ';
+$lang['i_enableacl']           = 'Включване на ÑпиÑъци за доÑтъп(ACL) (препоръчително)';
+$lang['i_superuser']           = 'Суперпотребител';
+$lang['i_problems']            = 'ИнÑталатора намери проблеми указани по-долу. Ðе може да продължите докато не ги оправите';
+$lang['i_modified']            = 'Поради мерки за ÑигурноÑÑ‚ този Ñкрипт ще работи Ñамо Ñ Ð½Ð¾Ð²Ð° и непроменена Dokuwiki инÑталациÑ.
                          ТрÑбва или да разархивирате отново файловете от Ð´Ñ€ÑŠÐ¿Ð½Ð°Ñ‚Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚ или да Ñе поÑъветвате Ñ Ð¿ÑŠÐ»Ð½Ð¸Ñ‚Ðµ
                          ИнÑтрукции за инÑÑ‚Ð°Ð»Ð°Ñ†Ð¸Ñ Ð½Ð° Dokuwiki ';
-$lang['i_funcna']                = 'PHP функциÑта %s не е доÑтъпна. Може би доÑтавчика на хоÑтинг Ñ Ðµ изключил';
-$lang['i_phpver']                = 'Вашата PHP верÑÐ¸Ñ %s е по-Ñтара от нужната %s. ТрÑбва да обновите вашата PHP инÑталациÑ.';
-$lang['i_permfail']              = '%s не е доÑтъпна за пиÑане от DokuWiki. ТрÑбва да промените наÑтройките за доÑтъп до директориÑта!';
-$lang['i_confexists']            = '%s вече ÑъщеÑтвува';
-$lang['i_writeerr']              = '%s не можа да бъде Ñъздаден. ТрÑбва да проверите правата на директориÑта/файла за доÑтъп и да Ñъздадете файлът ръчно';
-$lang['i_badhash']               = 'неразпознат или променен dokuwiki.php (hash=%s)';
-$lang['i_badval']                = '%s - непозволена или празна ÑтойноÑÑ‚';
-$lang['i_success']               = 'ÐаÑтройката приключи уÑпешно. Може да Ñъздадете файлът install.php Ñега. Продължете към
+$lang['i_funcna']              = 'PHP функциÑта %s не е доÑтъпна. Може би доÑтавчика на хоÑтинг Ñ Ðµ изключил';
+$lang['i_phpver']              = 'Вашата PHP верÑÐ¸Ñ %s е по-Ñтара от нужната %s. ТрÑбва да обновите вашата PHP инÑталациÑ.';
+$lang['i_permfail']            = '%s не е доÑтъпна за пиÑане от DokuWiki. ТрÑбва да промените наÑтройките за доÑтъп до директориÑта!';
+$lang['i_confexists']          = '%s вече ÑъщеÑтвува';
+$lang['i_writeerr']            = '%s не можа да бъде Ñъздаден. ТрÑбва да проверите правата на директориÑта/файла за доÑтъп и да Ñъздадете файлът ръчно';
+$lang['i_badhash']             = 'неразпознат или променен dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - непозволена или празна ÑтойноÑÑ‚';
+$lang['i_success']             = 'ÐаÑтройката приключи уÑпешно. Може да Ñъздадете файлът install.php Ñега. Продължете към
                         Ðово Ви DokuWiki.';
-$lang['i_failure']               = 'Имаше грешки при запиÑа на файловете Ñ Ð½Ð°Ñтройки. Може да Ñ‚Ñ€Ñбва да ги редактирате ръчно
+$lang['i_failure']             = 'Имаше грешки при запиÑа на файловете Ñ Ð½Ð°Ñтройки. Може да Ñ‚Ñ€Ñбва да ги редактирате ръчно
                          може да използвате Ðово Ви DokuWiki.';
-$lang['i_policy']                = 'Първоначална политика доÑтъп(ACL policy)';
-$lang['i_pol0']                  = 'Отворено Уики (четене, пиÑане, качване от вÑички)';
-$lang['i_pol1']                  = 'Публично Уики (четене от вÑички, пиÑане и качване от региÑтрирани потребители)';
-$lang['i_pol2']                  = 'Затворено Wiki (четене, пиÑане, качване Ñамо от региÑтрирани потребители)';
-$lang['i_retry']                 = 'Отново';
+$lang['i_policy']              = 'Първоначална политика доÑтъп(ACL policy)';
+$lang['i_pol0']                = 'Отворено Уики (четене, пиÑане, качване от вÑички)';
+$lang['i_pol1']                = 'Публично Уики (четене от вÑички, пиÑане и качване от региÑтрирани потребители)';
+$lang['i_pol2']                = 'Затворено Wiki (четене, пиÑане, качване Ñамо от региÑтрирани потребители)';
+$lang['i_retry']               = 'Отново';
+$lang['mu_gridname']           = 'Име на файл';
+$lang['mu_gridsize']           = 'Размер';
+$lang['mu_gridstat']           = 'Статут';
+$lang['mu_namespace']          = 'ИменнопроÑтранÑво';
+$lang['mu_browse']             = 'Разглеждане';
+$lang['mu_toobig']             = 'прекалено голÑм';
+$lang['mu_ready']              = 'готов за качване';
+$lang['mu_done']               = 'готов';
+$lang['mu_fail']               = 'неуÑпешно';
+$lang['mu_authfail']           = 'ÑеÑиÑта е изтекла';
+$lang['mu_progress']           = '@PCT@% качено';
+$lang['mu_filetypes']          = 'Позволени типове файлове';
+$lang['mu_info']               = 'качени файлове.';
+$lang['mu_lasterr']            = 'ПоÑледната грешка:';
+$lang['years']                 = 'преди %d години';
+$lang['months']                = 'преди %d меÑеца';
+$lang['weeks']                 = 'преди %d Ñедмици';
+$lang['days']                  = 'преди %d дена';
+$lang['hours']                 = 'преди %d чаÑа';
+$lang['minutes']               = 'преди %d минути';
+$lang['seconds']               = 'преди %d Ñекунди';
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/locked.txt dokuwiki-rc2009-12-02/inc/lang/bg/locked.txt
--- dokuwiki-2009-02-14/inc/lang/bg/locked.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/locked.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
-======Страницата е затворена======
+====== Страницата е затворена ======
 
 Ð’ момента Ñтраницата е затворена за Ñ€ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð¾Ñ‚ друг потребител. ТрÑбва да изчаката докато този потребител приключи или затварÑнето изтече.
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/bg/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/bg/mailtext.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/mailtext.txt	2009-12-02 19:50:11.000000000 +0100
@@ -12,6 +12,6 @@
 @DIFF@
 
 
---
+-- 
 Tова пиÑмо е генерирано от DokuWiki на:
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/norev.txt dokuwiki-rc2009-12-02/inc/lang/bg/norev.txt
--- dokuwiki-2009-02-14/inc/lang/bg/norev.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/norev.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,4 +1,4 @@
-======ÐÑма такава верÑиÑ======
+====== ÐÑма такава верÑÐ¸Ñ ======
 
 Избраната верÑÐ¸Ñ Ð½Ðµ ÑъщеÑтвува. Използвайте бутона ''Редакции'' за ÑпиÑък на Ñтари верÑии на документа.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/password.txt dokuwiki-rc2009-12-02/inc/lang/bg/password.txt
--- dokuwiki-2009-02-14/inc/lang/bg/password.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/password.txt	2009-12-02 19:50:11.000000000 +0100
@@ -5,6 +5,6 @@
 Потребител: @LOGIN@
 Парола    : @PASSWORD@
 
---
+-- 
 Това пиÑмо е генерирано от DokuWiki на
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/bg/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/bg/pwconfirm.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/pwconfirm.txt	2009-12-02 19:50:11.000000000 +0100
@@ -10,6 +10,6 @@
 
 @CONFIRM@
 
---
+-- 
 Това пиÑмо е генерирано от DokuWiki на
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/bg/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/bg/searchpage.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/searchpage.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,5 +1,5 @@
-======ТърÑене======
+====== ТърÑене ======
 
 Може да намерите резултатите на Ñ‚ÑŠÑ€Ñенето долу. Ðко не Ñте намерили каквото Ñте Ñ‚ÑŠÑ€Ñили, може да Ñъздадете или редактирате Ñтраница кръÑтена по вашета заÑвка за Ñ‚ÑŠÑ€Ñене ÑÑŠÑ ÑъответниÑÑ‚ бутон
 
-=====Резултати=====
+===== Резултати =====
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/bg/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/bg/subscribermail.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/subscribermail.txt	2009-12-02 19:50:11.000000000 +0100
@@ -12,6 +12,6 @@
 @NEWPAGE@
 и изберете 'ОтпиÑване от промените'.
 
---
+-- 
 Това пиÑмо е генерирано от DokuWiki на
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/bg/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/bg/uploadmail.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/uploadmail.txt	2009-12-02 19:50:11.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Тип    : @MIME@
 Потребител  : @USER@
 
---
+-- 
 Tова пиÑмо е генерирано от DokuWiki на:
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/bg/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/bg/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/bg/wordblock.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/bg/wordblock.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,4 +1,4 @@
-======СПÐÐœ бе блокиран======
+====== СПÐÐœ бе блокиран ======
 
 Промените ви **не** бÑха запазени, защото Ñъдържат една или повече забранени думи. Ðко Ñте Ñе опитали да пуÑнете Ñпам в уикито -- Лошо куче! Ðко ÑмÑтате, че това е грешка, Ñвържете Ñе Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора на това уики
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/ca/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/ca/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Connectors addicionals =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/lang.php dokuwiki-rc2009-12-02/inc/lang/ca/lang.php
--- dokuwiki-2009-02-14/inc/lang/ca/lang.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -49,9 +49,10 @@
 $lang['btn_draft']             = 'Edita esborrany';
 $lang['btn_recover']           = 'Recupera esborrany';
 $lang['btn_draftdel']          = 'Suprimeix esborrany';
+$lang['btn_revert']            = 'Restaura';
 $lang['loggedinas']            = 'Heu entrat com';
 $lang['user']                  = 'Nom d\'usuari';
-$lang['pass']                  = 'Contrassenya';
+$lang['pass']                  = 'Contrasenya';
 $lang['newpass']               = 'Nova contrasenya';
 $lang['oldpass']               = 'Confirmeu la contrasenya actual';
 $lang['passchk']               = 'una altra vegada';
@@ -87,6 +88,8 @@
 $lang['resendpwdsuccess']      = 'Se us ha enviat la nova contrasenya per correu electrònic.';
 $lang['license']               = 'Excepte on es digui una altra cosa, el contingut d\'aquest wiki està subjecte a la llicència següent:';
 $lang['licenseok']             = 'Nota. En editar aquesta pàgina esteu acceptant que el vostre contingut estigui subjecte a la llicència següent:';
+$lang['searchmedia']           = 'Cerca pel nom de fitxer';
+$lang['searchmedia_in']        = 'Cerca en: %s';
 $lang['txt_upload']            = 'Trieu el fitxer que voleu penjar';
 $lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
 $lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
@@ -111,10 +114,14 @@
 $lang['mediainuse']            = 'No s\'ha pogut suprimir el fitxer "%s". Encara s\'està utilitzant.';
 $lang['namespaces']            = 'Espais';
 $lang['mediafiles']            = 'Fitxers disponibles en';
+$lang['js']['searchmedia']     = 'Cerca fitxers';
 $lang['js']['keepopen']        = 'Manté la finestra oberta';
 $lang['js']['hidedetails']     = 'Oculta detalls';
 $lang['js']['nosmblinks']      = 'Els enllaços amb recursos compartits de Windows només funcionen amb el Microsoft Internet Explorer.
 Si voleu podeu copiar i enganxar l\'enllaç.';
+$lang['js']['linkwiz']         = 'Auxiliar d\'enllaços';
+$lang['js']['linkto']          = 'Enllaça a:';
+$lang['js']['del_confirm']     = 'Suprimiu aquesta entrada?';
 $lang['js']['mu_btn']          = 'Penja múltiples fitxers';
 $lang['mediausage']            = 'Utilitzeu la sintaxi següent per referir-vos a aquest enllaç:';
 $lang['mediaview']             = 'Mostra el fitxer original';
@@ -142,11 +149,11 @@
 $lang['external_edit']         = 'edició externa';
 $lang['summary']               = 'Resum d\'edició';
 $lang['noflash']               = 'Per a visualitzar aquest contingut necessiteu el connector d\'Adobe Flash.';
+$lang['download']              = 'Baixa el fragment';
 $lang['mail_newpage']          = 'pàgina afegida:';
 $lang['mail_changed']          = 'pàgina modificada:';
 $lang['mail_new_user']         = 'nou usuari:';
 $lang['mail_upload']           = 'fitxer penjat:';
-$lang['qb_alert']              = 'Introduïu el text que voleu formatar.\nS\'afegirà al final del document.';
 $lang['qb_bold']               = 'Negreta';
 $lang['qb_italic']             = 'Cursiva';
 $lang['qb_underl']             = 'Subratllat';
@@ -157,6 +164,11 @@
 $lang['qb_h3']                 = 'Encapçalament nivell 3';
 $lang['qb_h4']                 = 'Encapçalament nivell 4';
 $lang['qb_h5']                 = 'Encapçalament nivell 5';
+$lang['qb_h']                  = 'Encapçalament';
+$lang['qb_hs']                 = 'Selcciona l\'encapçalament';
+$lang['qb_hplus']              = 'Encapçalament més alt';
+$lang['qb_hminus']             = 'Encapçalament més baix';
+$lang['qb_hequal']             = 'Encapçalament del mateix nivell';
 $lang['qb_link']               = 'Enllaç intern';
 $lang['qb_extlink']            = 'Enllaç extern';
 $lang['qb_hr']                 = 'Ratlla horitzontal';
@@ -166,7 +178,7 @@
 $lang['qb_sig']                = 'Insereix signatura';
 $lang['qb_smileys']            = 'Emoticones';
 $lang['qb_chars']              = 'Caràcters especials';
-$lang['del_confirm']           = 'Suprimiu aquesta entrada?';
+$lang['upperns']               = 'Salta a l\'espai superior';
 $lang['admin_register']        = 'Afegeix nou usuari';
 $lang['metaedit']              = 'Edita metadades';
 $lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
@@ -223,4 +235,13 @@
 $lang['mu_authfail']           = 'la sessió ha vençut';
 $lang['mu_progress']           = 'càrrega @PCT@%';
 $lang['mu_filetypes']          = 'Tipus de fitxer permesos';
+$lang['mu_info']               = 'fitxers penjats.';
+$lang['mu_lasterr']            = 'Darrer error:';
 $lang['recent_global']         = 'Esteu veient els canvis recents de l\'espai %s. També podeu veure els canvis recents de tot el wiki.';
+$lang['years']                 = 'fa %d anys';
+$lang['months']                = 'fa %d mesos';
+$lang['weeks']                 = 'fa %d setmanes';
+$lang['days']                  = 'fa %d dies';
+$lang['hours']                 = 'fa %d hores';
+$lang['minutes']               = 'fa %d minuts';
+$lang['seconds']               = 'fa %d segons';
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/preview.txt dokuwiki-rc2009-12-02/inc/lang/ca/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ca/preview.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/preview.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Previsualització ======
 
-Heus ací una previsualització del vostre text. Recordeu que encara **no l'heu desat!** 
+Heus ací una previsualització del vostre text. Recordeu que encara **no l'heu desat!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ca/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ca/pwconfirm.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/pwconfirm.txt	2009-12-02 19:50:11.000000000 +0100
@@ -10,6 +10,6 @@
 
 @CONFIRM@
 
---
+-- 
 Missatge generat per DokuWiki en
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ca/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ca/subscribermail.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/subscribermail.txt	2009-12-02 19:50:11.000000000 +0100
@@ -10,6 +10,6 @@
 @NEWPAGE@
 i trieu 'Cancel·la subscripció'.
 
---
+-- 
 Missatge generat per DokuWiki en
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ca/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ca/uploadmail.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca/uploadmail.txt	2009-12-02 19:50:11.000000000 +0100
@@ -9,6 +9,6 @@
 Tipus MIME: @MIME@
 Usuari: @USER@
 
---
+-- 
 Missatge generat per DokuWiki en
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/admin.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/admin.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/admin.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/admin.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Administració ======
-
-Avall pot trobar una llista de tasques administratives disponibles en DokuWiki.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/backlinks.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/backlinks.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Vínculs remitents ======
-
-Una llista de pàgines que enllacen a la pàgina actual.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/conflict.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/conflict.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/conflict.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-====== Ya existix una versió més nova ======
-
-Existix una versió nova del document que ha editat. Açò ha passat perque un atre usuari ha modificat el document mentres vosté estava editant-lo.
-
-Estudie be les diferències mostrades avall i decidixca quina versió vol guardar. Si pulsa ''Guardar'' es guardarà la versió que està editant. Pulse ''Cancelar'' per a conservar la versió modificada per l'atre usuari..
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/denied.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/denied.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/denied.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======Permís denegat======
-
-Ho sentim, no té permís per a continuar. ¿Haurà oblidat identificar-se?
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/diff.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/diff.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/diff.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======Diferències======
-
-Ací es mostren les diferències entre la versió seleccionada i la versió actual de la pàgina.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/draft.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/draft.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/draft.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/draft.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-====== Borrador pendent ======
-
-La seua última edició d'esta pàgina no es completà correctament. DokuWiki guarda automàticament un borrador que ara pot recuperar per a continuar editant. Avall pot vore la data en que es guardà l'últim borrador.
-
-Per favor, decidixca si vol //recuperar// la sessió que pergué, //borrar// el borrador o //cancelar// l'edició.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/editrev.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/editrev.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/editrev.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-**¡Ha carregat una versió antiga del document!** Si la guarda crearà una nova versió a partir d'esta.
-----
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/edit.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/edit.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/edit.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/edit.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Edite la pàgina, pulse en ''Vista prèvia'' per a comprovar els canvis, i si està tot correcte pulse ''Guardar''. Consulte la sintaxis del Wiki en [[wiki:syntax|Sintaxis]]. Per favor, edite la pàgina només si pot **millorar-la**. Si vol fer proves, deprenga a utilisar el Wiki en  [[playground:playground|l'espai de proves]].
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/index.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/index.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/index.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/index.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Ãndex ======
-
-Un índex de totes les pàgines disponibles ordenades per [[doku>wiki:namespaces|espais de noms]].
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/install.html dokuwiki-rc2009-12-02/inc/lang/ca-va/install.html
--- dokuwiki-2009-02-14/inc/lang/ca-va/install.html	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/install.html	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-
    Esta pàgina l'ajudarà en la primera instalació i configuració de Dokuwiki. N'hi ha més informació de l'instalador disponible en la
-pàgina de documentació.
    
-
-
    DokuWiki utilisa archius normals per a l'almagasenament de les pàgines i atra informació associada ad estes pàgines (p.e. imàgens, índexs de busca, versions antigues, etc.). Per a que DokuWiki funcione correctament 
-deu tindre accés d'escritura als directoris que contenen estos archius. Est instalador no pot ajustar els permissos del directori. Normalment, haurà de fer-ho directament en una consola de comandaments o, si utilisa un hostage, per FTP o en el panel de control (p.e. cPanel).
    
-
-
    Est instalador configurarà ACL en el seu DokuWiki, que al mateix temps permet l'accés de l'administrador i l'accés al menú d'administració de DokuWiki per a instalar plúgins, gestionar usuaris, gestionar els accesos a les pàgines del wiki i la modificació dels ajusts de configuració. No és necessari per a que DokuWiki funcione, pero farà més fàcil l'administració de DokuWiki.
    
-
-
    Els usuaris experimentats i usuaris en necessitats especials de configuració deuen utilisar estos vínculs per a detalls concernent a
-instruccions d'instalació
-i ajusts de configuració.
    
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/lang.php dokuwiki-rc2009-12-02/inc/lang/ca-va/lang.php
--- dokuwiki-2009-02-14/inc/lang/ca-va/lang.php	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/lang.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,221 +0,0 @@
-
- */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-
-$lang['btn_edit']   = 'Editar esta pàgina';
-$lang['btn_source'] = 'Mostrar font';
-$lang['btn_show']   = 'Mostrar pàgina';
-$lang['btn_create'] = 'Crear esta pàgina';
-$lang['btn_search'] = 'Buscar';
-$lang['btn_save']   = 'Guardar';
-$lang['btn_preview']= 'Vista prèvia';
-$lang['btn_top']    = 'Tornar dalt';
-$lang['btn_newer']  = '<< més recents';
-$lang['btn_older']  = 'manco recents >>';
-$lang['btn_revs']   = 'Versions antigues';
-$lang['btn_recent'] = 'Canvis recents';
-$lang['btn_upload'] = 'Pujar';
-$lang['btn_cancel'] = 'Cancelar';
-$lang['btn_index']  = 'Ãndex';
-$lang['btn_secedit']= 'Editar';
-$lang['btn_login']  = 'Identificar-se';
-$lang['btn_logout'] = 'Eixir';
-$lang['btn_admin']  = 'Administrar';
-$lang['btn_update'] = 'Actualisar';
-$lang['btn_delete'] = 'Borrar';
-$lang['btn_back']   = 'Arrere';
-$lang['btn_backlink']    = 'Vínculs remitents';
-$lang['btn_backtomedia'] = 'Tornar a la selecció d\'archius de mijos';
-$lang['btn_subscribe']   = 'Subscriure\'s a la pàgina';
-$lang['btn_unsubscribe'] = 'Desubscriure\'s de la pàgina';
-$lang['btn_subscribens']   = 'Subscriure\'s a l\'espai de noms';
-$lang['btn_unsubscribens'] = 'Desubscriure\'s de l\'espai de noms';
-$lang['btn_profile']     = 'Actualisar perfil';
-$lang['btn_reset']       = 'Reiniciar';
-$lang['btn_resendpwd']   = 'Enviar contrasenya nova';
-$lang['btn_draft']    = 'Editar borrador';
-$lang['btn_recover']  = 'Recuperar borrador';
-$lang['btn_draftdel'] = 'Borrar borrador';
-
-$lang['loggedinas'] = 'Identificat com a';
-$lang['user']       = 'Nom d\'usuari';
-$lang['pass']       = 'Contrasenya';
-$lang['newpass']    = 'Contrasenya nova';
-$lang['oldpass']    = 'Confirmar la contrasenya actual';
-$lang['passchk']    = 'una atra volta';
-$lang['remember']   = 'Recorda\'m';
-$lang['fullname']   = 'Nom complet';
-$lang['email']      = 'E-Mail';
-$lang['register']   = 'Registrar';
-$lang['profile']    = 'Perfil d\'usuari';
-$lang['badlogin']   = 'Ho sent, pero el nom d\'usuari o la contrasenya estan equivocats.';
-$lang['minoredit']  = 'Canvis menors';
-$lang['draftdate']  = 'Borrador gravat el'; // full dformat date will be added
-
-$lang['regmissing'] = 'Ho sent, pero deu omplir tots els camps.';
-$lang['reguexists'] = 'Ho sent, pero ya existix un usuari en este nom.';
-$lang['regsuccess'] = 'L\'usuari ha segut creat i la contrasenya se li ha enviat per correu electrònic.';
-$lang['regsuccess2']= 'L\'usuari ha segut creat.';
-$lang['regmailfail']= 'Pareix que ha hagut un erro enviant la contrasenya per correu. Per favor, ¡contacte en l\'administrador!';
-$lang['regbadmail'] = 'La direcció de correu no pareix vàlida - si pensa que açò es un erro nostre, contacte en l\'administrador';
-$lang['regbadpass'] = 'Les dos contrasenyes que ha donat no són idèntiques, per favor, torne a intentar-ho.';
-$lang['regpwmail']  = 'La seua contrasenya de DokuWiki';
-$lang['reghere']    = '¿Encara no té un conte? Cree-se\'n un';
-
-$lang['profna']       = 'Este wiki no permet que modifique el seu perfil';
-$lang['profnochange'] = 'Sense canvis, no hi ha res que fer.';
-$lang['profnoempty']  = 'No es permet deixar el nom o la direcció de correu buits.';
-$lang['profchanged']  = 'Pefil de l\'usuari actualisat.';
-
-$lang['pwdforget'] = '¿Ha oblidat la contrasenya? Demane\'n una nova';
-$lang['resendna']  = 'Este wiki no permet reenviar la contrasenya.';
-$lang['resendpwd'] = 'Enviar contrasenya nova per a';
-$lang['resendpwdmissing'] = 'Ho sent, deu omplir tots els camps.';
-$lang['resendpwdnouser']  = 'Ho sent, no trobem est usuari en la base de senyes.';
-$lang['resendpwdbadauth'] = 'Ho sent, este còdic d\'autenticació no es vàlit. Assegure\'s d\'utilisar el víncul de confirmació sancer.';
-$lang['resendpwdconfirm'] = 'Li hem enviat un víncul de confirmació al correu.';
-$lang['resendpwdsuccess'] = 'Se li ha enviat una nova contrasenya al correu.';
-
-$lang['txt_upload']   = 'Seleccione l\'archiu que vol pujar';
-$lang['txt_filename'] = 'Pujar com (opcional)';
-$lang['txt_overwrt']  = 'Sobreescriure archius existents';
-$lang['lockedby']     = 'Actualment bloquejat per';
-$lang['lockexpire']   = 'El bloqueig venç a les';
-$lang['willexpire']   = 'El seu bloqueig per a editar esta pàgina està a punt de vencer en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia per a reiniciar el contador.';
-
-$lang['notsavedyet'] = 'Els canvis no guardats es perdran.\n¿Segur que vol continuar?';
-$lang['rssfailed']   = 'Ha ocorregut un erro solicitant este canal: ';
-$lang['nothingfound']= 'No s\'ha trobat res.';
-
-$lang['mediaselect'] = 'Archius de mijos';
-$lang['fileupload']  = 'Pujar archius de mijos';
-$lang['uploadsucc']  = 'Pujat correctament';
-$lang['uploadfail']  = 'Erro pujant. ¿Potser no tinga els permissos?';
-$lang['uploadwrong'] = 'Pujar denegat. ¡Esta extensió d\'archiu està prohibida!';
-$lang['uploadexist'] = 'L\'archiu ya exisitix. No s\'ha fet res.';
-$lang['deletesucc']  = 'S\'ha borrat l\'archiu "%s".';
-$lang['deletefail']  = 'No s\'ha pogut borrar "%s" - comprove els permissos.';
-$lang['mediainuse']  = 'L\'archiu "%s" no s\'ha borrat - encara està utilisant-se.';
-$lang['namespaces']  = 'Espais de noms';
-$lang['mediafiles']  = 'Archius disponibles en';
-
-$lang['js']['keepopen']    = 'Mantindre la finestra oberta al seleccionar';
-$lang['js']['hidedetails'] = 'Ocultar detalls';
-$lang['mediausage']  = 'Utilise la següent sintaxis per a referenciar est archiu:';
-$lang['mediaview']   = 'Vore l\'archiu original';
-$lang['mediaroot']   = 'root';
-$lang['mediaupload'] = 'Pujar un archiu a l\'espai de noms actual. Per a crear sub-espais, afixga\'ls en dos punts davant del nom d\'archiu que pose en "Pujar com".';
-$lang['mediaextchange'] = '¡Extensió de l\'archiu canviada de .%s a .%s!';
-
-$lang['reference']   = 'Referències per a';
-$lang['ref_inuse']   = 'No es pot borrar l\'archiu perque encara es gasta en les següents pàgines:';
-$lang['ref_hidden']  = 'Algunes referències estan en pàgines que no té permissos per a vore';
-
-$lang['hits']       = 'Encerts';
-$lang['quickhits']  = 'Noms de pàgines coincidents';
-$lang['toc']        = 'Taula de continguts';
-$lang['current']    = 'Actual';
-$lang['yours']      = 'La seua versió';
-$lang['diff']       = 'Mostrar diferències en la versió actual';
-$lang['diff2']      = 'Mostrar diferències entre versions';
-$lang['line']       = 'Llínea';
-$lang['breadcrumb'] = 'Traça';
-$lang['youarehere'] = 'Vosté està ací';
-$lang['lastmod']    = 'Última modificació el';
-$lang['by']         = 'per';
-$lang['deleted']    = 'borrat';
-$lang['created']    = 'creat';
-$lang['restored']   = 'restaurada l\'última versió';
-$lang['summary']    = 'Editar sumari';
-
-$lang['mail_newpage'] = 'pàgina afegida:';
-$lang['mail_changed'] = 'pàgina canviada:';
-$lang['mail_new_user'] = 'Usuari nou:';
-
-$lang['nosmblinks'] = 'Enllaçar a compartits de Windows només funciona en Microsoft Internet Explorer.\nPero podrà copiar i apegar el víncul.';
-
-$lang['qb_alert']   = 'Per favor, introduïxca el text que vullga formatejar.\nS\'afegirà al final del document.';
-$lang['qb_bold']    = 'Negreta';
-$lang['qb_italic']  = 'Itàlica';
-$lang['qb_underl']  = 'Subrallat';
-$lang['qb_code']    = 'Còdic';
-$lang['qb_strike']  = 'Tachat';
-$lang['qb_h1']      = 'Encapçalament 1';
-$lang['qb_h2']      = 'Encapçalament 2';
-$lang['qb_h3']      = 'Encapçalament 3';
-$lang['qb_h4']      = 'Encapçalament 4';
-$lang['qb_h5']      = 'Encapçalament 5';
-$lang['qb_link']    = 'Víncul intern';
-$lang['qb_extlink'] = 'Víncul extern';
-$lang['qb_hr']      = 'Llínea horisontal';
-$lang['qb_ol']      = 'Llista numerada';
-$lang['qb_ul']      = 'Llista ';
-$lang['qb_media']   = 'Afegir imàgens i atres archius';
-$lang['qb_sig']     = 'Afegir firma';
-$lang['qb_smileys'] = 'Smileys';
-$lang['qb_chars']   = 'Caràcters especials';
-
-$lang['del_confirm']= '¿Realment vol borrar el(s) ítem(s) seleccionat(s)?';
-$lang['admin_register']= 'Afegir nou usuari';
-
-$lang['metaedit']    = 'Editar metasenyes';
-$lang['metasaveerr'] = 'Erro escrivint metasenyes';
-$lang['metasaveok']  = 'Metasenyes guardades';
-$lang['img_backto']  = 'Tornar a';
-$lang['img_title']   = 'Títul';
-$lang['img_caption'] = 'Subtítul';
-$lang['img_date']    = 'Data';
-$lang['img_fname']   = 'Nom de l\'archiu';
-$lang['img_fsize']   = 'Tamany';
-$lang['img_artist']  = 'Fotógraf';
-$lang['img_copyr']   = 'Copyright';
-$lang['img_format']  = 'Format';
-$lang['img_camera']  = 'Càmara';
-$lang['img_keywords']= 'Paraules clau';
-
-$lang['subscribe_success']  = '%s afegit a la llista de subscripció per a %s';
-$lang['subscribe_error']    = 'Erro afegint a %s a la llista de subscripció per a %s';
-$lang['subscribe_noaddress']= 'No hi ha cap direcció associada al seu usuari, no es pot afegir a la llista de subscripció';
-$lang['unsubscribe_success']= '%s borrat de la llista de subscripció per a %s';
-$lang['unsubscribe_error']  = 'Erro borrant a %s de la llista de subscripció per a %s';
-
-/* auth.class language support */
-$lang['authmodfailed']   = 'Mala configuració de l\'autenticació d\'usuari. Per favor, informe a l\'administrador del Wiki.';
-$lang['authtempfail']    = 'L\'autenticació d\'usuaris està desactivada temporalment. Si la situació persistix, per favor, informe a l\'administrador del Wiki.';
-
-/* installer strings */
-$lang['i_chooselang'] = 'Trie l\'idioma';
-$lang['i_installer']  = 'Instalador de DokuWiki';
-$lang['i_wikiname']   = 'Nom del Wiki';
-$lang['i_enableacl']  = 'Activar ACL (recomanat)';
-$lang['i_superuser']  = 'Superusuari';
-$lang['i_problems']   = 'L\'instalador ha trobat els problemes mostrats més avall.. No pot continuar fins que no els arregle.';
-$lang['i_modified']   = 'Per raons de seguritat, este script nomes funcionarà en una instalació nova i verge de DokuWiki.
-                         Deuria tornar a extraure els archius del paquet que ha descarregat o consultar les 
-                         instruccions d\'instalació de Dokuwiki completes';
-$lang['i_funcna']     = 'La funcio de PHP %s no està disponible. ¿Pot ser que el seu proveïdor d\'hostage l\'haja desactivada per algun motiu?';
-$lang['i_phpver'] = 'La versió de PHP %s és menor que
-la %s que es necessita. Necessita actualisar PHP.';
-$lang['i_permfail']   = 'DokuWiki no pot escriure en %s. ¡Necessita arreglar els permissos d\'este directori!';
-$lang['i_confexists'] = '%s ya existix';
-$lang['i_writeerr']   = 'No es pot crear %s. Deurà comprovar els permissos del directori/archiu i crear manualment l\'archiu..';
-$lang['i_badhash']    = 'dokuwiki.php substituït o modificat (hash=%s)';
-$lang['i_badval']     = '%s - valor illegal o buit';
-$lang['i_success']    = 'La configuració ha finalisat correctament. Ya pot borrar l\'archiu install.php. Continue en
-                        el seu nou DokuWiki.';
-$lang['i_failure']    = 'Han aparegut alguns erros escrivint els archius de configuració. Deurà arreglar-los manualment ans que
-                         puga utilisar el seu nou DokuWiki.';
-$lang['i_policy']     = 'Política inicial ACL';
-$lang['i_pol0']       = 'Wiki obert (llegir, escriure i pujar per a tots)';
-$lang['i_pol1']       = 'Wiki public (llegir per a tots, escriure i pujar només per a usuaris registrats)';
-$lang['i_pol2']       = 'Wiki tancat (llegir, escriure i pujar només per a usuaris registrats)';
-
-$lang['i_retry']      = 'Reintentar';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/locked.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/locked.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/locked.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/locked.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-====== Pàgina bloquejada ======
-
-Esta pàgina està actualment bloquejada mentres l'edita un atre usuari. Ha d'esperar fins que l'usuari acabe d'editar la pàgina o vença el bloqueig.
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/login.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/login.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/login.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/login.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Inici de sessió ======
-
-¡Encara no ha iniciat sessió! Introduïxca les seues credencials d'autenticació per a iniciar-la. Necessita tindre les "galletes" del navegador activades.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/mailtext.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/mailtext.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-S'ha afegit o modificat una pàgina en el seu DokuWiki. Els detalls:
-
-Data          : @DATE@
-Navegador     : @BROWSER@
-Direccio-IP   : @IPADDRESS@
-Hostname      : @HOSTNAME@
-Revisio vella : @OLDPAGE@
-Revisio nova  : @NEWPAGE@
-Sumari        : @SUMMARY@
-Usuari        : @USER@
-
-@DIFF@
-
-
---
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/newpage.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/newpage.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-======Este tema encara no existix======
-
-Ha seguit un víncul a una pàgina que encara no existix. Si té els permissos necessaris, pot crear-la utilisant el botó ''Crear esta pàgina''.
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/norev.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/norev.txt	2009-02-14 13:13:24.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/norev.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======No existix la versió======
-
-La versió especificada no existix. Utilise el botó de ''Version antigues'' per a vore una llista de versions antigues d'este document.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/password.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/password.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/password.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-¡Hola @FULLNAME@!
-
-Estes són les teues senyes d'usuari per a @TITLE@ en @DOKUWIKIURL@
-
-Usuari      : @LOGIN@
-Contrasenya : @PASSWORD@
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/preview.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/preview.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======Previsualisació======
-
-Açò es una previsualisació de com quedarà la pàgina. ¡Recorda que encara no està guardada!
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-¡Hola @FULLNAME@!
-
-Algú ha solicitat una contrasenya per a entrar en
-@TITLE en @DOKUWIKIURL@
-
-Si no ha solicitat vosté la nova contrasenya ignore este correu.
-
-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 -Naur dokuwiki-2009-02-14/inc/lang/ca-va/read.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/read.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/read.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Esta pàgina es només de llectura. Pot vore el còdic font, pero no pot canviar-lo. Pregunte a l'administrador si creu que açò és un erro.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/recent.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/recent.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-======Canvis recents======
-
-Les següents pàgines han canviat recentment.
-
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/registermail.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/registermail.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-S'ha registrat un usuari nou. Estes són les senyes:
-
-Nom d'usuari  : @NEWUSER@
-Nom complet   : @NEWNAME@
-E-mail        : @NEWEMAIL@
-
-Data          : @DATE@
-Navegador     : @BROWSER@
-Direcció-IP   : @IPADDRESS@
-Hostname      : @HOSTNAME@
-
--- 
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/register.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/register.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/register.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Registrar-se com a nou usuari ======
-
-Escriga tota la informació que se li demana avall per a crear un nou conte en este wiki. Assegure's de donar una **direcció de correu vàlida** - si no se li demana una contrasenya ací, se li enviarà a eixa direcció. El nom d'usuari deuria ser un nom vàlit de [[doku>wiki:pagename|pàgina wiki]].
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-====== Enviar contrasenya nova ======
-
-Faça el favor d'introduir el seu nom d'usuari en el formulari per a demanar una nova contrasenya per al seu conte en este wiki. Se li enviarà un víncul de confirmació a la direcció de correu en que estiga registrat.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/revisions.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======Versions antigues======
-
-Versions antigues del document actual. Per a recuperar una versió anterior de la pàgina, trie-la d'ací avall, mostre-la, pulse ''Editar esta pàgina'' i guarde-la.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/searchpage.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-======Buscar======
-
-Pot trobar els resultats de la busca ací avall. Si no ha trobat lo que buscava pot crear o editar una pàgina en el mateix nom que el text que ha buscat utilisant el botó corresponent.
-
-=====Resultats=====
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/showrev.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/showrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/showrev.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-**¡Esta és una versió antiga del document!**
-----
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/stopwords.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-# 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
-ell
-ella
-nosatres
-nosatros
-mosatros
-vosatres
-vosatros
-ells
-els
-los
-dels
-les
-una
-uns
-unes
-seu
-seua
-seus
-seues
-meu
-meua
-meus
-meues
-teu
-teua
-teus
-teues
-nostre
-nostres
-vostre
-vostres
-nos
-vos
-#eix
-eixe
-eixa
-aquell
-aquella
-aquells
-aquelles
-#est
-este
-esta
-estos
-estes
-està
-això
-açò
-allò
-des
-soc
-eres
-som
-sou
-són
-fon
-per
-com
-cóm
-qui
-que
-qué
-quan
-quant
-quants
-quanta
-quantes
-mentres
-pero
-atre
-atra
-atres
-també
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/subscribermail.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-¡Hola!
-
-La pàgina @PAGE@ del wiki @TITLE@ ha canviat.
-Estos són els canvis.
-
---------------------------------------------------------
-@DIFF@
---------------------------------------------------------
-
-Per a cancelar les notificacions de canvis en pàgines, inicie sessió en el wiki en 
-@DOKUWIKIURL@, visite
-@NEWPAGE@
-i desubscriga's dels canvis de la pàgina o de l'espai de noms.
-
---
-Este correu l'ha generat DokuWiki en
-@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/updateprofile.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-====== Actualise el seu perfil ======
-
-Només deu completar els camps que vol canviar. No es pot canviar el nom d'usuari.
-
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-va/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ca-va/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ca-va/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-va/wordblock.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-======Bloqueig de SPAM======
-
-Els seus canvis *no* s'han guardat perque contenen una o més paraules prohibides. Si ha intentat ficar coses inapropiades en el wiki.. ¡malament! Si pensa que açò és un erro, contacte en l'administrador d'este wiki.
-
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Connectors addicionals =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/admin.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/admin.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/admin.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Administració ======
+
+Heus ací una llista de les tasques administratives disponibles en DokuWiki.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/backlinks.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Enllaços ======
+
+Heus ací una llista de pàgines enllaçades amb la pàgina actual.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/conflict.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/conflict.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,6 @@
+====== Hi ha una versió més recent ======
+
+Existeix una versió més recent del document que heu editat. Això passa quan un altre usuari canvia el document mentre l'estàveu editant.
+
+Examineu detingudament les diferències que es mostren més avall i després decidiu quina versió voleu mantindre. Si trieu ''alça'', s'alçarà la vostra versió. Si trieu ''cancel·la'' es mantindrà la versió actual.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/denied.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/denied.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Permís denegat ======
+
+No teniu prou drets per continuar. Potser vos heu descuidat d'entrar?
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/diff.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/diff.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Diferències ======
+
+Ací es mostren les diferències entre la revisió seleccionada i la versió actual de la pàgina.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/draft.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/draft.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/draft.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== S'ha trobat un esborrany ======
+
+La darrera sessió vostra d'edició d'esta pàgina no es va completar correctament. DokuWiki en va alçar automàticament un esborrany mentre treballàveu, el qual podeu utilitzar ara per continuar l'edició. Més avall podeu vore la data i hora en què es va alçar durant la vostra darrera sessió.
+
+Decidiu si voleu //recuperar// la vostra darrera sessió d'edició, //suprimir// l'esborrany que es va alçar automàticament o //cancel·lar// el procés d'edició.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/editrev.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/editrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**Heu penjat una revisió anterior del document.** Si l'alceu, creareu una nova versió amb estes dades.
+----
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/edit.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/edit.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/edit.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+Editeu la pàgina i premeu ''Alça''. Per a més informació sobre la sintaxi Wiki vegeu [[wiki:syntax|sintaxi]]. Per favor, editeu la pàgina només si podeu **millorar-la**. Si voleu fer proves, aprengueu a donar les primeres passes al [[playground:playground|pati]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/index.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/index.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/index.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Ãndex ======
+
+Heus ací un índex de totes les pàgines disponibles, ordenades per [[doku>namespaces|espais]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/install.html dokuwiki-rc2009-12-02/inc/lang/ca-valencia/install.html
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/install.html	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,8 @@
+
    Esta pàgina vos ajuda a fer la primera instal·lació i la configuració de Dokuwiki. Hi ha més informació sobre este instal·lador en la seua pàgina de documentació.
    
+
+
    DokuWiki utilitza fitxers normals per a emmagatzemar les pàgines wiki i la informació associada a estes pàgines (p. ex. imatges, índexs de cerca, revisions anteriors, etc.). Per tal de funcionar correctament DokuWiki necessita tindre accés d'escriptura als directoris que contenen estos fitxers. Este instal·lador no pot configurar els permisos del directori. Normalment això cal fer-ho directament en la línia d'ordes o, si esteu utilitzant un hostatge, mitjançant FTP o el tauler de control del vostre hostatge (p. ex. cPanel).
    
+
+
    Este instal·lador configurarà el vostre DokuWiki per a ACL, cosa que, al seu torn, permet l'accés de l'administrador al menú d'administració, on pot instal·lar connectors, gestionar usuaris, gestionar l'accés a les pàgines wiki i modificar els paràmetres de configuració. No és un requisit per al funcionament de DokuWiki, però el fa més fàcil d'administrar.
    
+
+
    Els usuaris experts o els que tinguen requeriments específics poden utilitzar els enllaços següents per a obtindre més detalls sobre instruccions d'instal·lació
+i paràmetres de configuració.
    
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/inc/lang/ca-valencia/lang.php
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,245 @@
+
+ * @author Bernat Arlandis 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = 'â€';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Edita esta pàgina';
+$lang['btn_source']            = 'Mostra codi font';
+$lang['btn_show']              = 'Mostra pàgina';
+$lang['btn_create']            = 'Crea esta pàgina';
+$lang['btn_search']            = 'Cerca';
+$lang['btn_save']              = 'Alça';
+$lang['btn_preview']           = 'Previsualitza';
+$lang['btn_top']               = 'Torna dalt';
+$lang['btn_newer']             = '<< més recent';
+$lang['btn_older']             = 'menys recent >>';
+$lang['btn_revs']              = 'Revisions anteriors';
+$lang['btn_recent']            = 'Canvis recents';
+$lang['btn_upload']            = 'Penja';
+$lang['btn_cancel']            = 'Cancel·la';
+$lang['btn_index']             = 'Ãndex';
+$lang['btn_secedit']           = 'Edita';
+$lang['btn_login']             = 'Entra';
+$lang['btn_logout']            = 'Ix';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Actualitza';
+$lang['btn_delete']            = 'Suprimeix';
+$lang['btn_back']              = 'Arrere';
+$lang['btn_backlink']          = 'Què hi enllaça';
+$lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
+$lang['btn_subscribe']         = 'Subscripció a canvis d\'esta pàgina';
+$lang['btn_unsubscribe']       = 'Cancel·la subscripció a pàgina';
+$lang['btn_subscribens']       = 'Subscripció a canvis d\'este espai';
+$lang['btn_unsubscribens']     = 'Cancel·la subscripció a espai';
+$lang['btn_profile']           = 'Actualització del perfil';
+$lang['btn_reset']             = 'Reinicia';
+$lang['btn_resendpwd']         = 'Envia nova contrasenya';
+$lang['btn_draft']             = 'Edita esborrany';
+$lang['btn_recover']           = 'Recupera esborrany';
+$lang['btn_draftdel']          = 'Suprimeix esborrany';
+$lang['btn_revert']            = 'Restaura';
+$lang['loggedinas']            = 'Heu entrat com';
+$lang['user']                  = 'Nom d\'usuari';
+$lang['pass']                  = 'Contrasenya';
+$lang['newpass']               = 'Nova contrasenya';
+$lang['oldpass']               = 'Confirmeu la contrasenya actual';
+$lang['passchk']               = 'una altra vegada';
+$lang['remember']              = 'Recorda\'m';
+$lang['fullname']              = 'Nom complet';
+$lang['email']                 = 'Correu electrònic';
+$lang['register']              = 'Registra\'m';
+$lang['profile']               = 'Perfil d\'usuari';
+$lang['badlogin']              = 'Nom d\'usuari o contrasenya incorrectes.';
+$lang['minoredit']             = 'Canvis menors';
+$lang['draftdate']             = 'L\'esborrany s\'ha alçat automàticament';
+$lang['nosecedit']             = 'Mentrestant la pàgina ha estat modificada. La informació de seccions estava obsoleta i ha calgut carregar la pàgina sencera.';
+$lang['regmissing']            = 'Heu d\'omplir tots els camps.';
+$lang['reguexists']            = 'Ja existeix un altre usuari amb este nom.';
+$lang['regsuccess']            = 'S\'ha creat l\'usuari. La contrasenya s\'ha enviat per correu.';
+$lang['regsuccess2']           = 'S\'ha creat l\'usuari.';
+$lang['regmailfail']           = 'Sembla que un error ha impedit enviar la contrasenya per correu. Contacteu amb l\'administrador.';
+$lang['regbadmail']            = 'L\'adreça de correu que heu donat no sembla vàlida. Si creieu que això és un error, contacu amb l\'administrador.';
+$lang['regbadpass']            = 'Les dues contrasenyes no són iguals. Torneu a intentar-ho.';
+$lang['regpwmail']             = 'La vostra contrasenya per al Wiki';
+$lang['reghere']               = 'Si no teniu un compte, ací en podeu obtindre un';
+$lang['profna']                = 'Este wiki no permet modificar el perfil';
+$lang['profnochange']          = 'No heu introduït cap canvi.';
+$lang['profnoempty']           = 'No es pot deixar en blanc el nom o l\'adreça de correu.';
+$lang['profchanged']           = 'El perfil d\'usuari s\'ha actualitzat correctament.';
+$lang['pwdforget']             = 'Heu oblidat la contrasenya? Podeu obtindre\'n una de nova.';
+$lang['resendna']              = 'Este wiki no permet tornar a enviar la contrasenya.';
+$lang['resendpwd']             = 'Enviament d\'una nova contrasenya per a';
+$lang['resendpwdmissing']      = 'Heu d\'emplenar tots els camps.';
+$lang['resendpwdnouser']       = 'No s\'ha pogut trobar este usuari a la base de dades.';
+$lang['resendpwdbadauth']      = 'Este codi d\'autenticació no és vàlid. Assegureu-vos d\'utilitzar l\'enllaç de confirmació complet.';
+$lang['resendpwdconfirm']      = 'Se vos ha enviat per correu electrònic un enllaç de confirmació.';
+$lang['resendpwdsuccess']      = 'Se vos ha enviat la nova contrasenya per correu electrònic.';
+$lang['license']               = 'Excepte on es digui una altra cosa, el contingut d\'este wiki està subjecte a la llicència següent:';
+$lang['licenseok']             = 'Nota. En editar esta pàgina esteu acceptant que el vostre contingut estiga subjecte a la llicència següent:';
+$lang['searchmedia']           = 'Cerca pel nom de fitxer';
+$lang['searchmedia_in']        = 'Cerca en: %s';
+$lang['txt_upload']            = 'Trieu el fitxer que voleu penjar';
+$lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
+$lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
+$lang['lockedby']              = 'Actualment blocat per:';
+$lang['lockexpire']            = 'Venciment del blocatge:';
+$lang['willexpire']            = 'El blocatge per a editar esta pàgina venç d\'ací a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
+$lang['notsavedyet']           = 'Heu fet canvis que es perdran si no els alceu.\nVoleu continuar?';
+$lang['rssfailed']             = 'S\'ha produït un error en recollir esta alimentació: ';
+$lang['nothingfound']          = 'No s\'ha trobat res.';
+$lang['mediaselect']           = 'Selecció de fitxers';
+$lang['fileupload']            = 'Càrrega de fitxers';
+$lang['uploadsucc']            = 'S\'ha penjat el fitxer';
+$lang['uploadfail']            = 'No es pot penjar el fitxer. Potser no teniu prou permisos?';
+$lang['uploadwrong']           = 'No es pot penjar el fitxer. Esta extensió està prohibida.';
+$lang['uploadexist']           = 'El fitxer ja existeix. No s\'ha penjat.';
+$lang['uploadbadcontent']      = 'El contingut que heu penjat coincideix amb l\'extensió de fitxer %s.';
+$lang['uploadspam']            = 'La càrrega ha estat blocada per la llista negra de brossa.';
+$lang['uploadxss']             = 'La càrrega ha estat blocada perquè podria ser un contingut maligne.';
+$lang['uploadsize']            = 'El fitxer que voleu penjar és massa gran (màxim %s)';
+$lang['deletesucc']            = 'S\'ha suprimit el fitxer "%s".';
+$lang['deletefail']            = 'No s\'ha pogut suprimir el fitxer "%s". Comproveu els permisos.';
+$lang['mediainuse']            = 'No s\'ha pogut suprimir el fitxer "%s". Encara s\'està utilitzant.';
+$lang['namespaces']            = 'Espais';
+$lang['mediafiles']            = 'Fitxers disponibles en';
+$lang['js']['searchmedia']     = 'Cerca fitxers';
+$lang['js']['keepopen']        = 'Manté la finestra oberta';
+$lang['js']['hidedetails']     = 'Oculta detalls';
+$lang['js']['nosmblinks']      = 'Els enllaços amb recursos compartits de Windows només funcionen amb el Microsoft Internet Explorer.
+Si voleu podeu copiar i enganxar l\'enllaç.';
+$lang['js']['linkwiz']         = 'Auxiliar d\'enllaços';
+$lang['js']['linkto']          = 'Enllaça a:';
+$lang['js']['del_confirm']     = 'Suprimiu esta entrada?';
+$lang['js']['mu_btn']          = 'Penja múltiples fitxers';
+$lang['mediausage']            = 'Utilitzeu la sintaxi següent per referir-vos a este enllaç:';
+$lang['mediaview']             = 'Mostra el fitxer original';
+$lang['mediaroot']             = 'arrel';
+$lang['mediaupload']           = 'Pengeu ací un fitxer dins de l\'espai actual. Per a crear un nou subespai, poseu-ne el nom davant del nom de fitxer i separeu-los amb el signe de dos punts.';
+$lang['mediaextchange']        = 'S\'ha canviat l\'extensió del fitxer de .%s a .%s';
+$lang['reference']             = 'Referències per a';
+$lang['ref_inuse']             = 'El fitxer no es pot suprimir perquè l\'estan utilitzant les pàgines següents:';
+$lang['ref_hidden']            = 'Algunes referències apareixen en pàgines per a les quals no teniu permís de lectura';
+$lang['hits']                  = 'Resultats';
+$lang['quickhits']             = 'Noms de pàgina coincidents';
+$lang['toc']                   = 'Taula de continguts';
+$lang['current']               = 'actual';
+$lang['yours']                 = 'La vostra versió';
+$lang['diff']                  = 'Mostra diferències amb la versió actual';
+$lang['diff2']                 = 'Mostra diferències entre les revisions seleccionades';
+$lang['line']                  = 'Línia';
+$lang['breadcrumb']            = 'Camí';
+$lang['youarehere']            = 'Sou ací';
+$lang['lastmod']               = 'Darrera modificació';
+$lang['by']                    = 'per';
+$lang['deleted']               = 'suprimit';
+$lang['created']               = 'creat';
+$lang['restored']              = 's\'ha restaurat una versió anterior';
+$lang['external_edit']         = 'edició externa';
+$lang['summary']               = 'Resum d\'edició';
+$lang['noflash']               = 'Per a visualitzar este contingut necessiteu el connector d\'Adobe Flash.';
+$lang['download']              = 'Baixa el fragment';
+$lang['mail_newpage']          = 'pàgina afegida:';
+$lang['mail_changed']          = 'pàgina modificada:';
+$lang['mail_new_user']         = 'nou usuari:';
+$lang['mail_upload']           = 'fitxer penjat:';
+$lang['qb_bold']               = 'Negreta';
+$lang['qb_italic']             = 'Cursiva';
+$lang['qb_underl']             = 'Subratllat';
+$lang['qb_code']               = 'Codi';
+$lang['qb_strike']             = 'Text barrat';
+$lang['qb_h1']                 = 'Encapçalament nivell 1';
+$lang['qb_h2']                 = 'Encapçalament nivell 2';
+$lang['qb_h3']                 = 'Encapçalament nivell 3';
+$lang['qb_h4']                 = 'Encapçalament nivell 4';
+$lang['qb_h5']                 = 'Encapçalament nivell 5';
+$lang['qb_h']                  = 'Encapçalament';
+$lang['qb_hs']                 = 'Selcciona l\'encapçalament';
+$lang['qb_hplus']              = 'Encapçalament més alt';
+$lang['qb_hminus']             = 'Encapçalament més baix';
+$lang['qb_hequal']             = 'Encapçalament del mateix nivell';
+$lang['qb_link']               = 'Enllaç intern';
+$lang['qb_extlink']            = 'Enllaç extern';
+$lang['qb_hr']                 = 'Ratlla horitzontal';
+$lang['qb_ol']                 = 'Element de llista numerada';
+$lang['qb_ul']                 = 'Element de llista de pics';
+$lang['qb_media']              = 'Afig imatges o altres fitxers';
+$lang['qb_sig']                = 'Insereix signatura';
+$lang['qb_smileys']            = 'Emoticones';
+$lang['qb_chars']              = 'Caràcters especials';
+$lang['upperns']               = 'Salta a l\'espai superior';
+$lang['admin_register']        = 'Afig nou usuari';
+$lang['metaedit']              = 'Edita metadades';
+$lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
+$lang['metasaveok']            = 'S\'han alçat les metadades';
+$lang['img_backto']            = 'Torna a';
+$lang['img_title']             = 'Títol';
+$lang['img_caption']           = 'Peu d\'imatge';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nom de fitxer';
+$lang['img_fsize']             = 'Grandària';
+$lang['img_artist']            = 'Fotògraf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Càmera';
+$lang['img_keywords']          = 'Paraules clau';
+$lang['subscribe_success']     = 'S\'ha afegit %s a la llista de subscripcions de %s';
+$lang['subscribe_error']       = 'S\'ha produït un error en afegir %s a la llista de subscripcions de %s';
+$lang['subscribe_noaddress']   = 'No hi ha cap adreça de correu associada al vostre nom d\'usuari. No se vos ha pogut afegir a la llista de subscripcions.';
+$lang['unsubscribe_success']   = '%s ha estat suprimit de la llista de subscripcions de %s';
+$lang['unsubscribe_error']     = 'S\'ha produït un error en suprimir %s de la llista de subscripcions de %s';
+$lang['authmodfailed']         = 'La configuració de l\'autenticació d\'usuaris és errònia. Informeu els administradors del wiki.';
+$lang['authtempfail']          = 'L\'autenticació d\'usuaris no està disponible temporalment. Si esta situació persisteix, per favor informeu els administradors del wiki.';
+$lang['i_chooselang']          = 'Trieu l\'idioma';
+$lang['i_installer']           = 'Instal·lador de DokuWiki';
+$lang['i_wikiname']            = 'Nom del wiki';
+$lang['i_enableacl']           = 'Habilita ACL (recomanat)';
+$lang['i_superuser']           = 'Superusuari';
+$lang['i_problems']            = 'L\'instal·lador ha trobat alguns problemes, que s\'indiquen més avall. No podeu continuar fins que no els hagueu solucionat.';
+$lang['i_modified']            = 'Per raons de seguretat esta seqüència només funciona amb una instal·lació nova i no modificada de Dokuwiki. Hauríeu de tornar a baixar el paquet i/o descomprimir-lo o consultar les instruccions d\'instal·lació de Dokuwiki completes';
+$lang['i_funcna']              = 'La funció PHP %s no està disponible. Potser el vostre proveïdor de serveis l\'ha inhabilitada per alguna raó';
+$lang['i_phpver']              = 'La vostra versió de PHP %s és inferior a la requerida %s. Necessiteu actualitzar la vostra instal·lació de PHP.';
+$lang['i_permfail']            = 'DokuWiki no pot escriure %s. Heu d\'arreglar els permisos d\'este directori';
+$lang['i_confexists']          = '%s ja existeix';
+$lang['i_writeerr']            = 'No es pot crear %s. Comproveu els permisos del directori i/o del fitxer i creeu el fitxer manualment.';
+$lang['i_badhash']             = 'dokuwiki.php no reconegut o modificat (hash=%s)';
+$lang['i_badval']              = '%s - valor il·legal o buit';
+$lang['i_success']             = 'La configuració s\'ha acabat amb èxit. Ara podeu suprimir el fitxer install.php. Aneu al vostre nou DokuWiki.';
+$lang['i_failure']             = 'S\'han produït alguns errors en escriure els fitxers de configuració. Potser caldrà que els arregleu manualment abans d\'utilitzar el vostre nou DokuWiki.';
+$lang['i_policy']              = 'Política ACL inicial';
+$lang['i_pol0']                = 'Wiki obert (tothom pot llegir, escriure i penjar fitxers)';
+$lang['i_pol1']                = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)';
+$lang['i_pol2']                = 'Wiki tancat (només els usuaris registrats poden llegir, escriure i penjar fitxers)';
+$lang['i_retry']               = 'Reintenta';
+$lang['mu_intro']              = 'Ací podeu penjar múltiples fitxers d\'una vegada. Feu clic en el botó Explora per afegir els fitxers a la cua. Després, premeu Penja.';
+$lang['mu_gridname']           = 'Nom del fitxer';
+$lang['mu_gridsize']           = 'Grandària';
+$lang['mu_gridstat']           = 'Estat';
+$lang['mu_namespace']          = 'Espai';
+$lang['mu_browse']             = 'Explora';
+$lang['mu_toobig']             = 'massa gran';
+$lang['mu_ready']              = 'llest per a penjar';
+$lang['mu_done']               = 'complet';
+$lang['mu_fail']               = 'error';
+$lang['mu_authfail']           = 'la sessió ha vençut';
+$lang['mu_progress']           = 'càrrega @PCT@%';
+$lang['mu_filetypes']          = 'Tipus de fitxer permesos';
+$lang['mu_info']               = 'fitxers penjats.';
+$lang['mu_lasterr']            = 'Darrer error:';
+$lang['recent_global']         = 'Esteu veient els canvis recents de l\'espai %s. També podeu vore els canvis recents de tot el wiki.';
+$lang['years']                 = 'fa %d anys';
+$lang['months']                = 'fa %d mesos';
+$lang['weeks']                 = 'fa %d setmanes';
+$lang['days']                  = 'fa %d dies';
+$lang['hours']                 = 'fa %d hores';
+$lang['minutes']               = 'fa %d minuts';
+$lang['seconds']               = 'fa %d segons';
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/locked.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/locked.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/locked.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Pàgina blocada ======
+
+Esta pàgina actualment està blocada per a edició per un altre usuari. Haureu d'esperar fins que este usuari acabe d'editar-la o fins que venci el blocatge.
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/login.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/login.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/login.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Entrada ======
+
+No heu entrat. Introduïu les vostres credencials d'autenticació en este formulari. A partir d'este moment heu de tindre les galetes habilitades en el vostre navegador.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/mailtext.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,16 @@
+S'ha afegit o modificat una pàgina en el vostre wiki. Ací teniu més detalls:
+
+Data           : @DATE@
+Navegador      : @BROWSER@
+IP             : @IPADDRESS@
+Rev. anterior  : @OLDPAGE@
+Rev. actual    : @NEWPAGE@
+Resum d'edició : @SUMMARY@
+Usuari         : @USER@
+
+@DIFF@
+
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/newpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Este tema encara no existeix ======
+
+Heu seguit un enllaç a un tema que encara no existeix. Podeu crear-lo per mitjà del botó ''Crea esta pàgina''.
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/norev.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/norev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== No existeix esta revisió ======
+
+
+La revisió especificada no existeix. Utilitzeu el botó ''Revisions anteriors'' per obtindre una llista de revisions d'este document.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/password.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/password.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/password.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,10 @@
+Benvolgut/da @FULLNAME@,
+
+Estes 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 -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/preview.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/preview.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Previsualització ======
+
+Heus ací una previsualització del vostre text. Recordeu que encara **no l'heu alçat!**
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,15 @@
+@FULLNAME@,
+
+Algú ha sol·licitat una nova contrasenya per al vostre compte d'usuari en @TITLE@
+@DOKUWIKIURL@
+
+Si no heu fet esta sol·licitud, simplement no feu cas de la resta del missatge.
+
+Per confirmar que realment heu sol·licitat una nova contrasenya, utilitzeu
+l'enllaç següent:
+
+@CONFIRM@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/read.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/read.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/read.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+Esta pàgina és només de lectura. Podeu vore'n el codi font, però no podeu canviar-la. Consulteu el vostre administrador si penseu que això és degut a algun error.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/recent.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/recent.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Canvis recents ======
+
+Les pàgines següents s'han modificat recentment.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/registermail.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/registermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+S'ha registrat un nou usuari. Heus ací els detalls:
+
+Nom d'usuari: @NEWUSER@
+Nom complet:  @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Navegador: @BROWSER@
+Adreça IP: @IPADDRESS@
+Ordinador: @HOSTNAME@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/register.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/register.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/register.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Registre d'un usuari nou ======
+
+Empleneu tota la informació que se vos demana per crear un compte nou en este wiki. Assegureu-vos que doneu una **adreça de correu vàlida**, on se vos enviarà la vostra contrasenya. El nom d'usuari o usuària ha de ser vàlid com a [[doku>pagename|nom de pàgina]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Nova contrasenya ======
+
+Per sol·licitar una nova contrasenya, introduïu el vostre nom d'usuari en el formulari següent. Se vos enviarà un enllaç de confirmació a l'adreça de correu amb què vos vau registrar.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/revisions.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Revisions anteriors ======
+
+Heus ací les revisions anteriors del document actual. Per restaurar una revisió anterior, seleccioneu-la de la llista, feu clic en ''Edita esta pàgina'' i alceu-la.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/searchpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Cerca ======
+
+Heus ací els resultats de la cerca. Si no trobeu allò que buscàveu, podeu crear una pàgina nova per mitjà del botó ''Edita esta pàgina''.
+
+===== Resultats =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/showrev.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/showrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/showrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**Esta és una revisió antiga del document**
+----
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/stopwords.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,106 @@
+# Això és una llista de paraules que seran omeses per l'indexador, una paraula per línia
+# Utilitzeu finals de línia UNIX
+# No cal incloure paraules de menys de 3 caràcters: s'ometran igualment
+# Llista basada en http://www.ranks.nl/stopwords/
+abans
+algun
+alguna
+alguns
+algunes
+altre
+altra
+altres
+amb
+ambdós
+anar
+ans
+aquell
+aquella
+aquelles
+aquells
+ací
+bastant
+cada
+com
+dalt
+des
+dins
+ell
+ella
+elles
+ells
+els
+ens
+entre
+era
+erem
+eren
+eres
+estan
+estat
+estava
+estem
+esteu
+estic
+està
+ets
+faig
+fan
+fas
+fem
+fer
+feu
+haver
+inclòs
+llarg
+llavors
+mentre
+meu
+mode
+molt
+molts
+nosaltres
+per
+per que
+perquè
+però
+podem
+poden
+poder
+podeu
+potser
+primer
+puc
+quan
+quant
+qui
+sabem
+saben
+saber
+sabeu
+sap
+saps
+sense
+ser
+seu
+seus
+sóc
+solament
+sols
+som
+sota
+també
+tene
+tenim
+tindre
+teniu
+teu
+tinc
+tot
+una
+uns
+unes
+uns
+vaig
+van
+vosaltres
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/subscribermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,15 @@
+La pàgina @PAGE@ del wiki @TITLE@ ha estat modificada.
+Heus ací els canvis:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Per cancel·lar la subscripció a esta pàgina, entre al wiki en
+@DOKUWIKIURL@, aneu a
+@NEWPAGE@
+i trieu 'Cancel·la subscripció'.
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/updateprofile.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Actualització del perfil d'usuari ======
+
+Només cal que completeu els camps que vulgueu canviar. El nom d'usuari no es pot canviar.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/uploadmail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+S'ha penjat un fitxer al vostre DokuWiki. Heus ací els detalls:
+
+Fitxer: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Adreça IP: @IPADDRESS@
+Ordinador: @HOSTNAME@
+Grandària: @SIZE@
+Tipus MIME: @MIME@
+Usuari: @USER@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ca-valencia/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ca-valencia/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ca-valencia/wordblock.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ca-valencia/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Brossa blocada ======
+
+Els canvis **no** s'han alçat perquè contenen una o més paraules blocades. Volíeu inundar el wiki amb brossa? Molt mal fet! Si penseu que això és un error, contacteu amb l'administrador d'este Wiki.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/cs/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/cs/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/cs/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/cs/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Další pluginy =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/cs/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/cs/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/cs/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/cs/backlinks.txt	2009-12-02 19:50:11.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Zpětné odkazy ======
 
-Zde je seznam stránek, které pravděpodobně odkazují na aktuální stránku. 
+Zde je seznam stránek, které pravděpodobně odkazují na aktuální stránku.
diff -Naur dokuwiki-2009-02-14/inc/lang/cs/lang.php dokuwiki-rc2009-12-02/inc/lang/cs/lang.php
--- dokuwiki-2009-02-14/inc/lang/cs/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/cs/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -6,6 +6,7 @@
  * @author Bohumir Zamecnik 
  * @author Tomas Valenta 
  * @author Zbynek Krivka 
+ * @author tomas@valenta.cz
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +49,7 @@
 $lang['btn_draft']             = 'Upravit koncept';
 $lang['btn_recover']           = 'Obnovit koncept';
 $lang['btn_draftdel']          = 'Vymazat koncept';
+$lang['btn_revert']            = 'Vrátit zpět';
 $lang['loggedinas']            = 'Přihlášen(a) jako';
 $lang['user']                  = 'Uživatelské jméno';
 $lang['pass']                  = 'Heslo';
@@ -86,6 +88,8 @@
 $lang['resendpwdsuccess']      = 'Vaše nové heslo bylo odesláno emailem.';
 $lang['license']               = 'Kromě míst, kde je explicitně uvedeno jinak, je obsah této wiki licencován pod následující licencí:';
 $lang['licenseok']             = 'Poznámka: Tím, že editujete tuto stránku, souhlasíte, aby váš obsah byl licencován pod následující licencí:';
+$lang['searchmedia']           = 'Hledat jméno souboru:';
+$lang['searchmedia_in']        = 'Hledat v %s';
 $lang['txt_upload']            = 'Vyberte soubor jako přílohu';
 $lang['txt_filename']          = 'Wiki jméno (volitelné)';
 $lang['txt_overwrt']           = 'Přepsat existující soubor';
@@ -110,10 +114,14 @@
 $lang['mediainuse']            = 'Soubor "%s" nebyl vymazán - stále se používá.';
 $lang['namespaces']            = 'Jmenné prostory';
 $lang['mediafiles']            = 'Dostupné soubory';
+$lang['js']['searchmedia']     = 'Hledat soubory';
 $lang['js']['keepopen']        = 'Po vybrání souboru nechat okno otevřené';
 $lang['js']['hidedetails']     = 'Skrýt detaily';
 $lang['js']['nosmblinks']      = 'Odkazování na sdílené prostředky Windows funguje jen v Internet Exploreru.
 Přesto tento odkaz můžete zkopírovat a vložit jinde.';
+$lang['js']['linkwiz']         = 'Průvodce odkazy';
+$lang['js']['linkto']          = 'Odkaz na:';
+$lang['js']['del_confirm']     = 'Vymazat tuto položku?';
 $lang['js']['mu_btn']          = 'NaÄíst více souborů najednou';
 $lang['mediausage']            = 'K odkázání se na tento soubor použijte následující syntax:';
 $lang['mediaview']             = 'Zobrazit původní soubor';
@@ -141,11 +149,11 @@
 $lang['external_edit']         = 'upraveno mimo DokuWiki';
 $lang['summary']               = 'Komentář k úpravám';
 $lang['noflash']               = 'Pro přehrání obsahu potřebujete Adobe Flash Plugin.';
+$lang['download']              = 'Stáhnout snippet';
 $lang['mail_newpage']          = 'nová stránka:';
 $lang['mail_changed']          = 'změna stránky:';
 $lang['mail_new_user']         = 'nový uživatel:';
 $lang['mail_upload']           = 'naÄtený dokument:';
-$lang['qb_alert']              = 'Vložte prosím text, který chcete formátovat.\nBude pak přidán na konec dokumentu.';
 $lang['qb_bold']               = 'TuÄnÄ›';
 $lang['qb_italic']             = 'Kurzíva';
 $lang['qb_underl']             = 'Podtržení';
@@ -156,6 +164,11 @@
 $lang['qb_h3']                 = 'Nadpis 3. úrovně';
 $lang['qb_h4']                 = 'Nadpis 4. úrovně';
 $lang['qb_h5']                 = 'Nadpis 5. úrovně';
+$lang['qb_h']                  = 'Nadpis';
+$lang['qb_hs']                 = 'Vybrat nadpis';
+$lang['qb_hplus']              = 'Nadpis vyšší úrovně';
+$lang['qb_hminus']             = 'Nadpis nižší úrovně';
+$lang['qb_hequal']             = 'Nadpis stejné úrovně';
 $lang['qb_link']               = 'Interní odkaz';
 $lang['qb_extlink']            = 'Externí odkaz';
 $lang['qb_hr']                 = 'Vodorovná Äára';
@@ -165,7 +178,7 @@
 $lang['qb_sig']                = 'Vložit podpis';
 $lang['qb_smileys']            = 'Emotikony';
 $lang['qb_chars']              = 'Speciální znaky';
-$lang['del_confirm']           = 'Vymazat tuto položku?';
+$lang['upperns']               = 'skoÄit do nadÅ™azeného jmenného prostoru';
 $lang['admin_register']        = 'Přidat nového uživatele';
 $lang['metaedit']              = 'Upravit Metadata';
 $lang['metasaveerr']           = 'Chyba při zápisu metadat';
@@ -222,4 +235,13 @@
 $lang['mu_authfail']           = 'vypršla session';
 $lang['mu_progress']           = '@PCT@% naÄten';
 $lang['mu_filetypes']          = 'Povolené typy souborů';
+$lang['mu_info']               = 'soubory naÄteny.';
+$lang['mu_lasterr']            = 'Poslední chyba:';
 $lang['recent_global']         = 'Právě si prohlížíte změny ve jmenném prostoru %s. Také si můžete zobrazit změny v celé wiki.';
+$lang['years']                 = 'před % roky';
+$lang['months']                = 'před % měsíci';
+$lang['weeks']                 = 'před % týdny';
+$lang['days']                  = 'před % dny';
+$lang['hours']                 = 'před % hodinami';
+$lang['minutes']               = 'před % minutami';
+$lang['seconds']               = 'před % sekundami';
diff -Naur dokuwiki-2009-02-14/inc/lang/cs/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/cs/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/cs/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/cs/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Tento mail byl automaticky vygenerován systémem DokuWiki
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/da/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/da/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/da/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Yderligere udvidelser =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/da/denied.txt dokuwiki-rc2009-12-02/inc/lang/da/denied.txt
--- dokuwiki-2009-02-14/inc/lang/da/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Adgang nægtet!======
+====== Adgang nægtet! ======
 
 Du har ikke rettigheder til at fortsætte. Måske er du ikke logget ind.
diff -Naur dokuwiki-2009-02-14/inc/lang/da/draft.txt dokuwiki-rc2009-12-02/inc/lang/da/draft.txt
--- dokuwiki-2009-02-14/inc/lang/da/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Kladdefil fundet ======
 
-Din sidste redigeringssession på denne side blev ikke afsluttet korrekt. DokuWiki har automatisk gemt en kladde mens du arbejdede, som du kan benytte til at fortsætte redigeringen. Forneden kan du se de datader blev gemt fra din sidste session.
+Din sidste redigeringssession på denne side blev ikke afsluttet korrekt. DokuWiki har automatisk gemt en kladde mens du arbejdede, som du kan benytte til at fortsætte redigeringen. Forneden kan du se de data der blev gemt fra din sidste session.
 
 Vælg venligst, om du vil //gendanne// din tabte redigering, //slette// den gemte kladde eller //afbryde// redigeringen.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/da/install.html dokuwiki-rc2009-12-02/inc/lang/da/install.html
--- dokuwiki-2009-02-14/inc/lang/da/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -14,7 +14,7 @@
 
    Denne installer vil opsætte din DokuWiki konfiguration for 
 ACL, hvilket tillader 
 administrator login og adgang til DokuWiki's adminstrative menu til 
-installation af plugins, håndtering af brugere, håndtering af adgang til wiki 
+installation af udvidelser, håndtering af brugere, håndtering af adgang til wiki 
 sider og ændring af konfigurations indstillinger. Det er ikke et krav for at 
 DokuWiki kan fungere, men det vil gøre DokuWiki lettere at administre.
    
 
diff -Naur dokuwiki-2009-02-14/inc/lang/da/lang.php dokuwiki-rc2009-12-02/inc/lang/da/lang.php
--- dokuwiki-2009-02-14/inc/lang/da/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,9 @@
  * @author Lars Næsbye Christensen 
  * @author Kalle Sommer Nielsen 
  * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -28,7 +31,7 @@
 $lang['btn_older']             = 'næste side >>';
 $lang['btn_revs']              = 'Gamle udgaver';
 $lang['btn_recent']            = 'Nye ændringer';
-$lang['btn_upload']            = 'Upload';
+$lang['btn_upload']            = 'Overføre';
 $lang['btn_cancel']            = 'Fortryd';
 $lang['btn_index']             = 'Indeks';
 $lang['btn_secedit']           = 'Rediger';
@@ -46,80 +49,88 @@
 $lang['btn_unsubscribens']     = 'Fjern abonnement på namespace ændringer';
 $lang['btn_profile']           = 'Opdater profil';
 $lang['btn_reset']             = 'Nulstil';
-$lang['btn_resendpwd']         = 'Send nyt password';
+$lang['btn_resendpwd']         = 'Send nyt adgangskode';
 $lang['btn_draft']             = 'Rediger kladde';
 $lang['btn_recover']           = 'Gendan kladde';
 $lang['btn_draftdel']          = 'Slet kladde';
+$lang['btn_revert']            = 'Reetablere';
 $lang['loggedinas']            = 'Logget på som';
 $lang['user']                  = 'Brugernavn';
-$lang['pass']                  = 'Password';
-$lang['newpass']               = 'Nyt password';
-$lang['oldpass']               = 'Bekræft gammelt password';
-$lang['passchk']               = 'Gentag nyt password';
+$lang['pass']                  = 'Adgangskode';
+$lang['newpass']               = 'Nyt adgangskode';
+$lang['oldpass']               = 'Bekræft gammelt adgangskode';
+$lang['passchk']               = 'Gentag nyt adgangskode';
 $lang['remember']              = 'Log automatisk på';
 $lang['fullname']              = 'Navn';
 $lang['email']                 = 'E-mail';
 $lang['register']              = 'Tilmeld';
 $lang['profile']               = 'Brugerprofil';
-$lang['badlogin']              = 'Forkert brugernavn eller password.';
+$lang['badlogin']              = 'Brugernavn eller adgangskode var forkert.';
 $lang['minoredit']             = 'Mindre ændringer';
 $lang['draftdate']             = 'Kladde automatisk gemt d.';
 $lang['nosecedit']             = 'Siden blev ændret i mellemtiden, sektions information var for gammel, hentede hele siden i stedet.';
 $lang['regmissing']            = 'Du skal udfylde alle felter.';
 $lang['reguexists']            = 'Dette brugernavn er allerede i brug.';
-$lang['regsuccess']            = 'Du er nu oprettet som bruger. Dit password bliver sendt til dig i en e-mail.';
+$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['regmailfail']           = 'Dit password blev ikke sendt. Kontakt venligst administratoren.';
+$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 passwords er ikke ens, vær venlig at prøve igen.';
+$lang['regbadpass']            = 'De to adgangskoder er ikke ens, vær venlig at prøve igen.';
 $lang['regpwmail']             = 'Dit DokuWiki password';
 $lang['reghere']               = 'Opret en DokuWiki-konto her';
 $lang['profna']                = 'Denne wiki understøtter ikke ændring af profiler';
 $lang['profnochange']          = 'Ingen ændringer, intet modificeret.';
 $lang['profnoempty']           = 'Tomt navn eller e-mail adresse er ikke tilladt.';
 $lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
-$lang['pwdforget']             = 'Glemt dit password? FÃ¥ et nyt';
-$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt password.';
-$lang['resendpwd']             = 'Send nyt password for';
+$lang['pwdforget']             = 'Har du glemt dit adgangskode? FÃ¥ et nyt';
+$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
+$lang['resendpwd']             = 'Send nyt adgangskode for';
 $lang['resendpwdmissing']      = 'Du skal udfylde alle felter.';
 $lang['resendpwdnouser']       = 'Vi kan ikke finde denne bruger i vores database.';
 $lang['resendpwdbadauth']      = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
-$lang['resendpwdconfirm']      = 'Et link med bekræftelse er blevet sendt med email.';
-$lang['resendpwdsuccess']      = 'Dit nye password er blevet sendt med e-mail.';
+$lang['resendpwdconfirm']      = 'Et henvisning med bekræftelse er blevet sendt med email.';
+$lang['resendpwdsuccess']      = 'Dit nye adgangskode er blevet sendt med e-mail.';
 $lang['license']               = 'Med mindre andet angivet, vil indhold på denne wiki blive frigjort under følgende licens:';
 $lang['licenseok']             = 'Note: ved at ændre denne side, acceptere du at dit indhold bliver frigivet under følgende licens:';
-$lang['txt_upload']            = 'Vælg den fil der skal uploades';
+$lang['searchmedia']           = 'Søg filnavn';
+$lang['searchmedia_in']        = 'Søg i %s';
+$lang['txt_upload']            = 'Vælg den fil der skal overføres';
 $lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Midlertidig låst af';
 $lang['lockexpire']            = 'Lås udløber kl.';
 $lang['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
-$lang['notsavedyet']           = 'Der er lavet ændringer i dokumentet, hvis du fortsætter vil ændringerne gå tabt.\nØnsker du at fortsætte?';
+$lang['notsavedyet']           = 'Der er lavet ændringer i dokumentet. Hvis du fortsætter vil ændringerne gå tabt.\nØnsker du at fortsætte?';
 $lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
 $lang['nothingfound']          = 'Søgningen gav intet resultat.';
 $lang['mediaselect']           = 'Vælg mediefil';
-$lang['fileupload']            = 'Upload mediefil';
-$lang['uploadsucc']            = 'Upload var en succes';
-$lang['uploadfail']            = 'Upload fejlede. Der er muligvis problemer med rettighederne';
-$lang['uploadwrong']           = 'Upload afvist. Filtypen er ikke tilladt';
+$lang['fileupload']            = 'Overføre mediefil';
+$lang['uploadsucc']            = 'Overførelse var en succes';
+$lang['uploadfail']            = 'Overførelse fejlede. Der er muligvis problemer med rettighederne.';
+$lang['uploadwrong']           = 'Overførelse afvist. Filtypen er ikke tilladt.';
 $lang['uploadexist']           = 'Filen eksisterer allerede.';
-$lang['uploadbadcontent']      = 'Upload indhold matchede ikke %s fil-endelsen.';
-$lang['uploadspam']            = 'Upload blev blokeret af spam sortlisten.';
-$lang['uploadxss']             = 'Upload blev blokeret på grund af mulig skadeligt indhold.';
+$lang['uploadbadcontent']      = 'Overføret indhold tilsvaret ikke til %s fil-endelsen.';
+$lang['uploadspam']            = 'Overførelsen blev blokeret af spam sortlisten.';
+$lang['uploadxss']             = 'Overførelsen blev blokeret på grund af mulig skadeligt indhold.';
+$lang['uploadsize']            = 'Den overføret fil var for stor (max. %s)';
 $lang['deletesucc']            = 'Filen "%s" er blevet slettet.';
 $lang['deletefail']            = '"%s" kunne ikke slettes - check rettighederne.';
 $lang['mediainuse']            = 'Filen "%s" er ikke slettet - den er stadig i brug.';
 $lang['namespaces']            = 'Navnerum';
 $lang['mediafiles']            = 'Tilgængelige filer i';
+$lang['js']['searchmedia']     = 'Søg for filer';
 $lang['js']['keepopen']        = 'Hold vindue åbent ved valg';
 $lang['js']['hidedetails']     = 'Skjul detaljer';
 $lang['js']['nosmblinks']      = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.
 Du kan stadig kopiere og indsætte linket.';
-$lang['js']['mu_btn']          = 'Upload flere filer på en gang';
+$lang['js']['linkwiz']         = 'guiden til henvisninger';
+$lang['js']['linkto']          = 'Henvise til:';
+$lang['js']['del_confirm']     = 'Slet valgte post(er)?';
+$lang['js']['mu_btn']          = 'Overføre flere filer på en gang';
 $lang['mediausage']            = 'Brug den følgende syntaks til at henvise til denne fil:';
 $lang['mediaview']             = 'Vis oprindelig fil';
 $lang['mediaroot']             = 'rod';
-$lang['mediaupload']           = 'Upload en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Upload som" filnavnet, adskilt af kolontegn.';
+$lang['mediaupload']           = 'Overføre en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Overføre som" filnavnet, adskilt af kolontegn.';
 $lang['mediaextchange']        = 'Filudvidelse ændret fra .%s til .%s!';
 $lang['reference']             = 'Henvisning til';
 $lang['ref_inuse']             = 'Filen kan ikke slettes, da den stadig er i brug på følgende sider:';
@@ -140,12 +151,13 @@
 $lang['created']               = 'oprettet';
 $lang['restored']              = 'gammel udgave reetableret';
 $lang['external_edit']         = 'ekstern redigering';
-$lang['summary']               = 'Redigerings resume';
+$lang['summary']               = 'Redigerings resumé';
+$lang['noflash']               = 'Den Adobe Flash Plugin er nødvendig til at vise denne indehold.';
+$lang['download']              = 'Hente kodestykke';
 $lang['mail_newpage']          = 'dokument tilføjet:';
 $lang['mail_changed']          = 'dokument ændret:';
 $lang['mail_new_user']         = 'Ny bruger';
-$lang['mail_upload']           = 'fil uploadet:';
-$lang['qb_alert']              = 'Skriv den tekst du ønsker at formatere.\nDen vil blive tilføjet i slutningen af dokumentet.';
+$lang['mail_upload']           = 'fil overføret:';
 $lang['qb_bold']               = 'Fed';
 $lang['qb_italic']             = 'Kursiv';
 $lang['qb_underl']             = 'Understregning';
@@ -156,6 +168,11 @@
 $lang['qb_h3']                 = 'Niveau 3 overskrift';
 $lang['qb_h4']                 = 'Niveau 4 overskrift';
 $lang['qb_h5']                 = 'Niveau 5 overskrift';
+$lang['qb_h']                  = 'Overskrift';
+$lang['qb_hs']                 = 'Vælg overskriften';
+$lang['qb_hplus']              = 'Højere overskriftsniveau';
+$lang['qb_hminus']             = 'Lavere overskriftsniveau';
+$lang['qb_hequal']             = 'Samme overskriftsniveau';
 $lang['qb_link']               = 'Intern henvisning';
 $lang['qb_extlink']            = 'Ekstern henvisning';
 $lang['qb_hr']                 = 'Vandret linje';
@@ -165,7 +182,7 @@
 $lang['qb_sig']                = 'Indsæt signatur';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Specialtegn';
-$lang['del_confirm']           = 'Slet valgte post(er)?';
+$lang['upperns']               = 'GÃ¥ til overordnet navnerum';
 $lang['admin_register']        = 'Tilføj ny bruger';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skrivning af metadata fejlede';
@@ -177,7 +194,7 @@
 $lang['img_fname']             = 'Filnavn';
 $lang['img_fsize']             = 'Størrelse';
 $lang['img_artist']            = 'Fotograf';
-$lang['img_copyr']             = 'Copyright';
+$lang['img_copyr']             = 'Ophavsret';
 $lang['img_format']            = 'Format';
 $lang['img_camera']            = 'Kamera';
 $lang['img_keywords']          = 'Emneord';
@@ -195,35 +212,42 @@
 $lang['i_superuser']           = 'Superbruger';
 $lang['i_problems']            = 'Installeren fandt nogle problemer, vist nedenunder. Du kan ikke fortsætte før du har rettet dem.';
 $lang['i_modified']            = 'Af sikkerheds hensyn vil dette script kun virke på en ny og umodificeret Dokuwiki installation.
-                         Du burde enten gen-udpakke filerne fra den downloaded pakke eller tjekke den fuldstændige
-                         DokuWiki installations instruktioner';
+Du burde enten gen-udpakke filerne fra den hentede pakke eller tjekke den fuldstændige
+DokuWiki installations instruktioner';
 $lang['i_funcna']              = 'PHP funtionen %s er ikke tilgængelig. Måske har din udbyder slået det fra af en eller anden grund?';
-$lang['i_phpver']              = 'Din PHP version %s er mindre en den nødvendige %s. Du er nød til at opgradere din PHP installation.';
+$lang['i_phpver']              = 'Din PHP version %s er mindre en den nødvendige %s. Du er nød til at opgradere din PHP installation.';
 $lang['i_permfail']            = 'DokuWiki kan ikke skrive til %s. Du er nød til at rette tilladelses indstillingerne for denne mappe!';
 $lang['i_confexists']          = '%s eksisterer allerede';
 $lang['i_writeerr']            = 'Kunne ikke oprette %s. Du bliver nød til at tjekke mappe/fil- tilladelserne og oprette filen manuelt.';
 $lang['i_badhash']             = 'uigenkendelig eller modificeret dokuwiki.php (hash=%s)';
-$lang['i_badval']              = '%s - ulovlig eller tom værdi';
-$lang['i_success']             = 'Konfigurationen fulførtedes med success.  Du kan nu slette install.php filen. Forsæt til
-                        din nye DokuWiki.';
-$lang['i_failure']             = 'Nogle fejl forekom mens konfigurations filerne skulle skrives. Du er mulighvis nød til at fixe dem manuelt før
-                         du kan bruge din nye DokuWiki.';
+$lang['i_badval']              = '%s - ulovlig eller tom værdi';
+$lang['i_success']             = 'Konfigurationen fulførtedes med success.  Du kan nu slette install.php filen. Fortsætte til din nye DokuWiki.';
+$lang['i_failure']             = 'Nogle fejl forekom mens konfigurations filerne skulle skrives. Du er mulighvis nød til at fixe dem manuelt før du kan bruge din nye DokuWiki.';
 $lang['i_policy']              = 'Begyndende ACL politik';
 $lang['i_pol0']                = 'Åben Wiki (alle kan læse, skrive og uploade)';
-$lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og uploade)';
-$lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og uploade)';
+$lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og overføre)';
+$lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og overføre)';
 $lang['i_retry']               = 'Forsøg igen';
-$lang['mu_intro']              = 'Her kan du uploade flere filer af gangen. Klik på gennemse for at tilføje dem til køen. Tryk upload når du er klar.';
+$lang['mu_intro']              = 'Her kan du overføre flere filer af gangen. Klik på gennemse for at tilføje dem til køen. Tryk på overføre knappen når du er klar.';
 $lang['mu_gridname']           = 'Filnavn';
-$lang['mu_gridsize']           = 'Størelse';
+$lang['mu_gridsize']           = 'Størrelse';
 $lang['mu_gridstat']           = 'Status';
 $lang['mu_namespace']          = 'Navnerum';
 $lang['mu_browse']             = 'gennemse';
 $lang['mu_toobig']             = 'for stor';
-$lang['mu_ready']              = 'klar til upload';
+$lang['mu_ready']              = 'klar til overføre';
 $lang['mu_done']               = 'færdig';
 $lang['mu_fail']               = 'fejlede';
 $lang['mu_authfail']           = 'session udløb';
 $lang['mu_progress']           = '@PCT@% upload';
 $lang['mu_filetypes']          = 'Tilladte filtyper';
-$lang['recent_global']         = 'Du ser lige nu ændringerne i %s navnerummet. Du kan også Se de sidste ændringer for hele wiki siden ';
+$lang['mu_info']               = 'filer var overføret.';
+$lang['mu_lasterr']            = 'Sidste fejl:';
+$lang['recent_global']         = 'Du ser lige nu ændringerne i %s navnerummet. Du kan også se de sidste ændringer for hele wiki siden ';
+$lang['years']                 = '%d år siden';
+$lang['months']                = '%d måned siden';
+$lang['weeks']                 = '%d uge siden';
+$lang['days']                  = '%d dage siden';
+$lang['hours']                 = '%d timer siden';
+$lang['minutes']               = '%d minutter siden';
+$lang['seconds']               = '%d sekunder siden';
diff -Naur dokuwiki-2009-02-14/inc/lang/da/locked.txt dokuwiki-rc2009-12-02/inc/lang/da/locked.txt
--- dokuwiki-2009-02-14/inc/lang/da/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== LÃ¥st Dokument ======
 
-Dette dokument er midlertidigt låst af en anden bruger. Vent venligst til brugeren er fædig med at redigere dokumentet, eller låsen udløber.
+Dette dokument er midlertidigt låst af en anden bruger. Vent venligst til brugeren er færdig med at redigere dokumentet, eller låsen udløber.
diff -Naur dokuwiki-2009-02-14/inc/lang/da/login.txt dokuwiki-rc2009-12-02/inc/lang/da/login.txt
--- dokuwiki-2009-02-14/inc/lang/da/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Login ======
 
-Du er ikke logget ind! Indtast brugernavn og password. Din browser skal have tilladt cookies for at du kan logge ind.
+Du er ikke logget ind! Indtast brugernavn og adgangskode. Din browser skal have tilladt cookies for at du kan logge ind.
diff -Naur dokuwiki-2009-02-14/inc/lang/da/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/da/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/da/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -6,7 +6,7 @@
 Hostnavn           : @HOSTNAME@
 Gammel udgave      : @OLDPAGE@
 Ny udgave          : @NEWPAGE@
-Redigerings resume : @SUMMARY@
+Redigerings resumé : @SUMMARY@
 Bruger             : @USER@
 
 @DIFF@
diff -Naur dokuwiki-2009-02-14/inc/lang/da/password.txt dokuwiki-rc2009-12-02/inc/lang/da/password.txt
--- dokuwiki-2009-02-14/inc/lang/da/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,9 +2,10 @@
 
 Her er dine brugeroplysninger @TITLE@ at @DOKUWIKIURL@
 
-Brugernavn : @LOGIN@
-Password   : @PASSWORD@
+Brugernavn  : @LOGIN@
+Adgangskode : @PASSWORD@
 
 -- 
 Denne e-mail blev genereret af DokuWiki på
 @DOKUWIKIURL@
+ 
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/da/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/da/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/da/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 
 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 link.
+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 -Naur dokuwiki-2009-02-14/inc/lang/da/registermail.txt dokuwiki-rc2009-12-02/inc/lang/da/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/da/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,13 +1,13 @@
 En ny bruger har registreret. Her er detaljerne:
 
-Brugernavn  : @NEWUSER@
-Navn        : @NEWNAME@
-E-mail      : @NEWEMAIL@
+Brugernavn : @NEWUSER@
+Navn       : @NEWNAME@
+E-mail     : @NEWEMAIL@
 
-Dato        : @DATE@
-Browser     : @BROWSER@
-IP-adresse  : @IPADDRESS@
-Værtsnavn   : @HOSTNAME@
+Dato       : @DATE@
+Browser    : @BROWSER@
+IP-adresse : @IPADDRESS@
+Værtsnavn  : @HOSTNAME@
 
 -- 
 Denne mail blev genereret af DokuWiki på
diff -Naur dokuwiki-2009-02-14/inc/lang/da/register.txt dokuwiki-rc2009-12-02/inc/lang/da/register.txt
--- dokuwiki-2009-02-14/inc/lang/da/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Opret en wiki-konto ======
 
-Udfyld nedenstånde skema for at oprette en konto i denne wiki. Sørg for at bruge en **gyldig e-mail-adresse** - dit password bliver sendt til dig. Dit brugernavn skal være et gyldigt [[doku>pagename|dokumentnavn]].
+Udfyld nedenstånde skema for at oprette en konto i denne wiki. Sørg for at bruge en **gyldig e-mail-adresse** - dit adgangskode bliver sendt til dig. Dit brugernavn skal være et gyldigt [[doku>pagename|dokumentnavn]].
 
diff -Naur dokuwiki-2009-02-14/inc/lang/da/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/da/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/da/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Send nyt password ======
 
-Udfyld alle nedenstående felter for at få tilsendt et nyt password til denne wiki. Dit nye password vil blive sendt til den opgivne e-mailadresse. Brugernavnet bør være dit wiki brugernavn.
+Udfyld alle nedenstående felter for at få tilsendt et nyt password til denne wiki. Dit nye password vil blive sendt til den opgivne e-mail-adresse. Brugernavnet bør være dit wiki brugernavn.
diff -Naur dokuwiki-2009-02-14/inc/lang/da/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/da/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/da/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -84,3 +84,4 @@
 til
 tre
 var
+www
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/da/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/da/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/da/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/da/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,14 +1,14 @@
-En fil blev uploaded til din DokuWiki. Her er detaljerne:
+En fil blev overføret til din DokuWiki. Her er detaljerne:
 
 Fil         : @MEDIA@
 Dato        : @DATE@
 Browser     : @BROWSER@
 IP-adresse  : @IPADDRESS@
-V�rtsnavn   : @HOSTNAME@
-St�rrelse   : @SIZE@
+Værtsnavn   : @HOSTNAME@
+Størrelse   : @SIZE@
 MIME Type   : @MIME@
 Bruger      : @USER@
 
---
-Denne e-mail blev genereret af DokuWiki p�
+-- 
+Denne e-mail blev genereret af DokuWiki på
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/de/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/de/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Weitere Plugins =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/de/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/de/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/de/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Backlinks ======
 
-Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken. 
+Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/denied.txt dokuwiki-rc2009-12-02/inc/lang/de/denied.txt
--- dokuwiki-2009-02-14/inc/lang/de/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Zugang verweigert ======
 
-Sie haben nicht die erforderlichen Rechte, um diese Aktion durchzuführen. Evtl. sind Sie nicht beim Wiki angemeldet?
+Sie haben nicht die erforderlichen Rechte, um diese Aktion durchzuführen. Eventuell sind Sie nicht beim Wiki angemeldet?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/diff.txt dokuwiki-rc2009-12-02/inc/lang/de/diff.txt
--- dokuwiki-2009-02-14/inc/lang/de/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Unterschiede======
+====== Unterschiede ======
 
 Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/lang.php dokuwiki-rc2009-12-02/inc/lang/de/lang.php
--- dokuwiki-2009-02-14/inc/lang/de/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -13,6 +13,9 @@
  * @author Florian Anderiasch 
  * @author Robin Kluth 
  * @author Arne Pelka 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -55,6 +58,7 @@
 $lang['btn_draft']             = 'Entwurf bearbeiten';
 $lang['btn_recover']           = 'Entwurf wieder herstellen';
 $lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
 $lang['loggedinas']            = 'Angemeldet als';
 $lang['user']                  = 'Benutzername';
 $lang['pass']                  = 'Passwort';
@@ -70,18 +74,18 @@
 $lang['minoredit']             = 'kleine Änderung';
 $lang['draftdate']             = 'Entwurf gespeichert am';
 $lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
-$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
+$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
 $lang['reguexists']            = 'Der Nutzername existiert leider schon.';
-$lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per Email versandt.';
+$lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
 $lang['regsuccess2']           = 'Der neue Nutzer wurde angelegt.';
-$lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wenden Sie sich an den Wiki-Admin.';
-$lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wenden Sie sich bitte an den Wiki-Admin.';
+$lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwort-E-Mail aufgetreten. Bitte wenden Sie sich an den Wiki-Admin.';
+$lang['regbadmail']            = 'Die angegebene E-Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wenden Sie sich bitte an den Wiki-Admin.';
 $lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.';
 $lang['regpwmail']             = 'Ihr DokuWiki Passwort';
 $lang['reghere']               = 'Sie haben noch keinen Zugang? Hier anmelden';
 $lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
 $lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
-$lang['profnoempty']           = 'Es muß ein Name und eine E-Mail Adresse angegeben werden.';
+$lang['profnoempty']           = 'Es muß ein Name und eine E-Mail-Adresse angegeben werden.';
 $lang['profchanged']           = 'Benuzerprofil erfolgreich geändert.';
 $lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
 $lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
@@ -91,8 +95,10 @@
 $lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.';
 $lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
 $lang['resendpwdsuccess']      = 'Ihr neues Passwort wurde per E-Mail versandt.';
-$lang['license']               = 'Falls nicht anders bezeichnet ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
+$lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
 $lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite geben Sie Ihr Einverständnis, dass Ihr Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+$lang['searchmedia']           = 'Suche Dateinamen:';
+$lang['searchmedia_in']        = 'Suche in %s';
 $lang['txt_upload']            = 'Datei zum Hochladen auswählen';
 $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
@@ -108,7 +114,7 @@
 $lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
 $lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
 $lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
-$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %s überein.';
 $lang['uploadspam']            = 'Hochladen verweigert: Treffer auf der Spamliste.';
 $lang['uploadxss']             = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.';
 $lang['uploadsize']            = 'Die hochgeladene Datei war zu groß. (max. %s)';
@@ -117,10 +123,14 @@
 $lang['mediainuse']            = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.';
 $lang['namespaces']            = 'Namensräume';
 $lang['mediafiles']            = 'Vorhandene Dateien in';
+$lang['js']['searchmedia']     = 'Suche Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
 $lang['js']['hidedetails']     = 'Details ausblenden';
-$lang['js']['nosmblinks']      = 'Das Verlinken von Windows Freigaben funktioniert nur im Microsoft Internet Explorer.
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet Explorer.
 Der Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
+$lang['js']['linkwiz']         = 'Link-Assistent';
+$lang['js']['linkto']          = 'Link nach:';
+$lang['js']['del_confirm']     = 'Eintrag wirklich löschen?';
 $lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
 $lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
 $lang['mediaview']             = 'Originaldatei öffnen';
@@ -148,11 +158,11 @@
 $lang['external_edit']         = 'Externe Bearbeitung';
 $lang['summary']               = 'Zusammenfassung';
 $lang['noflash']               = 'Das Adobe Flash Plugin wird benötigt, um diesen Ihnalt anzuzeigen.';
+$lang['download']              = 'Schnipsel herunterladen';
 $lang['mail_newpage']          = 'Neue Seite:';
 $lang['mail_changed']          = 'Seite geaendert:';
 $lang['mail_new_user']         = 'Neuer Benutzer:';
 $lang['mail_upload']           = 'Datei hochgeladen:';
-$lang['qb_alert']              = 'Bitte geben Sie den zu formatierenden Text ein.\nDieser wird am Ende des Dokuments eingefügt.';
 $lang['qb_bold']               = 'Fetter Text';
 $lang['qb_italic']             = 'Kursiver Text';
 $lang['qb_underl']             = 'Unterstrichener Text';
@@ -163,6 +173,11 @@
 $lang['qb_h3']                 = 'Level 3 Ãœberschrift';
 $lang['qb_h4']                 = 'Level 4 Ãœberschrift';
 $lang['qb_h5']                 = 'Level 5 Ãœberschrift';
+$lang['qb_h']                  = 'Ãœberschrift';
+$lang['qb_hs']                 = 'Wähle die Überschrift';
+$lang['qb_hplus']              = 'Obere Ãœberschrift';
+$lang['qb_hminus']             = 'Untere Ãœberschrift';
+$lang['qb_hequal']             = 'Gleichzeilige Ãœberschrift';
 $lang['qb_link']               = 'Interner Link';
 $lang['qb_extlink']            = 'Externer Link';
 $lang['qb_hr']                 = 'Horizontale Linie';
@@ -172,7 +187,7 @@
 $lang['qb_sig']                = 'Unterschrift einfügen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Sonderzeichen';
-$lang['del_confirm']           = 'Eintrag wirklich löschen?';
+$lang['upperns']               = 'zum übergeordneten Namensraum springen';
 $lang['admin_register']        = 'Neuen Benutzer anmelden';
 $lang['metaedit']              = 'Metadaten bearbeiten';
 $lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
@@ -194,7 +209,7 @@
 $lang['unsubscribe_success']   = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
 $lang['unsubscribe_error']     = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
 $lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
-$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert wenden Sie sich an den Systembetreuer.';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
 $lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
 $lang['i_installer']           = 'DokuWiki Installation';
 $lang['i_wikiname']            = 'Wiki-Name';
@@ -203,14 +218,13 @@
 $lang['i_problems']            = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen bevor Sie mit der Installation fortfahren können.';
 $lang['i_modified']            = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki Installation.  Sie sollten entweder alle Dateien noch einmal frisch installieren oder die Dokuwiki-Installationsanleitung konsultieren.';
 $lang['i_funcna']              = 'Die PHP Funktion %s ist nicht verfügbar. Unter Umständen wurde sie von Ihrem Hoster deaktiviert?';
-$lang['i_phpver']              = 'Ihre PHP-Version %s ist niedriger als die benötigte Version %s. Bitte aktualisieren Sie Ihre PHP Installation.';
+$lang['i_phpver']              = 'Ihre PHP-Version %s ist niedriger als die benötigte Version %s. Bitte aktualisieren Sie Ihre PHP-Installation.';
 $lang['i_permfail']            = '%s ist nicht durch DokuWiki beschreibbar. Sie müssen die Berechtigungen dieses Ordners ändern!';
 $lang['i_confexists']          = '%s existiert bereits';
 $lang['i_writeerr']            = '%s konnte nicht erzeugt werden. Sie sollten die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.';
 $lang['i_badhash']             = 'Unbekannte oder modifizierte dokuwiki.php (Hash=%s)';
 $lang['i_badval']              = '%s - unerlaubter oder leerer Wert';
-$lang['i_success']             = 'Die Konfiguration wurde erfolgreich abgeschlossen. Sie können jetzt die install.php löschen. Ihr
-                        neues DokuWiki ist jetzt für Sie bereit.';
+$lang['i_success']             = 'Die Konfiguration wurde erfolgreich abgeschlossen. Sie können jetzt die install.php löschen. Ihr neues DokuWiki ist jetzt für Sie bereit.';
 $lang['i_failure']             = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Sie müssen diese vermutlich von Hand beheben, bevor Sie Ihr neues DokuWiki nutzen können.';
 $lang['i_policy']              = 'Anfangseinstellung für Zugangskontrolle (ACL)';
 $lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben, hochladen für alle)';
@@ -230,4 +244,14 @@
 $lang['mu_authfail']           = 'Sitzung abgelaufen';
 $lang['mu_progress']           = '@PCT@% hochgeladen';
 $lang['mu_filetypes']          = 'Erlaubte Dateitypen';
+$lang['mu_info']               = 'Dateien hochgeladen!';
+$lang['mu_lasterr']            = 'Letzter Fehler:';
 $lang['recent_global']         = 'Im Moment sehen Sie die Änderungen im Namensraum %s. Sie können auch die Änderungen im gesamten Wiki sehen.';
+
+$lang['years']   = 'vor %d Jahren';
+$lang['months']  = 'vor %d Monaten';
+$lang['weeks']   = 'vor %d Wochen';
+$lang['days']    = 'vor %d Tagen';
+$lang['hours']   = 'vor %d Stunden';
+$lang['minutes'] = 'vor %d Minuten';
+$lang['seconds'] = 'vor %d Sekunden';
diff -Naur dokuwiki-2009-02-14/inc/lang/de/newpage.txt dokuwiki-rc2009-12-02/inc/lang/de/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/de/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Dieses Thema existiert noch nicht======
+====== Dieses Thema existiert noch nicht ======
 
 Sie sind einem Link zu einer Seite gefolgt, die noch nicht existiert. Sie können die Seite mit dem Knopf **"[Seite anlegen]"** selbst anlegen und mit Inhalt füllen.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/norev.txt dokuwiki-rc2009-12-02/inc/lang/de/norev.txt
--- dokuwiki-2009-02-14/inc/lang/de/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Version existiert nicht======
+====== Version existiert nicht ======
 
 Die angegebene Version des Dokuments wurde nicht gefunden. Benutzen Sie den **''[Ältere Versionen]''** Knopf,  um eine Liste aller verfügbaren Versionen dieses Dokuments zu erhalten.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/preview.txt dokuwiki-rc2009-12-02/inc/lang/de/preview.txt
--- dokuwiki-2009-02-14/inc/lang/de/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Vorschau======
+====== Vorschau ======
 
 So wird Ihr Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/recent.txt dokuwiki-rc2009-12-02/inc/lang/de/recent.txt
--- dokuwiki-2009-02-14/inc/lang/de/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Letzte Änderungen======
+====== Letzte Änderungen ======
 
 Die folgenden Seiten wurden zuletzt geändert.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/revisions.txt dokuwiki-rc2009-12-02/inc/lang/de/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/de/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ältere Versionen======
+====== Ältere Versionen ======
 
 Dies sind ältere Versionen des gewählten Dokuments. Um zu einer älteren Version zurückzukehren, wählen Sie die entsprechende Version aus, klicken auf **''[Diese Seite bearbeiten]''** und speichern Sie sie erneut ab.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/de/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/de/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
-======Suche======
+====== Suche ======
 
 Unten sind die Ergebnisse Ihrer Suche gelistet. Falls der gesuchte Begriff nicht gefunden wurde, können Sie direkt eine neue Seite für den Suchbegriff anlegen, indem Sie auf den **''[Seite anlegen]''** Knopf drücken.
 
-=====Ergebnisse=====
+===== Ergebnisse =====
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/de/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/de/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
-# 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/
+# Die Wörter dieser Liste werden bei der Indexierung ignoriert. Jedes Wort steht in einer neuen Zeile.
+# Beachten Sie beim Bearbeiten der Datei darauf, dass Sie UNIX-Zeilenumbrüche verwenden (einfacher Zeilenumbruch).
+# Wörter, die kürzer als 3 Buchstaben sind, brauchen Sie nicht in die Liste mit aufnehmen. Diese werden automatisch ignoriert.
+# Diese Liste basiert auf der folgenden: http://www.ranks.nl/stopwords/
 aber
 als
 auch
diff -Naur dokuwiki-2009-02-14/inc/lang/de/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/de/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/de/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM blockiert======
+====== SPAM blockiert ======
 
 Ihre Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls Sie versucht haben sollten, das Wiki zu Spammen -- Schande über Sie! Wenn Sie glauben, dass der Eintrag zu Unrecht blockiert wurde, kontaktieren Sie bitte den Administrator des Wikis.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Zusätzliche Plugins =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/admin.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/admin.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/admin.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Folgende administrative Aufgaben stehen in DokuWiki zur Verfügung.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/backlinks.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Backlinks ======
+
+Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/conflict.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/conflict.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,6 @@
+====== Eine neuere Version existiert ======
+
+Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat parallel an der selben Seite gearbeitet und zuerst gespeichert.
+
+Die unten aufgeführten Unterschiede können bei der Entscheidung helfen, welchem Dokument Vorrang gewährt wird. Wähle **''[Speichern]''** zum Sichern deiner Version oder **''[Abbrechen]''**,  um deine Version zu verwerfen und die zuerst gespeicherte Seite zu behalten.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/denied.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/denied.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/denied.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Zugang verweigert ======
+
+Du hast nicht die erforderlichen Rechte, um diese Aktion durchzuführen. Eventuell bist du nicht beim Wiki angemeldet?
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/diff.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/diff.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/diff.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Unterschiede ======
+
+Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/draft.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/draft.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/draft.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,6 @@
+====== Entwurf gefunden ======
+
+Deine letzte Bearbeitungssitzung wurde nicht ordnungsgemäß abgeschlossen. DokuWiki hat während deiner Arbeit automatisch einen Zwischenentwurf gespeichert, den du jetzt nutzen kannst, um deine Arbeit fortzusetzen. Unten siehst du die Daten, die bei deiner letzten Sitzung gespeichert wurden.
+
+Bitte entscheide dich, ob du den Entwurf //wieder herstellen// oder //löschen// willst oder ob du die Bearbeitung abbrechen möchtest.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/editrev.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/editrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**Eine ältere Version des Dokuments wurde geladen!** Beim Speichern wird eine neue Version des Dokuments mit diesem Inhalt erstellt.
+----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/edit.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/edit.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/edit.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+Bitte nur editieren, falls das Dokument **verbessert** werden kann.
+
+Nach dem Bearbeiten den **''[Speichern]''**-Knopf drücken. Siehe [[wiki:syntax]] zur Wiki-Syntax. Zum Testen bitte erst im [[playground:playground|Spielplatz]] üben.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/index.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/index.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/index.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Ãœbersicht ======
+
+Dies ist eine Übersicht über alle vorhandenen Seiten und [[doku>namespaces|Namensräume]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/install.html dokuwiki-rc2009-12-02/inc/lang/de-informal/install.html
--- dokuwiki-2009-02-14/inc/lang/de-informal/install.html	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,27 @@
+
    Diese Seite hilft dir bei der Erst-Installation und Konfiguration von
+Dokuwiki. Zusätzliche Informationen zu
+diesem Installationsskript findest du auf der entsprechenden
+Hilfe-Seite (en).
    
+
+
    DokuWiki verwendet normale Dateien für das Speichern von Wikiseiten und
+anderen Informationen (Bilder, Suchindizes, alte Versionen, usw.).
+Um DokuWiki betreiben zu können, muss Schreibzugriff auf die
+Verzeichnisse bestehen, in denen DokuWiki diese Dateien ablegt. Dieses
+Installationsprogramm kann diese Rechte nicht für dich setzen. Du musst dies
+manuell auf einer Kommando-Shell oder, falls du DokuWiki bei einem Fremdanbieter
+hostest, über FTP oder ein entsprechendes Werkzeug (z.B. cPanel) durchführen.
    
+
+
    Dieses Skript hilft dir beim ersten Einrichten des Zugangsschutzes
+(ACL) von DokuWiki, welcher eine
+Administratoranmeldung und damit Zugang zum Administrationsmenu ermöglicht.
+Dort kannst du dann weitere Tätigkeiten wie das Installieren von Plugins, das
+Verwalten von Nutzern und das Ändern von Konfigurationseinstellungen durchführen.
+Das Nutzen der Zugangskontrolle ist nicht zwingend erforderlich, es erleichtert aber
+die Administration von DokuWiki.
    
+
+
    Erfahrene Anwender oder Nutzer mit speziellen Konfigurationsbedürfnissen sollten
+die folgenden Links nutzen, um sich über
+Installation
+und Konfiguration zu
+informieren.
    
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/lang.php dokuwiki-rc2009-12-02/inc/lang/de-informal/lang.php
--- dokuwiki-2009-02-14/inc/lang/de-informal/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,249 @@
+
+ * @author Christof 
+ * @author Anika Henke 
+ * @author Esther Brunner 
+ * @author Matthias Grimm 
+ * @author Michael Klier 
+ * @author Leo Moll 
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Alexander Fischer 
+ * @author Juergen Schwarzer 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Diese Seite bearbeiten';
+$lang['btn_source']            = 'Zeige Quelltext';
+$lang['btn_show']              = 'Seite anzeigen';
+$lang['btn_create']            = 'Seite anlegen';
+$lang['btn_search']            = 'Suche';
+$lang['btn_save']              = 'Speichern';
+$lang['btn_preview']           = 'Vorschau';
+$lang['btn_top']               = 'Nach oben';
+$lang['btn_newer']             = '<< jüngere Änderungen';
+$lang['btn_older']             = 'ältere Änderungen >>';
+$lang['btn_revs']              = 'Ältere Versionen';
+$lang['btn_recent']            = 'Letzte Änderungen';
+$lang['btn_upload']            = 'Hochladen';
+$lang['btn_cancel']            = 'Abbrechen';
+$lang['btn_index']             = 'Ãœbersicht';
+$lang['btn_secedit']           = 'Bearbeiten';
+$lang['btn_login']             = 'Anmelden';
+$lang['btn_logout']            = 'Abmelden';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Updaten';
+$lang['btn_delete']            = 'Löschen';
+$lang['btn_back']              = 'Zurück';
+$lang['btn_backlink']          = 'Links hierher';
+$lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
+$lang['btn_subscribe']         = 'Änderungen abonnieren';
+$lang['btn_unsubscribe']       = 'Änderungen abbestellen';
+$lang['btn_subscribens']       = 'Namensraumänderungen abonnieren';
+$lang['btn_unsubscribens']     = 'Namensraumänderungen abbestellen';
+$lang['btn_profile']           = 'Benutzerprofil';
+$lang['btn_reset']             = 'Zurücksetzen';
+$lang['btn_resendpwd']         = 'Sende neues Passwort';
+$lang['btn_draft']             = 'Entwurf bearbeiten';
+$lang['btn_recover']           = 'Entwurf wieder herstellen';
+$lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
+$lang['loggedinas']            = 'Angemeldet als';
+$lang['user']                  = 'Benutzername';
+$lang['pass']                  = 'Passwort';
+$lang['newpass']               = 'Neues Passwort';
+$lang['oldpass']               = 'Bestätigen (Altes Passwort)';
+$lang['passchk']               = 'und nochmal';
+$lang['remember']              = 'Angemeldet bleiben';
+$lang['fullname']              = 'Voller Name';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrieren';
+$lang['profile']               = 'Benutzerprofil';
+$lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
+$lang['minoredit']             = 'kleine Änderung';
+$lang['draftdate']             = 'Entwurf gespeichert am';
+$lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
+$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
+$lang['reguexists']            = 'Der Nutzername existiert leider schon.';
+$lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per Email versandt.';
+$lang['regsuccess2']           = 'Der neue Nutzer wurde angelegt.';
+$lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wende dich an den Wiki-Admin.';
+$lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wende dich bitte an den Wiki-Admin.';
+$lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
+$lang['regpwmail']             = 'Ihr DokuWiki Passwort';
+$lang['reghere']               = 'Du hast noch keinen Zugang? Hier anmelden';
+$lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
+$lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
+$lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
+$lang['profchanged']           = 'Benuzerprofil erfolgreich geändert.';
+$lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
+$lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
+$lang['resendpwd']             = 'Neues Passwort schicken für';
+$lang['resendpwdmissing']      = 'Es tut mir Leid, aber du musst alle Felder ausfüllen.';
+$lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
+$lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
+$lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
+$lang['resendpwdsuccess']      = 'Dein neues Passwort wurde per E-Mail versandt.';
+$lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
+$lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+$lang['searchmedia']           = 'Suche Dateiname:';
+$lang['searchmedia_in']        = 'Suche in %s';
+$lang['txt_upload']            = 'Datei zum Hochladen auswählen';
+$lang['txt_filename']          = 'Hochladen als (optional)';
+$lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
+$lang['lockedby']              = 'Momentan gesperrt von';
+$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['notsavedyet']           = 'Nicht gespeicherte Änderungen gehen verloren!\nWeitermachen?';
+$lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
+$lang['nothingfound']          = 'Nichts gefunden.';
+$lang['mediaselect']           = 'Dateiauswahl';
+$lang['fileupload']            = 'Datei hochladen';
+$lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
+$lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
+$lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
+$lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.';
+$lang['uploadspam']            = 'Hochladen verweigert: Treffer auf der Spamliste.';
+$lang['uploadxss']             = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.';
+$lang['uploadsize']            = 'Die hochgeladene Datei war zu groß. (max. %s)';
+$lang['deletesucc']            = 'Die Datei "%s" wurde gelöscht.';
+$lang['deletefail']            = '"%s" konnte nicht gelöscht werden - prüfe die Berechtigungen.';
+$lang['mediainuse']            = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.';
+$lang['namespaces']            = 'Namensräume';
+$lang['mediafiles']            = 'Vorhandene Dateien in';
+$lang['js']['searchmedia']     = 'Suche nach Dateien';
+$lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
+$lang['js']['hidedetails']     = 'Details ausblenden';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows Freigaben funktioniert nur im Microsoft Internet Explorer.
+Der Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
+$lang['js']['linkwiz']         = 'Link-Assistent';
+$lang['js']['linkto']          = 'Link zu:';
+$lang['js']['del_confirm']     = 'Die ausgewählten Dateien wirklich löschen?';
+$lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
+$lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
+$lang['mediaview']             = 'Originaldatei öffnen';
+$lang['mediaroot']             = 'Wurzel';
+$lang['mediaupload']           = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
+$lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
+$lang['reference']             = 'Verwendung von';
+$lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
+$lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.';
+$lang['hits']                  = 'Treffer';
+$lang['quickhits']             = 'Passende Seitennamen';
+$lang['toc']                   = 'Inhaltsverzeichnis';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Deine Version';
+$lang['diff']                  = 'Zeige Unterschiede zu aktueller Version';
+$lang['diff2']                 = 'Zeige Unterschiede der ausgewählten Versionen';
+$lang['line']                  = 'Zeile';
+$lang['breadcrumb']            = 'Zuletzt angesehen';
+$lang['youarehere']            = 'Du befindest dich hier';
+$lang['lastmod']               = 'Zuletzt geändert';
+$lang['by']                    = 'von';
+$lang['deleted']               = 'gelöscht';
+$lang['created']               = 'angelegt';
+$lang['restored']              = 'alte Version wieder hergestellt';
+$lang['external_edit']         = 'Externe Bearbeitung';
+$lang['summary']               = 'Zusammenfassung';
+$lang['noflash']               = 'Das Adobe Flash Plugin wird benötigt, um diesen Ihnalt anzuzeigen.';
+$lang['download']              = 'Download-Teil';
+$lang['mail_newpage']          = 'Neue Seite:';
+$lang['mail_changed']          = 'Seite geaendert:';
+$lang['mail_new_user']         = 'Neuer Benutzer:';
+$lang['mail_upload']           = 'Datei hochgeladen:';
+$lang['qb_bold']               = 'Fetter Text';
+$lang['qb_italic']             = 'Kursiver Text';
+$lang['qb_underl']             = 'Unterstrichener Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Durchgestrichener Text';
+$lang['qb_h1']                 = 'Level 1 Ãœberschrift';
+$lang['qb_h2']                 = 'Level 2 Ãœberschrift';
+$lang['qb_h3']                 = 'Level 3 Ãœberschrift';
+$lang['qb_h4']                 = 'Level 4 Ãœberschrift';
+$lang['qb_h5']                 = 'Level 5 Ãœberschrift';
+$lang['qb_h']                  = 'Ãœberschrift';
+$lang['qb_hs']                 = 'Wähle eine Überschrift';
+$lang['qb_hplus']              = 'Überschrift eine Ebene höher';
+$lang['qb_hminus']             = 'Ãœberschrift eine Ebene runter';
+$lang['qb_hequal']             = 'Ãœberschrift auf selber Ebene';
+$lang['qb_link']               = 'Interner Link';
+$lang['qb_extlink']            = 'Externer Link';
+$lang['qb_hr']                 = 'Horizontale Linie';
+$lang['qb_ol']                 = 'Nummerierter Listenpunkt';
+$lang['qb_ul']                 = 'Listenpunkt';
+$lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
+$lang['qb_sig']                = 'Unterschrift einfügen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Sonderzeichen';
+$lang['upperns']               = 'Gehe zum Ausgangsfeld';
+$lang['admin_register']        = 'Neuen Benutzer anmelden';
+$lang['metaedit']              = 'Metadaten bearbeiten';
+$lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
+$lang['metasaveok']            = 'Metadaten gesichert';
+$lang['img_backto']            = 'Zurück zu';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Bildunterschrift';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Dateiname';
+$lang['img_fsize']             = 'Grösse';
+$lang['img_artist']            = 'FotografIn';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlagwörter';
+$lang['subscribe_success']     = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscribe_error']       = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['subscribe_noaddress']   = 'Weil deine E-Mail-Adresse fehlt, kannst du das Thema nicht abonnieren';
+$lang['unsubscribe_success']   = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
+$lang['unsubscribe_error']     = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Systembetreuer.';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Systembetreuer.';
+$lang['i_chooselang']          = 'Wähle deine Sprache';
+$lang['i_installer']           = 'DokuWiki Installation';
+$lang['i_wikiname']            = 'Wiki-Name';
+$lang['i_enableacl']           = 'Zugangskontrolle (ACL) aktivieren (empfohlen)';
+$lang['i_superuser']           = 'Administrator Benutzername';
+$lang['i_problems']            = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen, bevor du mit der Installation fortfahren kannst.';
+$lang['i_modified']            = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki-Installation. Du solltest entweder alle Dateien noch einmal frisch installieren oder die Dokuwiki-Installationsanleitung konsultieren.';
+$lang['i_funcna']              = 'Die PHP Funktion %s ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?';
+$lang['i_phpver']              = 'Deine PHP-Version %s ist niedriger als die benötigte Version %s. Bitte aktualisiere deine PHP-Installation.';
+$lang['i_permfail']            = '%s ist nicht durch DokuWiki beschreibbar. Du musst die Berechtigungen dieses Ordners ändern!';
+$lang['i_confexists']          = '%s existiert bereits';
+$lang['i_writeerr']            = '%s konnte nicht erzeugt werden. Du solltest die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.';
+$lang['i_badhash']             = 'Unbekannte oder modifizierte dokuwiki.php (Hash=%s)';
+$lang['i_badval']              = '%s - unerlaubter oder leerer Wert';
+$lang['i_success']             = 'Die Konfiguration wurde erfolgreich abgeschlossen. Du kannst jetzt die install.php löschen. Dein
+                        neues DokuWiki ist jetzt für dich bereit.';
+$lang['i_failure']             = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Du musst diese vermutlich von Hand beheben, bevor du dein neues DokuWiki nutzen kannst.';
+$lang['i_policy']              = 'Anfangseinstellung für Zugangskontrolle (ACL)';
+$lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben, hochladen für alle)';
+$lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben und hochladen für registrierte Nutzer)';
+$lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
+$lang['i_retry']               = 'Wiederholen';
+$lang['mu_intro']              = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.';
+$lang['mu_gridname']           = 'Dateiname';
+$lang['mu_gridsize']           = 'Größe';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namensraum';
+$lang['mu_browse']             = 'Durchsuchen';
+$lang['mu_toobig']             = 'zu groß';
+$lang['mu_ready']              = 'bereit zum hochladen';
+$lang['mu_done']               = 'fertig';
+$lang['mu_fail']               = 'gescheitert';
+$lang['mu_authfail']           = 'Sitzung abgelaufen';
+$lang['mu_progress']           = '@PCT@% hochgeladen';
+$lang['mu_filetypes']          = 'Erlaubte Dateitypen';
+$lang['mu_info']               = 'Dateien hochgeladen.';
+$lang['mu_lasterr']            = 'Letzter Fehler:';
+$lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum %s. Du kannst auch die Änderungen im gesamten Wiki sehen.';
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/locked.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/locked.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/locked.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Seite gesperrt ======
+
+Diese Seite ist momentan von einem anderen Nutzer gesperrt. Warte, bis dieser mit dem Bearbeiten fertig ist oder die Sperre abläuft.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/login.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/login.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/login.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Anmelden ======
+
+Gib deinen Benutzernamen und dein Passwort in das Formular unten ein, um dich anzumelden. Bitte beachte, dass dafür "Cookies" in den Sicherheitseinstellungen deines Browsers erlaubt sein müssen.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/mailtext.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,17 @@
+Eine Seite in deinem Wiki wurde geändert oder neu angelegt. Hier sind die Details:
+
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Adresse     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Alte Version   : @OLDPAGE@
+Neue Version   : @NEWPAGE@
+Zusammenfassung: @SUMMARY@
+Benutzer       : @USER@
+
+@DIFF@
+
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/newpage.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/newpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Dieses Thema existiert noch nicht ======
+
+Du bist einem Link zu einer Seite gefolgt, die noch nicht existiert. Du kannst die Seite mit dem Knopf **''[Seite anlegen]''** selbst anlegen und mit Inhalt füllen.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/norev.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/norev.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/norev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Version existiert nicht ======
+
+Die angegebene Version des Dokuments wurde nicht gefunden. Benutze den **''[Ältere Versionen]''** Knopf, um eine Liste aller verfügbaren Versionen dieses Dokuments zu erhalten.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/password.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/password.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/password.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,10 @@
+Hallo @FULLNAME@!
+
+Hier sind deine Nutzerdaten für @TITLE@ auf @DOKUWIKIURL@
+
+Benutzername: @LOGIN@
+Passwort    : @PASSWORD@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/preview.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/preview.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/preview.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Vorschau ======
+
+So wird dein Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,16 @@
+Hallo @FULLNAME@!
+
+Jemand hat ein neues Passwort für deinen @TITLE@
+login auf @DOKUWIKIURL@ angefordert.
+
+Wenn du diese Änderung nicht angefordert hast, ignoriere diese
+E-Mail einfach.
+
+Um die Anforderung zu bestätigen, folge bitte dem unten angegebenen
+Bestätigungslink.
+
+@CONFIRM@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/read.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/read.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/read.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+Diese Seite ist nicht editierbar. Du kannst den Quelltext sehen, jedoch nicht verändern. Kontaktiere den Administrator, wenn du glaubst, dass hier ein Fehler vorliegt.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/recent.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/recent.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/recent.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Letzte Änderungen ======
+
+Die folgenden Seiten wurden zuletzt geändert.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/registermail.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/registermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+Ein neuer Benutzer hat sich registriert. Hier sind die Details:
+
+Benutzername : @NEWUSER@
+Voller Name  : @NEWNAME@
+E-Mail       : @NEWEMAIL@
+
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/register.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/register.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/register.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Als neuer Nutzer registrieren ======
+
+Bitte fülle alle Felder aus, um einen neuen Nutzer-Account in diesem Wiki anzulegen. Stelle sicher, dass eine **gültige E-Mail-Adresse** angegeben wird - das Passwort wird an diese Adresse gesendet. Der Nutzername sollte aus einem Wort ohne Umlaute, Leer- oder Sonderzeichen bestehen.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Neues Passwort anfordern ======
+
+Fülle alle Felder unten aus, um ein neues Passwort für deinen Zugang zu erhalten. Das neue Passwort wird an deine gespeicherte E-Mail-Adresse geschickt. Der Benutzername sollte dein Wiki-Benutzername sein.
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/revisions.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/revisions.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== Ältere Versionen ======
+
+Dies sind ältere Versionen des gewählten Dokuments. Um zu einer älteren Version zurückzukehren, wähle die entsprechende Version aus, klicke auf **''[Diese Seite bearbeiten]''** und speichere sie erneut ab.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/searchpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,7 @@
+====== Suche ======
+
+Unten sind die Ergebnisse deiner Suche gelistet. Falls der gesuchte Begriff nicht gefunden wurde, kannst du direkt eine neue Seite für den Suchbegriff anlegen, indem du auf den Knopf **''[Seite anlegen]''** drückst.
+
+===== Ergebnisse =====
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/showrev.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/showrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/showrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**Dies ist eine alte Version des Dokuments!**
+----
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/stopwords.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,125 @@
+# 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/
+aber
+als
+auch
+auf
+aus
+bei
+bin
+bis
+bist
+dadurch
+daher
+darum
+das
+daß
+dass
+dein
+deine
+dem
+den
+der
+des
+dessen
+deshalb
+die
+dies
+dieser
+dieses
+doch
+dort
+durch
+ein
+eine
+einem
+einen
+einer
+eines
+euer
+eure
+für
+hatte
+hatten
+hattest
+hattet
+hier
+hinter
+ich
+ihr
+ihre
+in
+im
+ist
+jede
+jedem
+jeden
+jeder
+jedes
+jener
+jenes
+jetzt
+kann
+kannst
+können
+könnt
+machen
+mein
+meine
+mit
+muß
+mußt
+musst
+müssen
+müßt
+nach
+nachdem
+nein
+nicht
+nun
+oder
+seid
+sein
+seine
+sich
+sie
+sind
+soll
+sollen
+sollst
+sollt
+sonst
+soweit
+sowie
+und
+unser
+unsere
+unter
+vom
+von
+vor
+um
+wann
+warum
+was
+weiter
+weitere
+wenn
+wer
+werde
+werden
+werdet
+weshalb
+wie
+wieder
+wieso
+wir
+wird
+wirst
+woher
+wohin
+zum
+zur
+über
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/subscribermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,23 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Das sind die Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum : @DATE@
+Benutzer : @USER@
+Ãœbersicht: @SUMMARY@
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
+@DOKUWIKIURL@, besuche dann
+@NEWPAGE@
+und klicke auf die Taste 'Änderungen abbestellen'.
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/updateprofile.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== Benutzerprofil ändern ======
+
+Nur die Felder, die du änderst, werden aktualisiert. Alle anderen bleiben, wie sie sind. Deinen Benutzernamen kannst du jedoch nicht ändern.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/uploadmail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+Eine Datei wurde in deinem Wiki hochgeladen. Hier sind die Details:
+
+Datei      : @MEDIA@
+Datum      : @DATE@
+Browser    : @BROWSER@
+IP-Adresse : @IPADDRESS@
+Hostname   : @HOSTNAME@
+Größe      : @SIZE@
+MIME-Typ   : @MIME@
+Benutzer   : @USER@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/de-informal/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/de-informal/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/de-informal/wordblock.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/de-informal/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== SPAM blockiert ======
+
+Deine Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls du versucht haben solltest, das Wiki zu Spammen -- Schande über ich! Wenn du glaubst, dass der Eintrag zu Unrecht blockiert wurde, kontaktiere bitte den Administrator des Wikis.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/el/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/el/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/el/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== ΠÏόσθετες συνδεόμενες υπομονάδες =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/el/admin.txt dokuwiki-rc2009-12-02/inc/lang/el/admin.txt
--- dokuwiki-2009-02-14/inc/lang/el/admin.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== ΔιαχείÏιση ======
 
-ΠαÏακάτω μποÏείτε να βÏείτε μια λίστα με τις δυνατότητες διαχείÏισης στην DokuWiki
+ΠαÏακάτω μποÏείτε να βÏείτε μια λίστα με τις δυνατότητες διαχείÏισης στο DokuWiki
diff -Naur dokuwiki-2009-02-14/inc/lang/el/edit.txt dokuwiki-rc2009-12-02/inc/lang/el/edit.txt
--- dokuwiki-2009-02-14/inc/lang/el/edit.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1 +1 @@
-ΤÏοποποιήστε την σελίδα **μόνο** εάν μποÏείτε να την **βελτιώσετε**. Για να κάνετε δοκιμές με ασφάλεια ή να εξοικειωθείτε με το πεÏιβάλλον χÏησιμοποιήστε το [[:playground:playground|playground]]. Î‘Ï†Î¿Ï Ï„Ïοποποιήστε την σελίδα επιλέξτε ''Αποθήκευση''. Δείτε τις [[:wiki:syntax|οδηγίες]] για την σωστή σÏνταξη. 
+ΤÏοποποιήστε την σελίδα **μόνο** εάν μποÏείτε να την **βελτιώσετε**. Για να κάνετε δοκιμές με ασφάλεια ή να εξοικειωθείτε με το πεÏιβάλλον χÏησιμοποιήστε το [[:playground:playground|playground]]. Î‘Ï†Î¿Ï Ï„Ïοποποιήστε την σελίδα επιλέξτε ''Αποθήκευση''. Δείτε τις [[:wiki:syntax|οδηγίες]] για την σωστή σÏνταξη.
diff -Naur dokuwiki-2009-02-14/inc/lang/el/lang.php dokuwiki-rc2009-12-02/inc/lang/el/lang.php
--- dokuwiki-2009-02-14/inc/lang/el/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Thanos Massias 
  * @author Αθανάσιος Îταής 
+ * @author Konstantinos Koryllos 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -37,18 +38,21 @@
 $lang['btn_back']              = 'Πίσω';
 $lang['btn_backlink']          = 'ΣÏνδεσμοι Ï€Ïος την Ï„Ïέχουσα σελίδα';
 $lang['btn_backtomedia']       = 'ΕπιστÏοφή στην επιλογή αÏχείων';
-$lang['btn_subscribe']         = 'ΕγγÏαφή σε λήψη ενημεÏώσεων';
-$lang['btn_unsubscribe']       = 'ΔιαγÏαφή από λήψη ενημεÏώσεων';
+$lang['btn_subscribe']         = 'ΕγγÏαφή σε λήψη ενημεÏώσεων σελίδας';
+$lang['btn_unsubscribe']       = 'ΔιαγÏαφή από λήψη ενημεÏώσεων σελίδας';
+$lang['btn_subscribens']       = 'ΕγγÏαφή σε λήψη ενημεÏώσεων φακέλου';
+$lang['btn_unsubscribens']     = 'ΔιαγÏαφή από λήψη ενημεÏώσεων φακέλου';
 $lang['btn_profile']           = 'ΤÏοποποίηση Ï€Ïοφίλ';
 $lang['btn_reset']             = 'ΑκÏÏωση';
 $lang['btn_resendpwd']         = 'Αποστολή νέου κωδικοÏ';
 $lang['btn_draft']             = 'ΤÏοποποίηση αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_recover']           = 'ΕπαναφοÏά αυτόματα αποθηκευμένης σελίδας';
 $lang['btn_draftdel']          = 'ΔιαγÏαφή αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_revert']            = 'Αποκατάσταση';
 $lang['loggedinas']            = 'Συνδεδεμένος ως';
-$lang['user']                  = 'Όνομα';
+$lang['user']                  = 'Όνομα χÏήστη';
 $lang['pass']                  = 'Κωδικός';
-$lang['newpass']               = 'Îέος κωδικός εισόδου';
+$lang['newpass']               = 'Îέος κωδικός';
 $lang['oldpass']               = 'Επιβεβαίωση Ï„Ïέχοντος κωδικοÏ';
 $lang['passchk']               = 'ακόμη μια φοÏά';
 $lang['remember']              = 'Απομνημόνευση στοιχείων λογαÏιασμοÏ';
@@ -59,15 +63,16 @@
 $lang['badlogin']              = 'Συγνώμη, το όνομα χÏήστη ή ο κωδικός ήταν λανθασμένο.';
 $lang['minoredit']             = 'Ασήμαντες αλλαγές';
 $lang['draftdate']             = 'Αυτόματη αποθήκευση Ï€ÏόχειÏης σελίδας στις';
+$lang['nosecedit']             = 'Η σελίδα Ï„Ïοποποιήθηκε στο Î¼ÎµÏ„Î±Î¾Ï ÎºÎ±Î¹ τα στοιχεία της ενότητας δεν ήταν συγχÏονισμένα, οπότε φοÏτώθηκε η πλήÏης σελίδα.  ';
 $lang['regmissing']            = 'ΠÏέπει να συμπληÏώσετε όλα τα πεδία.';
 $lang['reguexists']            = 'Αυτός ο λογαÏιασμός υπάÏχει ήδη.';
 $lang['regsuccess']            = 'Ο λογαÏιασμός δημιουÏγήθηκε και ο κωδικός εστάλει με e-mail.';
 $lang['regsuccess2']           = 'Ο λογαÏιασμός δημιουÏγήθηκε.';
 $lang['regmailfail']           = 'Φαίνεται να υπάÏχει Ï€Ïόβλημα με την αποστολή του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î¼Î­ÏƒÏ‰ e-mail. ΠαÏακαλοÏμε επικοινωνήστε μαζί μας!';
-$lang['regbadmail']            = 'Η διεÏθυνση e-mail δεν δείχνει έγκυÏη - εάν πιστεÏεται ότι αυτό είναι λάθος, επικοινωνήστε μαζί μας';
+$lang['regbadmail']            = 'Η διεÏθυνση e-mail δεν δείχνει έγκυÏη - εάν πιστεÏετε ότι αυτό είναι λάθος, επικοινωνήστε μαζί μας';
 $lang['regbadpass']            = 'Οι δÏο κωδικοί δεν είναι ίδιοι, Ï€Ïοσπαθήστε ξανά.';
 $lang['regpwmail']             = 'Ο κωδικός σας';
-$lang['reghere']               = 'Δεν έχετε λογαÏιασμο ακόμη? ΔημιουÏγήστε έναν';
+$lang['reghere']               = 'Δεν έχετε λογαÏιασμό ακόμη? ΔημιουÏγήστε έναν';
 $lang['profna']                = 'Αυτό το wiki δεν υποστηÏίζει την Ï„Ïοποποίηση Ï€Ïοφίλ.';
 $lang['profnochange']          = 'Καμία αλλαγή.';
 $lang['profnoempty']           = 'Δεν επιτÏέπεται κενό όνομα χÏήστη η κενή διεÏθυνση email.';
@@ -80,31 +85,43 @@
 $lang['resendpwdbadauth']      = 'Αυτός ο κωδικός ενεÏγοποίησης δεν είναι έγκυÏος.';
 $lang['resendpwdconfirm']      = 'Ο σÏνδεσμος Ï€Ïος την σελίδα ενεÏγοποίησης εστάλει με e-mail.';
 $lang['resendpwdsuccess']      = 'Ο νέος σας κωδικός εστάλη με e-mail.';
+$lang['license']               = 'Εκτός εάν αναφέÏεται διαφοÏετικά, το υλικό Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… wiki διατίθεται κάτω από την ακόλουθη άδεια:';
+$lang['licenseok']             = 'Σημείωση: ΤÏοποποιώντας αυτή την σελίδα αποδέχεστε την διάθεση του Ï…Î»Î¹ÎºÎ¿Ï ÏƒÎ±Ï‚ σÏμφωνα με την ακόλουθη άδεια:';
+$lang['searchmedia']           = 'Αναζήτηση αÏχείου:';
+$lang['searchmedia_in']        = 'Αναζήτηση σε %s';
 $lang['txt_upload']            = 'Επιλέξτε αÏχείο για φόÏτωση';
 $lang['txt_filename']          = 'Επιλέξτε νέο όνομα αÏχείου (Ï€ÏοαιÏετικό)';
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάÏχοντος αÏχείου';
 $lang['lockedby']              = 'ΠÏοσωÏινά κλειδωμένο από';
 $lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
-$lang['willexpire']            = 'Το κλείδωμά σας για την επεξεÏγασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\nΓαι να το ανανεώσετε χÏησιμοποιήστε την επιλογή ΠÏοεπισκόπηση.';
+$lang['willexpire']            = 'Το κλείδωμά σας για την επεξεÏγασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χÏησιμοποιήστε την επιλογή ΠÏοεπισκόπηση.';
 $lang['notsavedyet']           = 'Οι μη αποθηκευμένες αλλαγές θα χαθοÏν.\nΘέλετε να συνεχίσετε?';
 $lang['rssfailed']             = 'Εμφανίστηκε κάποιο σφάλμα κατά την ανάγνωση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… feed: ';
 $lang['nothingfound']          = 'Δεν βÏέθηκαν σχετικά αποτελέσματα.';
 $lang['mediaselect']           = 'Επιλογή ΑÏχείων';
-$lang['fileupload']            = 'ΜεταφόÏτωση αÏχείων';
-$lang['uploadsucc']            = 'Επιτυχής μεταφόÏτωση';
+$lang['fileupload']            = 'ΦόÏτωση αÏχείου';
+$lang['uploadsucc']            = 'Επιτυχής φόÏτωση';
 $lang['uploadfail']            = 'Η μεταφόÏτωση απέτυχε. Πιθανόν αυτό να οφείλεται στις Ïυθμίσεις Ï€Ïόσβασης του αÏχείου.';
 $lang['uploadwrong']           = 'Η μεταφόÏτωση δεν έγινε δεκτή. Δεν επιτÏέπονται αÏχεία Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï„Ïπου!';
 $lang['uploadexist']           = 'Το αÏχείο ήδη υπάÏχει. Δεν έγινε καμία αλλαγή.';
 $lang['uploadbadcontent']      = 'Το πεÏιεχόμενο του αÏχείου δεν ταιÏιάζει με την επέκτασή του.';
 $lang['uploadspam']            = 'Η μεταφόÏτωση ακυÏώθηκε από το φίλτÏο spam.';
 $lang['uploadxss']             = 'Η μεταφόÏτωση ακυÏώθηκε λόγω Ï€Î¹Î¸Î±Î½Î¿Ï ÎµÏ€Î¹ÎºÎ¯Î½Î´Ï…Î½Î¿Ï… πεÏιεχομένου.';
+$lang['uploadsize']            = 'Το αÏχείο ήταν Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿. (μέγιστο %s)';
 $lang['deletesucc']            = 'Το αÏχείο "%s" διαγÏάφηκε.';
-$lang['deletefail']            = '"%s" δεν διαγÏάφηκε. Πιθανόν αυτό να οφείλεται στις Ïυθμίσεις Ï€Ïόσβασης του αÏχείου.';
+$lang['deletefail']            = 'Το αÏχείο "%s" δεν διαγÏάφηκε. Πιθανόν αυτό να οφείλεται στις Ïυθμίσεις Ï€Ïόσβασης του αÏχείου.';
 $lang['mediainuse']            = 'Το αÏχείο "%s" δεν διαγÏάφηκε - είναι ακόμα σε χÏήση.';
 $lang['namespaces']            = 'Φάκελοι';
-$lang['mediafiles']            = 'ΥπάÏχοντα αÏχεία σε';
+$lang['mediafiles']            = 'Διαθέσιμα αÏχεία σε';
+$lang['js']['searchmedia']     = 'Αναζήτηση για αÏχεία';
 $lang['js']['keepopen']        = 'Το παÏάθυÏο να μην κλείνει';
 $lang['js']['hidedetails']     = 'ΑπόκÏυψη λεπτομεÏειών';
+$lang['js']['nosmblinks']      = 'Οι σÏνδεσμοι Ï€Ïος Windows shares δουλεÏουν μόνο στον Microsoft Internet Explorer.
+ΜποÏείτε πάντα να κάνετε αντιγÏαφή και επικόλληση του συνδέσμου.';
+$lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμων';
+$lang['js']['linkto']          = 'ΣÏνδεση σε:';
+$lang['js']['del_confirm']     = 'Îα διαγÏαφεί?';
+$lang['js']['mu_btn']          = 'ΤαυτόχÏονη φόÏτωση πολλαπλών φακέλων';
 $lang['mediausage']            = 'ΧÏησιμοποιήστε την ακόλουθη σÏνταξη για να παÏαθέσετε αυτό το αÏχείο:';
 $lang['mediaview']             = 'Κανονική Ï€Ïοβολή αÏχείου';
 $lang['mediaroot']             = 'root';
@@ -130,12 +147,12 @@
 $lang['restored']              = 'παλαιότεÏη έκδοση επαναφέÏθηκε';
 $lang['external_edit']         = 'εξωτεÏική Ï„Ïοποποίηση';
 $lang['summary']               = 'ΕπεξεÏγασία σÏνοψης';
+$lang['noflash']               = 'Το Adobe Flash Plugin απαιτείται για την Ï€Ïοβολή Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… στοιχείου.';
+$lang['download']              = 'Λήψη Κώδικα';
 $lang['mail_newpage']          = 'σελίδα Ï€Ïοστέθηκε:';
 $lang['mail_changed']          = 'σελίδα Ï„Ïοποποιήθηκε:';
 $lang['mail_new_user']         = 'νέος χÏήστης:';
 $lang['mail_upload']           = 'αÏχείο φοÏτώθηκε:';
-$lang['js']['nosmblinks']            = "Οι σÏνδεσμοι Ï€Ïος Windows shares δουλεÏουν μόνο στον Microsoft Internet Explorer.\nΜποÏείτε πάντα να κάνετε αντιγÏαφή και επικόλληση του συνδέσμου.";
-$lang['qb_alert']              = 'ΠÏοσθέσετε το κείμενο που θέλετε να μοÏφοποιήσετε.\nΘα Ï€Ïοστεθεί στο τέλος του εγγÏάφου.';
 $lang['qb_bold']               = 'Έντονο Κείμενο';
 $lang['qb_italic']             = 'Πλάγιο Κείμενο';
 $lang['qb_underl']             = 'ΥπογÏαμμισμένο Κείμενο';
@@ -146,6 +163,8 @@
 $lang['qb_h3']                 = 'Κεφαλίδα 3ου Επιπέδου';
 $lang['qb_h4']                 = 'Κεφαλίδα 4ου Επιπέδου';
 $lang['qb_h5']                 = 'Κεφαλίδα 5ου Επιπέδου';
+$lang['qb_h']                  = 'Κεφαλίδα';
+$lang['qb_hs']                 = 'Επιλογή Κεφαλίδας';
 $lang['qb_link']               = 'ΕσωτεÏικός ΣÏνδεσμος';
 $lang['qb_extlink']            = 'ΕξωτεÏικός ΣÏνδεσμος';
 $lang['qb_hr']                 = 'ΔιαχωÏιστική ΓÏαμμή';
@@ -155,7 +174,6 @@
 $lang['qb_sig']                = 'ΠÏοσθήκη ΥπογÏαφής';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Ειδικοί ΧαÏακτήÏες';
-$lang['del_confirm']           = 'Îα διαγÏαφεί?';
 $lang['admin_register']        = 'ΠÏοσθήκη νέου χÏήστη';
 $lang['metaedit']              = 'ΤÏοποποίηση metadata';
 $lang['metasaveerr']           = 'Η αποθήκευση των metadata απέτυχε';
@@ -180,13 +198,12 @@
 $lang['authtempfail']          = 'Η είσοδος χÏηστών δεν λειτουÏγεί αυτή την στιγμή. Εάν αυτό διαÏκεί για Ï€Î¿Î»Ï Ï‡Ïόνο, παÏακαλοÏμε ενημεÏώστε τον διαχειÏιστή του wiki.';
 $lang['i_chooselang']          = 'Επιλογή γλώσσας';
 $lang['i_installer']           = 'Οδηγός εγκατάστασης DokuWiki';
-$lang['i_wikiname']            = 'Ονομασία Wiki';
+$lang['i_wikiname']            = 'Ονομασία wiki';
 $lang['i_enableacl']           = 'ΕνεÏγοποίηση Λίστας Δικαιωμάτων ΠÏόσβασης - ACL (συνιστάται)';
 $lang['i_superuser']           = 'ΔιαχειÏιστής';
 $lang['i_problems']            = 'Ο οδηγός εγκατάστασης συνάντησε τα Ï€Ïοβλήματα που αναφέÏονται παÏακάτω. Η εγκατάσταση δεν θα ολοκληÏωθεί επιτυχώς μέχÏι να επιλυθοÏν αυτά τα Ï€Ïοβλήματα.';
 $lang['i_modified']            = 'Για λόγους ασφαλείας, ο οδηγός εγκατάστασης λειτουÏγεί μόνο με νέες και μη Ï„Ïοποποιημένες εγκαταστάσεις Dokuwiki.
-                                      ΠÏέπει είτε να κάνετε νέα εγκατάσταση, χÏησιμοποιώντας το αÏχικό πακέτο εγκατάστασης, ή να
-                                      συμβουλευτείτε τις οδηγίες εγκατάστασης της εφαÏμογής.';
+ΠÏέπει είτε να κάνετε νέα εγκατάσταση, χÏησιμοποιώντας το αÏχικό πακέτο εγκατάστασης, ή να συμβουλευτείτε τις οδηγίες εγκατάστασης της εφαÏμογής.';
 $lang['i_funcna']              = 'Η λειτουÏγία %s της PHP δεν είναι διαθέσιμη. Πιθανόν να είναι απενεÏγοποιημένη στις Ïυθμίσεις έναÏξης της PHP';
 $lang['i_phpver']              = 'Η έκδοση %s της PHP που έχετε είναι παλαιότεÏη της απαιτοÏμενης %s. ΠÏέπει να αναβαθμίσετε την PHP.';
 $lang['i_permfail']            = 'Ο φάκελος %s δεν είναι εγγÏάψιμος από την εφαÏμογή DokuWiki. ΠÏέπει να διοÏθώσετε τα δικαιώματα Ï€Ïόσβασης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… φακέλου!';
@@ -194,12 +211,33 @@
 $lang['i_writeerr']            = 'Δεν είναι δυνατή η δημιουÏγία του %s. ΠÏέπει να διοÏθώσετε τα δικαιώματα Ï€Ïόσβασης Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… φακέλου/αÏχείου και να δημιουÏγήσετε το αÏχείο χειÏοκίνητα!';
 $lang['i_badhash']             = 'Μη αναγνωÏίσιμο ή Ï„Ïοποποιημένο αÏχείο dokuwiki.php (hash=%s)';
 $lang['i_badval']              = '%s - λάθος ή ανÏπαÏκτη τιμή';
-$lang['i_success']             = 'Η εγκατάσταση ολοκληÏώθηκε επιτυχώς. ΜποÏείτε πλέον να διαγÏάψετε το αÏχείο install.php. Συνεχίστε στο 
-                                      νέο σας DokuWiki.';
-$lang['i_failure']             = 'Εμφανίστηκαν κάποια Ï€Ïοβλήματα στη διαδικασία ανανέωσης των αÏχείων Ïυθμίσεων. Πιθανόν να χÏειάζεται να 
-                                      τα Ï„Ïοποποιήσετε χειÏοκίνητα ώστε να μποÏείτε να χÏησιμοποιήσετε το νέο σας DokuWiki.';
+$lang['i_success']             = 'Η εγκατάσταση ολοκληÏώθηκε επιτυχώς. ΜποÏείτε πλέον να διαγÏάψετε το αÏχείο install.php. Συνεχίστε στο νέο σας DokuWiki.';
+$lang['i_failure']             = 'Εμφανίστηκαν κάποια Ï€Ïοβλήματα στη διαδικασία ανανέωσης των αÏχείων Ïυθμίσεων. Πιθανόν να χÏειάζεται να τα Ï„Ïοποποιήσετε χειÏοκίνητα ώστε να μποÏείτε να χÏησιμοποιήσετε το νέο σας DokuWiki.';
 $lang['i_policy']              = 'ΑÏχική πολιτική Λίστας Δικαιωμάτων ΠÏόσβασης - ACL';
 $lang['i_pol0']                = 'Ανοιχτό Wiki (όλοι μποÏοÏν να διαβάσουν ή να δημιουÏγήσουν/Ï„Ïοποποιήσουν σελίδες και να μεταφοÏτώσουν αÏχεία)';
 $lang['i_pol1']                = 'Δημόσιο Wiki (όλοι μποÏοÏν να διαβάσουν σελίδες αλλά μόνο οι εγγεγÏαμμένοι χÏήστες μποÏοÏν να δημιουÏγήσουν/Ï„Ïοποποιήσουν σελίδες και να μεταφοÏτώσουν αÏχεία)';
 $lang['i_pol2']                = 'Κλειστό Wiki (μόνο οι εγγεγÏαμμένοι χÏήστες μποÏοÏν να διαβάσουν ή να δημιουÏγήσουν/Ï„Ïοποποιήσουν σελίδες και να μεταφοÏτώσουν αÏχεία)';
 $lang['i_retry']               = 'Îέα Ï€Ïοσπάθεια';
+$lang['mu_intro']              = 'Εδώ μποÏείτε να φοÏτώσετε ταυτόχÏονα πολλαπλά αÏχεία. Πατήστε στο κουμπί Ï€Ïοεπισκόπησης για να τα Ï€Ïοσθέσετε στη λίστα. Πατήστε στο κουμπί μεταφόÏτωσης όταν έχετε τελειώσει.';
+$lang['mu_gridname']           = 'Όνομα αÏχείου';
+$lang['mu_gridsize']           = 'Μέγεθος';
+$lang['mu_gridstat']           = 'Κατάσταση';
+$lang['mu_namespace']          = 'Φάκελος';
+$lang['mu_browse']             = 'Επισκόπηση';
+$lang['mu_toobig']             = 'υπεÏβολικά μεγάλο';
+$lang['mu_ready']              = 'έτοιμο για φόÏτωση';
+$lang['mu_done']               = 'ολοκληÏώθηκε';
+$lang['mu_fail']               = 'απέτυχε';
+$lang['mu_authfail']           = 'η συνεδÏία έληξε';
+$lang['mu_progress']           = '@PCT@% φοÏτώθηκε';
+$lang['mu_filetypes']          = 'ΕπιτÏεπτοί Ï„Ïποι αÏχείων';
+$lang['mu_info']               = 'τα αÏχεία ανέβηκαν.';
+$lang['mu_lasterr']            = 'Τελευταίο σφάλμα:';
+$lang['recent_global']         = 'Βλέπετε τις αλλαγές εντός του φακέλου %s. ΜποÏείτε επίσης να δείτε τις Ï€Ïόσφατες αλλαγές σε όλο το wiki.';
+$lang['years']                 = 'Ï€Ïιν από %d χÏόνια';
+$lang['months']                = 'Ï€Ïιν από %d μήνες';
+$lang['weeks']                 = 'Ï€Ïιν από %d εβδομάδες';
+$lang['days']                  = 'Ï€Ïιν από %d ημέÏες';
+$lang['hours']                 = 'Ï€Ïιν από %d ÏŽÏες';
+$lang['minutes']               = 'Ï€Ïιν από %d λεπτά';
+$lang['seconds']               = 'Ï€Ïιν από %d δευτεÏόλεπτα';
diff -Naur dokuwiki-2009-02-14/inc/lang/el/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/el/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/el/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,11 +1,11 @@
-Μία σελίδα Ï€Ïοστέθηκε ή Ï„Ïoποποιήθηκε στο DokuWiki σας.
-Αυτά είναι τα αντίστοιχα στοιχεία: 
+Μία σελίδα Ï€Ïοστέθηκε ή Ï„Ïοποποιήθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
 
 ΗμεÏομηνία      : @DATE@
 ΦυλλομετÏητής   : @BROWSER@
 IP-ΔιεÏθυνση    : @IPADDRESS@
 Όνομα υπολογιστή: @HOSTNAME@
-Παλία έκδοση    : @OLDPAGE@
+Παλιά έκδοση    : @OLDPAGE@
 Îέα έκδοση      : @NEWPAGE@
 ΣÏνοψη          : @SUMMARY@
 ΧÏήστης         : @USER@
diff -Naur dokuwiki-2009-02-14/inc/lang/el/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/el/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/el/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 
 @CONFIRM@
 
---
+-- 
 Αυτό το e-mail δημιουÏγήθηκε αυτόματα από την εφαÏμογή DokuWiki στην διεÏθυνση
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/el/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/el/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/el/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,13 +1,19 @@
 Γειa σας!
 
 Η σελίδα @PAGE@ στο wiki @TITLE@ Ï„Ïοποποιήθηκε.
-Αυτές είναι οι διαφοÏές σε σχέση με την Ï€ÏοηγοÏμενη έκδοση: 
+Αυτές είναι οι διαφοÏές σε σχέση με την Ï€ÏοηγοÏμενη έκδοση:
 
 --------------------------------------------------------
 @DIFF@
 --------------------------------------------------------
 
-Για να πάψετε να λαμβάνετε τέτοια ενημεÏωτικά e-mails, 
+ΗμεÏομηνία: @DATE@
+ΧÏήστης: @USER@
+ΠεÏίληψη Ï„Ïοποποίησης: @SUMMARY@
+Παλιά έκδοση: @OLDPAGE@
+Îέα έκδοση: @NEWPAGE@
+
+Για να πάψετε να λαμβάνετε τέτοια ενημεÏωτικά e-mails,
 επισκεφτείτε το wiki στο
 @DOKUWIKIURL@ δείτε την σελίδα
 @NEWPAGE@
diff -Naur dokuwiki-2009-02-14/inc/lang/el/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/el/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/el/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== ΤÏοποποίηση Ï€Ïοφίλ  ======
+====== ΤÏοποποίηση Ï€Ïοφίλ ======
 
 ΤÏοποποιήστε **μόνο** τα πεδία που θέλετε να αλλάξετε. Δεν μποÏείτε να αλλάξετε το πεδίο ''Όνομα''.
diff -Naur dokuwiki-2009-02-14/inc/lang/el/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/el/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/el/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/el/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-Ένα αÏχείο μεταφοÏτώθηκε στο DokuWiki σας.
-Αυτά είναι τα αντίστοιχα στοιχεία: 
+Ένα αÏχείο φοÏτώθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
 
 ΑÏχείο          : @MEDIA@
 ΗμεÏομηνία      : @DATE@
diff -Naur dokuwiki-2009-02-14/inc/lang/en/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/en/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/en/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+===== Additional Plugins =====
+
diff -Naur dokuwiki-2009-02-14/inc/lang/en/denied.txt dokuwiki-rc2009-12-02/inc/lang/en/denied.txt
--- dokuwiki-2009-02-14/inc/lang/en/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Permission Denied======
+====== Permission Denied ======
 
 Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/diff.txt dokuwiki-rc2009-12-02/inc/lang/en/diff.txt
--- dokuwiki-2009-02-14/inc/lang/en/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Differences======
+====== Differences ======
 
 This shows you the differences between two versions of the page.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/lang.php dokuwiki-rc2009-12-02/inc/lang/en/lang.php
--- dokuwiki-2009-02-14/inc/lang/en/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -49,6 +49,7 @@
 $lang['btn_draft']    = 'Edit draft';
 $lang['btn_recover']  = 'Recover draft';
 $lang['btn_draftdel'] = 'Delete draft';
+$lang['btn_revert'] = 'Restore';
 
 $lang['loggedinas'] = 'Logged in as';
 $lang['user']       = 'Username';
@@ -93,6 +94,8 @@
 $lang['license']   = 'Except where otherwise noted, content on this wiki is licensed under the following license:';
 $lang['licenseok'] = 'Note: By editing this page you agree to license your content under the following license:';
 
+$lang['searchmedia']  = 'Search file name:';
+$lang['searchmedia_in']  = 'Search in %s';
 $lang['txt_upload']   = 'Select file to upload';
 $lang['txt_filename'] = 'Upload as (optional)';
 $lang['txt_overwrt']  = 'Overwrite existing file';
@@ -120,6 +123,7 @@
 $lang['namespaces']  = 'Namespaces';
 $lang['mediafiles']  = 'Available files in';
 
+$lang['js']['searchmedia']    = 'Search for files';
 $lang['js']['keepopen']    = 'Keep window open on selection';
 $lang['js']['hidedetails'] = 'Hide Details';
 $lang['mediausage']  = 'Use the following syntax to reference this file:';
@@ -150,6 +154,7 @@
 $lang['external_edit'] = 'external edit';
 $lang['summary']    = 'Edit summary';
 $lang['noflash']    = 'The Adobe Flash Plugin is needed to display this content.';
+$lang['download']   = 'Download Snippet';
 
 $lang['mail_newpage']  = 'page added:';
 $lang['mail_changed']  = 'page changed:';
@@ -158,7 +163,6 @@
 
 $lang['js']['nosmblinks'] = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
 
-$lang['qb_alert']   = 'Please enter the text you want to format.\nIt will be appended to the end of the document.';
 $lang['qb_bold']    = 'Bold Text';
 $lang['qb_italic']  = 'Italic Text';
 $lang['qb_underl']  = 'Underlined Text';
@@ -169,6 +173,13 @@
 $lang['qb_h3']      = 'Level 3 Headline';
 $lang['qb_h4']      = 'Level 4 Headline';
 $lang['qb_h5']      = 'Level 5 Headline';
+
+$lang['qb_h']       = 'Headline';
+$lang['qb_hs']      = 'Select Headline';
+$lang['qb_hplus']   = 'Higher Headline';
+$lang['qb_hminus']  = 'Lower Headline';
+$lang['qb_hequal']  = 'Same Level Headline';
+
 $lang['qb_link']    = 'Internal Link';
 $lang['qb_extlink'] = 'External Link';
 $lang['qb_hr']      = 'Horizontal Rule';
@@ -179,7 +190,11 @@
 $lang['qb_smileys'] = 'Smileys';
 $lang['qb_chars']   = 'Special Chars';
 
-$lang['del_confirm']= 'Really delete selected item(s)?';
+$lang['upperns']       = 'jump to parent namespace';
+$lang['js']['linkwiz'] = 'Link Wizard';
+$lang['js']['linkto']  = 'Link to:';
+
+$lang['js']['del_confirm']= 'Really delete selected item(s)?';
 $lang['admin_register']= 'Add new user';
 
 $lang['metaedit']    = 'Edit Metadata';
@@ -249,7 +264,17 @@
 $lang['mu_authfail']  = 'session expired';
 $lang['mu_progress']  = '@PCT@% uploaded';
 $lang['mu_filetypes'] = 'Allowed Filetypes';
+$lang['mu_info']      = 'files uploaded.';
+$lang['mu_lasterr']   = 'Last error:';
 
 $lang['recent_global'] = 'You\'re currently watching the changes inside the %s namespace. You can also view the recent changes of the whole wiki.';
 
+$lang['years']   = '%d years ago';
+$lang['months']  = '%d months ago';
+$lang['weeks']   = '%d weeks ago';
+$lang['days']    = '%d days ago';
+$lang['hours']   = '%d hours ago';
+$lang['minutes'] = '%d minutes ago';
+$lang['seconds'] = '%d seconds ago';
+
 //Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/lang/en/newpage.txt dokuwiki-rc2009-12-02/inc/lang/en/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/en/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======This topic does not exist yet======
+====== This topic does not exist yet ======
 
 You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by using the ''Create this page'' button.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/norev.txt dokuwiki-rc2009-12-02/inc/lang/en/norev.txt
--- dokuwiki-2009-02-14/inc/lang/en/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======No such revision======
+====== No such revision ======
 
 The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/preview.txt dokuwiki-rc2009-12-02/inc/lang/en/preview.txt
--- dokuwiki-2009-02-14/inc/lang/en/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Preview======
+====== Preview ======
 
 This is a preview of how your text will look like. Remember: It is **not saved** yet!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/recent.txt dokuwiki-rc2009-12-02/inc/lang/en/recent.txt
--- dokuwiki-2009-02-14/inc/lang/en/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Recent Changes======
+====== Recent Changes ======
 
 The following pages were changed recently.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/revisions.txt dokuwiki-rc2009-12-02/inc/lang/en/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/en/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Old Revisions======
+====== Old Revisions ======
 
 These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/en/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/en/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/en/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Search======
+====== Search ======
 
 You can find the results of your search below. If you didn't find what you were looking for, you can create or edit the page named after your query with the appropriate button.
 
-=====Results=====
+===== Results =====
diff -Naur dokuwiki-2009-02-14/inc/lang/en/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/en/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/en/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/en/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM blocked======
+====== SPAM blocked ======
 
 Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/eo/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/eo/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Ekstra kromaĵojn =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/admin.txt dokuwiki-rc2009-12-02/inc/lang/eo/admin.txt
--- dokuwiki-2009-02-14/inc/lang/eo/admin.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Administro ======
 
-Sube vi povas trovi liston de admnistraj taskoj disponeblaj en DokuWiki.
+Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/eo/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/eo/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Retroligoj ======
+====== Retroligiloj ======
 
 Ĉi tiu listo montras paÄojn, kiuj referencas al la aktuala paÄo.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/conflict.txt dokuwiki-rc2009-12-02/inc/lang/eo/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/eo/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,4 +2,4 @@
 
 Ekzistas pli nova versio de la dokumento. Tio okazas kiam iu alia uzanto ÅanÄigis enhavon de la dokumento dum vi redaktis Äin.
 
-Atente esploru distingojn kaj decidu kiun version vi tenigos. Se vi premos ''"Konservi"'', do via versio estos konservita. Presonte butonon ''Rezigni'' vi tenos la kurantan version.
+Atente esploru distingojn kaj decidu kiun version vi tenigos. Se vi premos ''Konservi'', do via versio estos konservita. Presonte butonon ''Rezigni'' vi tenos la kurantan version.
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/diff.txt dokuwiki-rc2009-12-02/inc/lang/eo/diff.txt
--- dokuwiki-2009-02-14/inc/lang/eo/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Diferencoj======
+====== Diferencoj ======
 
 Ĉi tie vi povas ekvidi diferencojn inter la aktuala versio kaj la elektita revizio de la paÄo.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/draft.txt dokuwiki-rc2009-12-02/inc/lang/eo/draft.txt
--- dokuwiki-2009-02-14/inc/lang/eo/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Skiza dosiero estis trovata ======
 
-Via lasta sekcio de redakto en tiu ĉi paÄo ne estis korekte kompletita. Dokuwiki aÅ­tomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daÅ­rigi vian redaktadon. Sube vi povas vidi la datenaron, kiun estis konservata el via lasta sekcio.
+Via lasta sekcio de redakto en tiu ĉi paÄo ne estis korekte kompletita. DokuWiki aÅ­tomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daÅ­rigi vian redaktadon. Sube vi povas vidi la datenaron, kiu estis konservata el via lasta sekcio.
 
-Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aux //rezigni// pri la redakta procezo.
+Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aŭ //rezigni// pri la redakta procezo.
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/editrev.txt dokuwiki-rc2009-12-02/inc/lang/eo/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/eo/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos Äin, tiel kreiÄos nova kuranta versio kun la sama enhavo. 
+**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos Äin, tiel kreiÄos nova kuranta versio kun la sama enhavo.
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/edit.txt dokuwiki-rc2009-12-02/inc/lang/eo/edit.txt
--- dokuwiki-2009-02-14/inc/lang/eo/edit.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1 +1 @@
-Redaktu paÄon kaj poste premu butonon titolitan ''"Konservi"''. Bonvolu tralegi la [[vikio:sintakso|vikian sintakson]] por kompreni kiel vi povas krei paÄojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paÄo. Se vi volas nur testi ion, do bonvolu uzi specialan paÄon: [[vikio:ludejo|ludejo]].
+Redaktu paÄon kaj poste premu butonon titolitan ''Konservi''. Bonvolu tralegi la [[vikio:sintakso|vikian sintakson]] por kompreni kiel vi povas krei paÄojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paÄo. Se vi volas nur testi ion, do bonvolu uzi specialan paÄon: [[vikio:ludejo|ludejo]].
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/install.html dokuwiki-rc2009-12-02/inc/lang/eo/install.html
--- dokuwiki-2009-02-14/inc/lang/eo/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -1,12 +1,9 @@
-
    Tiu ĉi paÄo helpas en la unua instalo kaj agordado de Dokuwiki. Pli da informo pri tiu instalilo estas disponebla en Äia propra dokumentada paÄo.
    
+
    Tiu ĉi paÄo helpas en la unua instalo kaj agordado de DokuWiki. Pli da informo pri tiu instalilo estas disponebla en Äia propra dokumentada paÄo.
    
 
-
    DokuWiki uzas ordinarajn dosierojn por konservi vikiajn paÄojn kaj aliaj informoj asociitaj al tiuj paÄoj (ekz. bildoj, serĉindeksoj, malnovaj revizioj, ktp). Por bone funkcii, DokuWiki
-devas havi registran rajton sur la subdosierujoj, kiuj gardas tiujn dosierojn. Tiu ĉi instalilo ne kapablas difini permes-atributojn de dosierujoj. Ordinare, tio devas esti senpere farita de iu komando en konzolo aŭ , se vi abonas retprovizanton, per FTP aŭ kontrola panelo de tiu retprovizanto (ekz, cPanel).
    
+
    DokuWiki uzas ordinarajn dosierojn por konservi vikiajn paÄojn kaj aliajn informojn asociitaj al tiuj paÄoj (ekz. bildoj, serĉindeksoj, malnovaj revizioj, ktp). Por bone funkcii, DokuWiki devas havi registran rajton sur la subdosierujoj, kiuj entenas tiujn dosierojn. Tiu ĉi instalilo ne kapablas difini permes-atributojn de dosierujoj. Ordinare, tio devas esti senpere farita de iu komando en konzolo aÅ­, se vi abonas retprovizanton, per FTP aÅ­ kontrola panelo de tiu retprovizanto (ekz. cPanel).
    
 
-
    Tiu ĉi instalilo difinos vian DokuWiki-an agordadon por
-ACL, kiu ebligas al administranto identiÄi kaj aliri taÅ­gan interfacon por instali kromaĵojn, administri uzulojn kaj alireblon al vikipaÄoj, kaj difini agordojn Äeneralajn.
-Äœi ne estas nepra por ke DokuWiki funkciu, tamen Äi multe faciligos admnistradon.
    
+
    Tiu ĉi instalilo difinos vian DokuWiki-an agordadon por ACL, kiu ebligas al administranto identiÄi kaj aliri taÅ­gan interfacon por instali kromaĵojn, administri uzantojn kaj alireblon al vikipaÄoj, kaj difini agordojn Äeneralajn.
+Äœi ne estas nepra por ke DokuWiki funkciu, tamen Äi multe faciligos administradon.
    
 
-
    Spertuloj aÅ­ uzuloj kiuj bezonas specialajn agordrimedojn devus uzi tiujn ligilojn por havi pli detalojn pri 
-instaladaj instrukcioj
+
    Spertuloj aÅ­ uzantoj kiuj bezonas specialajn agordrimedojn devus uzi tiujn ligilojn por havi pli detalojn pri instaladaj instrukcioj
 kaj agordadaj difinoj.
    
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/lang.php dokuwiki-rc2009-12-02/inc/lang/eo/lang.php
--- dokuwiki-2009-02-14/inc/lang/eo/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,10 @@
  * @author Felipe Castro 
  * @author Felipe Castro 
  * @author Felipo Kastro 
+ * @author Robert Bogenschneider 
+ * @author Erik Pedersen 
+ * @author Erik Pedersen 
+ * @author Robert Bogenschneider 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -41,54 +45,57 @@
 $lang['btn_back']              = 'Retroiri';
 $lang['btn_backlink']          = 'Retroligoj';
 $lang['btn_backtomedia']       = 'Retroiri al elekto de dosiero';
-$lang['btn_subscribe']         = 'AliÄi al PaÄaj Modifoj';
-$lang['btn_unsubscribe']       = 'MalaliÄi al PaÄaj Modifoj';
-$lang['btn_subscribens']       = 'AliÄi al Nomspacaj Modifoj';
-$lang['btn_unsubscribens']     = 'MalaliÄi al Nomspacaj Modifoj';
+$lang['btn_subscribe']         = 'AliÄi al paÄaj modifoj';
+$lang['btn_unsubscribe']       = 'MalaliÄi al paÄaj modifoj';
+$lang['btn_subscribens']       = 'AliÄi al nomspacaj modifoj';
+$lang['btn_unsubscribens']     = 'MalaliÄi al nomspacaj modifoj';
 $lang['btn_profile']           = 'Äœisdatigi profilon';
-$lang['btn_reset']             = 'Rekomencigi';
+$lang['btn_reset']             = 'Rekomenci';
 $lang['btn_resendpwd']         = 'Sendi novan pasvorton';
 $lang['btn_draft']             = 'Redakti skizon';
 $lang['btn_recover']           = 'Restarigi skizon';
 $lang['btn_draftdel']          = 'Forigi skizon';
+$lang['btn_revert']            = 'Restarigi';
 $lang['loggedinas']            = 'Ensalutita kiel';
 $lang['user']                  = 'Uzant-nomo';
 $lang['pass']                  = 'Pasvorto';
 $lang['newpass']               = 'Nova pasvorto';
-$lang['oldpass']               = 'Konfirmu validantan pasvorton';
-$lang['passchk']               = 'pli unu fojo';
+$lang['oldpass']               = 'Konfirmu la nunan pasvorton';
+$lang['passchk']               = 'plian fojon';
 $lang['remember']              = 'Rememoru min';
 $lang['fullname']              = 'Kompleta nomo';
 $lang['email']                 = 'RetpoÅto';
 $lang['register']              = 'Registro';
-$lang['profile']               = 'Profilo de uzanto';
+$lang['profile']               = 'Uzanto-profilo';
 $lang['badlogin']              = 'Pardonu, uzant-nomo aÅ­ pasvorto estis erara.';
-$lang['minoredit']             = 'Etaj Modifoj';
+$lang['minoredit']             = 'Etaj modifoj';
 $lang['draftdate']             = 'Lasta konservo de la skizo:';
-$lang['nosecedit']             = 'La paÄo ÅanÄis intertempe, sekcio-informo estis malÄisdata, ni Åargas la tutan paÄon anstataÅ­e.';
+$lang['nosecedit']             = 'La paÄo ÅanÄiÄis intertempe, sekcio-informo estis malÄisdata, ni Åargas la tutan paÄon anstataÅ­e.';
 $lang['regmissing']            = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
-$lang['reguexists']            = 'Pardonu, ĉi tiu uzulnomo jam estas okupita.';
+$lang['reguexists']            = 'Pardonu, ĉi tiu uzanto-nomo jam estas okupita.';
 $lang['regsuccess']            = 'La uzanto estas kreita kaj la pasvorto estis elsendita per retpoÅto.';
 $lang['regsuccess2']           = 'La uzanto estas kreita.';
-$lang['regmailfail']           = 'Åœajne okazis eraro dum elsendo de la pasvorto. Bonvole informu administranton pri tio!';
-$lang['regbadmail']            = 'Entajpita retpoÅta adreso ne Åajnas valida. Se vi pensas, ke estas eraro, kontaktu la administranton.';
-$lang['regbadpass']            = 'La du pasvortoj ne interegalas, bonvolu provi refoje.';
-$lang['regpwmail']             = 'Via pasvorto DokuWiki';
+$lang['regmailfail']           = 'Åœajne okazis eraro dum elsendo de la pasvorto. Bonvolu informi administranton pri tio!';
+$lang['regbadmail']            = 'Entajpita retpoÅta adreso ne Åajnas valida. Se vi pensas, ke tio estas eraro, kontaktu la administranton.';
+$lang['regbadpass']            = 'La du pasvortoj ne samas, bonvolu provi refoje.';
+$lang['regpwmail']             = 'Via DokuWiki-pasvorto';
 $lang['reghere']               = 'Se vi ne havas konton, do vi povos akiri Äin';
 $lang['profna']                = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.';
 $lang['profnochange']          = 'Neniu ÅanÄo, nenio farinda.';
 $lang['profnoempty']           = 'Malplena nomo aÅ­ retadreso ne estas permesataj.';
-$lang['profchanged']           = 'La profilo de la uzulo estas sukcese Äisdatigita.';
+$lang['profchanged']           = 'La profilo de la uzanto estas sukcese Äisdatigita.';
 $lang['pwdforget']             = 'Ĉu vi forgesis vian pasvorton? Prenu novan';
 $lang['resendna']              = 'Tiu ĉi vikio ne ebligas resendon de la pasvortoj.';
 $lang['resendpwd']             = 'Sendi novan pasvorton al';
 $lang['resendpwdmissing']      = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
-$lang['resendpwdnouser']       = 'Pardonu, ni ne trovas tiun uzulon en nia datenbazo.';
-$lang['resendpwdbadauth']      = 'Pardonu, tiu "aÅ­tentikiga kodo" ne validas. CertiÄu, ke vi uzis la kompletan konfirmigan ligilon.';
+$lang['resendpwdnouser']       = 'Pardonu, ni ne trovas tiun uzanton en nia datenbazo.';
+$lang['resendpwdbadauth']      = 'Pardonu, tiu aÅ­tentiga kodo ne validas. CertiÄu, ke vi uzis la kompletan konfirmigan ligilon.';
 $lang['resendpwdconfirm']      = 'Konfirmiga ligilo estas sendita per retpoÅto.';
 $lang['resendpwdsuccess']      = 'Via nova pasvorto estas sendita per retpoÅto.';
 $lang['license']               = 'Krom kie rekte indikite, enhavo de tiu ĉi vikio estas publikigita laŭ la jena permesilo:';
 $lang['licenseok']             = 'Rimarku: redaktante tiun ĉi paÄon vi konsentas publikigi vian enhavon laÅ­ la jena permesilo:';
+$lang['searchmedia']           = 'Serĉi dosiernomon:';
+$lang['searchmedia_in']        = 'Serĉi en %s';
 $lang['txt_upload']            = 'Elektu dosieron por alÅuto';
 $lang['txt_filename']          = 'AlÅuti kiel (laÅ­vole)';
 $lang['txt_overwrt']           = 'AnstataÅ­igi ekzistantan dosieron';
@@ -96,7 +103,7 @@
 $lang['lockexpire']            = 'Ŝlosado ĉesos en';
 $lang['willexpire']            = 'Vi povos redakti ĉi tiun paÄon post unu minuto.\nSe vi volas nuligi tempkontrolon de la Ålosado, do premu butonon "AntaÅ­rigardi".';
 $lang['notsavedyet']           = 'Ne konservitaj modifoj perdiÄos.\nĈu vi certe volas daÅ­rigi la procezon?';
-$lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-strio: ';
+$lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-fluo: ';
 $lang['nothingfound']          = 'AnkoraÅ­ nenio troviÄas tie ĉi.';
 $lang['mediaselect']           = 'Elekto de aŭdvidaĵa dosiero';
 $lang['fileupload']            = 'AlÅuto de aÅ­dvidaĵa dosiero';
@@ -113,15 +120,19 @@
 $lang['mediainuse']            = 'La dosiero "%s" ne estis forigita - Äi ankoraÅ­ estas uzata.';
 $lang['namespaces']            = 'Nomspacoj';
 $lang['mediafiles']            = 'Disponeblaj dosieroj';
+$lang['js']['searchmedia']     = 'Serĉi dosierojn';
 $lang['js']['keepopen']        = 'Tenu la fenestron malfermata dum elekto';
 $lang['js']['hidedetails']     = 'KaÅi detalojn';
 $lang['js']['nosmblinks']      = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer".
 Vi ankoraÅ­ povas kopii kaj almeti la ligilon.';
+$lang['js']['linkwiz']         = 'Ligil-Asistanto';
+$lang['js']['linkto']          = 'Ligilo al:';
+$lang['js']['del_confirm']     = 'Ĉu vere forigi elektitajn ero(j)n?';
 $lang['js']['mu_btn']          = 'AlÅuti plurajn dosierojn multope.';
 $lang['mediausage']            = 'Uzu la jenan sintakson por referenci tiun ĉi dosieron:';
 $lang['mediaview']             = 'Rigardi originalan dosieron';
 $lang['mediaroot']             = 'ĉefo (root)';
-$lang['mediaupload']           = 'AlÅutu dosieron al la kuranta nomspaco tie ĉi. Por krei subnomspacojn, antaÅ­metu ilin al via "AlÅuti kiel" dosiernomo, apartigante per dupunktoj (:).';
+$lang['mediaupload']           = 'AlÅutu dosieron al la kuranta nomspaco tien ĉi. Por krei subnomspacojn, antaÅ­metu ilin al via "AlÅuti kiel" dosiernomo, apartigante per dupunktoj (:).';
 $lang['mediaextchange']        = 'La dosiersufikso ÅanÄis de .%s al .%s!';
 $lang['reference']             = 'Referencoj por';
 $lang['ref_inuse']             = 'La dosiero ne povas esti forigita, ĉar Äi ankoraÅ­ estas uzata de la jenaj paÄoj:';
@@ -135,7 +146,7 @@
 $lang['diff2']                 = 'Montri diferencojn inter la elektitaj revizioj';
 $lang['line']                  = 'Linio';
 $lang['breadcrumb']            = 'PaÅoj';
-$lang['youarehere']            = 'Vi ĉi tie';
+$lang['youarehere']            = 'Vi estas ĉi tie';
 $lang['lastmod']               = 'Lastaj ÅanÄoj';
 $lang['by']                    = 'de';
 $lang['deleted']               = 'forigita';
@@ -144,21 +155,26 @@
 $lang['external_edit']         = 'ekstera redakto';
 $lang['summary']               = 'Bulteno de ÅanÄoj';
 $lang['noflash']               = 'La Adobe Flash Plugin estas bezonata por montrigi tiun ĉi enhavon.';
+$lang['download']              = 'ElÅuti eltiraĵon';
 $lang['mail_newpage']          = 'paÄo aldonita:';
 $lang['mail_changed']          = 'paÄo modifita:';
 $lang['mail_new_user']         = 'Nova uzanto:';
 $lang['mail_upload']           = 'dosiero alÅutita:';
-$lang['qb_alert']              = 'Bonvolu enskribi formatotan tekston.\nĜi estos aldonita ĉe la fino de la dokumento.';
-$lang['qb_bold']               = 'Dika Teksto';
-$lang['qb_italic']             = 'Dekliva Teksto';
-$lang['qb_underl']             = 'Substrekita Teksto';
-$lang['qb_code']               = 'Koduma Teksto';
-$lang['qb_strike']             = 'Trastrekita Teksto';
+$lang['qb_bold']               = 'Dika teksto';
+$lang['qb_italic']             = 'Dekliva teksto';
+$lang['qb_underl']             = 'Substrekita teksto';
+$lang['qb_code']               = 'Koduma teksto';
+$lang['qb_strike']             = 'Trastrekita teksto';
 $lang['qb_h1']                 = 'Titolo de 1-a nivelo';
 $lang['qb_h2']                 = 'Titolo de 2-a nivelo';
 $lang['qb_h3']                 = 'Titolo de 3-a nivelo';
 $lang['qb_h4']                 = 'Titolo de 4-a nivelo';
 $lang['qb_h5']                 = 'Titolo de 5-a nivelo';
+$lang['qb_h']                  = 'Ĉeftitolo';
+$lang['qb_hs']                 = 'Elektu ĉeftitolon';
+$lang['qb_hplus']              = 'Altnivela titolo';
+$lang['qb_hminus']             = 'Subnivela titolo';
+$lang['qb_hequal']             = 'Samnivela titolo';
 $lang['qb_link']               = 'Interna ligilo';
 $lang['qb_extlink']            = 'Ekstera ligilo';
 $lang['qb_hr']                 = 'Horizontala streko';
@@ -168,11 +184,11 @@
 $lang['qb_sig']                = 'Inkluzivi subskribon';
 $lang['qb_smileys']            = 'Ridetuloj';
 $lang['qb_chars']              = 'Specialaj signaĵoj';
-$lang['del_confirm']           = 'Ĉu vere forigi elektitajn ero(j)n?';
-$lang['admin_register']        = 'Aldoni novan uzulon';
+$lang['upperns']               = 'saltu al la parenca nomspaco';
+$lang['admin_register']        = 'Aldoni novan uzanton';
 $lang['metaedit']              = 'Redakti metadatenaron';
 $lang['metasaveerr']           = 'La konservo de metadatenaro malsukcesis';
-$lang['metasaveok']            = 'La metadatenaron estis konservita';
+$lang['metasaveok']            = 'La metadatenaro estis konservita';
 $lang['img_backto']            = 'Retroiri al';
 $lang['img_title']             = 'Titolo';
 $lang['img_caption']           = 'Priskribo';
@@ -183,35 +199,35 @@
 $lang['img_copyr']             = 'Kopirajtoj';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Kamerao';
-$lang['img_keywords']          = 'Ĉefvortoj';
+$lang['img_keywords']          = 'Åœlosilvortoj';
 $lang['subscribe_success']     = '%s estis aldonita al dissendolisto por %s';
 $lang['subscribe_error']       = 'Estas eraro je aldono de %s al dissendolisto por %s';
 $lang['subscribe_noaddress']   = 'Estas neniu retadreso asociita al via identiÄ-nomo, do vi ne povas esti aldonata al la dissendolisto.';
 $lang['unsubscribe_success']   = '%s estas forigita de la dissendolisto por %s';
 $lang['unsubscribe_error']     = 'Estas eraro je forigo de %s el dissendolisto por %s';
-$lang['authmodfailed']         = 'Malbona agordo por identigi la uzulon. Bonvolu informi la administranton de la vikio.';
-$lang['authtempfail']          = 'La identigo de via uzulnomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi al la adminstranto de la vikio.';
+$lang['authmodfailed']         = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.';
+$lang['authtempfail']          = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
 $lang['i_chooselang']          = 'Elektu vian lingvon';
 $lang['i_installer']           = 'Instalilo de DokuWiki';
 $lang['i_wikiname']            = 'Nomo de la vikio';
-$lang['i_enableacl']           = 'Ebligi "ACL" (rekomendinde)';
+$lang['i_enableacl']           = 'Ebligi "ACL" (alirkontrolo, rekomendinde)';
 $lang['i_superuser']           = 'Superuzanto';
-$lang['i_problems']            = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri Äis ili estu iel korektitaj.';
-$lang['i_modified']            = 'Por sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita Dokuwiki-pakaĵo.
+$lang['i_problems']            = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri Äis ili estos iel korektitaj.';
+$lang['i_modified']            = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita Dokuwiki-pakaĵo.
 Vi devas aÅ­ redemeti la dosierojn el la elÅutita pakaĵo aÅ­ plibone informiÄi pri la instalada procezo.';
-$lang['i_funcna']              = 'La PHP-a funkcio %s ne estas uzebla. Eble via retprovizanto ial malpermesis tion, ĉu ne?';
+$lang['i_funcna']              = 'La PHP-a funkcio %s ne estas uzebla. Eble via retprovizanto ial malpermesis tion?';
 $lang['i_phpver']              = 'La versio de la PHP %s estas pli malnova ol la bezonata %s. Vi bezonas Äisdatigi la PHP-an instalon.';
 $lang['i_permfail']            = '%s ne estas skribebla por DokuWiki. Vi devas redifini la permes-atributojn de tiu ĉi dosierujo!';
 $lang['i_confexists']          = '%s jam ekzistas';
-$lang['i_writeerr']            = 'Ne eblas krei "%s"-on. Vi bezonas kontroli la permesojn de la dosir(uj)oj kaj mem krej la dosieron.';
+$lang['i_writeerr']            = 'Ne eblas krei "%s"-on. Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.';
 $lang['i_badhash']             = 'dokuwiki.php ne estas rekonebla aÅ­ Äi estas modifita (hash=%s)';
 $lang['i_badval']              = '%s - malvalida aÅ­ malplena valoro';
 $lang['i_success']             = 'La agordado estas sukcese kompletita. Vi povas forigi la dosieron nun. Pluiru al via nova DokuWiki.';
 $lang['i_failure']             = 'Kelkaj eraroj okazis dum la konservo de la agordaj dosieroj. Vi devas senpere korekti ilin antaÅ­ ol vi povos uzi vian novan DokuWiki-on.                       ';
 $lang['i_policy']              = 'Apriora ACL-a agordo';
 $lang['i_pol0']                = 'Malferma Vikio (legi, skribi, alÅuti povas ĉiuj)';
-$lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj alÅuti povas registritaj uzuloj)';
-$lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alÅuti nur povas registritaj uzuloj)';
+$lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj alÅuti povas registritaj uzantoj)';
+$lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alÅuti nur povas registritaj uzantoj)';
 $lang['i_retry']               = 'Reprovi';
 $lang['mu_intro']              = 'Ĉi tie vi povas alÅuti plurajn dosierojn multope. Klaku la esplor-butonon por aldoni ilin al la vico. Premu alÅuti kiam prete.';
 $lang['mu_gridname']           = 'Dosiernomo';
@@ -220,10 +236,19 @@
 $lang['mu_namespace']          = 'Nomspaco';
 $lang['mu_browse']             = 'Esplori';
 $lang['mu_toobig']             = 'tro granda';
-$lang['mu_ready']              = 'prete por alÅuti';
+$lang['mu_ready']              = 'preta por alÅuti';
 $lang['mu_done']               = 'plenumite';
-$lang['mu_fail']               = 'malsukcesite';
+$lang['mu_fail']               = 'malsukcesinte';
 $lang['mu_authfail']           = 'sekcio tro longdaÅ­ris';
 $lang['mu_progress']           = '@PCT@% alÅutite';
-$lang['mu_filetypes']          = 'Permesitaj Dosiertipoj';
-$lang['recent_global']         = 'Vi nune rigardas la ÅanÄojn ene de la nomspaco %s. Vi povas ankaÅ­ vidi la freÅajn ÅanÄojn de la tuta vikio.';
+$lang['mu_filetypes']          = 'Permesitaj dosiertipoj';
+$lang['mu_info']               = 'alÅutitaj dosieroj.';
+$lang['mu_lasterr']            = 'Lasta eraro:';
+$lang['recent_global']         = 'Vi nun rigardas la ÅanÄojn ene de la nomspaco %s. Vi povas ankaÅ­ vidi la freÅajn ÅanÄojn de la tuta vikio.';
+$lang['years']                 = 'antaÅ­ %d jaroj';
+$lang['months']                = 'antaÅ­ %d monatoj';
+$lang['weeks']                 = 'antaÅ­ %d semajnoj';
+$lang['days']                  = 'antaÅ­ %d tagoj';
+$lang['hours']                 = 'antaÅ­ %d horoj';
+$lang['minutes']               = 'antaÅ­ %d minutoj';
+$lang['seconds']               = 'antaÅ­ %d sekundoj';
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/eo/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/eo/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -13,4 +13,4 @@
 
 -- 
 Tiu ĉi mesaÄo estis kreata de DokuWiki, kiu lokiÄas tie:
-@DOKUWIKIURL@
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/newpage.txt dokuwiki-rc2009-12-02/inc/lang/eo/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/eo/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Ĉi tiu paÄo ankoraÅ­ ne ekzistas ======
 
-Vi sekvis ligilon, kiu kondukas al artikolo ankoraÅ­ ne ekzistanta. Se vi rajtas, tiel vi povas krei tiun ĉi paÄon ekpremante la butonon ''"Krei paÄon"''.
+Vi sekvis ligilon, kiu kondukas al artikolo ankoraÅ­ ne ekzistanta. Se vi rajtas, tiel vi povas krei tiun ĉi paÄon ekpremante la butonon ''Krei paÄon''.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/norev.txt dokuwiki-rc2009-12-02/inc/lang/eo/norev.txt
--- dokuwiki-2009-02-14/inc/lang/eo/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Tia revizio ne ekzistas ======
 
-La elektita revizio ne ekzistas. Premu butonon ''"Malnovaj revizioj"'', por vidi liston de malnovaj revizioj de la dokumento.
\ Brak znaku nowej linii na końcu pliku
+La elektita revizio ne ekzistas. Premu butonon ''Malnovaj revizioj'', por vidi liston de malnovaj revizioj de la dokumento.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/password.txt dokuwiki-rc2009-12-02/inc/lang/eo/password.txt
--- dokuwiki-2009-02-14/inc/lang/eo/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,6 @@
 Ensalutnomo : @LOGIN@
 Pasvorto    : @PASSWORD@
 
---
+-- 
 Tiu ĉi mesaÄo estis kreata de DokuWiki ĉe
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/eo/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/eo/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 
 Se ne estas vi, kiu petis tion, do preterlasu tiun ĉi mesaÄon.
 
-Por konfirmi, ke la peto estis vere via, bonvolu musklaki en la jena ligilo.
+Por konfirmi, ke la peto estis vere via, bonvolu musklaki la jenan ligilon.
 
 @CONFIRM@
 
---
+-- 
 Tiu ĉi mesaÄo estis kreita de DokuWiki ĉe
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/read.txt dokuwiki-rc2009-12-02/inc/lang/eo/read.txt
--- dokuwiki-2009-02-14/inc/lang/eo/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-Tiu ĉi paÄo estas disponigata nur por legado (vi ne povas redakti Äin). Sciigu administranton, se vi opinias ke tio estas ne Äusta malpermeso. 
+Tiu ĉi paÄo estas disponigata nur por legado (vi ne povas redakti Äin). Sciigu administranton, se vi opinias ke tio estas ne Äusta malpermeso.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/registermail.txt dokuwiki-rc2009-12-02/inc/lang/eo/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/eo/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 Nova uzulo estis registrata. Jen la detaloj:
 
-Uzulnomo: @NEWUSER@
+Uzantonomo: @NEWUSER@
 Kompleta nomo: @NEWNAME@
 Retadreso: @NEWEMAIL@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/eo/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/eo/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,3 @@
 ====== Sendi novan pasvorton ======
 
-Bonvolu meti vian uzulnomon en la suba formularo petante novan pasvorton por via aliÄo en tiu ĉi vikio. Konfirma ligilo estos sendata al via registrita retadreso.
-
+Bonvolu meti vian uzantonomon en la suban formularon petante novan pasvorton por via aliÄo en tiu ĉi vikio. Konfirma ligilo estos sendata al via registrita retadreso.
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/eo/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/eo/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Serĉo ======
 
-Sube estas rezultoj de serĉo en la retejo.\\ Se vi ne trovis tion, kion vi serĉis, vi povas krei novan paÄon kun necesa nomo. 
+Sube estas rezultoj de serĉo en la retejo.\\ Se vi ne trovis tion, kion vi serĉis, vi povas krei novan paÄon kun necesa nomo per la koresponda butono.
 
 ===== Rezultoj =====
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/eo/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/eo/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,9 +1,13 @@
 # This is a list of words the indexer ignores, one word per line
 # When you edit this file be sure to use UNIX line endings (single newline)
 # No need to include words shorter than 3 chars - these are ignored anyway
+la
 pri
 estas
 kaj
+mi
+mia
+vi
 via
 ili
 ilia
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/eo/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/eo/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,13 +1,23 @@
 Saluton!
 
-La retpaÄo @PAGE@ en la vikio @TITLE@ ÅanÄis. Jen la ÅanÄoj:
+La retpaÄo @PAGE@ en la vikio @TITLE@ ÅanÄiÄis.
+Jen la ÅanÄoj:
 
 --------------------------------------------------------
 @DIFF@
 --------------------------------------------------------
 
-Por malaliÄi el tiu ĉi paÄo, ensalutu en la vikio ĉe @DOKUWIKIURL@ kaj aliru @NEWPAGE@ kaj elektu 'MalaliÄi el avizoj pri ÅanÄoj'.
+Dato : @DATE@
+Uzanto : @USER@
+Modifa rezumo: @SUMMARY@
+Malnova revizio: @OLDPAGE@
+Nova revizio: @NEWPAGE@
 
---
+Por nuligi la avizojn pri paÄoÅanÄoj, ensalutu en la vikio ĉe
+@DOKUWIKIURL@ kaj aliru
+@NEWPAGE@
+kaj malaliÄu al avizoj pri paÄaj kaj/aÅ­ nomspacaj ÅanÄoj.
+
+-- 
 Tiu ĉi mesaÄo estis kreita de DokuWiki ĉe
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/eo/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/eo/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Äœisdatigi vian profilon ======
 
-Vi nur bezonas kompletigi tiujn kampojn, kiujn vi deziras ÅanÄi. Vi ne povas ÅanÄi vian uzulnomon.
\ Brak znaku nowej linii na końcu pliku
+Vi nur bezonas kompletigi tiujn kampojn, kiujn vi deziras ÅanÄi. Vi ne povas ÅanÄi vian uzantonomon.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eo/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/eo/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/eo/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eo/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 Foliumilo: @BROWSER@
 IP-Adreso: @IPADDRESS@
 Ret-nodo: @HOSTNAME@
-Gradeco: @SIZE@
+Grandeco: @SIZE@
 Dosier-tipo: @MIME@
-Uzulo: @USER@
+Uzanto: @USER@
 
---
+-- 
 Tiu ĉi mesaÄo estis kreita de DokuWiki ĉe
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/es/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/es/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugins Adicionales =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/es/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/es/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Referencias ======
 
-Esta lista contiene páginas que hacen referencia a la actual.
+Esta es una lista de páginas que parecen hacer referencia a la página actual.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/diff.txt dokuwiki-rc2009-12-02/inc/lang/es/diff.txt
--- dokuwiki-2009-02-14/inc/lang/es/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Diferencias======
+====== Diferencias ======
 
-Muestra las diferencias entre la revision seleccionada y la versión actual de esta página.
+Muestra las diferencias entre dos versiones de la página.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/draft.txt dokuwiki-rc2009-12-02/inc/lang/es/draft.txt
--- dokuwiki-2009-02-14/inc/lang/es/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Fichero borrador encontrado ======
 
-Su última sesión de edición en esta página no se completó correctamente. Dokuwiki guardó automáticamente un borrador mientras usted trabajaba; puede utilizar el borrador para continuar editándolo. Abajo se ven los datos que fueron guardados en su última sesión.
+Su última sesión de edición en esta página no se completó correctamente. DokuWiki guardó automáticamente un borrador mientras usted trabajaba; puede utilizar el borrador para continuar editándolo. Abajo se ven los datos que fueron guardados en su última sesión.
 
 Por favor decida si desea //recuperar// su sesión perdida, //eliminar// el borrador guardado automáticamente o //cancelar// el proceso de edición.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/editrev.txt dokuwiki-rc2009-12-02/inc/lang/es/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/es/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Has cargado una revisión vieja del documento!** Si la guardas crearás una versión actual nueva con estos datos.
+**Has cargado una revisión vieja del documento!** Si la guardas crearás una versión nueva con estos datos.
 ----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/index.txt dokuwiki-rc2009-12-02/inc/lang/es/index.txt
--- dokuwiki-2009-02-14/inc/lang/es/index.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Indice ======
+====== Ãndice ======
 
-Este es un índice sobre todas las páginas disponibles ordenado por [[doku>namespaces|namespaces]].
+Este es un índice de todas las páginas disponibles ordenado por [[doku>namespaces|espacios de nombres]].
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/install.html dokuwiki-rc2009-12-02/inc/lang/es/install.html
--- dokuwiki-2009-02-14/inc/lang/es/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -4,23 +4,11 @@
 página de documentación.
 
    
 
-
    DokuWiki usa ficheros comunes para el almacenamiento de las páginas del wiki
-y otra información asociada a esas páginas (por ejemplo, imágenes, índices de archivos,
-revisiones viejas, etc). Para funcionar correctamente DokuWiki debe
-tener permisos de escritura en los directorios que contienen esos ficheros. Este
-instalador no es capaz de establecer permisos en directorios. Normalmente eso
-debe ser hecho a través de una consola de comandos o si usted usa servicios de
-hosting a través de FTP o el panel de control brindado por su hosting (e.g. cPanel).
    
+
    DokuWiki usa ficheros comunes para el almacenamiento de las páginas del wiki y otra información asociada a esas páginas (por ejemplo, imágenes, índices de archivos, revisiones viejas, etc). Para funcionar correctamente DokuWiki debe tener permisos de escritura en los directorios que contienen esos ficheros. Este instalador no es capaz de establecer permisos en directorios. Normalmente eso debe ser hecho a través de una consola de comandos o si usted usa servicios de hosting a través de FTP o el panel de control brindado por su hosting (e.g. cPanel).
    
 
+
    Este instalador configurará una ACL, que a su vez permite el acceso al administrador y acceso a los menúes de administración para instalación
+de plugins, administración de usuarios, administración de permisos para las páginas wiki y modificación de la configuración. A pesar que no es necesario para que DokuWiki funcione, hará que sea más fácil la administración.
    
 
-
    Este instalador configurará una 
-ACL, que a su vez permite el
-acceso al administrador y acceso a los menúes de administración para instalación
-de plugins, administración de usuarios, administración de permisos para las páginas 
-wiki y modificación de la configuración. A pesar que no es necesario para que 
-DokuWiki funcione, hará que sea más fácil la administración.
    
-
-
    Usuarios experimentados o usuarios con requerimientos especiales deben usar
-estos enlaces para detalles concernientes a
+
    Usuarios experimentados o usuarios con requerimientos especiales deben usar estos enlaces para detalles concernientes a
 instrucciones de instalación
 y configuración.
    
diff -Naur dokuwiki-2009-02-14/inc/lang/es/lang.php dokuwiki-rc2009-12-02/inc/lang/es/lang.php
--- dokuwiki-2009-02-14/inc/lang/es/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -16,6 +16,12 @@
  * @author Manuel Meco 
  * @author VictorCastelan 
  * @author Jordan Mero  hack.jord@gmail.com
+ * @author Felipe Martinez 
+ * @author Javier Aranda 
+ * @author Zerial 
+ * @author Marvin Ortega 
+ * @author Daniel Castro Alvarado 
+ * @author Fernando J. Gómez 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -31,33 +37,34 @@
 $lang['btn_search']            = 'Buscar';
 $lang['btn_save']              = 'Guardar';
 $lang['btn_preview']           = 'Previsualización';
-$lang['btn_top']               = 'Subir';
+$lang['btn_top']               = 'Ir hasta arriba';
 $lang['btn_newer']             = '<< más reciente';
 $lang['btn_older']             = 'menos reciente >>';
-$lang['btn_revs']              = 'Revisiones anteriores';
+$lang['btn_revs']              = 'Revisiones antiguas';
 $lang['btn_recent']            = 'Cambios recientes';
 $lang['btn_upload']            = 'Cargar';
 $lang['btn_cancel']            = 'Cancelar';
-$lang['btn_index']             = 'Indice';
+$lang['btn_index']             = 'Ãndice';
 $lang['btn_secedit']           = 'Editar';
-$lang['btn_login']             = 'Entrar';
-$lang['btn_logout']            = 'Salir';
+$lang['btn_login']             = 'Conectarse';
+$lang['btn_logout']            = 'Desconectarse';
 $lang['btn_admin']             = 'Administrar';
 $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Borrar';
 $lang['btn_back']              = 'Atrás';
 $lang['btn_backlink']          = 'Enlaces anteriores';
-$lang['btn_backtomedia']       = 'Vuelta a la selección de medios';
-$lang['btn_subscribe']         = 'Subscribirse a la notificación de cambios';
-$lang['btn_unsubscribe']       = 'Desubscribirse a la notificación de cambios';
-$lang['btn_subscribens']       = 'Subscribirse a cambios de un directorio';
-$lang['btn_unsubscribens']     = 'Borrarse de cambios de un directorio';
-$lang['btn_profile']           = 'Actualizar datos del usuario';
-$lang['btn_reset']             = 'Deshacer cambios';
+$lang['btn_backtomedia']       = 'Volver a la selección de archivos multimedia';
+$lang['btn_subscribe']         = 'Suscribirse a cambios de la página';
+$lang['btn_unsubscribe']       = 'Cancelar suscripción a cambios de la página';
+$lang['btn_subscribens']       = 'Suscribirse a cambios del espacio de nombres';
+$lang['btn_unsubscribens']     = 'Cancelar suscripción a cambios del espacio de nombres';
+$lang['btn_profile']           = 'Actualizar perfil';
+$lang['btn_reset']             = 'Restablecer';
 $lang['btn_resendpwd']         = 'Enviar nueva contraseña';
 $lang['btn_draft']             = 'Editar borrador';
 $lang['btn_recover']           = 'Recuperar borrador';
 $lang['btn_draftdel']          = 'Eliminar borrador';
+$lang['btn_revert']            = 'Restaurar';
 $lang['loggedinas']            = 'Conectado como ';
 $lang['user']                  = 'Usuario';
 $lang['pass']                  = 'Contraseña';
@@ -65,28 +72,28 @@
 $lang['oldpass']               = 'Confirma tu contraseña actual';
 $lang['passchk']               = 'otra vez';
 $lang['remember']              = 'Recordarme';
-$lang['fullname']              = 'Nombre completo';
+$lang['fullname']              = 'Nombre real';
 $lang['email']                 = 'E-Mail';
 $lang['register']              = 'Registrarse';
-$lang['profile']               = 'Datos del usuario';
-$lang['badlogin']              = 'El usuario o contraseña ingresados son incorrectos.';
+$lang['profile']               = 'Perfil del usuario';
+$lang['badlogin']              = 'Lo siento, el usuario o la contraseña es incorrecto.';
 $lang['minoredit']             = 'Cambios menores';
-$lang['draftdate']             = 'Borrador guardado automáticamente en';
-$lang['nosecedit']             = 'La página ha cambiado en el lapso, información de sección estuvo fuera de tiempo, en su lugar se cargó la página completa.';
+$lang['draftdate']             = 'Borrador guardado automáticamente:';
+$lang['nosecedit']             = 'La página ha cambiado en el lapso, la información de sección estaba anticuada, en su lugar se cargó la página completa.';
 $lang['regmissing']            = 'Lo siento, tienes que completar todos los campos.';
-$lang['reguexists']            = 'Lo siento, el nombre de usuario ya existe.';
-$lang['regsuccess']            = 'El usuario ha sido creado. La contraseña se ha enviado por correo.';
+$lang['reguexists']            = 'Lo siento, ya existe un usuario con este nombre.';
+$lang['regsuccess']            = 'El usuario ha sido creado y la contraseña se ha enviado por correo.';
 $lang['regsuccess2']           = 'El usuario ha sido creado.';
-$lang['regmailfail']           = 'Parece que ha habido un error al enviar el correo con la contraseña. ¡Por favor, ponte en contacto con el administrador del Wiki!';
-$lang['regbadmail']            = 'La dirección de correo no parece válida. Si piensas que esto es un error, ponte en contacto con el administrador del Wiki';
+$lang['regmailfail']           = 'Parece que ha habido un error al enviar el correo con la contraseña. ¡Por favor, contacta al administrador!';
+$lang['regbadmail']            = 'La dirección de correo no parece válida. Si piensas que esto es un error, contacta al administrador';
 $lang['regbadpass']            = 'Las dos contraseñas no son iguales, por favor inténtalo de nuevo.';
-$lang['regpwmail']             = 'Tu contraseña del DokuWiki';
-$lang['reghere']               = '¿No tienes cuenta todavía? Consigue una';
-$lang['profna']                = 'Este wiki no permite la modificación de datos de usuarios';
+$lang['regpwmail']             = 'Tu contraseña de DokuWiki';
+$lang['reghere']               = '¿No tienes una cuenta todavía? Consigue una';
+$lang['profna']                = 'Este wiki no permite la modificación del perfil';
 $lang['profnochange']          = 'Sin cambios, nada que hacer.';
 $lang['profnoempty']           = 'No se permite que el nombre o la dirección de correo electrónico estén vacíos.';
-$lang['profchanged']           = 'Se actualizaron correctamente los datos del usuario.';
-$lang['pwdforget']             = '¿Has olvidado tu contraseña? Consigue una nueva.';
+$lang['profchanged']           = 'Se actualizó correctamente el perfil del usuario.';
+$lang['pwdforget']             = '¿Has olvidado tu contraseña? Consigue una nueva';
 $lang['resendna']              = 'Este wiki no brinda la posibilidad de reenvío de contraseña.';
 $lang['resendpwd']             = 'Enviar una nueva contraseña para';
 $lang['resendpwdmissing']      = 'Lo siento, debes completar todos los campos.';
@@ -96,18 +103,20 @@
 $lang['resendpwdsuccess']      = 'Tu nueva contraseña ha sido enviada por correo electrónico.';
 $lang['license']               = 'Excepto donde se indique lo contrario, el contenido de esta wiki se autoriza bajo la siguiente licencia:';
 $lang['licenseok']             = 'Nota: Al editar esta página, estás de acuerdo en autorizar su contenido bajo la siguiente licencia:';
-$lang['txt_upload']            = 'Selecciona el fichero a cargar';
+$lang['searchmedia']           = 'Buscar archivo:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Selecciona el archivo a subir';
 $lang['txt_filename']          = 'Subir como (opcional)';
-$lang['txt_overwrt']           = 'Sobreescribe el fichero existente';
+$lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
 $lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
-$lang['notsavedyet']           = 'Hay cambios que no se han guardado que se perderán.\n¿Quieres continuar?';
-$lang['rssfailed']             = 'Se ha producido un error leyendo datos (feed): ';
+$lang['notsavedyet']           = 'Los cambios que no se han guardado se perderán.\n¿Realmente quieres continuar?';
+$lang['rssfailed']             = 'Se ha producido un error mientras se leían los datos de este feed: ';
 $lang['nothingfound']          = 'No se ha encontrado nada.';
-$lang['mediaselect']           = 'Selección de fichero';
-$lang['fileupload']            = 'Subida de fichero';
-$lang['uploadsucc']            = 'La subida del fichero ha sido satisfactoria';
+$lang['mediaselect']           = 'Archivos Multimedia';
+$lang['fileupload']            = 'Subida de archivos multimedia';
+$lang['uploadsucc']            = 'El archivo se ha subido satisfactoriamente';
 $lang['uploadfail']            = 'La subida del fichero ha fallado. ¿Permisos equivocados?';
 $lang['uploadwrong']           = 'Subida de fichero denegada. ¡Los ficheros con esta extensión están prohibidos!';
 $lang['uploadexist']           = 'El fichero ya existe. No se ha hecho nada.';
@@ -116,14 +125,18 @@
 $lang['uploadxss']             = 'La subida ha sido bloqueada por contenido posiblemente malicioso';
 $lang['uploadsize']            = 'El fichero subido es demasiado grande. (max. %s)';
 $lang['deletesucc']            = 'El fichero "%s" ha sido borrado.';
-$lang['deletefail']            = '"%s" no pudo ser borrado, verifique los permisos.';
-$lang['mediainuse']            = 'El fichero %s no ha sido borrado, aun está en uso.';
+$lang['deletefail']            = '"%s" no pudo ser borrado; verifique los permisos.';
+$lang['mediainuse']            = 'El fichero "%s" no ha sido borrado, aún está en uso.';
 $lang['namespaces']            = 'Espacios de nombres';
 $lang['mediafiles']            = 'Ficheros disponibles en';
-$lang['js']['keepopen']        = 'Mantener esta ventana abierta durante la selección';
+$lang['js']['searchmedia']     = 'Buscar archivos';
+$lang['js']['keepopen']        = 'Mantener la ventana abierta luego de seleccionar';
 $lang['js']['hidedetails']     = 'Ocultar detalles';
-$lang['js']['nosmblinks']      = 'Enlazar a recursos compartidos de Windows sólo funciona en Microsoft Internet Explorer.
-Lo que si puedes hacer es copiar y pegar el enlace.';
+$lang['js']['nosmblinks']      = 'El enlace a recursos compartidos de Windows sólo funciona en Microsoft Internet Explorer.
+Lo que sí puedes hacer es copiar y pegar el enlace.';
+$lang['js']['linkwiz']         = 'Asistente de enlaces';
+$lang['js']['linkto']          = 'Enlazar a:';
+$lang['js']['del_confirm']     = '¿Quieres realmente borrar lo seleccionado?';
 $lang['js']['mu_btn']          = 'Subir varios archivos a la vez';
 $lang['mediausage']            = 'Use la siguiente sintaxis para hacer referencia a este fichero:';
 $lang['mediaview']             = 'Ver el fichero original';
@@ -131,55 +144,60 @@
 $lang['mediaupload']           = 'Subir aquí un fichero al espacio de nombres actual. Para crear sub-espacios de nombres, antepóngalos al nombre de fichero separándolos por dos puntos (:) en "Subir como".';
 $lang['mediaextchange']        = 'Extensión del fichero cambiada de .%s a .%s!';
 $lang['reference']             = 'Referencias para';
-$lang['ref_inuse']             = 'El fichero no ha podido ser borrado, porque se está usando en las siguientes páginas:';
-$lang['ref_hidden']            = 'Algunas referencias están en páginas en las que no tienes permisos para leer';
+$lang['ref_inuse']             = 'El fichero no puede ser borrado, porque todavía se está usando en las siguientes páginas:';
+$lang['ref_hidden']            = 'Algunas referencias están en páginas sobre las que no tienes permiso de lectura';
 $lang['hits']                  = 'Entradas';
 $lang['quickhits']             = 'Páginas que coinciden';
 $lang['toc']                   = 'Tabla de Contenidos';
 $lang['current']               = 'actual';
 $lang['yours']                 = 'Tu versión';
-$lang['diff']                  = 'muestra diferencias a la versión actual';
-$lang['diff2']                 = 'Muestra las diferencias entre las revisiones elegidas';
+$lang['diff']                  = 'Muestra diferencias a la versión actual';
+$lang['diff2']                 = 'Muestra las diferencias entre las revisiones seleccionadas';
 $lang['line']                  = 'Línea';
 $lang['breadcrumb']            = 'Traza';
-$lang['youarehere']            = 'Tu estás aquí';
+$lang['youarehere']            = 'Estás aquí';
 $lang['lastmod']               = 'Última modificación';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'borrado';
 $lang['created']               = 'creado';
-$lang['restored']              = 'Se ha restaurado la vieja versión';
+$lang['restored']              = 'se ha restaurado la vieja versión';
 $lang['external_edit']         = 'editor externo';
-$lang['summary']               = 'Edita el resumen';
-$lang['noflash']               = 'El Plugin Adobe Flash es necesario para exibir este contenido.';
+$lang['summary']               = 'Resumen de la edición';
+$lang['noflash']               = 'Para mostrar este contenido es necesario el Plugin Adobe Flash.';
+$lang['download']              = 'Descargar trozo de código fuente';
 $lang['mail_newpage']          = 'página añadida:';
 $lang['mail_changed']          = 'página cambiada:';
-$lang['mail_new_user']         = 'Nuevo usuario:';
+$lang['mail_new_user']         = 'nuevo usuario:';
 $lang['mail_upload']           = 'archivo subido:';
-$lang['qb_alert']              = 'Por favor, pega el texto al que quieres dar formato.\n Será añadido al final del documento.';
 $lang['qb_bold']               = 'Negrita';
 $lang['qb_italic']             = 'Itálica';
 $lang['qb_underl']             = 'Subrayado';
 $lang['qb_code']               = 'Código';
-$lang['qb_strike']             = 'tachado';
+$lang['qb_strike']             = 'Tachado';
 $lang['qb_h1']                 = 'Título 1';
 $lang['qb_h2']                 = 'Título 2';
 $lang['qb_h3']                 = 'Título 3';
 $lang['qb_h4']                 = 'Título 4';
 $lang['qb_h5']                 = 'Título 5';
-$lang['qb_link']               = 'Enlace Interno';
-$lang['qb_extlink']            = 'Enlace Externo';
+$lang['qb_h']                  = 'Título';
+$lang['qb_hs']                 = 'Selecciona el título';
+$lang['qb_hplus']              = 'Título alto';
+$lang['qb_hminus']             = 'Título bajo';
+$lang['qb_hequal']             = 'Título del mismo nivel';
+$lang['qb_link']               = 'Enlace interno';
+$lang['qb_extlink']            = 'Enlace externo';
 $lang['qb_hr']                 = 'Línea horizontal';
-$lang['qb_ol']                 = 'Ãtem de Lista Ordenada';
-$lang['qb_ul']                 = 'Ãtem de Lista Desordenada';
+$lang['qb_ol']                 = 'Ãtem de lista ordenada';
+$lang['qb_ul']                 = 'Ãtem de lista desordenada';
 $lang['qb_media']              = 'Añadir Imágenes u otros ficheros';
-$lang['qb_sig']                = 'Firmar';
+$lang['qb_sig']                = 'Insertar firma';
 $lang['qb_smileys']            = 'Sonrisas';
 $lang['qb_chars']              = 'Caracteres especiales';
-$lang['del_confirm']           = '¿Quieres realmente borrar lo seleccionado?';
-$lang['admin_register']        = 'Añadir nuevo usuario...';
-$lang['metaedit']              = 'Editar los metadatos';
+$lang['upperns']               = 'Saltar al espacio de nombres superior';
+$lang['admin_register']        = 'Añadir nuevo usuario';
+$lang['metaedit']              = 'Editar metadatos';
 $lang['metasaveerr']           = 'La escritura de los metadatos ha fallado';
-$lang['metasaveok']            = 'Los metadatos han sido guardados.';
+$lang['metasaveok']            = 'Los metadatos han sido guardados';
 $lang['img_backto']            = 'Volver a';
 $lang['img_title']             = 'Título';
 $lang['img_caption']           = 'Epígrafe';
@@ -193,14 +211,14 @@
 $lang['img_keywords']          = 'Palabras claves';
 $lang['subscribe_success']     = '%s ha sido añadido a la lista de notificación de cambios de %s';
 $lang['subscribe_error']       = 'Ha habido un error al agregar %s a la lista de notificación de cambios de %s';
-$lang['subscribe_noaddress']   = 'No hay ninguna dirección de correo electrónico asociada con tu nombre de usuario, no puedes agregarte a la lista de notificación de cambios';
-$lang['unsubscribe_success']   = '%s ha sido eliminado a la lista de notificación de cambios de %s';
+$lang['subscribe_noaddress']   = 'No hay ninguna dirección de correo electrónico asociada con tu nombre de usuario, no puedes ser añadido a la lista de notificación de cambios';
+$lang['unsubscribe_success']   = '%s ha sido eliminado de la lista de notificación de cambios de %s';
 $lang['unsubscribe_error']     = 'Ha habido un error al eliminar %s de la lista de notificación de cambios de %s';
 $lang['authmodfailed']         = 'Está mal configurada la autenticación de usuarios. Por favor, avisa al administrador del wiki.';
-$lang['authtempfail']          = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor, avisa al administrador del wiki.';
+$lang['authtempfail']          = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
 $lang['i_chooselang']          = 'Elija su idioma';
 $lang['i_installer']           = 'Instalador de DokuWiki';
-$lang['i_wikiname']            = 'Nombre del Wiki';
+$lang['i_wikiname']            = 'Nombre del wiki';
 $lang['i_enableacl']           = 'Habilitar ACL (recomendado) (ACL: lista de control de acceso)';
 $lang['i_superuser']           = 'Super-usuario';
 $lang['i_problems']            = 'El instalador encontró algunos problemas, se muestran abajo. No se puede continuar la instalación hasta que usted no los corrija.';
@@ -211,15 +229,15 @@
 $lang['i_confexists']          = '%s ya existe';
 $lang['i_writeerr']            = 'Imposible crear %s. Se necesita que usted controle los permisos del fichero/directorio y que cree el fichero manualmente.';
 $lang['i_badhash']             = 'dokuwiki.php no reconocido o modificado (hash=%s)';
-$lang['i_badval']              = '%s - ilegal o valor vacío';
-$lang['i_success']             = 'La configuración ha concluido correctamente. Usted ahora puede eliminar el archivo install.php. Continue con su nueva instalación de DokuWiki.';
-$lang['i_failure']             = 'Han ocurrido algunos errores durante la escritura de los ficheros de configuración. Usted puede corregirlos manualmente antes de poder usar su nueva instalación de DokuWiki.';
+$lang['i_badval']              = '%s - valor ilegal o vacío';
+$lang['i_success']             = 'La configuración ha concluido correctamente. Ahora puede eliminar el archivo install.php. Visite su nuevo DokuWiki.';
+$lang['i_failure']             = 'Han ocurrido algunos errores durante la escritura de los ficheros de configuración. Puede ser que necesite corregirlos manualmente antes de poder usar su nuevo DokuWiki.';
 $lang['i_policy']              = 'Política de ACL inicial';
-$lang['i_pol0']                = 'Wiki abierta (leer, escribir y subir archivos para todos)';
-$lang['i_pol1']                = 'Wiki pública (leer para todos, escribir y subir archivos para usuarios registrados únicamente)';
-$lang['i_pol2']                = 'Wiki cerrada (leer, escribir y subir archivos para usuarios registrados únicamente)';
+$lang['i_pol0']                = 'Wiki abierto (leer, escribir y subir archivos para todos)';
+$lang['i_pol1']                = 'Wiki público (leer para todos, escribir y subir archivos para usuarios registrados únicamente)';
+$lang['i_pol2']                = 'Wiki cerrado (leer, escribir y subir archivos para usuarios registrados únicamente)';
 $lang['i_retry']               = 'Reintentar';
-$lang['mu_intro']              = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa subir archivo para proceder.';
+$lang['mu_intro']              = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa "subir archivo" para proceder.';
 $lang['mu_gridname']           = 'Nombre de archivo';
 $lang['mu_gridsize']           = 'Tamaño';
 $lang['mu_gridstat']           = 'Estado';
@@ -229,7 +247,16 @@
 $lang['mu_ready']              = 'listo para subir';
 $lang['mu_done']               = 'completado';
 $lang['mu_fail']               = 'falló';
-$lang['mu_authfail']           = 'sesión caducada';
+$lang['mu_authfail']           = 'la sesión caducó';
 $lang['mu_progress']           = '@PCT@% transferido';
 $lang['mu_filetypes']          = 'Tipos de archivos permitidos';
-$lang['recent_global']         = 'Actualmente estás viendo los cambios dentro del namespace %s. También puedes ver los cambios recientes en la wiki completa.';
+$lang['mu_info']               = 'Archivos subidos:';
+$lang['mu_lasterr']            = 'Último error:';
+$lang['recent_global']         = 'Actualmente estás viendo los cambios dentro del namespace %s. También puedes ver los cambios recientes en el wiki completo.';
+$lang['years']                 = '%d años atrás';
+$lang['months']                = '%d meses atrás';
+$lang['weeks']                 = '%d semanas atrás';
+$lang['days']                  = '%d días atrás';
+$lang['hours']                 = '%d horas atrás';
+$lang['minutes']               = '%d minutos atrás';
+$lang['seconds']               = '%d segundos atrás';
diff -Naur dokuwiki-2009-02-14/inc/lang/es/locked.txt dokuwiki-rc2009-12-02/inc/lang/es/locked.txt
--- dokuwiki-2009-02-14/inc/lang/es/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Página Bloqueada ======
+====== Página bloqueada ======
 
 Esta página está actualmente bloqueada porque la está editando otro usuario. Tienes que esperar a que  termine de editarla o el bloqueo expire.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/es/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/es/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,17 +1,17 @@
-Se ha cambiado o añadido una pagina en el DokuWiki-Manuales. Aqui están los detalles
+Se ha cambiado o añadido una página en tu DokuWiki. Aquí están los detalles:
 
-Fecha          : @DATE@
-Navegador      : @BROWSER@
-Dirección-IP   : @IPADDRESS@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
 Nombre de Host : @HOSTNAME@
-Revisión Anterior: @OLDPAGE@
+Revisión Vieja: @OLDPAGE@
 Revisión Nueva : @NEWPAGE@
-Editar sumario   : @SUMMARY@
-Usuario          : @USER@
+Resumen de la edición: @SUMMARY@
+Usuario : @USER@
 
 @DIFF@
 
 
 -- 
-Este email ha sido generado por DokuWiki en
-@DOKUWIKIURL@
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/newpage.txt dokuwiki-rc2009-12-02/inc/lang/es/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/es/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Este tema no existe todavía======
+====== Este tema no existe todavía ======
 
-Has seguido un enlace a un tema que no existe todavía. Puedes crearlo usando el botón ''Crea esta página''. 
+Has seguido un enlace a un tema que no existe todavía. Puedes crearlo usando el botón ''Crea esta página''.
diff -Naur dokuwiki-2009-02-14/inc/lang/es/norev.txt dokuwiki-rc2009-12-02/inc/lang/es/norev.txt
--- dokuwiki-2009-02-14/inc/lang/es/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======No existe esta revision======
+====== No existe esta revision ======
 
 La revisión especificada no existe. Usa el botón ''Revisiones antiguas'' para una lista de revisiones antiguas de este documento.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/password.txt dokuwiki-rc2009-12-02/inc/lang/es/password.txt
--- dokuwiki-2009-02-14/inc/lang/es/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,8 +2,8 @@
 
 Estos son los datos de usuario para @TITLE@ en @DOKUWIKIURL@
 
-Usuario    : @LOGIN@
+Usuario : @LOGIN@
 Contraseña : @PASSWORD@
 
 -- 
-Este correo a sido generado por DokuWiki en @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
+Este correo ha sido generado por DokuWiki en @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/preview.txt dokuwiki-rc2009-12-02/inc/lang/es/preview.txt
--- dokuwiki-2009-02-14/inc/lang/es/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Previsualización======
+====== Previsualización ======
 
 Esto es una previsualización de cómo aparecerá tu texto. Recuerda: **no está guardado** todavía!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/es/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/es/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 Hola @FULLNAME@!
 
-Alguien solicitó una nueva contraseña para su nombre de 
+Alguien solicitó una nueva contraseña para su nombre de
 usuario @TITLE@ en @DOKUWIKIURL@
 
 Si usted no solicitó una nueva contraseña, simplemente ignore este email.
diff -Naur dokuwiki-2009-02-14/inc/lang/es/read.txt dokuwiki-rc2009-12-02/inc/lang/es/read.txt
--- dokuwiki-2009-02-14/inc/lang/es/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1 +1 @@
-Esta página es de solo lectura. Puedes ver la fuente pero no puedes cambiarla. Pregunta a tu administrador si crees que esto está mal.
+Esta página es de solo lectura. Puedes ver la fuente pero no puedes cambiarla. Pregunta a tu administrador si crees que esto es incorrecto.
diff -Naur dokuwiki-2009-02-14/inc/lang/es/recent.txt dokuwiki-rc2009-12-02/inc/lang/es/recent.txt
--- dokuwiki-2009-02-14/inc/lang/es/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Cambios Recientes======
+====== Cambios Recientes ======
 
 Las siguientes páginas han sido modificadas recientemente.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/es/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/es/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Enviar nueva contraseña  ======
+====== Enviar nueva contraseña ======
 
-Completa la información requerida abajo para obtener una nueva contraseña para tu cuenta de usuario en este wiki. La nueva contraseña te será enviada a la dirección de mail que está registrada. El nombre de usuario debe ser tu nombre de usuario en este wiki.
+Completa la información requerida abajo para obtener una nueva contraseña para tu cuenta de usuario en este wiki. La nueva contraseña te será enviada a la dirección de mail que está registrada.
diff -Naur dokuwiki-2009-02-14/inc/lang/es/revisions.txt dokuwiki-rc2009-12-02/inc/lang/es/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/es/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisiones Antiguas======
+====== Revisiones Antiguas ======
 
-Estas son revisiones más antiguas del documento actual. Para volver a una revisión antigua seleccionala de abajo, pulsa ''Edita esta página'' y guárdala.
+Estas son revisiones más antiguas del documento actual. Para volver a una revisión antigua selecciónala de abajo, pulsa ''Edita esta página'' y guárdala.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/es/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/es/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/es/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Búsqueda======
+====== Búsqueda ======
 
 Puedes encontrar los resultados de tu búsqueda abajo. Si no has encontrado lo que buscabas, puedes crear una nueva página con tu consulta utilizando el botón  ''Crea esta página''.
 
-=====Resultados=====
\ Brak znaku nowej linii na końcu pliku
+===== Resultados =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/showrev.txt dokuwiki-rc2009-12-02/inc/lang/es/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/es/showrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/showrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Esta es una revisión vieja del documento!**
+**¡Esta es una revisión vieja del documento!**
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/es/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/es/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/es/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,17 +1,23 @@
-Hola!
+¡Hola!
 
-La página  @PAGE@ en el wiki @TITLE@ ha cambiado.
+La página @PAGE@ en el wiki @TITLE@ ha cambiado.
 Los cambios son los siguientes:
 
 --------------------------------------------------------
 @DIFF@
 --------------------------------------------------------
 
-Para borrarte de esta página, entra al wiki
-en @DOKUWIKIURL@ y luego visita la página:
+Fecha : @DATE@
+Usuario : @USER@
+Resumen de la edición: @SUMMARY@
+Revisión vieja: @OLDPAGE@
+Revisión nueva: @NEWPAGE@
+
+Para cacelar las notificaciones, ingresa al wiki
+en @DOKUWIKIURL@ y luego visita la página
 @NEWPAGE@
-y elige 'Unsubscribe Changes'.
+y elige 'Cancelar suscripción'.
 
---
+-- 
 Este mail fue generado por DokuWiki en
-@DOKUWIKIURL@
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/es/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/es/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Actualiza el perfil de tu cuenta de usuario  ======
+====== Actualiza el perfil de tu cuenta de usuario ======
 
 Sólo necesitas completar aquellos campos que quieres cambiar. No puedes cambiar tu nombre de usuario.
diff -Naur dokuwiki-2009-02-14/inc/lang/es/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/es/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/es/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-Se ha subido un fichero a tu DokuWuki. Detalles del fichero:
+Se ha subido un fichero a tu DokuWuki. Estos son los detalles:
 
 Archivo : @MEDIA@
 Fecha : @DATE@
@@ -9,6 +9,6 @@
 MIME Type : @MIME@
 Usuario : @USER@
 
---
-Correo generado por DokuWiki en
+-- 
+Este correo fue generado por DokuWiki en
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/es/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/es/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/es/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/es/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM bloqueado======
+====== SPAM bloqueado ======
 
-Tus cambios **no** se han guardado porque contienen una o más palabras prohibidas . Si has intentado spammear el Wiki -- Perro malo! Si crees que es un error contacta con el administrador de este Wiki.
+Tus cambios **no** se han guardado porque contienen una o más palabras prohibidas. Si has intentado spamear el Wiki: ¡Perro malo! Si crees que es un error contacta con el administrador de este Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/et/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/et/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Siia lehele lingiga haagitud lehed ======
 
-Nimekiri nendest lehtedest, kuskohalt Sa lingi abil siia lehele saad. 
+Nimekiri nendest lehtedest, kuskohalt Sa lingi abil siia lehele saad.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/denied.txt dokuwiki-rc2009-12-02/inc/lang/et/denied.txt
--- dokuwiki-2009-02-14/inc/lang/et/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Sul pole ligipääsuluba======
+====== Sul pole ligipääsuluba ======
 
-Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja. 
+Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja.
diff -Naur dokuwiki-2009-02-14/inc/lang/et/diff.txt dokuwiki-rc2009-12-02/inc/lang/et/diff.txt
--- dokuwiki-2009-02-14/inc/lang/et/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Erinevused======
+====== Erinevused ======
 
 Siin näed erinevusi valitud versiooni ja hetkel kehtiva lehekülje vahel.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/lang.php dokuwiki-rc2009-12-02/inc/lang/et/lang.php
--- dokuwiki-2009-02-14/inc/lang/et/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -137,9 +137,9 @@
 $lang['regmissing'] = 'Kõik väljad tuleb ära täita.';
 $lang['reguexists'] = 'Tegelikult on sellise nimega kasutaja juba olemas.';
 $lang['regsuccess'] = 'Kasutaja sai tehtud. Parool saadeti Sulle e-posti aadressil.';
-$lang['regmailfail']= 'Ilmselt tekkis e-posti teel parooli saatmisel mingi tõrge. Palun suhtle sel teemal 
+$lang['regmailfail']= 'Ilmselt tekkis e-posti teel parooli saatmisel mingi tõrge. Palun suhtle sel teemal
 oma serveri administraatoriga!';
-$lang['regbadmail'] = 'Tundub, et Sinu antud e-posti aadress ei toimi - kui Sa arvad, et tegemist on 
+$lang['regbadmail'] = 'Tundub, et Sinu antud e-posti aadress ei toimi - kui Sa arvad, et tegemist on
 ekstitusega, suhtle oma serveri administraatoriga';
 $lang['regpwmail']  = 'Sinu DokuWiki parool';
 $lang['reghere']    = 'Sul ei olegi veel kasutajakontot? No aga tekita see siis endale!';
@@ -150,14 +150,14 @@
 $lang['lockexpire']   = 'Lukustus aegub';
 $lang['willexpire']   = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
 
-$lang['notsavedyet'] = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.\nKas Sa ikka tahad edasi liikuda?'; 
+$lang['notsavedyet'] = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.\nKas Sa ikka tahad edasi liikuda?';
 $lang['rssfailed']   = 'Sinu soovitud info ammutamisel tekkis viga: ';
 $lang['nothingfound']= 'Oops, aga mitte muhvigi ei leitud.';
 
 $lang['mediaselect'] = 'Hunnik faile';
 $lang['fileupload']  = 'Faili üleslaadimine';
 $lang['uploadsucc']  = 'Üleslaadimine läks ootuspäraselt hästi';
-$lang['uploadfail']  = 'Üleslaadimine läks nässu. Äkki pole Sa selleks lihtsalt piisavalt võimukas tegija?'; 
+$lang['uploadfail']  = 'Üleslaadimine läks nässu. Äkki pole Sa selleks lihtsalt piisavalt võimukas tegija?';
 $lang['uploadwrong'] = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida';
 $lang['namespaces']  = 'Alajaotus';
 $lang['mediafiles']  = 'Failid on Sulle kättesaadavad';
@@ -180,10 +180,9 @@
 $lang['mail_newpage'] = 'leht lisatud:';
 $lang['mail_changed'] = 'leht muudetud';
 
-$lang['nosmblinks'] = 'Windowsis võrguarvutiga ühendamine toimib ainult Internet Exploreris ja 
+$lang['nosmblinks'] = 'Windowsis võrguarvutiga ühendamine toimib ainult Internet Exploreris ja
 sisevõrgus.\nAga Sa saad õnneks omale lingi kopeerida ja hiljem kuhugi kleepida.';
 
-$lang['qb_alert']   = 'Sisesta palun tekst, mida Sa tahad kujundada.\nSee lisatakse dokumendi lõppu..'; 
 $lang['qb_bold']    = 'Rasvane kiri';
 $lang['qb_italic']  = 'Kaldkiri';
 $lang['qb_underl']  = 'Alajoonega kiri';
@@ -204,7 +203,7 @@
 $lang['authmodfailed'] = 'Vigane kasutajate autentimise konfiguratsioon. Palun teavita sellest serveri haldajat.';
 $lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.';
 
-$lang['del_confirm']= 'Kas kustutame selle kirje?';
+$lang['js']['del_confirm']= 'Kas kustutame selle kirje?';
 
 #$lang['subscribe_success'] = '';
 #$lang['subscribe_error'] = '';
diff -Naur dokuwiki-2009-02-14/inc/lang/et/newpage.txt dokuwiki-rc2009-12-02/inc/lang/et/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/et/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Seda teemat veel ei ole ======
+====== Seda teemat veel ei ole ======
 
 Sa klikkisid lingile, mille all teemat veel pole. Selle saad Sa tekitada kasutades ''Tekita see leht nuppu''.
diff -Naur dokuwiki-2009-02-14/inc/lang/et/norev.txt dokuwiki-rc2009-12-02/inc/lang/et/norev.txt
--- dokuwiki-2009-02-14/inc/lang/et/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Sellist versiooni pole======
+====== Sellist versiooni pole ======
 
 Sellist versiooni ei ole olemas. Selle dokumendi eelmiste versioonide nägemiseks klõpsa ''Eelmised versioonid'' nupul.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/preview.txt dokuwiki-rc2009-12-02/inc/lang/et/preview.txt
--- dokuwiki-2009-02-14/inc/lang/et/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Eelvaade======
+====== Eelvaade ======
 
-Siin saad eelnevalt vaadata, milline su tekst välja näeks. Pea aga meeles, et see **ei ole veel salvestatud** ! 
+Siin saad eelnevalt vaadata, milline su tekst välja näeks. Pea aga meeles, et see **ei ole veel salvestatud** !
diff -Naur dokuwiki-2009-02-14/inc/lang/et/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/et/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/et/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,6 +7,6 @@
 
 @CONFIRM@
 
---
+-- 
 See meil on saadetud DokuWiki poolt
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/et/recent.txt dokuwiki-rc2009-12-02/inc/lang/et/recent.txt
--- dokuwiki-2009-02-14/inc/lang/et/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Viimased muutused======
+====== Viimased muutused ======
 
 Viimati muudeti alljärgnevaid lehti.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/revisions.txt dokuwiki-rc2009-12-02/inc/lang/et/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/et/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======eelnevad versioonid======
+====== eelnevad versioonid ======
 
 Need on käesoleva dokumendi eelnevad versioonid. Vana versiooni juurde tagasi pöördumiseks vali sobiv, klõpsa ''Toimeta seda lehte'' peal ja salvesta see.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/et/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/et/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/et/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Otsi ======
+====== Otsi ======
 
 Leiad vasted oma otsingule. Kui Sa otsitavat ei leidnud võid tekitada oma otsingu nimelise uue lehe kasutades ''Toimeta seda lehte'' nuppu.
 
-=====Vasted=====
+===== Vasted =====
diff -Naur dokuwiki-2009-02-14/inc/lang/et/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/et/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/et/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/et/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,6 @@
 @NEWPAGE@
 ning vali sealt 'Lõpeta jälgimine'.
 
---
+-- 
 See meil on saadetud DokuWiki poolt
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/conflict.txt dokuwiki-rc2009-12-02/inc/lang/eu/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/eu/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Bertsio berriago bat existitzen da ======
 
-Editatu duzun dokumentua baino bertsio berriago existitzen da. Editatzen ari zarela beste erabiltzaile batek dokumentua aldatzen duenean gertatzen da hau. 
+Editatu duzun dokumentua baino bertsio berriago existitzen da. Editatzen ari zarela beste erabiltzaile batek dokumentua aldatzen duenean gertatzen da hau.
 
 Aztertu arretaz behean erakutsitako desberdintasunak eta erabaki zein bertsio mantendu. Zure aukera "Gorde" bada, zure bertsioa gordeko da. Uneko bertsioa mantentzeko "ezeztatu" sakatu.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/denied.txt dokuwiki-rc2009-12-02/inc/lang/eu/denied.txt
--- dokuwiki-2009-02-14/inc/lang/eu/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Ez duzu baimenik======
+====== Ez duzu baimenik ======
 
 Barkatu, ez duzu baimenik orri hau ikusteko. Agian sesioa hastea ahaztu zaizu?
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/diff.txt dokuwiki-rc2009-12-02/inc/lang/eu/diff.txt
--- dokuwiki-2009-02-14/inc/lang/eu/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Aldaketak======
+====== Aldaketak ======
 
 Aukeratutako bertsioaren eta egungo bertsioaren arteko aldaketak aurkezten ditu.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/lang.php dokuwiki-rc2009-12-02/inc/lang/eu/lang.php
--- dokuwiki-2009-02-14/inc/lang/eu/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -144,7 +144,6 @@
 $lang['mail_changed']          = '[DokuWiki] aldatutako orria:';
 $lang['mail_new_user']         = 'erabiltzaile berria:';
 $lang['mail_upload']           = 'fitxategia igota:';
-$lang['qb_alert']              = 'Mesedez, sartu formatua eman nahi diozun testua.\nDokumentuaren bukaeran txertatuko da.';
 $lang['qb_bold']               = 'Letra beltzez';
 $lang['qb_italic']             = 'Letra italiarrez';
 $lang['qb_underl']             = 'Azpimarratua';
@@ -164,7 +163,7 @@
 $lang['qb_sig']                = 'Gehitu sinadura';
 $lang['qb_smileys']            = 'Irrifartxoak';
 $lang['qb_chars']              = 'Karaktere Bereziak';
-$lang['del_confirm']           = 'Benetan ezabatu aukeratutako fitxategia(k)?';
+$lang['js']['del_confirm']           = 'Benetan ezabatu aukeratutako fitxategia(k)?';
 $lang['admin_register']        = 'Erabiltzaile berria gehitu';
 $lang['metaedit']              = 'Metadatua Aldatu';
 $lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/newpage.txt dokuwiki-rc2009-12-02/inc/lang/eu/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/eu/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Gai hau ez da existitzen oraindik======
+====== Gai hau ez da existitzen oraindik ======
 
 Existitzen ez den gai batera doan lotura bat jarraitu duzu. Zuk zeuk sortu dezakezu ''Sortu orri hau'' erabiliz.
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/norev.txt dokuwiki-rc2009-12-02/inc/lang/eu/norev.txt
--- dokuwiki-2009-02-14/inc/lang/eu/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Berrikuspen hau ez da existitzen======
+====== Berrikuspen hau ez da existitzen ======
 
 Zehaztutako bertsioa ez da existitzen. Erabili ''Bertsio zaharrak'' dokumentu honen aurreko bertsioen zerrenda bat ikusi ahal izateko.
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/preview.txt dokuwiki-rc2009-12-02/inc/lang/eu/preview.txt
--- dokuwiki-2009-02-14/inc/lang/eu/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Aurreikuspena======
+====== Aurreikuspena ======
 
 Hau zure testuaren aurrebista bat besterik ez da. Gogoratu: **ez da gorde** oraindik!
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/recent.txt dokuwiki-rc2009-12-02/inc/lang/eu/recent.txt
--- dokuwiki-2009-02-14/inc/lang/eu/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Azken Aldaketak======
+====== Azken Aldaketak ======
 
 Ondorengo orriak aldatu berriak izan dira:
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/revisions.txt dokuwiki-rc2009-12-02/inc/lang/eu/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/eu/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Bertsio zaharrak======
+====== Bertsio zaharrak ======
 
 Hauek egungo dokumentua baino zaharragoak diren bertsioak dira. Hauetako bertsio batetara itzultzeko aukera ezazu behetik, pultsatu ''Sortu orri hau'' eta gorde.
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/eu/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/eu/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Bilaketa======
+====== Bilaketa ======
 
 Emaitzak ondorengo aurkiketan bilatu ditzakezu. Bilatzen zabiltzana aurkitu ez baduzu, zuk zeuk sortu dezakezu orri berri bat bilaketa ostean ''Sortu orri hau'' erabiliz.
 
-=====Bilaketa emaitzak:=====
+===== Bilaketa emaitzak: =====
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/eu/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/eu/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
 # Lista hau, indexatzaileak alde batera uzten dituen hitzen zerrenda da, hitz bat lerroko
 # Fitxategi hau editatzean, ziurtatu UNIX lerro bukaerak (lerro berri bakarra) erabiltzen duzula
 # Ez dago 3 letra baino motzagoak diren hitzik sartu beharrik - bestela ere baztertuak dira
-# This list is based upon the ones found at http://www.ranks.nl/stopwords/ 
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
 # FITXATEGI HONEK BEGIRATU BAT BEHAR DU!
 buruz
 dira
diff -Naur dokuwiki-2009-02-14/inc/lang/eu/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/eu/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/eu/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/eu/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======SPAMaren aurkako babesa======
+====== SPAMaren aurkako babesa ======
 
 Zure aldaketak **ez** dira gorde aurrez debekatutako hitzak erabili dituzulako. Wiki-a spammeatzen saitu bazara... -- Aiss osobuko! (VS). Hau akats bat dela uste baduzu jarri arremanetan Wiki-aren administratzailearekin.
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/fa/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/fa/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== برنامه های جانبی دیگر =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/denied.txt dokuwiki-rc2009-12-02/inc/lang/fa/denied.txt
--- dokuwiki-2009-02-14/inc/lang/fa/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======دسترسی ممکن نیست======
+====== دسترسی ممکن نیست ======
 
 شرمنده، شما اجازه‌ی دسترسی ب این صÙحه را ندارید. ممکن است Ùراموش کرده باشید Ú©Ù‡ وارد سایت شوید!
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/diff.txt dokuwiki-rc2009-12-02/inc/lang/fa/diff.txt
--- dokuwiki-2009-02-14/inc/lang/fa/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======تÙاوت‌ها======
+====== تÙاوت‌ها ======
 
 تÙاوت دو نسخه‌ی متÙاوت از صÙحه را مشاهده می‌کنید.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/install.html dokuwiki-rc2009-12-02/inc/lang/fa/install.html
--- dokuwiki-2009-02-14/inc/lang/fa/install.html	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,12 @@
+
    این صÙحه به شما در نصب Ùˆ تنظیم
+Dokuwiki کمک می‌کند. اطلاعات بیشتری در این مورد را می‌توانید در بخش راهنما مشاهده کنید.
    
+
+
    DokuWiki از Ùایل‌های معمولی برای ذخیره‌ی صÙحات ویکی Ùˆ اطلاعات مربوط به آن‌ها استÙاده می‌کند (مثل تصاویر، Ùهرست‌های جستجو، نگارش‌های پیشین Ùˆ غیره). برای نصب موÙقیت آمیز DokuWiki
+باید دسترسی نوشتن برای شاخه‌های این Ùایل‌ها داشته باشید. این کار باید توسط دستورات خط Ùرمان Ùˆ یا دسترسی FTP Ùˆ یا از طریق کنترل پنل خدمات میزبانی‌تون انجام شود. 
    
+
+
    این برنامه دسترسی‌های DokuWiki را برای شما تنظیم خواهد کرد،
+به این معنی Ú©Ù‡ مدیر سیستم می‌تواند به صÙحه‌ی مدیران وارد شود، اÙزونه نصب کنید، کاربران را مدیریت کند، دسترسی به صÙحات ویکی را مدیریت کند Ùˆ یا تنظیمات را تغییر دهد.
    
+
+
    برای اطلاعات بیشتر در مورد نصب می‌توانید از این پیوند‌ها استÙاده کنید
+روش نصب
+و  تنظیمات پیکربندی.
    
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/lang.php dokuwiki-rc2009-12-02/inc/lang/fa/lang.php
--- dokuwiki-2009-02-14/inc/lang/fa/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,7 @@
  * @author Mohsen Firoozmandan 
  * @author omidmr@gmail.com
  * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -147,11 +148,11 @@
 $lang['external_edit']         = 'ویرایش خارجی';
 $lang['summary']               = 'پیش‌نمایش';
 $lang['noflash']               = 'برای نمایش محتویات اÙزونه‌ی Ùلش مورد نیاز است.';
+$lang['download']              = 'دیاÙت Ùایل منقطع گردید';
 $lang['mail_newpage']          = 'صÙحه اضاÙÙ‡ شد:';
 $lang['mail_changed']          = 'صÙحه تغییر داده شد:';
 $lang['mail_new_user']         = 'کاربر جدید:';
 $lang['mail_upload']           = 'Ùایل ارسال شده:';
-$lang['qb_alert']              = 'خواهشمندیم متنی را Ú©Ù‡ می‌خواهید در قالب مناسب در بیاورید را وارد کنید.\nاین متن به آخر مطلب اضاÙÙ‡ خواهد شد.';
 $lang['qb_bold']               = 'متن Ù¾Ùررنگ';
 $lang['qb_italic']             = 'متن ایتالیک';
 $lang['qb_underl']             = 'متن زیرخط‌دار';
@@ -162,6 +163,11 @@
 $lang['qb_h3']                 = 'عنوان سطح ۳';
 $lang['qb_h4']                 = 'عنوان سطح ۴';
 $lang['qb_h5']                 = 'عنوان سطح ۵';
+$lang['qb_h']                  = 'تیتر';
+$lang['qb_hs']                 = 'تیتر مورد نظر را انتخاب نمایید';
+$lang['qb_hplus']              = 'تیتر بالاتر';
+$lang['qb_hminus']             = 'تیتر پایین تر';
+$lang['qb_hequal']             = 'تیتر در یک سطح';
 $lang['qb_link']               = 'پیوند داخلی';
 $lang['qb_extlink']            = 'پیوند به بیرون (پیشوند http:// را Ùراموش نکنید)';
 $lang['qb_hr']                 = 'خط اÙÙ‚ÛŒ';
@@ -171,7 +177,7 @@
 $lang['qb_sig']                = 'اÙزودن امضا';
 $lang['qb_smileys']            = 'Ø´Ú©Ù„Ú©';
 $lang['qb_chars']              = 'حرو٠ویژه';
-$lang['del_confirm']           = 'واقعن تصمیم به حذ٠این موارد دارید؟';
+$lang['js']['del_confirm']           = 'واقعن تصمیم به حذ٠این موارد دارید؟';
 $lang['admin_register']        = 'یک حساب جدید بسازید';
 $lang['metaedit']              = 'ویرایش داده‌های متا';
 $lang['metasaveerr']           = 'نوشتن داده‌نما با مشکل مواجه شد';
@@ -228,4 +234,6 @@
 $lang['mu_authfail']           = 'سشن به پایان رسید';
 $lang['mu_progress']           = '@PCT@% ارسال شد';
 $lang['mu_filetypes']          = 'توسعه‌های مجاز';
+$lang['mu_info']               = 'Ùایل ارسال گردید';
+$lang['mu_lasterr']            = 'آخرین خطا:';
 $lang['recent_global']         = 'شما هم‌اکنون تغییرات Ùضای‌نام %s را مشاهده می‌کنید. شما هم‌چنین می‌توانید تغییرات اخیر در Ú©Ù„ ویکی را مشاهده نمایید.';
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/fa/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/fa/mailtext.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,17 @@
+یک صÙحه در ویکی اÙزوده شده یا تغییر کرده، اطلاعات آن را می‌توانید در زیر بینید:
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+خلاصه ویرایش: @SUMMARY@
+کاربر: @USER@
+
+@DIFF@
+
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/newpage.txt dokuwiki-rc2009-12-02/inc/lang/fa/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/fa/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======این صÙحه وجود ندارد======
+====== این صÙحه وجود ندارد ======
 
 شما به این صÙحه Ú©Ù‡ وجود ندارد رسیده‌اید. اگر دسترسی‌ها به شما اجازه می‌دهند، می‌توانید این صÙحه را با کلیلک کردن روی دکمه‌ی «ساخت این صÙحه» ایجاد کنید.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/norev.txt dokuwiki-rc2009-12-02/inc/lang/fa/norev.txt
--- dokuwiki-2009-02-14/inc/lang/fa/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======نگارشی یاÙت نشد======
+====== نگارشی یاÙت نشد ======
 
 نگارش موردنظر یاÙت نشد. از دکمه‌ی «نگارش‌های پیشین» برای مشاهده‌ی نگارش‌های پیشین این صÙحه استÙاده کنید.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/password.txt dokuwiki-rc2009-12-02/inc/lang/fa/password.txt
--- dokuwiki-2009-02-14/inc/lang/fa/password.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,10 @@
+سلام @FULLNAME@!
+
+اطلاعات شخصی خود را با عنوان @TITLE@ در @DOKUWIKIURL@ را در زیر مشاهده کنید:
+
+نام کاربری: @LOGIN@
+گذرواژه: @PASSWORD@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/preview.txt dokuwiki-rc2009-12-02/inc/lang/fa/preview.txt
--- dokuwiki-2009-02-14/inc/lang/fa/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======پیش‌نمایش======
+====== پیش‌نمایش ======
 
 این پیش‌نمایش متن شماست. به یاد داشته باشید که این متن **هنوز ذخیره نشده‌است**
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/fa/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/fa/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,13 @@
+سلام @FULLNAME@!
+
+یک Ù†Ùر برای ورود به @DOKUWIKIURL@ با عنوان @TITLE@ درخواست گذرواژه‌ای جدید کرده است:
+
+اگر شما چنین درخواستی نداده‌اید، این ایمیل را پاک کنید.
+
+اگر این درخواست توسط شما داده شده است، باید آن را تایید کنید، پس روی پیوند زیر کلیک کنید.
+
+@CONFIRM@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/recent.txt dokuwiki-rc2009-12-02/inc/lang/fa/recent.txt
--- dokuwiki-2009-02-14/inc/lang/fa/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======تغییرات اخیر======
+====== تغییرات اخیر ======
 
 این صÙحه‌ها اخیرن تغییر کرده‌اند.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/registermail.txt dokuwiki-rc2009-12-02/inc/lang/fa/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/fa/registermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+یک کاربر تازه با مشخصات زیر عضو ویکی شده است:
+
+نام کاربری: @NEWUSER@
+اسم کامل: @NEWNAME@
+ایمیل: @NEWEMAIL@
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/revisions.txt dokuwiki-rc2009-12-02/inc/lang/fa/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/fa/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======نگارش‌های پیشین======
+====== نگارش‌های پیشین ======
 
 در اینجا نگارش‌های پیشین این صÙحه را مشاهده می‌کنید. برای بازگشتن به آن‌ها، آن را انتخاب کنید Ùˆ کلید «ویرایش این صÙحه» را انتخاب کنید Ùˆ سپس ذخیره نمایید.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/fa/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/fa/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======جستجو======
+====== جستجو ======
 
 نتایج جستجو در زیر آمده است. اگر به نتیجه‌ی مطلوبی نرسیده‌اید، می‌توانید صÙحه‌ی مورد نظر را ایجاد کنید.
 
-=====نتایج=====
\ Brak znaku nowej linii na końcu pliku
+===== نتایج =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/fa/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/fa/stopwords.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,445 @@
+# 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/
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+من
+تو
+او
+ما
+شما
+آنها
+ایشان
+ایشون
+از
+Ùˆ
+را
+ای
+یا
+باید
+شاید
+چرا
+چون
+چگونه
+Ú†Ù‡
+اگر
+الان
+سلام
+ممنون
+موÙÙ‚
+باشید
+باش
+باشند
+باشی
+باشم
+باشد
+است
+نیست
+شد
+شدن
+شدند
+شدیم
+شدید
+درباره
+یک
+دو
+سه
+چهار
+پنج
+شش
+Ù‡Ùت
+هشت
+ده
+در
+هست
+هستم
+هستی
+هستیم
+هستید
+هستند
+برای
+این
+آن
+اون
+روی
+رو
+بود
+بودم
+بودی
+بودیم
+بودید
+بودند
+کجا
+کی
+با
+کس
+کسی
+پیرامون
+نزدیک
+بالا
+پایین
+بالای
+بالاتر
+مواÙÙ‚
+مطابق
+طبق
+برطبق
+همان
+سر
+درمیان
+عرض
+طرÙ
+عملا
+واقعا
+بعد
+قبل
+جستجو
+سپس
+دوباره
+رÙتم
+رÙتی
+رÙت
+رÙتیم
+رÙتید
+رÙتند
+بای
+اوه
+آه
+اه
+برابر
+بااینکه
+همواره
+همیشه
+پیوسته
+وقت
+هزار
+دیگر
+جدا
+شخص
+کدام
+هیچگونه
+بهرحال
+هرچیز
+هیچکار
+درهرصورت
+پدیدار
+درک
+باشه
+جنوب
+ضبط
+حوالی
+نزدیکی
+چنانچه
+بطوریکه
+هنگامیکه
+مثال
+مانند
+پرسیدن
+جویا
+خواهش
+خواستن
+انجمن
+کنار
+پیک
+بیرون
+خارج
+مرتبا
+آغاز
+پایان
+آمد
+امد
+به
+زیرا
+چونکه
+آمدن
+بودن
+درخور
+بوده
+پیش
+پس
+قبلا
+راحت
+مقدم
+کار
+برو
+بیا
+باور
+گمان
+بمیر
+Ú†Ù¾
+راست
+شمال
+غرب
+شرق
+دور
+گذشته
+آینده
+بهتر
+بهترین
+بدترین
+عظیم
+Ú©ÙˆÚ†Ú©
+نیک
+بدتر
+خوب
+بد
+زشت
+میان
+هردو
+هم
+یکی
+کوتاه
+بلند
+مختصر
+Ø­Ú©Ù…
+اما
+ولی
+لیکن
+حز
+مگر
+Ùقط
+بدون
+محض
+بخش
+بدست
+وسیله
+درجه
+اول
+دوم
+سوم
+چهارم
+پنجم
+ششم
+Ù‡Ùتم
+هشتم
+نهم
+دهم
+امکان
+داشتن
+داشتیم
+داشتی
+داشتند
+داشتید
+سبب
+علت
+موجب
+هدÙ
+صÙر
+محتوی
+دارا
+شامل
+نیا
+چیز
+نرو
+مسیر
+روش
+جهت
+دقیقا
+درطی
+درضمن
+بسرعت
+رایج
+جاری
+طورقطعی
+شرح
+کرد
+انجام
+عدد
+غیر
+بریم
+کاملا
+قلم
+آب
+سایه
+مساوی
+صاÙ
+هموار
+حتی
+جÙت
+هرگز
+درست
+کامل
+چنین
+دومین
+سومین
+چهارمین
+پنجمین
+ششمین
+هشتمین
+نهمین
+دهمین
+برید
+رÙتن
+راه
+درود
+خداحاÙظ
+حاجی
+واقع
+سخت
+آسان
+مشکل
+اینجا
+آنجا
+خودش
+هنوز
+بلاÙاصله
+نگاه
+Ù†Ú¯Ù‡
+آخر
+اخر
+عمرا
+کمترین
+کوچکترین
+اقل
+مثل
+Ø´Ú©Ù„
+نظر
+چندین
+زیاد
+احتمالا
+متوسط
+یعنی
+اساسا
+عالی
+وای
+خودم
+خودت
+خودمان
+خودمون
+اسم
+نام
+آره
+حال
+حالا
+اینک
+خیلی
+بارها
+بسیار
+Ú©Ù†
+وسط
+ممکن
+راستی
+Ùعلا
+صحیح
+واقعی
+Ú¯Ùت
+Ú¯Ùتم
+Ú¯Ùتیم
+امثال
+آنکه
+مهم
+جدی
+چنان
+چندان
+زیادی
+بعضی
+گاهگاهی
+زود
+بزودی
+بگیر
+ببر
+بردن
+گیرنده
+تا
+تشکر
+سپاس
+ان
+آنان
+بکلی
+تماما
+بنا
+همدیگر
+جلو
+معمولا
+مقدار
+موقع
+اونجا
+آیا
+Ú©Ù‡
+بچه
+حاضر
+میخواستم
+بلی
+خیر
+Ùوروم
+خواهم
+داره
+نداره
+داری
+همون
+میبینم
+اینجوریه
+بهش
+هستن
+امضام
+اولی
+دومی
+سومی
+چهارمی
+بگذار
+بکنه
+امروز
+صدمین
+همش
+همگی
+هوا
+اعلام
+اخرین
+خودشون
+حد
+شده
+اینکه
+خب
+یه
+اینجوری
+گاه
+گهگاه
+گاهی
+گهگدار
+گهگداری
+ها
+میشه
+کمی
+راجبه
+توضیح
+بدی
+راجع
+می
+شه
+روز
+کنی
+اصلا
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/fa/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/fa/uploadmail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+یک Ùایل به ویکی ارسال شد:
+
+Ùایل: @MEDIA@
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+اندازه: @SIZE@
+MIME: @MIME@
+کاربر: @USER@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fa/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/fa/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/fa/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fa/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======اسپم مسدود شد======
+====== اسپم مسدود شد ======
 
 این تغییرات ذخیره **نمی‌شود**ØŒ چون چند کلمه از کلمه‌های مسدود شده در آن یاÙت شده است. اگر Ùکر می‌کنید Ú©Ù‡ نباید این اتÙاق می‌اÙتاد با مدیر سیستم تماس بگیرید.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/fi/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/fi/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Muita liitännäisiä =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/conflict.txt dokuwiki-rc2009-12-02/inc/lang/fi/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/fi/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,4 +2,4 @@
 
 Muokkaamastasi dokumentista on olemassa uudempi versio. Näin käy, kun toinen käyttäjä muuttaa dokumenttia sillä aikaa, kun sinä olit muokkaamassa sitä.
 
-Tutki alla näkyvät eroavaisuudet kunnolla ja päätä mikä versio säilytetään. Jos valitse "tallenna" sinun versiosi tallennetaan. Valitse ''peru'' pitääksesi tämänhetkisen version.
+Tutki alla näkyvät eroavaisuudet kunnolla ja päätä mikä versio säilytetään. Jos valitset "tallenna", sinun versiosi tallennetaan. Valitse ''peru'' pitääksesi tämänhetkisen, toisen käyttäjän muuttaman version.
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/editrev.txt dokuwiki-rc2009-12-02/inc/lang/fi/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/fi/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Olet ladannut vanhan version dokumentista** Jos tallennat tulee tästä uusin versio dokumentista.
+**Olet ladannut vanhan version dokumentista** Jos tallennat tämän, tästä tulee uusin versio dokumentista.
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/lang.php dokuwiki-rc2009-12-02/inc/lang/fi/lang.php
--- dokuwiki-2009-02-14/inc/lang/fi/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -7,6 +7,7 @@
  * @author Matti Pöllä 
  * @author otto@valjakko.net
  * @author Otto Vainio 
+ * @author Teemu Mattila 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -49,6 +50,7 @@
 $lang['btn_draft']             = 'Muokkaa luonnosta';
 $lang['btn_recover']           = 'Palauta luonnos';
 $lang['btn_draftdel']          = 'Poista luonnos';
+$lang['btn_revert']            = 'palauta';
 $lang['loggedinas']            = 'Kirjautunut nimellä';
 $lang['user']                  = 'Käyttäjänimi';
 $lang['pass']                  = 'Salasana';
@@ -86,7 +88,9 @@
 $lang['resendpwdconfirm']      = 'Varmistuslinkki on lähetetty sähköpostilla';
 $lang['resendpwdsuccess']      = 'Uusi salasanasi on lähetetty sähköpostilla.';
 $lang['license']               = 'Jollei muuta ole mainittu, niin sisältö tässä wikissä on lisensoitu seuraavalla lisenssillä:';
-$lang['licenseok']             = 'Huom: Muokkaamalla tätä sivua suostut lisensoimaan sisällön seuraavan lisenssin alla:';
+$lang['licenseok']             = 'Huom: Muokkaamalla tätä sivua suostut lisensoimaan sisällön seuraavan lisenssin mukaisesti:';
+$lang['searchmedia']           = 'Etsi tiedostoa nimeltä:';
+$lang['searchmedia_in']        = 'Etsi kohteesta %s';
 $lang['txt_upload']            = 'Valitse tiedosto lähetettäväksi';
 $lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
@@ -111,10 +115,14 @@
 $lang['mediainuse']            = 'Tiedostoa "%s" ei ole poistettu - se on vielä käytössä.';
 $lang['namespaces']            = 'Nimiavaruudet';
 $lang['mediafiles']            = 'Tarjolla olevat tiedostot';
+$lang['js']['searchmedia']     = 'Etsi tiedostoja';
 $lang['js']['keepopen']        = 'Pidä valinnan ikkuna avoinna.';
 $lang['js']['hidedetails']     = 'Piilota yksityiskohdat';
 $lang['js']['nosmblinks']      = 'Linkit Windows-jakoihin toimivat vain Microsoft Internet Explorerilla.
 Voit silti kopioida ja liittää linkin.';
+$lang['js']['linkwiz']         = 'Linkkivelho';
+$lang['js']['linkto']          = 'Linkki kohteeseen:';
+$lang['js']['del_confirm']     = 'Haluatko todella poistaa valitut kohteet?';
 $lang['js']['mu_btn']          = 'Lähetä useampia tiedostoja kerralla';
 $lang['mediausage']            = 'Käytä seuraavaa merkintätapaa viittausta tehtäessä:';
 $lang['mediaview']             = 'Katsele alkuperäistä tiedostoa';
@@ -141,12 +149,12 @@
 $lang['restored']              = 'vanha versio palautettu';
 $lang['external_edit']         = 'ulkoinen muokkaus';
 $lang['summary']               = 'Yhteenveto muokkauksesta';
-$lang['noflash']               = 'Tarvitset Adobe Flash pluginnin nähdäksesi tämän sisällön.';
+$lang['noflash']               = 'Tarvitset Adobe Flash-liitännäisen nähdäksesi tämän sisällön.';
+$lang['download']              = 'Lataa palanen';
 $lang['mail_newpage']          = 'sivu lisätty:';
 $lang['mail_changed']          = 'sivu muutettu:';
 $lang['mail_new_user']         = 'uusi käyttäjä:';
 $lang['mail_upload']           = 'tiedosto lähetetty:';
-$lang['qb_alert']              = 'Syötä teksti jonka haluat muotoilla.\nSe lisätään dokumentin loppuun.';
 $lang['qb_bold']               = 'Lihavoitu teksti';
 $lang['qb_italic']             = 'Kursivoitu teksti';
 $lang['qb_underl']             = 'Alleviivattu teksti';
@@ -157,6 +165,11 @@
 $lang['qb_h3']                 = 'Taso 3 otsikko';
 $lang['qb_h4']                 = 'Taso 4 otsikko';
 $lang['qb_h5']                 = 'Taso 5 otsikko';
+$lang['qb_h']                  = 'Otsikko';
+$lang['qb_hs']                 = 'Valitse otsikko';
+$lang['qb_hplus']              = 'Ylempi otsikko';
+$lang['qb_hminus']             = 'Alempi otsikko';
+$lang['qb_hequal']             = 'Saman tason otsikko';
 $lang['qb_link']               = 'Sisäinen linkki';
 $lang['qb_extlink']            = 'Ulkoinen linkki';
 $lang['qb_hr']                 = 'Vaakaerotin';
@@ -166,7 +179,7 @@
 $lang['qb_sig']                = 'Lisää allekirjoitus';
 $lang['qb_smileys']            = 'Hymiöt';
 $lang['qb_chars']              = 'Erikoismerkit';
-$lang['del_confirm']           = 'Haluatko todella poistaa valitut kohteet?';
+$lang['upperns']               = 'Hyppää edelliseen nimiavaruuteen';
 $lang['admin_register']        = 'Lisää uusi käyttäjä';
 $lang['metaedit']              = 'Muokkaa metadataa';
 $lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
@@ -195,9 +208,9 @@
 $lang['i_enableacl']           = 'Käytä käyttöoikeuksien hallintaa (ACL) (Suositeltu)';
 $lang['i_superuser']           = 'Pääkäyttäjä';
 $lang['i_problems']            = 'Asennusohjelma löysi alla listattuja ongelmia ongelmia. Et voi jatkaa ennen kuin ne on korjattu.';
-$lang['i_modified']            = 'Turvallisuussyistä tämä ohjelma toimii vain uusien ja muokkaamattoman Dokuwiki asennusten kanssa. Pura tiedostot uudestaan asennuspaketista, tai lue Dokuwiki asennusohjeen (Englanniksi)';
-$lang['i_funcna']              = 'PHP funktio %s ei ole käytettävissä. Ehkä palveluntarjoajasi on poistanut sen jostain syystä?';
-$lang['i_phpver']              = 'PHP versiosi %s on pienempi, kuin tarvitaan %s. PHP asennukseni pitää päivittää.';
+$lang['i_modified']            = 'Turvallisuussyistä tämä ohjelma toimii vain uusien ja muokkaamattomien Dokuwiki-asennusten kanssa. Pura tiedostot uudestaan asennuspaketista, tai lue Dokuwikin asennusohje (englanniksi)';
+$lang['i_funcna']              = 'PHP:n funktio %s ei ole käytettävissä. Palveluntarjoajasi on saattanut poistaa sen jostain syystä.';
+$lang['i_phpver']              = 'Käyttämäsi PHP-ohjelmiston versio %s on pienempi, kuin tarvitaan %s. PHP-asennuksesi pitää päivittää.';
 $lang['i_permfail']            = '%s ei ole DokuWikin kirjoitettavissa. Muokkaa hakemiston oikeuksia!';
 $lang['i_confexists']          = '%s on jo olemassa';
 $lang['i_writeerr']            = '%sn luonti epäonnistui. Tarkista hakemiston/tiedoston oikeudet ja luo tiedosto käsin.';
@@ -205,8 +218,8 @@
 $lang['i_badval']              = '%s - väärä tai tyhjä arvo';
 $lang['i_success']             = 'Kokoonpano tehty onnistuneesti. Voit poistaa install.php tiedoston. Jatka uuteen DokuWikiisi.';
 $lang['i_failure']             = 'Joitain virheitä tapahtui kirjoitettaessa vaadittavia tiedostoja. Sinun pitää korjata ne käsin ennen kuin voit käyttää uutta DokuWikiäsi.';
-$lang['i_policy']              = 'Käyttöoikeuksien oletus menettelytapa';
-$lang['i_pol0']                = 'Avoin Wiki (luku, kirjoitus, tiedostojen lähetys kaikille)';
+$lang['i_policy']              = 'Käyttöoikeuksien oletusmenettelytapa';
+$lang['i_pol0']                = 'Avoin Wiki (luku, kirjoitus, tiedostojen lähetys on sallittu kaikille)';
 $lang['i_pol1']                = 'Julkinen Wiki (luku kaikilla, kirjoitus ja tiedostojen lähetys rekisteröidyillä käyttäjillä)';
 $lang['i_pol2']                = 'Suljettu Wiki (luku, kirjoitus ja tiedostojen lähetys vain rekisteröityneillä käyttäjillä)';
 $lang['i_retry']               = 'Yritä uudelleen';
@@ -223,4 +236,13 @@
 $lang['mu_authfail']           = 'istunto on vanhentunut';
 $lang['mu_progress']           = '@PCT@% lähetetty';
 $lang['mu_filetypes']          = 'Sallitut tyypit';
+$lang['mu_info']               = 'tiedstoa ladattu.';
+$lang['mu_lasterr']            = 'Edellinen virhe:';
 $lang['recent_global']         = 'Seuraat tällä hetkellä muutoksia nimiavaruuden %s sisällä. Voit myös katsoa muutoksia koko wikissä';
+$lang['years']                 = '%d vuotta sitten';
+$lang['months']                = '%d kuukautta sitten';
+$lang['weeks']                 = '%d viikkoa sitten';
+$lang['days']                  = '%d päivää sitten';
+$lang['hours']                 = '%d tuntia sitten';
+$lang['minutes']               = '%d minuuttia sitten';
+$lang['seconds']               = '% sekuntia sitten';
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/login.txt dokuwiki-rc2009-12-02/inc/lang/fi/login.txt
--- dokuwiki-2009-02-14/inc/lang/fi/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Sisäänkirjautuminen ======
 
-Et ole tällä hetkellä kirjautunut sisään!. Anna käyttäjätunnus ja salasana alle kirjautuaksesi sisään. Muista että evästeiden käyttö tulee olla päällä, jotta sisäänkirjautuminen onnistuu.
+Et ole tällä hetkellä kirjautunut sisään! Anna käyttäjätunnus ja salasana alle kirjautuaksesi. Muista, että evästeiden käyttö tulee olla päällä, jotta sisäänkirjautuminen onnistuu.
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/fi/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/fi/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,6 @@
 @DIFF@
 
 
---
+-- 
 Tämän postin generoi DokuWiki
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/password.txt dokuwiki-rc2009-12-02/inc/lang/fi/password.txt
--- dokuwiki-2009-02-14/inc/lang/fi/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,6 @@
 Käyttäjätunnus : @LOGIN@
 Salasana : @PASSWORD@
 
---
+-- 
 Tämän postin generoi DokuWiki
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/preview.txt dokuwiki-rc2009-12-02/inc/lang/fi/preview.txt
--- dokuwiki-2009-02-14/inc/lang/fi/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Esikatselu ======
 
-Tämä on esikatselu miltä tekstisi tulee näyttämään. Muista tätä **ei ole tallennettu** vielä!
+Tämä on esikatselu siitä, miltä tekstisi tulee näyttämään. Muista, että tätä **ei ole tallennettu** vielä!
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/fi/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/fi/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Tämän postin generoi DokuWiki
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/read.txt dokuwiki-rc2009-12-02/inc/lang/fi/read.txt
--- dokuwiki-2009-02-14/inc/lang/fi/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1 +1 @@
-Tämä sivu on vain luettavissa. Voit katsoa sen lähdekoodia, mutta et muuttaa sitä. Kysy ylläpitäjältä jos pidät tätä vääryytenä.
+Tämä sivu on vain luettavissa. Voit katsoa sen lähdekoodia, mutta et muuttaa sitä. Kysy ylläpitäjältä jos pidät tätä estoa virheellisenä.
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/registermail.txt dokuwiki-rc2009-12-02/inc/lang/fi/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/fi/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 IP-osoite : @IPADDRESS@
 Hostname : @HOSTNAME@
 
---
+-- 
 Tämän postin generoi DokuWiki osoitteessa
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/register.txt dokuwiki-rc2009-12-02/inc/lang/fi/register.txt
--- dokuwiki-2009-02-14/inc/lang/fi/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Rekisteröi uusi käyttäjä ======
 
-Täytä alla olevat tiedot tehdäksesi uusi käyttäjätili tähän wikiin. Muista antaa **toimiva sähköpostiosoite**. Jos sinulta ei kysytä uutta salasanaa, niin uusi salasanasi lähetetään sinne. Käyttäjänimi pitää olla myös käypä [[doku>pagename|sivunimi]].
+Täytä alla olevat tiedot luodaksesi uuden käyttäjätilin tähän wikiin. Muista antaa **toimiva sähköpostiosoite**. Jos sinulta ei kysytä uutta salasanaa, niin uusi salasanasi lähetetään sähköpostiisi. Käyttäjänimi pitää olla myös käypä [[doku>pagename|sivunimi]].
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/fi/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/fi/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Päivitä käyttäjätilisi profiilia ======
 
-Täytä vain ne kentät, joita haluat muuttaa. Käyttäjä tunnustasi et voi muuttaa.
\ Brak znaku nowej linii na końcu pliku
+Täytä vain ne kentät, joita haluat muuttaa. Et voi muuttaa käyttäjätunnustasi.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fi/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/fi/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/fi/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fi/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Type : @MIME@
 Käyttäjä : @USER@
 
---
+-- 
 Tämän postin generoi DokuWiki osoitteessa
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fo/lang.php dokuwiki-rc2009-12-02/inc/lang/fo/lang.php
--- dokuwiki-2009-02-14/inc/lang/fo/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fo/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -122,7 +122,6 @@
 
 $lang['js']['nosmblinks'] = "Ãvísingar til Windows shares virka bert í Microsoft Internet Explorer.\nTú kanst enn avrita og sata inn slóðina.";
 
-$lang['qb_alert']   = 'Skriva tann tekst tú ynskir at forsniða.\nHann verður skoyttur uppí í endanum av skjalinum.';
 $lang['qb_bold']    = 'Feit';
 $lang['qb_italic']  = 'Skák';
 $lang['qb_underl']  = 'Undurstrika';
@@ -143,7 +142,7 @@
 $lang['qb_smileys'] = 'Smileys';
 $lang['qb_chars']   = 'Sertekn';
 
-$lang['del_confirm']= 'Strika post(ar)?';
+$lang['js']['del_confirm']= 'Strika post(ar)?';
 $lang['admin_register']= 'Upprætta nýggjan brúkara';
 
 $lang['metaedit']    = 'Rætta metadáta';
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/fr/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/fr/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Modules supplémentaires ===== 
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/fr/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/fr/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,4 @@
-====== Pages pointant sur la page en cours (backlinks) ====== 
- Ceci est la liste des pages qui pointent sur la page en cours.
+====== Pages pointant sur la page en cours ======
+
+Ceci est la liste des pages qui pointent sur la page en cours.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/denied.txt dokuwiki-rc2009-12-02/inc/lang/fr/denied.txt
--- dokuwiki-2009-02-14/inc/lang/fr/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Autorisation refusée======
+====== Autorisation refusée ======
 
 Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ?
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/install.html dokuwiki-rc2009-12-02/inc/lang/fr/install.html
--- dokuwiki-2009-02-14/inc/lang/fr/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -8,7 +8,7 @@
 wiki et les autres informations associées à ces pages
 (tel que images, index de recherche, anciennes révisions, etc). Pour fonctionner correctement DokuWiki doit avoir accès en écriture aux différents répertoires qui contiennent ces fichiers. L'installeur n'est pas capable de modifier les permissions sur les répertoires. Ceci doit être effectué directement sur la ligne de commande de votre shell, ou, si vous êtes hébergé, via FTP ou votre panneau de contrôle (tel que cPanel).
    
 
-
    Cet installeur va paramétrer votre configuration de DokuWiki pour des ACL, qui permettront l'accès à un login administrateur et l'accès au menu d'administration de DokuWiki pour l'ajout de plugins, la gestion d'utilisateurs, la gestion de l'accès aux pages du wiki et les changements de paramètres de configuration. Il n'est pas nécessaire au fonctionnement de DokuWiki, néanmoins il facilite l'administration de DokuWiki.
    
+
    Cet installeur va paramétrer votre configuration de DokuWiki pour des ACL, qui permettront l'accès à un login administrateur et l'accès au menu d'administration de DokuWiki pour l'ajout de modules externes, la gestion d'utilisateurs, la gestion de l'accès aux pages du wiki et les changements de paramètres de configuration. Il n'est pas nécessaire au fonctionnement de DokuWiki, néanmoins il facilite l'administration de DokuWiki.
    
 
 
    Les utilisateurs expérimentés ou ceux
 nécessitant des paramétrages particuliers devraient se
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/lang.php dokuwiki-rc2009-12-02/inc/lang/fr/lang.php
--- dokuwiki-2009-02-14/inc/lang/fr/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -15,6 +15,9 @@
  * @author gb@isis.u-strasbg.fr
  * @author stephane.gully@gmail.com
  * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -57,6 +60,7 @@
 $lang['btn_draft']             = 'Éditer brouillon';
 $lang['btn_recover']           = 'Récupérer brouillon';
 $lang['btn_draftdel']          = 'Effacer brouillon';
+$lang['btn_revert']            = 'Restaurer';
 $lang['loggedinas']            = 'Connecté en tant que ';
 $lang['user']                  = 'Utilisateur';
 $lang['pass']                  = 'Mot de passe';
@@ -95,6 +99,8 @@
 $lang['resendpwdsuccess']      = 'Votre nouveau mot de passe vous a été expédié par courriel.';
 $lang['license']               = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante:';
 $lang['licenseok']             = 'Note : En éditant cette page vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
+$lang['searchmedia']           = 'Chercher le nom de fichier :';
+$lang['searchmedia_in']        = 'Chercher dans %s';
 $lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
 $lang['txt_filename']          = 'Donnez un "wikiname" (optionnel) ';
 $lang['txt_overwrt']           = 'Écraser le fichier cible';
@@ -119,10 +125,14 @@
 $lang['mediainuse']            = 'Le fichier "%s" n\'a pas été effacé - il est en cours d\'utilisation.';
 $lang['namespaces']            = 'Catégories';
 $lang['mediafiles']            = 'Fichiers disponibles dans';
+$lang['js']['searchmedia']     = 'Chercher des fichiers';
 $lang['js']['keepopen']        = 'Gardez la fenêtre ouverte pendant la sélection';
 $lang['js']['hidedetails']     = 'Masquer détails';
 $lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.
 Vous pouvez toujours faire un copier/coller du lien.';
+$lang['js']['linkwiz']         = 'Assistant Lien';
+$lang['js']['linkto']          = 'Lien vers:';
+$lang['js']['del_confirm']     = 'Effacer cette entrée ?';
 $lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
 $lang['mediausage']            = 'Utilisez la syntaxe suivante pour faire référence à ce fichier :';
 $lang['mediaview']             = 'Voir fichier original';
@@ -150,11 +160,11 @@
 $lang['external_edit']         = 'édition externe';
 $lang['summary']               = 'Résumé';
 $lang['noflash']               = 'L"extension Adobe Flash Plugin est nécessaire pour afficher ce contenu.';
+$lang['download']              = 'Télécharger un extrait';
 $lang['mail_newpage']          = 'page ajoutée :';
 $lang['mail_changed']          = 'page changée :';
 $lang['mail_new_user']         = 'nouvel utilisateur :';
 $lang['mail_upload']           = 'fichier envoyé :';
-$lang['qb_alert']              = 'SVP, entrez le texte que vous souhaitez formater.\nIl sera ajouté à la fin du document.';
 $lang['qb_bold']               = 'Gras';
 $lang['qb_italic']             = 'Italique';
 $lang['qb_underl']             = 'Souligné';
@@ -165,6 +175,11 @@
 $lang['qb_h3']                 = 'En-tête 3';
 $lang['qb_h4']                 = 'En-tête 4';
 $lang['qb_h5']                 = 'En-tête 5';
+$lang['qb_h']                  = 'Titre';
+$lang['qb_hs']                 = 'Sélectionner la ligne de titre';
+$lang['qb_hplus']              = 'Titre supérieur';
+$lang['qb_hminus']             = 'Titre inférieur';
+$lang['qb_hequal']             = 'Titre de même niveau';
 $lang['qb_link']               = 'Lien interne';
 $lang['qb_extlink']            = 'Lien externe';
 $lang['qb_hr']                 = 'Ligne horizontale';
@@ -174,11 +189,11 @@
 $lang['qb_sig']                = 'Insérer une signature';
 $lang['qb_smileys']            = 'Émoticons';
 $lang['qb_chars']              = 'Caractères spéciaux';
-$lang['del_confirm']           = 'Effacer cette entrée ?';
+$lang['upperns']               = 'Aller à la catégorie parente';
 $lang['admin_register']        = 'Ajouter un nouvel utilisateur';
-$lang['metaedit']              = 'Éditer les metadonnées';
-$lang['metasaveerr']           = 'Erreur à l\'écriture des metadonnées';
-$lang['metasaveok']            = 'Metadonnées enregistrées';
+$lang['metaedit']              = 'Éditer les métadonnées';
+$lang['metasaveerr']           = 'Erreur à l\'écriture des métadonnées';
+$lang['metasaveok']            = 'Métadonnées enregistrées';
 $lang['img_backto']            = 'Retour à';
 $lang['img_title']             = 'Titre';
 $lang['img_caption']           = 'Légende';
@@ -231,4 +246,13 @@
 $lang['mu_authfail']           = 'Session expirée';
 $lang['mu_progress']           = '@PCT@% envoyé';
 $lang['mu_filetypes']          = 'Types de fichiers acceptés';
-$lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein du namespace %s. Vous pouvez aussi voir les récentes modifications sur tout le wiki';
+$lang['mu_info']               = 'fichiers envoyés.';
+$lang['mu_lasterr']            = 'Dernière erreur : ';
+$lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein du namespace %s. Vous pouvez aussi voir les récentes modifications sur tout le wiki.';
+$lang['years']                 = 'il y a %d ans';
+$lang['months']                = 'il y a %d mois';
+$lang['weeks']                 = 'il y a %d semaines';
+$lang['days']                  = 'il y a %d jours';
+$lang['hours']                 = 'il y a %d heures';
+$lang['minutes']               = 'il y a %d minutes';
+$lang['seconds']               = 'il y a %d secondes';
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/fr/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/fr/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-Une page dans votre Wiki a été ajoutée ou modifiée. Voici les 
+Une page dans votre Wiki a été ajoutée ou modifiée. Voici les
 détails :
 
 Date              : @DATE@
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/newpage.txt dokuwiki-rc2009-12-02/inc/lang/fr/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/fr/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,4 @@
-====== Cette page n'existe pas encore ====== 
- Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ''Créer cette page''.
+====== Cette page n'existe pas encore ======
+
+Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ''Créer cette page''.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/fr/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/fr/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/fr/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/fr/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 Bonjour @FULLNAME@ !
 
-Quelqu'un a demandé un nouveau mot de passe pour votre login 
+Quelqu'un a demandé un nouveau mot de passe pour votre login
 @TITLE@ sur @DOKUWIKIURL@
 
 Si vous n'êtes pas à l'origine de cette requête d'un nouveau mot de
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/gl/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/gl/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugins adicionais =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/admin.txt dokuwiki-rc2009-12-02/inc/lang/gl/admin.txt
--- dokuwiki-2009-02-14/inc/lang/gl/admin.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Administración ======
 
-De seguido podes atopar unha lista de tarefas administrativas dispoñibles no DokuWiki.
+A continuación pode encontrar unha lista de tarefas administrativas dispoñíbeis no DokuWiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/gl/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/gl/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Ligazóns con isto ======
+====== Ligazóns entrantes ======
 
-Isto é unha lista de páxinas que semellan ligar coa páxina actual.
+Isto é unha listaxe de páxinas que parecen estar vinculadas á páxina actual.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/conflict.txt dokuwiki-rc2009-12-02/inc/lang/gl/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/gl/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Hai unha versión máis nova ======
 
-Hai unha versión máis nova do documento que editaches. Isto sucede cando outro usuario mudou o documento mentres ti estabas a editalo.
+Hai unha versión máis nova do documento que editou. Isto sucede cando outra persoa usuaria alterou o documento mentres vostede o estaba a editar.
 
-Examina as diferenzas amosadas embaixo polo miúdo, e logo decide que versión manter. Se escolles ''gardar'', gardarase a túa versión. Preme en ''cancelar'' para manter a versión actual.
+Examine as diferenzas que se mostran abaixo detalladamente e despois decida a versión que quere manter. Se selecciona ''Gardar'', gardarase a súa versión. Prema en ''Cancelar'' para manter a versión actual.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/denied.txt dokuwiki-rc2009-12-02/inc/lang/gl/denied.txt
--- dokuwiki-2009-02-14/inc/lang/gl/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Permiso Denegado======
+====== Permiso denegado ======
 
-Sentímolo, pero non tes dereitos de abondo para continuar. Pode que esqueceses iniciar a sesión?
+Sentímolo, mais non ten os permisos suficientes para continuar. É posíbel que esquecese iniciar unha sesión.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/diff.txt dokuwiki-rc2009-12-02/inc/lang/gl/diff.txt
--- dokuwiki-2009-02-14/inc/lang/gl/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Diferenzas======
+====== Diferenzas ======
 
-Isto amosa as diferenzas entre a revisión seleccionada e a versión actual da páxina.
+Isto mostra as diferenzas entre a revisión seleccionada e a versión actual da páxina.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/draft.txt dokuwiki-rc2009-12-02/inc/lang/gl/draft.txt
--- dokuwiki-2009-02-14/inc/lang/gl/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
-====== Arquivo de borrador atopado ======
+====== Encontrouse un ficheiro de borrador ======
 
-A túa última sesión de edición desta páxina non foi completada de xeito correcto. O DokuWiki gravou automaticamente un borrador durante o teu traballo que agora podes usar para continuar coa edición. De seguido podes ver os datos que foron gardados da túa última sesión.
+A súa última sesión de edición desta páxina non terminou de modo correcto. O DokuWiki gardou automaticamente un borrador durante o seu traballo que agora pode usar para continuar coa edición. A continuación pode ver os datos que foron gardados durante a súa última sesión.
 
-Por favor, escolle se queres //recuperar// a túa sesión de edición perdida, //eliminar// o borrador autogardado ou //cancelar// o proceso de edición.
+Por favor, escolla entre se se quere //Recuperar// a súa sesión de edición perdida, //Eliminar// o borrador gardado automaticamente ou //Cancelar// o proceso de edición.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/editrev.txt dokuwiki-rc2009-12-02/inc/lang/gl/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/gl/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Cargaches unha revisión antiga do documento!** Se o gardas, crearás unha nova versión con estes datos.
+**Cargou unha revisión antiga do documento!** Se o garda, creará unha versión nova con eses datos.
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/edit.txt dokuwiki-rc2009-12-02/inc/lang/gl/edit.txt
--- dokuwiki-2009-02-14/inc/lang/gl/edit.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-Edita a páxina e preme en ''Gardar''. Bótalle un ollo á [[wiki:syntax|sintaxe]] para ver a sintaxe da Wiki. Por favor, edita a páxina só se podes **mellorala**. Se queres facer probas, aprende como levar a cabo os teus primeiros pasos na [[playground:playground|eira]].
+Edite a páxina e prema en ''Gardar''. Vexa a páxina [[wiki:syntax|sintaxe]] para aprender a sintaxe da Wiki. Edite a páxina só se pode **mellorala**. Se quere facer probas, aprenda como efectuar os seus primeiros pasos no [[playground:playground|campo de xogo]].
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/index.txt dokuwiki-rc2009-12-02/inc/lang/gl/index.txt
--- dokuwiki-2009-02-14/inc/lang/gl/index.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Ãndice ======
 
-Isto é un índice de todas as páxinas dispoñibles ordenadas por [[doku>namespaces|nomes de espazo]].
+Isto é un índice de todas as páxinas dispoñíbeis, ordenadas por [[doku>namespaces|nomes de espazo]].
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/install.html dokuwiki-rc2009-12-02/inc/lang/gl/install.html
--- dokuwiki-2009-02-14/inc/lang/gl/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -1,25 +1,25 @@
-
    Esta páxina é unha axuda na primeira vez que se instala e configura o
-Dokuwiki. Se queres máis información
-verbo deste instalador está dispoñible na súa propia
+
    Esta páxina é unha axuda para a primeira instalación e configuración do
+Dokuwiki. Se quere máis información
+sobre este instalador, está dispoñíbel na súa propia
 páxina de documentación.
    
 
-
    O DokuWiki usa arquivos normais para a almacenaxe das páxinas do wiki
-e outra información asociada coas mesmas (p.e. imaxes, índices de procura, 
-revisións antigas, etc).  Por iso, para poder operar correctamente, o DokuWiki
-precisa ter acceso de escritura aos directorios que conteñen
-eses arquivos. Este instalador non é quen de configurar os permisos dos directorios.
-Isto debe facerse normalmente de xeito directo na liña de comandos ou, se estás a 
-usar un hospedaxe, a través do FTP ou do panel de control da túa hospedaxe (p.e.
+
    O DokuWiki usa ficheiros normais para o almacenamento das páxinas do wiki
+e outra información asociada ás mesmas (por ex. imaxes, índices de procura, 
+revisións antigas etc.). Por iso, para poder operar correctamente, o DokuWiki
+precisa ter acceso de escritura nos directorios que conteñen
+eses ficheiros. Este instalador non é quen de configurar os permisos dos directorios.
+Isto debe facerse normalmente de xeito directo na liña de comandos ou, se está a 
+usar unha hospedaxe, a través do FTP ou do panel de control da súa hospedaxe (por ex.
 o cPanel).
    
 
-
    Este instalador configurará o teu DokuWiki para o uso do
-ACL, o cal permitirá ao administrador
-iniciar sesión e acceder ao menú de administración do DokuWiki para instalar plugins,
-xestionar usuarios e accesos ás páxinas do wiki, ademais de modificar a configuración.
-Non é imprescindible para o funcionamento do DokuWiki, pero fai moito máis doada a
+
    Este instalador configurará o seu DokuWiki para o uso da
+ACL, o cal lle permitirá á persoa administradora
+iniciar unha sesión e acceder ao menú de administración do DokuWiki para instalar plugins,
+xestionar as persoas usuarias e os accesos ás páxinas do wiki; ademais de modificar a configuración.
+Non é imprescindíbel para o funcionamento do DokuWiki, mais fai moito máis doada a
 administración do mesmo.
    
 
-
    Os usuarios expertos ou con requisitos especiais de configuración poden visitar
-as seguintes ligazóns para obter pormenores relativos ás
+
    As persoas usuarias expertas ou con requisitos especiais de configuración poden visitar
+as seguintes ligazóns para obter os pormenores relativos ás
 instruccións de instalación
 e á configuración.
    
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/lang.php dokuwiki-rc2009-12-02/inc/lang/gl/lang.php
--- dokuwiki-2009-02-14/inc/lang/gl/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -4,6 +4,8 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author CiberIrmandade da Fala 
+ * @author Tagen Ata 
+ * @author Leandro Regueiro 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -13,8 +15,8 @@
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '’';
 $lang['btn_edit']              = 'Editar esta páxina';
-$lang['btn_source']            = 'Amosar a fonte da páxina';
-$lang['btn_show']              = 'Amosar páxina';
+$lang['btn_source']            = 'Mostrar o código da páxina';
+$lang['btn_show']              = 'Mostrar a páxina';
 $lang['btn_create']            = 'Crear esta páxina';
 $lang['btn_search']            = 'Procurar';
 $lang['btn_save']              = 'Gardar';
@@ -23,205 +25,219 @@
 $lang['btn_newer']             = '<< máis recente';
 $lang['btn_older']             = 'menos recente >>';
 $lang['btn_revs']              = 'Revisións antigas';
-$lang['btn_recent']            = 'Trocos recentes';
+$lang['btn_recent']            = 'Cambios recentes';
 $lang['btn_upload']            = 'Subir';
 $lang['btn_cancel']            = 'Cancelar';
 $lang['btn_index']             = 'Ãndice';
 $lang['btn_secedit']           = 'Editar';
-$lang['btn_login']             = 'Iniciar sesión';
-$lang['btn_logout']            = 'Rematar sesión';
+$lang['btn_login']             = 'Iniciar unha sesión';
+$lang['btn_logout']            = 'Terminar a sesión';
 $lang['btn_admin']             = 'Administración';
 $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Borrar';
 $lang['btn_back']              = 'Atrás';
-$lang['btn_backlink']          = 'Ligazóns con isto';
-$lang['btn_backtomedia']       = 'Volver á Selección de Arquivos-Media';
-$lang['btn_subscribe']         = 'Avísame dos trocos na páxina';
-$lang['btn_unsubscribe']       = 'Xa non me avises dos trocos na páxina';
-$lang['btn_subscribens']       = 'Avísame dos trocos de Nomes de Espazo';
-$lang['btn_unsubscribens']     = 'Xa non me avises dos trocos de Nomes de Espazo';
-$lang['btn_profile']           = 'Actualizar Perfil';
+$lang['btn_backlink']          = 'Ligazón entrante';
+$lang['btn_backtomedia']       = 'Volver á Selección de Ficheiros multimedia';
+$lang['btn_subscribe']         = 'Avisar dos cambios na páxina';
+$lang['btn_unsubscribe']       = 'Non avisar dos cambios na páxina';
+$lang['btn_subscribens']       = 'Avísar dos cambios nos Nomes de espazo';
+$lang['btn_unsubscribens']     = 'Non avisar dos cambios nos Nomes de espazo';
+$lang['btn_profile']           = 'Actualizar o perfil';
 $lang['btn_reset']             = 'Reiniciar';
-$lang['btn_resendpwd']         = 'Envíame un novo contrasinal';
-$lang['btn_draft']             = 'Editar borrador';
-$lang['btn_recover']           = 'Recuperar borrador';
-$lang['btn_draftdel']          = 'Eliminar borrador';
-$lang['loggedinas']            = 'Iniciaches sesión coma';
-$lang['user']                  = 'Nome de Usuario';
+$lang['btn_resendpwd']         = 'Enviar un contrasinal novo';
+$lang['btn_draft']             = 'Editar o borrador';
+$lang['btn_recover']           = 'Recuperar o borrador';
+$lang['btn_draftdel']          = 'Eliminar o borrador';
+$lang['btn_revert']            = 'Restaurar';
+$lang['loggedinas']            = 'Iniciou unha sesión como';
+$lang['user']                  = 'Nome de persoa usuaria';
 $lang['pass']                  = 'Contrasinal';
-$lang['newpass']               = 'Novo Contrasinal';
-$lang['oldpass']               = 'Confirmar contrasinal actual';
+$lang['newpass']               = 'Contrasinal novo';
+$lang['oldpass']               = 'Confirmar o contrasinal actual';
 $lang['passchk']               = 'de novo';
 $lang['remember']              = 'Lémbrame';
-$lang['fullname']              = 'Nome Completo';
-$lang['email']                 = 'Correo-e';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'Correo';
 $lang['register']              = 'Rexístrate';
-$lang['profile']               = 'Perfil de Usuario';
-$lang['badlogin']              = 'Sentímolo, pero o nome de usuario ou o contrasinal non son correctos.';
-$lang['minoredit']             = 'Trocos Menores';
-$lang['draftdate']             = 'Borrador gardado automaticamente en';
-$lang['nosecedit']             = 'A páxina mudou no entanto, a información da sección estaba desfasada polo que se cargou a páxina completa no seu lugar.';
-$lang['regmissing']            = 'Sentímolo, pero tes que cubrir todos os campos.';
-$lang['reguexists']            = 'Sentímolo, pero xa existe un usuario con ese nome.';
-$lang['regsuccess']            = 'O usuario foi creado e o contrasinal enviado por correo-e.';
-$lang['regsuccess2']           = 'O usuario foi creado.';
-$lang['regmailfail']           = 'Semella que houbo un erro ao tentar enviar o correo-e co contrasinal. Por favor, contacto co administrador!';
-$lang['regbadmail']            = 'O enderezo de correo-e proporcionado semella incorrecto - se consideras que isto é un erro, contacta co administrador';
-$lang['regbadpass']            = 'Os dous contrasinais inseridos non coinciden, por favor téntao de novo.';
-$lang['regpwmail']             = 'O teu contrasinal do DokuWiki';
-$lang['reghere']               = 'Aínda non tes unha conta? Crea a túa';
+$lang['profile']               = 'Perfil de persoa usuaria';
+$lang['badlogin']              = 'Sentímolo, mais o nome de persoa usuaria ou o contrasinal non son correctos.';
+$lang['minoredit']             = 'Cambios menores';
+$lang['draftdate']             = 'O borrador gardouse automaticamente en';
+$lang['nosecedit']             = 'A páxina cambiou, no entanto, a información da sección estaba desactualizada, polo que se cargou a páxina completa en seu lugar.';
+$lang['regmissing']            = 'Sentímolo, mais ten que encher todos os campos.';
+$lang['reguexists']            = 'Sentímolo, mais xa existe unha persoa usuaria con ese nome.';
+$lang['regsuccess']            = 'A persoa usuaria foi creada e o contrasinal enviado por correo electrónico.';
+$lang['regsuccess2']           = 'A persoa usuaria foi creada.';
+$lang['regmailfail']           = 'Semella que houbo un erro ao tentar enviar o correo co contrasinal. Contacte coa persoa administradora!';
+$lang['regbadmail']            = 'O enderezo de correo proporcionado semella incorrecto - se considera que isto é un erro, contacte coa persoa administradora';
+$lang['regbadpass']            = 'Os dous contrasinais introducidos non coinciden: Ténteo de novo.';
+$lang['regpwmail']             = 'O seu contrasinal do DokuWiki';
+$lang['reghere']               = 'Aínda non ten unha conta? Cree unha';
 $lang['profna']                = 'Esta wiki non permite modificacións dos perfís';
-$lang['profnochange']          = 'Non hai trocos, nada que facer.';
-$lang['profnoempty']           = 'Non se permite un nome ou un enderezo de correo-e baleiros.';
-$lang['profchanged']           = 'Perfil de usuario actualizado correctamente.';
-$lang['pwdforget']             = 'Esqueceches o teu contrasinal? Consigue un novo';
-$lang['resendna']              = 'Esta wiki non permite reenvío de contrasinais.';
-$lang['resendpwd']             = 'Enviar novo contrasinal a';
-$lang['resendpwdmissing']      = 'Sentímolo, tes que cubrir todos os campos.';
-$lang['resendpwdnouser']       = 'Sentímolo, non atopamos este usuario no noso banco de datos.';
-$lang['resendpwdbadauth']      = 'Sentímolo, pero este código de autorización non é válido. Asegúrate de que usaches a ligazón completa de confirmación.';
-$lang['resendpwdconfirm']      = 'Enviouse unha ligazón de confirmación por correo-e.';
-$lang['resendpwdsuccess']      = 'O teu novo contrasinal foi enviado por correo-e.';
-$lang['license']               = 'O contido deste wiki, agás onde se indique o contrario, ofrécese baixo da seguinte licenza:';
-$lang['licenseok']             = 'Nota: Ao editares esta páxina aceptas licenciar o teu contido baixo da seguinte licenza:';
-$lang['txt_upload']            = 'Selecciona o arquivo a subir';
+$lang['profnochange']          = 'Non hai cambios, non hai nada para facer.';
+$lang['profnoempty']           = 'Non se permite un nome ou un enderezo de correo baleiros.';
+$lang['profchanged']           = 'O perfil de persoa usuaria foi actualizado correctamente.';
+$lang['pwdforget']             = 'Esqueceu o seu contrasinal? Obteña un novo';
+$lang['resendna']              = 'Esta wiki non permite o reenvío de contrasinais.';
+$lang['resendpwd']             = 'Enviar un contrasinal novo a';
+$lang['resendpwdmissing']      = 'Sentímolo, ten que encher todos os campos.';
+$lang['resendpwdnouser']       = 'Sentímolo, non encontramos esta persoa usuaria na nosa base de datos.';
+$lang['resendpwdbadauth']      = 'Sentímolo, mais este código de autorización non é válido. Asegúrese de que usou a ligazón completa de confirmación.';
+$lang['resendpwdconfirm']      = 'Enviouse unha ligazón de confirmación por correo.';
+$lang['resendpwdsuccess']      = 'O seu novo contrasinal foi enviado por correo.';
+$lang['license']               = 'O contido deste wiki, agás onde se indique o contrario, ofrécese baixo a seguinte licenza:';
+$lang['licenseok']             = 'Nota: Ao editar esta páxina estás a aceptar o licenciamento do contido baixo a seguinte licenza:';
+$lang['searchmedia']           = 'Buscar nome de ficheiro:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Selecciona o arquivo para subir';
 $lang['txt_filename']          = 'Subir como (opcional)';
-$lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
+$lang['txt_overwrt']           = 'Sobrescribir o arquivo existente';
 $lang['lockedby']              = 'Bloqueado actualmente por';
-$lang['lockexpire']            = 'O bloqueo remata o';
-$lang['willexpire']            = 'O teu bloqueo para editar esta páxina vai rematar nun minuto.\nCo fin de evitar conflitos, usa o botón de previsualización para reiniciar o contador do tempo de bloqueo.';
-$lang['notsavedyet']           = 'Perderanse os trocos non gardados.\nQueres continuar realmente?';
-$lang['rssfailed']             = 'Houbo un erro ao tentar adquirir este fluxo: ';
-$lang['nothingfound']          = 'Non se atopou nada.';
-$lang['mediaselect']           = 'Arquivos-Media';
-$lang['fileupload']            = 'Subida de Arquivos-Media';
-$lang['uploadsucc']            = 'Subida correcta';
-$lang['uploadfail']            = 'Fallou a subida. Pode que sexa problema de permisos?';
-$lang['uploadwrong']           = 'Subida denegada. Esta extensión de arquivo non está permitida!';
-$lang['uploadexist']           = 'Xa existe o arquivo. Non se fixo nada.';
-$lang['uploadbadcontent']      = 'O contido subido non concorda coa extensión do arquivo %s.';
-$lang['uploadspam']            = 'A subida foi bloqueada pola lista negra de spam.';
-$lang['uploadxss']             = 'A subida foi bloqueada por posible contido malicioso.';
-$lang['uploadsize']            = 'O arquivo subido é grande de máis. (max %s)';
-$lang['deletesucc']            = 'O arquivo "%s" foi eliminado.';
-$lang['deletefail']            = '"%s" non puido ser eliminado - comproba os permisos.';
-$lang['mediainuse']            = 'O arquivo "%s" non foi eliminado - aínda está en uso.';
+$lang['lockexpire']            = 'O bloqueo termina o';
+$lang['willexpire']            = 'O seu bloqueo para editar esta páxina vai caducar nun minuto.\nPara de evitar conflitos, use o botón de previsualización para reiniciar o contador do tempo de bloqueo.';
+$lang['notsavedyet']           = 'Perderanse os cambios non gardados.\nEstá segura/o de que quere continuar?';
+$lang['rssfailed']             = 'Houbo un erro ao tentar obter este fío RSS: ';
+$lang['nothingfound']          = 'Non se encontrou nada.';
+$lang['mediaselect']           = 'Ficheiros multimedia';
+$lang['fileupload']            = 'Subir ficheiros multimedia';
+$lang['uploadsucc']            = 'Subiuse correctamente';
+$lang['uploadfail']            = 'Fallou ao subir. É posíbel que sexa un problema de permisos?';
+$lang['uploadwrong']           = 'Subida denegada. Esta extensión de ficheiro non está permitida!';
+$lang['uploadexist']           = 'Xa existe o ficheiro. Non se fixo nada.';
+$lang['uploadbadcontent']      = 'O contido subido non concorda coa extensión de ficheiro %s.';
+$lang['uploadspam']            = 'A subida foi bloqueada pola lista negra de correo lixo.';
+$lang['uploadxss']             = 'A subida foi bloqueada por un posíbel contido malicioso.';
+$lang['uploadsize']            = 'O ficheiro subido é grande de máis. (máx. %s)';
+$lang['deletesucc']            = 'O ficheiro "%s" foi eliminado.';
+$lang['deletefail']            = '"%s" non puido ser eliminado - comprobe os permisos.';
+$lang['mediainuse']            = 'O ficheiro "%s" non foi eliminado - aínda está en uso.';
 $lang['namespaces']            = 'Nomes de espazos';
-$lang['mediafiles']            = 'Arquivos dispoñibles en';
+$lang['mediafiles']            = 'Ficheiro dispoñíbeis en';
+$lang['js']['searchmedia']     = 'Buscar ficheiros';
 $lang['js']['keepopen']        = 'Manter a xanela aberta na selección';
-$lang['js']['hidedetails']     = 'Agochar Pormenores';
-$lang['js']['nosmblinks']      = 'A ligazón aos compartidos do Windows só funciona no Microsoft Internet Explorer.
+$lang['js']['hidedetails']     = 'Ocultar os detalles';
+$lang['js']['nosmblinks']      = 'A ligazón aos compartidos do Windows só funciona co Microsoft Internet Explorer.
 Sempre podes copiar e colar a ligazón.';
-$lang['js']['mu_btn']          = 'Subir varios arquivos dunha vez';
-$lang['mediausage']            = 'Utilizar a seguinte sintaxe para referenciar este arquivo:';
-$lang['mediaview']             = 'Ver arquivo orixinal';
-$lang['mediaroot']             = 'raigaña';
-$lang['mediaupload']           = 'Sube un arquivo ao nome de espazo actual aquí. Para crear sub-nomes de espazos deberás antepoñelos ao nome indicado en "Subir como" separados por dous puntos.';
-$lang['mediaextchange']        = 'Extensión de arquivo mudada de .%s a .%s!';
+$lang['js']['linkwiz']         = 'Asistente de ligazóns';
+$lang['js']['linkto']          = 'Ligazón a:';
+$lang['js']['del_confirm']     = 'Quere eliminar os elementos seleccionados?';
+$lang['js']['mu_btn']          = 'Subir varios ficheiros dunha vez';
+$lang['mediausage']            = 'Utilice a seguinte sintaxe para referenciar este ficheiro:';
+$lang['mediaview']             = 'Ver o ficheiro orixinal';
+$lang['mediaroot']             = 'raíz';
+$lang['mediaupload']           = 'Suba aquí un ficheiro ao nome de espazo actual. Para crear subnomes de espazos deberá engadilos ao principio do seu nome de ficheiro en "Subir como", separados por dous puntos.';
+$lang['mediaextchange']        = 'A extensión de ficheiro foi alterada de .%s a .%s!';
 $lang['reference']             = 'Referencias para';
-$lang['ref_inuse']             = 'o arquivo non pode ser eliminado, xa que aínda está a ser usado polas seguintes páxinas:';
-$lang['ref_hidden']            = 'Algunhas referencias están en páxinas para as cales non tes permisos de lectura';
-$lang['hits']                  = 'Vistas';
+$lang['ref_inuse']             = 'O ficheiro non pode ser eliminado, xa que aínda está a ser usado polas seguintes páxinas:';
+$lang['ref_hidden']            = 'Algunhas referencias están en páxinas para as cales non ten permisos de lectura';
+$lang['hits']                  = 'Visualizacións';
 $lang['quickhits']             = 'Nomes de páxinas coincidentes';
-$lang['toc']                   = 'Táboa de Contidos';
+$lang['toc']                   = 'Táboa de contidos';
 $lang['current']               = 'actual';
-$lang['yours']                 = 'A túa Versión';
-$lang['diff']                  = 'amosar diferenzas coa versión actual';
-$lang['diff2']                 = 'Amosar diferenzas entre as revisións seleccionadas';
+$lang['yours']                 = 'A súa versión';
+$lang['diff']                  = 'Mostrar as diferenzas coa versión actual';
+$lang['diff2']                 = 'Mostrar as diferenzas entre as revisións seleccionadas';
 $lang['line']                  = 'Liña';
 $lang['breadcrumb']            = 'Trazado';
-$lang['youarehere']            = 'Estás aquí';
+$lang['youarehere']            = 'Vostede está aquí';
 $lang['lastmod']               = 'Última modificación';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'eliminado';
 $lang['created']               = 'creado';
-$lang['restored']              = 'revisión antiga restaurada';
+$lang['restored']              = 'a revisión antiga foi restaurada';
 $lang['external_edit']         = 'edición externa';
 $lang['summary']               = 'Resumo da edición';
-$lang['noflash']               = 'Precísase o Complemento Adobe Flash para amosar este contido.';
+$lang['noflash']               = 'Precísase o Plugin Adobe Flash para mostrar este contido.';
 $lang['mail_newpage']          = 'páxina engadida:';
-$lang['mail_changed']          = 'páxina mudada:';
-$lang['mail_new_user']         = 'Novo usuario:';
-$lang['mail_upload']           = 'arquivo subido:';
-$lang['qb_alert']              = 'Por favor, insire o texto que queres formatear.\nSerá engadido ao remate do documento.';
-$lang['qb_bold']               = 'Texto Resaltado';
-$lang['qb_italic']             = 'Texto en Cursiva';
-$lang['qb_underl']             = 'Texto Subliñado';
-$lang['qb_code']               = 'Texto de Código';
-$lang['qb_strike']             = 'Texto Riscado';
-$lang['qb_h1']                 = 'Liña de Cabeceira de Nivel 1';
-$lang['qb_h2']                 = 'Liña de Cabeceira de Nivel 2';
-$lang['qb_h3']                 = 'Liña de Cabeceira de Nivel 3';
-$lang['qb_h4']                 = 'Liña de Cabeceira de Nivel 4';
-$lang['qb_h5']                 = 'Liña de Cabeceira de Nivel 5';
-$lang['qb_link']               = 'Ligazón Interna';
-$lang['qb_extlink']            = 'Ligazón Externa';
-$lang['qb_hr']                 = 'Liña Horizontal';
-$lang['qb_ol']                 = 'Elemento de Lista Ordenada';
-$lang['qb_ul']                 = 'Elemento de Lista Desordenada';
-$lang['qb_media']              = 'Engadir Imaxes e outros arquivos';
-$lang['qb_sig']                = 'Inserir Sinatura';
-$lang['qb_smileys']            = 'Risoños';
-$lang['qb_chars']              = 'Caracteres Especiais';
-$lang['del_confirm']           = 'Eliminar o(s) elemento(s) seleccionado(s) realmente?';
-$lang['admin_register']        = 'Engadir novo usuario';
-$lang['metaedit']              = 'Editar Metadatos';
+$lang['mail_changed']          = 'páxina alterada:';
+$lang['mail_new_user']         = 'Persoa usuaria nova:';
+$lang['mail_upload']           = 'ficheiro subido:';
+$lang['qb_bold']               = 'Texto en negra';
+$lang['qb_italic']             = 'Texto en cursiva';
+$lang['qb_underl']             = 'Texto subliñado';
+$lang['qb_code']               = 'Texto de código';
+$lang['qb_strike']             = 'Texto riscado';
+$lang['qb_h1']                 = 'Título de nivel 1';
+$lang['qb_h2']                 = 'Título de nivel 2';
+$lang['qb_h3']                 = 'Título de nivel 3';
+$lang['qb_h4']                 = 'Título de nivel 4';
+$lang['qb_h5']                 = 'Título de nivel 5';
+$lang['qb_link']               = 'Ligazón interna';
+$lang['qb_extlink']            = 'Ligazón externa';
+$lang['qb_hr']                 = 'Liña horizontal';
+$lang['qb_ol']                 = 'Elemento de lista ordenada';
+$lang['qb_ul']                 = 'Elemento de lista desordenada';
+$lang['qb_media']              = 'Engadir imaxes e outros ficheiros';
+$lang['qb_sig']                = 'Inserir unha sinatura';
+$lang['qb_smileys']            = 'Emoticonas';
+$lang['qb_chars']              = 'Caracteres especiais';
+$lang['admin_register']        = 'Engadir unha persoa usuaria nova';
+$lang['metaedit']              = 'Editar os metadatos';
 $lang['metasaveerr']           = 'Non se puideron escribir os metadatos';
-$lang['metasaveok']            = 'Metadatos gardados';
+$lang['metasaveok']            = 'Os metadatos foron gardados';
 $lang['img_backto']            = 'Volver a';
 $lang['img_title']             = 'Título';
 $lang['img_caption']           = 'Lenda';
 $lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nome de arquivo';
+$lang['img_fname']             = 'Nome do ficheiro';
 $lang['img_fsize']             = 'Tamaño';
-$lang['img_artist']            = 'Fotógrafo';
+$lang['img_artist']            = 'Fotógrafa/o';
 $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formato';
 $lang['img_camera']            = 'Cámara';
-$lang['img_keywords']          = 'Chaves';
-$lang['subscribe_success']     = 'Engadiuse %s á lista de subscrición dos trocos de %s';
-$lang['subscribe_error']       = 'Erro ao tentar engadir %s á lista de subscrición dos trocos de %s';
-$lang['subscribe_noaddress']   = 'Non hai enderezo ningún asociado co teu usuario, non podes ser engadido á lista de subscrición';
-$lang['unsubscribe_success']   = 'Eliminouse %s da lista de subscrición dos trocos de %s';
-$lang['unsubscribe_error']     = 'Erro ao tentar eliminar %s da lista de subscrición dos trocos de %s';
-$lang['authmodfailed']         = 'Configuración de autenticación de usuario incorrecta. Por favor, informa ao Administrador do teu Wiki.';
-$lang['authtempfail']          = 'A autenticación de usuario non está dispoñible de xeito temporal. Se esta situación persiste, por favor, informa ao Administrador do teu Wiki.';
-$lang['i_chooselang']          = 'Escolle o teu idioma';
+$lang['img_keywords']          = 'Palabras chave';
+$lang['subscribe_success']     = '%s foi engadido á lista de subscrición de cambios de %s';
+$lang['subscribe_error']       = 'Erro ao tentar engadir %s á lista de subscrición de cambios de %s';
+$lang['subscribe_noaddress']   = 'Non hai ningún enderezo asociado ao seu nome de persoa usuaria: non pode ser engadida/o á lista de subscrición';
+$lang['unsubscribe_success']   = 'Eliminouse %s da lista de subscrición de cambios de %s';
+$lang['unsubscribe_error']     = 'Erro ao tentar eliminar %s da lista de subscrición de cambios de %s';
+$lang['authmodfailed']         = 'A configuración de autenticación de persoa usuaria é incorrecta. Informe á persoa administradora do seu Wiki.';
+$lang['authtempfail']          = 'A autenticación de persoa usuaria non está dispoñíbel de modo temporal. Se esta situación persiste informe á persoa administradora do seu Wiki.';
+$lang['i_chooselang']          = 'Seleccione o seu idioma';
 $lang['i_installer']           = 'Instalador do DokuWiki';
 $lang['i_wikiname']            = 'Nome do Wiki';
-$lang['i_enableacl']           = 'Activar ACL (recomendado)';
-$lang['i_superuser']           = 'Super-usuario';
-$lang['i_problems']            = 'O instalador atopou algúns problemas amosados de seguido. Non poderás continuar ata que os soluciones.';
+$lang['i_enableacl']           = 'Activar o lista de control de acceso (ACL) (recomendado)';
+$lang['i_superuser']           = 'Superusuaria/o';
+$lang['i_problems']            = 'O instalador encontrou algúns problemas que se mostran a continuación. Non poderá continuar até que os solucione.';
 $lang['i_modified']            = 'Por razóns de seguridade este script só funcionará cunha instalación nova e sen modificar do Dokuwiki.
-                         Podes ou ben re-extraer os arquivos dende o paquete descargado ou consultar as
+                         Pode ou ben extraer de novo os ficheiros desde o paquete descargado ou consultar as
                          instruccións completas de instalación do Dokuwiki';
-$lang['i_funcna']              = 'A función %s do PHP non está dispoñible. Pode que o teu provedor de hospedaxe a desactivase por algún motivo?';
-$lang['i_phpver']              = 'A túa versión %s do PHP é inferior á %s precisa. Debes actualizar a túa instalación do PHP.';
-$lang['i_permfail']            = '%s non é escribible polo DokuWiki. Debes corrixir a configuración de permisos deste directorio!';
+$lang['i_funcna']              = 'A función %s de PHP non está dispoñíbel. Pode que o seu provedor de hospedaxe a desactivase por algún motivo.';
+$lang['i_phpver']              = 'A súa versión %s de PHP é inferior á %s precisa. Debe actualizar a súa instalación de PHP.';
+$lang['i_permfail']            = '%s non é escribíbel polo DokuWiki. Debe corrixir a configuración de permisos deste directorio!';
 $lang['i_confexists']          = '%s xa existe';
-$lang['i_writeerr']            = 'Non se puido crear %s. Terás que comprobar os permisos do directorio/arquivo e crear o ficheiro de xeito manual.';
-$lang['i_badhash']             = 'dokuwiki.php irrecoñecible ou modificado (hash=%s)';
+$lang['i_writeerr']            = 'Non se puido crear %s. Terá que comprobar os permisos do directorio/ficheiro e crear o ficheiro de modo manual.';
+$lang['i_badhash']             = 'dokuwiki.php é irrecoñecíbel ou foi modificado (hash=%s)';
 $lang['i_badval']              = '%s - ilegal ou valor baleiro';
-$lang['i_success']             = 'A configuración rematou correctamente. Agora podes borrar o arquivo install.php. Continúa deica o
-                        teu novo DokuWiki.';
-$lang['i_failure']             = 'Houbo algúns erros ao tentar escribir os arquivos de configuración. Pode que precises solucionalos de xeito manual antes
-                         de que poidas usar o teu novo DokuWiki.';
-$lang['i_policy']              = 'Regras iniciais do ACL';
-$lang['i_pol0']                = 'Wiki Aberto (lectura, escritura, subida de arquivos para todo o mundo)';
-$lang['i_pol1']                = 'Wiki Público (lectura para todo o mundo, escritura e subida de arquivos para usuarios rexistrados)';
-$lang['i_pol2']                = 'Wiki Pechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)';
-$lang['i_retry']               = 'Probar de novo';
-$lang['mu_intro']              = 'Aquí podes subir varios arquivos dunha vez. Preme o botón navegar para engadilos á cola. Preme subir cando remates.';
-$lang['mu_gridname']           = 'Nome de arquivo';
+$lang['i_success']             = 'A configuración terminou correctamente. Agora pode borrar o ficheiro install.php. Continúe até o
+                        seu novo DokuWiki.';
+$lang['i_failure']             = 'Houbo algúns erros ao tentar escribir os ficheiros de configuración. Pode que precise solucionalos de mod manual antes
+                         de que poder usar o seu novo DokuWiki.';
+$lang['i_policy']              = 'Regras iniciais da ACL';
+$lang['i_pol0']                = 'Wiki aberto (lectura, escritura, subida de arquivos para todas as persoas)';
+$lang['i_pol1']                = 'Wiki público (lectura para todas as persoas, escritura e subida de ficheiros para as persoas usuarias rexistradas)';
+$lang['i_pol2']                = 'Wiki pechado (lectura, escritura, subida de arquivos só para as persoas usuarias rexistradas)';
+$lang['i_retry']               = 'Tentar de novo';
+$lang['mu_intro']              = 'Aquí podes subir varios ficheiros dunha vez. Preme o botón Examinar para engadilos á fila. Preme en Subir cando remates.';
+$lang['mu_gridname']           = 'Nome do ficheiro';
 $lang['mu_gridsize']           = 'Tamaño';
 $lang['mu_gridstat']           = 'Estado';
 $lang['mu_namespace']          = 'Nome de espazo';
-$lang['mu_browse']             = 'Navegar';
+$lang['mu_browse']             = 'Examinar';
 $lang['mu_toobig']             = 'demasiado grande';
 $lang['mu_ready']              = 'listo para subir';
-$lang['mu_done']               = 'completo';
+$lang['mu_done']               = 'feito';
 $lang['mu_fail']               = 'fallou';
-$lang['mu_authfail']           = 'sesión expirada';
+$lang['mu_authfail']           = 'a sesión caducou';
 $lang['mu_progress']           = '@PCT@% subido';
-$lang['mu_filetypes']          = 'Tipos de arquivo Permitidos';
-$lang['recent_global']         = 'Agora mesmo estás a ver os trocos no nome de espazo %s. Tamén podes ver os trocos recentes no wiki enteiro.';
+$lang['mu_filetypes']          = 'Tipos de ficheiro permitidos';
+$lang['mu_info']               = 'ficheiros subidos.';
+$lang['mu_lasterr']            = 'Último erro:';
+$lang['recent_global']         = 'Agora mesmo está a ver os cambios no nome de espazo %s. Tamén pode ver os cambios recentes en todo o Wiki.';
+$lang['years']                 = 'hai %d anos';
+$lang['months']                = 'hai %d meses';
+$lang['weeks']                 = 'hai %d semanas';
+$lang['days']                  = 'hai %d días';
+$lang['hours']                 = 'hai %d horas';
+$lang['minutes']               = 'hai %d minutos';
+$lang['seconds']               = 'hai %d segundos';
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/locked.txt dokuwiki-rc2009-12-02/inc/lang/gl/locked.txt
--- dokuwiki-2009-02-14/inc/lang/gl/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Páxina bloqueada ======
 
-Esta páxina está actualmente bloqueada para a edición por outro usuario. Terás que agardar deica este usuario remate coa edición ou expire o bloqueo.
+Esta páxina está actualmente bloqueada para a edición por outra persoa usuaria. Terá que agardar até que esa persoa usuaria termine de editar a páxina ou a que expire o bloqueo.
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/login.txt dokuwiki-rc2009-12-02/inc/lang/gl/login.txt
--- dokuwiki-2009-02-14/inc/lang/gl/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Inicio de Sesión ======
+====== Inicio de sesión ======
 
-Actualmente non iniciaches sesión ningunha! Insire as túas credenciais de autenticación para iniciar a sesión. Debes ter as cookies activadas para poder iniciar unha sesión.
+Actualmente non ten unha sesión iniciada! Insira as súas credenciais de autenticación para iniciar a sesión. Debe ter as cookies activadas para poder iniciar unha sesión.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/gl/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/gl/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,13 +1,13 @@
-Engadiuse ou mudouse unha páxina no teu DokuWiki. Aquí van os pormenores:
+Engadiuse ou modificouse unha páxina do seu DokuWiki. Aquí van os detalles:
 
-Data            : @DATE@
-Navegador       : @BROWSER@
-Enderezo IP     : @IPADDRESS@
-Nome de Host    : @HOSTNAME@
-Antiga Revisión : @OLDPAGE@
-Nova Revision   : @NEWPAGE@
-Resumo da Edción: @SUMMARY@
-Usuario         : @USER@
+Data              : @DATE@
+Navegador         : @BROWSER@
+Enderezo IP       : @IPADDRESS@
+Nome do host      : @HOSTNAME@
+Revisión antiga   : @OLDPAGE@
+Revision nova     : @NEWPAGE@
+Resumo da edición : @SUMMARY@
+Usuaria/o         : @USER@
 
 @DIFF@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/newpage.txt dokuwiki-rc2009-12-02/inc/lang/gl/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/gl/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Este tema aínda non existe======
+====== Este tema aínda non existe ======
 
-Seguiches unha ligazón deica un tema que aínda non existe. Se tes permisos axeitados, podes crealo ti premendo no botón ''Crear esta páxina''.
+Seguiu unha ligazón até un tema que aínda non existe. Se ten os permisos adecuados, pode creala vostede premendo no botón ''Crear esta páxina''.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/norev.txt dokuwiki-rc2009-12-02/inc/lang/gl/norev.txt
--- dokuwiki-2009-02-14/inc/lang/gl/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Non hai tal revisión======
+====== Non existe esa revisión ======
 
-A revisión especificada non existe. Utiliza o botón de ''Revisións Antigas'' para obter un listado das revisións antigas deste documento.
+A revisión especificada non existe. Utilice o botón ''Revisións antigas'' para obter un listado das revisións antigas deste documento.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/password.txt dokuwiki-rc2009-12-02/inc/lang/gl/password.txt
--- dokuwiki-2009-02-14/inc/lang/gl/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,9 +1,9 @@
-Ola @FULLNAME@!
+Benvida/o @FULLNAME@!
 
-Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@
+Aquí ten os seus datos de persoa usuaria para @TITLE@ en @DOKUWIKIURL@
 
-Usuario    : @LOGIN@
-Contrasinal : @PASSWORD@
+Nome de usuaria/o: @LOGIN@
+Contrasinal: @PASSWORD@
 
 -- 
 Este correo foi xerado polo DokuWiki en
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/preview.txt dokuwiki-rc2009-12-02/inc/lang/gl/preview.txt
--- dokuwiki-2009-02-14/inc/lang/gl/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Previsualización======
+====== Previsualización ======
 
-Isto é unha previsualización de como aparecerá o teu texto. Lembra: **Non está gardado** aínda!
+Isto é unha previsualización de como aparecerá o seu texto. Lembre: **Aínda non está gardado!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/gl/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/gl/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,15 +1,15 @@
 Ola @FULLNAME@!
 
-Alguén solicitou un novo contrasinal para o teu inicio de sesión
+Alguén solicitou un contrasinal novo para o seu inicio de sesión no
 @TITLE@ en @DOKUWIKIURL@
 
-Se non fuches ti quen o fixo podes ignorar este correo-e.
+Se non foi vostede quen o solicitou pode ignorar este correo.
 
-Para confirmar que esta solicitude foi realmente enviada por ti
-por favor visita a seguinte ligazón.
+Para confirmar que esta solicitude foi realmente enviada por vostede
+por favor, visite a seguinte ligazón.
 
 @CONFIRM@
 
---
-Este correo-e foi xerador polo DokuWiki de
+-- 
+Este correo foi xerador polo DokuWiki de
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/read.txt dokuwiki-rc2009-12-02/inc/lang/gl/read.txt
--- dokuwiki-2009-02-14/inc/lang/gl/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-Esta páxina é de lectura só. Podes ver a fonte, pero non podes mudala. Coméntallo ao teu administrador se consideras que é un erro.
+Esta páxina é só de lectura. Podes ver o código fonte, mais non pode alterala. Coméntello á persoa administradora se considera que é un erro.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/recent.txt dokuwiki-rc2009-12-02/inc/lang/gl/recent.txt
--- dokuwiki-2009-02-14/inc/lang/gl/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Trocos Recentes======
+====== Cambios recentes ======
 
-As páxinas seguintes foron mudadas recentemente.
+As seguintes páxinas foron cambiadas recentemente.
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/registermail.txt dokuwiki-rc2009-12-02/inc/lang/gl/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/gl/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,14 +1,14 @@
-Rexistrouse un novo usuario. Aquí van os pormenores:
+Rexistrouse unha persoa usuaria nova. Estes son os detalles:
 
-Nome de usuario   : @NEWUSER@
-Nome completo	: @NEWNAME@
-Correo-e	      : @NEWEMAIL@
+Nome de usuaria/o   : @NEWUSER@
+Nome completo	    : @NEWNAME@
+Correo	            : @NEWEMAIL@
 
-Data		      : @DATE@
-Navegador     	: @BROWSER@
-Enderezo IP		: @IPADDRESS@
-Nome de host	: @HOSTNAME@
+Data		    : @DATE@
+Navegador     	    : @BROWSER@
+Enderezo IP	    : @IPADDRESS@
+Nome do host	    : @HOSTNAME@
 
 -- 
-Este correo-e foi xerado polo DokuWiki de
+Este correo foi xerado polo DokuWiki de
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/register.txt dokuwiki-rc2009-12-02/inc/lang/gl/register.txt
--- dokuwiki-2009-02-14/inc/lang/gl/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Rexistro como novo usuario ======
+====== Rexistro como persoa usuaria nova ======
 
-Cubre toda a información requirida a continuación para crear unha nova conta nesta wiki. Asegúrate de fornecer un **enderezo de correo-e válido** - se non se che pide aquí que insiras un contrasinal, recibirás un novo nese enderezo. O nome de usuario deberá ser un [[doku>pagename|nome de páxina]] válido.
+Encha toda a información requirida a continuación para crear unha conta nova neste wiki. Asegúrese de proporcionar un **enderezo de correo electrónico válido** - se non se lle solicita aquí que insira un contrasinal, recibirá un contrasinal novo nese enderezo. O nome de persoa usuaria deberá ser un [[doku>pagename|nome de páxina]] válido.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/gl/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/gl/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Enviar novo contrasinal ======
+====== Enviar un contrasinal novo ======
 
-Insire o teu nome de usuario no seguinte formulario para obter un novo contrasinal da túa conta nesta wiki. Enviarase unha ligazón de confirmación ao teu enderezo rexistrado de correo-e.
+Insira o seu nome de persoa usuaria no seguinte formulario para obter un contrasinal novo para a súa conta neste wiki. Enviarase unha ligazón de confirmación ao seu enderezo de correo rexistrado.
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/revisions.txt dokuwiki-rc2009-12-02/inc/lang/gl/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/gl/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisións Antigas======
+====== Revisións antigas ======
 
-Estas son as revisións antigas do documento actual. Para retomar unha revisión antiga, selecciónaa na seguinte lista, preme en ''Editar esta páxina'' e gárdaa.
+Estas son as revisións antigas do documento actual. Para retomar unha revisión antiga: selecciónea na seguinte lista, prema en ''Editar esta páxina'' e gárdea.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/gl/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/gl/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Procura======
+====== Procurar ======
 
-Podes atopar os resultados da túa procura a continuación. Se non atopaches o que estabas a procurar, podes crear ou editar a páxina co nome verbo da túa procura co botón axeitado.
+Podes encontrar os resultados da súa procura a continuación. Se non encontrou o que estaba a procurar, pode crear ou editar a páxina co nome relacionado coa súa procura co botón axeitado.
 
-=====Resultados=====
+===== Resultados =====
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/gl/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/gl/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,31 +1,246 @@
-# Isto é unha lista das verbas que o indexador ignora, unha por liña
-# Cando edites este arquivo asegúrate de usar remates de liña UNIX (nova liña única)
-# Non precisas incluír verbas de menos de 3 caracteres - estas son ignoradas de todas formas
-# Esta lista está baseada nas atopadas en http://www.ranks.nl/stopwords/ (en proceso aínda)
+# Isto é unha listaxe das palabras que o indexador ignora (stopwords); unha por liña
+# Cando edite este ficheiro asegúrese de usar os fins de liña UNIX (nova liña única)
+# Non precisa incluír palabras de menos de 3 caracteres - estas son ignoradas de todas as formas
+# Esta listaxe está baseada nas encontradas en http://www.ranks.nl/stopwords/ (aínda en proceso)
+#	Actualizouse a listaxe a partir as stopwords dispoñibilizadas por Paulo Malvar en:
+# http://d108.dinaserver.com/hosting/paulomalvar.com/Paulo_Malvar_personal_webpage/Resources_files/Galician_single_and_multiword_stopwords_Verbal_Periphrases_and_Abbreviations.tgz
+# e tamén as listaxes de palabras gramaticais na Galipedia: http://gl.wikipedia.org/wiki/Categoría_gramatical
+abaixo
+acerca
+ademais
+agás
 aínda
-por
-para
-unhas
-unhas
-tamén
-todo
-outro
-outra
+alén
 algún
 algunha
-algúns
 algunhas
+algúns
+amais
+ante
+antes
+após
+aquel
+aquela
+aquelas
+aqueles
+aquén
+aquilo
+arredor
+bardante
+beira
+canda
+cando
+canto
+carón
+causa
+cerca
+como
+conforme
+consonte
+contra
+deica
+dela
+delas
+deles
+dende
+derredor
+derriba
+desde
+despois
+durante
+elas
+eles
+entre
+erades
+eramos
+eran
+eras
+esas
+eses
+esta
 está
-están
-estamos
-estades
 estaba
-como
-temos
-tedes
-porén
-antes
+estabades
+estabamos
+estaban
+estades
+estamos
+están
+estas
+este
+estea
+esteades
+esteamos
+estean
+esteas
+estes
+estivemos
+estiven
+estiver
+estivera
+estiveramos
+estiveran
+estiverdes
+estiveren
+estivermos
+estivese
+estivesemos
+estivesen
+estivo
+estou
+excepto
+fomos
+fora
+foramos
+foran
+fordes
+foren
+formos
+fose
+fosedes
+fosemos
+fosen
+habemos
+haberá
+haberán
+haberedes
+haberei
+haberemos
+habería
+haberíades
+haberíamos
+haxa
+haxades
+haxamos
+haxan
+haxas
+houbemos
+houben
+houber
+houbera
+houberades
+houberamos
+houberan
+houberemos
+houberen
+houberían
+houbermos
+houbese
+houbesedes
+houbesemos
+houbesen
+houbo
+isto
+lles
 logo
-agás
+mais
+máis
+malia
+mediante
+menos
+mesmo
+meus
+miña
+miñas
+moito
+nosa
+nosas
+noso
+nosos
+nunha
+onda
+outra
+outro
+para
+perante
 pero
+pois
+pola
+polas
+polo
+polos
+por
+porén
 porque
+prol
+quen
+redor
+rente
+respecto
+sacado
+sacando
+salvante
+salvo
+senón
+será
+serán
+serás
+seredes
+serei
+seremos
+sería
+seríamos
+serían
+seus
+sexa
+sexades
+sexamos
+sexan
+sexas
+sobre
+sodes
+somos
+súas
+tamén
+tedes
+temos
+teña
+teñades
+teñamos
+teñan
+teñas
+teño
+terá
+terán
+terás
+teredes
+terei
+teremos
+tería
+teriades
+teriamos
+terían
+terías
+teus
+tiña
+tiñades
+tiñamos
+tiñan
+tiñas
+tiveches
+tivemos
+tiven
+tiver
+tivera
+tiverades
+tiveramos
+tiveran
+tiveras
+tiverdes
+tiveren
+tivermos
+tivese
+tivesedes
+tivesemos
+tivesen
+tiveses
+tivestes
+tivo
+todo
+tras
+través
+túas
+unha
+unhas
+vostede
+vostedes
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/gl/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/gl/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,18 +1,18 @@
 Ola!
 
 A páxina @PAGE@ na wiki @TITLE@ foi mudada.
-Aquí van os trocos:
+Aquí van as modificacións:
 
 --------------------------------------------------------
 @DIFF@
 --------------------------------------------------------
 
-Para desubscribirte deste rexistro de trocos de páxina
+Para desubscribirte deste rexistro de cambios de páxina
 na wiki en
 @DOKUWIKIURL@
 fai unha visita a
 @NEWPAGE@
-e escolle 'Xa non me avises dos trocos'.
+e selecciona 'Non avisar dos cambios'.
 
 -- 
 Este correo foi xerado polo DokuWiki en
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/gl/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/gl/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-====== Actualizar o perfil da túa conta ======
+====== Actualizar o perfil da súa conta ======
 
-Só precisas cubrir os campos que desexes mudar.  Non podes mudar o teu nome de usuario.
+Só precisa cubrir os campos que desexe cambiar. Non pode cambiar o seu nome de persoa usuaria.
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/gl/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/gl/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,14 +1,14 @@
-Subiuse un arquivo ao teu DokuWiki. Aquí van os pormenores:
+Subiuse un ficheiro ao seu DokuWiki. Aquí van os detalles:
 
-Arquivo : @MEDIA@
-Data : @DATE@
-Navegador : @BROWSER@
-Enderezo IP : @IPADDRESS@
-Nome de Host : @HOSTNAME@
-Tamaño : @SIZE@
-Tipo MIME : @MIME@
-Usuario : @USER@
+Ficheiro     : @MEDIA@
+Data         : @DATE@
+Navegador    : @BROWSER@
+Enderezo IP  : @IPADDRESS@
+Nome do host : @HOSTNAME@
+Tamaño       : @SIZE@
+Tipo MIME    : @MIME@
+Usuaria/o    : @USER@
 
---
+-- 
 Este correo foi xerado polo DokuWiki en
-@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/gl/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/gl/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/gl/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/gl/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Bloqueo por SPAM======
+====== Bloqueo por SPAM ======
 
-Os teus trocos **non** foron gardados porque conteñen unha ou varias verbas bloqueadas. Se tentaches deixar spam no wiki -- Estívoche ben! Se consideras que é un erro, contacta co administrador deste Wiki.
+Os seus cambios **non** foron gardados porque conteñen unha ou varias palabras bloqueadas. Se tentou introducir spam no wiki -- Nen@ mal@! Se considera que é un erro, contacte coa persoa administradora deste Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/diff.txt dokuwiki-rc2009-12-02/inc/lang/he/diff.txt
--- dokuwiki-2009-02-14/inc/lang/he/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======הבדלי×======
+====== ×”×‘×“×œ×™× ======
 
 ×›×ן ×ž×•×¦×’×™× ×”×”×‘×“×œ×™× ×‘×™×Ÿ הגרסה שנבחרה והגרסה הנוכחית של הדף.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/lang.php dokuwiki-rc2009-12-02/inc/lang/he/lang.php
--- dokuwiki-2009-02-14/inc/lang/he/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -140,7 +140,6 @@
 $lang['mail_new_user']         = 'משתמש חדש:';
 $lang['mail_upload']           = 'קובץ הועלה:';
 $lang['js']['nosmblinks']            = ":( קישור למערכת ×§×‘×¦×™× ×©×œ חלונות פועל רק בדפדפן ×ינטרנט ×קספלורר.\n ×–×” בסדר, ×ין צורך לעבור. ×פשר להעתיק ולהדביק ×ת הקישור";
-$lang['qb_alert']              = '× × ×œ×”×–×™×Ÿ ×ת הטקסט לעריכה. \n הטקסט יוסף בקצה המסמך';
 $lang['qb_bold']               = 'טקסט מודגש';
 $lang['qb_italic']             = 'טקסט נטוי';
 $lang['qb_underl']             = 'טקסט ×¢× ×§×• תחתון';
@@ -160,7 +159,7 @@
 $lang['qb_sig']                = 'הזנת חתימה';
 $lang['qb_smileys']            = 'פרצופוני×';
 $lang['qb_chars']              = '×¡×™×ž× ×™× ×ž×™×•×—×“×™×';
-$lang['del_confirm']           = 'ב×מת למחוק?';
+$lang['js']['del_confirm']           = 'ב×מת למחוק?';
 $lang['admin_register']        = 'להוסיף משתמש חדש';
 $lang['metaedit']              = 'ערוך נתוני×';
 $lang['metasaveerr']           = 'כשל בשמירת נתוני×';
diff -Naur dokuwiki-2009-02-14/inc/lang/he/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/he/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/he/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,7 +11,7 @@
 
 @DIFF@
 
---
+-- 
 
 דף זה נוצר ע"י DokuWiki ב-
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/he/newpage.txt dokuwiki-rc2009-12-02/inc/lang/he/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/he/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======דף ×–×” עדיין ×œ× ×§×™×™×======
+====== דף ×–×” עדיין ×œ× ×§×™×™× ======
 
 הדף ×ליו הגעת עדיין ×œ× ×§×™×™×. לחיצה על הכפתור "יצירת דף" תצור ×ותו.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/he/norev.txt dokuwiki-rc2009-12-02/inc/lang/he/norev.txt
--- dokuwiki-2009-02-14/inc/lang/he/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======גרסה ×œ× ×§×™×™×ž×ª======
+====== גרסה ×œ× ×§×™×™×ž×ª ======
 
 הגרסה שהוזנה ××™× ×” קיימת. × × ×œ×”×©×ª×ž×© בכפתור ''גרס×ות קודמות'' להצגת רשימת הגרס×ות של מסמך ×–×”.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/password.txt dokuwiki-rc2009-12-02/inc/lang/he/password.txt
--- dokuwiki-2009-02-14/inc/lang/he/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,6 @@
 כניסה     : @LOGIN@
 סיסמה     : @PASSWORD@
 
---
-מכתב זה נוצר על ידי דוקוויקי ב- 
+-- 
+מכתב זה נוצר על ידי דוקוויקי ב-
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/he/preview.txt dokuwiki-rc2009-12-02/inc/lang/he/preview.txt
--- dokuwiki-2009-02-14/inc/lang/he/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======תצוגה מקדימה======
+====== תצוגה מקדימה ======
 
 זו תצוגה מקדימה של הדף לעתיד. להזכירך: **הדף עדיין ×œ× × ×©×ž×¨!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/he/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/he/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 דו×ר ×–×” נוצר על ידי DokuWiki ב-
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/he/recent.txt dokuwiki-rc2009-12-02/inc/lang/he/recent.txt
--- dokuwiki-2009-02-14/inc/lang/he/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======×©×™× ×•×™×™× ×חרוני×======
+====== ×©×™× ×•×™×™× ××—×¨×•× ×™× ======
 
 ×”×“×¤×™× ×”×‘××™× ×¢×‘×¨×• ×©×™× ×•×™×™× ×œ×חרונה.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/revisions.txt dokuwiki-rc2009-12-02/inc/lang/he/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/he/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======גרס×ות ישנות======
+====== גרס×ות ישנות ======
 
 ×לה גרס×ות מוקדמות יותר של המסמך הנוכחי. כדי לשחזר גרסה מוקדמת יותר יש ללחוץ על הכפתור ''עריכה'' ולשמור ×ת הדף.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/he/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/he/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/he/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======חיפוש======
+====== חיפוש ======
 
 ניתן לר×ות ×ת תוצ×ות החיפוש למטה. ×× ×œ× × ×ž×¦×ו ×“×¤×™× ×‘×—×™×¤×•×©, לחיצה על הכפתור "עריכה" תיצור דף חדש על ×©× ×ž×™×œ×ª החיפוש שהוזנה.
 
-=====תוצ×ות=====
\ Brak znaku nowej linii na końcu pliku
+===== תוצ×ות =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/he/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/he/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/he/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,6 @@
 @NEWPAGE@
 ולבחור  'הפסק לעקוב'.
 
---
+-- 
 דו×"ל ×–×” נוצר על ידי DokuWiki ב-
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/he/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/he/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/he/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/he/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======הצפה נחסמה======
+====== הצפה נחסמה ======
 
 ×”×©× ×•×™×™× ×©×œ×š **ל×** נשמרו מפני ×©×”× ×ž×›×™×œ×™× ×ž×™×œ×” חסומה ×ו יותר. ×× ×‘×מת ניסית להציף ×ת הויקי -- כלב רע! ×× × ×¨××” לך ×›×™ זו טעות,ניתן ליצור קשר ×¢× ×ž× ×”×œ הויקי (מפני ש×נחנו ×œ× ×¨×•×¦×™× ×œ×§×¨×•× ×œ×× ×©×™× ×›×œ×‘×™× ×œ×—×™× ×, ×–×” פוגע בכלבי×).
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hi/lang.php dokuwiki-rc2009-12-02/inc/lang/hi/lang.php
--- dokuwiki-2009-02-14/inc/lang/hi/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hi/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,126 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = 'â€';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'यह पृषà¥à¤  संपादित करें';
+$lang['btn_source']            = 'पृषà¥à¤  का शà¥à¤°à¥‹à¤¤ दिखाà¤à¤';
+$lang['btn_show']              = 'पृषà¥à¤  दिखाà¤à¤';
+$lang['btn_create']            = 'इस पृषà¥à¤  को बनायें';
+$lang['btn_search']            = 'खोजें';
+$lang['btn_save']              = 'सà¥à¤°à¤•à¥à¤·à¤¿à¤¤ करें';
+$lang['btn_preview']           = 'पूरà¥à¤µà¤¾à¤µà¤²à¥‹à¤•à¤¨';
+$lang['btn_top']               = 'वापस शीरà¥à¤· पर';
+$lang['btn_newer']             = '<< अधिक विगत';
+$lang['btn_older']             = 'अमूल विगत >>';
+$lang['btn_revs']              = 'पà¥à¤°à¤¾à¤¨à¥‡ संशोधन';
+$lang['btn_recent']            = 'विगत परिवरà¥à¤¤à¤¨';
+$lang['btn_upload']            = 'अपलोड करें';
+$lang['btn_cancel']            = 'रदà¥à¤¦ करें';
+$lang['btn_index']             = 'सूचकांक';
+$lang['btn_secedit']           = 'संपादित करें';
+$lang['btn_login']             = 'लॉग इन';
+$lang['btn_logout']            = 'लॉगआउट';
+$lang['btn_admin']             = 'वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤•';
+$lang['btn_update']            = 'अदà¥à¤¯à¤¤à¤¨ करना';
+$lang['btn_delete']            = 'मिटाना';
+$lang['btn_back']              = 'पीछे';
+$lang['btn_backlink']          = 'पिछली कड़ियाà¤';
+$lang['btn_backtomedia']       = 'मीडिया फाइल चयन पर पीछे जायें';
+$lang['user']                  = 'उपयोगकरà¥à¤¤à¤¾ का नाम';
+$lang['pass']                  = 'गà¥à¤ªà¥à¤¤ शबà¥à¤¦';
+$lang['newpass']               = 'नव गà¥à¤ªà¥à¤¤ शबà¥à¤¦';
+$lang['passchk']               = 'पासवरà¥à¤¡ दà¥à¤¬à¤¾à¤°à¤¾ लिखें';
+$lang['remember']              = 'मà¥à¤à¥‡ सà¥à¤®à¥ƒà¤¤ रखना';
+$lang['fullname']              = 'सही नाम';
+$lang['email']                 = 'ईमेल';
+$lang['badlogin']              = 'छमा करें, उपयोगकरà¥à¤¤à¤¾ का नाम व गà¥à¤ªà¥à¤¤ शबà¥à¤¦ ग़लत था |';
+$lang['minoredit']             = 'अमूल चूल परिवरà¥à¤¤à¤¨';
+$lang['regmissing']            = 'छमा करें, आपको सारे रिकà¥à¤¤ सà¥à¤¥à¤¾à¤¨ भरने पड़ेंगे |';
+$lang['regbadpass']            = 'दोनो दिठगये गà¥à¤ªà¥à¤¤à¤¶à¤¬à¥à¤¦ समान नहीं हैं | दोबारा पà¥à¤°à¤¯à¤¾à¤¸ करें |';
+$lang['regpwmail']             = 'आपकी डोकà¥à¤µà¤¿à¤•à¥€ का गà¥à¤ªà¥à¤¤à¤¶à¤¬à¥à¤¦';
+$lang['reghere']               = 'आपके पास अभी तक कोई खाता नहीं है? बस à¤à¤• लें |';
+$lang['profna']                = 'यह विकी पà¥à¤°à¥‹à¤«à¤¼à¤¾à¤‡à¤² संशोधन का समरà¥à¤¥à¤¨ नहीं करता |';
+$lang['profnochange']          = 'कोई परिवरà¥à¤¤à¤¨ नहीं, कà¥à¤› नहीं करना |';
+$lang['resendpwd']             = 'नवगà¥à¤ªà¥à¤¤à¤¶à¤¬à¥à¤¦ भेजें';
+$lang['resendpwdmissing']      = 'छमा करें, आपको सारे रिकà¥à¤¤ सà¥à¤¥à¤¾à¤¨ भरने पड़ेंगे |';
+$lang['resendpwdsuccess']      = 'आपका नवगà¥à¤ªà¥à¤¤à¤¶à¤¬à¥à¤¦ ईमेल दà¥à¤µà¤¾à¤°à¤¾ समà¥à¤ªà¥à¤°à¥‡à¤·à¤¿à¤¤ कर दिया गया है |';
+$lang['txt_upload']            = 'अपलोड करने के लिठफ़ाइल चà¥à¤¨à¥‡à¤‚';
+$lang['txt_filename']          = 'के रूप में अपलोड करें (वैकलà¥à¤ªà¤¿à¤•)';
+$lang['txt_overwrt']           = 'अधिलेखित उपसà¥à¤¥à¤¿à¤¤ फ़ाइल';
+$lang['lockedby']              = 'इस समय तक बंद';
+$lang['lockexpire']            = 'बंद समापà¥à¤¤ होगा';
+$lang['nothingfound']          = 'कà¥à¤šà¥à¤› नहीं मिला |';
+$lang['uploadexist']           = 'फ़ाइल पहले से उपसà¥à¤¥à¤¿à¤¤ है. कà¥à¤› भी नहीं किया |';
+$lang['mediafiles']            = 'उपलबà¥à¤§ फाइलों में';
+$lang['js']['hidedetails']     = 'विवरण छिपाà¤à¤';
+$lang['mediaview']             = 'मूल फ़ाइल देखें';
+$lang['reference']             = 'संदरà¥à¤­ के लिà¤';
+$lang['ref_hidden']            = 'कà¥à¤šà¥à¤› संदरà¥à¤­ उन पनà¥à¤¨à¥‹ पर हैं जिनको पड़ने की आपको अनà¥à¤®à¤¤à¤¿ नहीं है|';
+$lang['toc']                   = 'विषय सूची';
+$lang['current']               = 'वरà¥à¤¤à¤®à¤¾à¤¨';
+$lang['yours']                 = 'आपका संसà¥à¤•à¤°à¤£à¤ƒ';
+$lang['diff']                  = 'वरà¥à¤¤à¤®à¤¾à¤¨ संशोधन में मतभेद दिखाइये |';
+$lang['diff2']                 = 'चयनित संशोधन के बीच में मतभेद दिखाइये |';
+$lang['line']                  = 'रेखा
+';
+$lang['youarehere']            = 'आप यहाठहैं |
+
+';
+$lang['lastmod']               = 'अंतिम बार संशोधित';
+$lang['by']                    = 'के दà¥à¤µà¤¾à¤°à¤¾';
+$lang['deleted']               = 'हटाया';
+$lang['created']               = 'निरà¥à¤®à¤¿à¤¤';
+$lang['restored']              = 'पà¥à¤°à¤¾à¤¨à¥‡ संशोधन बहाल';
+$lang['external_edit']         = 'बाहà¥à¤¯ समà¥à¤ªà¤¾à¤¦à¤¿à¤¤';
+$lang['summary']               = 'सारांश संपादित करें';
+$lang['mail_newpage']          = 'पृषà¥à¤  जोड़ा:';
+$lang['mail_changed']          = 'पृषà¥à¤  बदला:';
+$lang['mail_new_user']         = 'नये उपयोगकरà¥à¤¤à¤¾:';
+$lang['mail_upload']           = 'अपलोड की गई फ़ाइल:';
+$lang['qb_bold']               = 'बोलà¥à¤¡ पाठà¥à¤¯';
+$lang['qb_h1']                 = 'सà¥à¤¤à¤° 1 शीरà¥à¤·à¤ªà¤‚कà¥à¤¤à¤¿';
+$lang['qb_h2']                 = 'सà¥à¤¤à¤° 2 शीरà¥à¤·à¤ªà¤‚कà¥à¤¤à¤¿';
+$lang['qb_h3']                 = 'सà¥à¤¤à¤° 3 शीरà¥à¤·à¤ªà¤‚कà¥à¤¤à¤¿';
+$lang['qb_h4']                 = 'सà¥à¤¤à¤° 4 शीरà¥à¤·à¤ªà¤‚कà¥à¤¤à¤¿';
+$lang['qb_h5']                 = 'सà¥à¤¤à¤° 5 शीरà¥à¤·à¤ªà¤‚कà¥à¤¤à¤¿';
+$lang['qb_link']               = 'आंतरिक कड़ी';
+$lang['qb_extlink']            = 'बाहà¥à¤¯ कड़ी';
+$lang['qb_hr']                 = 'खड़ी रेखा';
+$lang['qb_sig']                = 'हसà¥à¤¤à¤¾à¤•à¥à¤·à¤° डालें';
+$lang['admin_register']        = 'नया उपयोगकरà¥à¤¤à¤¾ जोड़ें';
+$lang['img_backto']            = 'वापस जाना';
+$lang['img_title']             = 'शीरà¥à¤·à¤•';
+$lang['img_caption']           = 'सहशीरà¥à¤·à¤•';
+$lang['img_date']              = 'तिथि';
+$lang['img_fsize']             = 'आकार';
+$lang['img_artist']            = 'फोटोगà¥à¤°à¤¾à¤«à¤°';
+$lang['img_format']            = 'पà¥à¤°à¤¾à¤°à¥‚प';
+$lang['img_camera']            = 'कैमरा';
+$lang['i_chooselang']          = 'अपनी भाषा चà¥à¤¨à¥‡à¤‚';
+$lang['i_installer']           = 'डोकà¥à¤µà¤¿à¤•à¥€ इंसà¥à¤Ÿà¥‰à¤²à¤°';
+$lang['i_wikiname']            = 'विकी का नाम';
+$lang['i_superuser']           = 'महाउपयोगकरà¥à¤¤à¤¾';
+$lang['i_retry']               = 'पà¥à¤¨à¤ƒà¤ªà¥à¤°à¤¯à¤¾à¤¸';
+$lang['mu_gridsize']           = 'आकार';
+$lang['mu_gridstat']           = 'सà¥à¤¥à¤¿à¤¤à¤¿';
+$lang['mu_browse']             = 'बà¥à¤°à¤¾à¤‰à¤œà¤¼
+';
+$lang['mu_toobig']             = 'बहà¥à¤¤ बड़ा';
+$lang['mu_ready']              = 'अपलोड करने के लिठतैयार';
+$lang['mu_done']               = 'पूरà¥à¤£';
+$lang['mu_fail']               = 'असफल';
diff -Naur dokuwiki-2009-02-14/inc/lang/hr/edit.txt dokuwiki-rc2009-12-02/inc/lang/hr/edit.txt
--- dokuwiki-2009-02-14/inc/lang/hr/edit.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hr/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1 +1 @@
-Nakon Å¡to ste napravili sve potrebne promjene - odaberite ''Snimi'' za snimanje dokumenta. 
+Nakon Å¡to ste napravili sve potrebne promjene - odaberite ''Snimi'' za snimanje dokumenta.
diff -Naur dokuwiki-2009-02-14/inc/lang/hr/lang.php dokuwiki-rc2009-12-02/inc/lang/hr/lang.php
--- dokuwiki-2009-02-14/inc/lang/hr/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hr/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -3,172 +3,198 @@
  * croatian language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Tomo Krajina 
+ * @author Tomo Krajina 
+ * @author Branko Rihtman 
+ * @author Dražen Odobašić 
  */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-
-$lang['btn_edit']   = 'Izmijeni dokument';
-$lang['btn_source'] = 'Prikaži kod';
-$lang['btn_show']   = 'Prikaži dokument';
-$lang['btn_create'] = 'Novi dokument';
-$lang['btn_search'] = 'Pretraživanje';
-$lang['btn_save']   = 'Snimi';
-$lang['btn_preview']= 'Prikaži';
-$lang['btn_top']    = 'Na vrh';
-$lang['btn_newer']  = '<< noviji';
-$lang['btn_older']  = 'stariji >>';
-$lang['btn_revs']   = 'Stare verzije';
-$lang['btn_recent'] = 'Nedavne izmjene';
-$lang['btn_upload'] = 'Upload';
-$lang['btn_cancel'] = 'Poništi';
-$lang['btn_index']  = 'Indeks';
-$lang['btn_secedit']= 'Izmjena';
-$lang['btn_login']  = 'Prijava';
-$lang['btn_logout'] = 'Odjava';
-$lang['btn_admin']  = 'Admin';
-$lang['btn_update'] = 'Update'; // ODO
-$lang['btn_delete'] = 'Brisanje'; 
-$lang['btn_back']   = 'Povratak';
-$lang['btn_backlink']    = "Povratni linkovi";
-$lang['btn_backtomedia'] = 'Povratak na Mediafile izbornik'; // TODO
-$lang['btn_subscribe']   = 'Pretplati se na promjene';
-$lang['btn_unsubscribe'] = 'Odjavi pretplatu o promjenama';
-$lang['btn_profile']    = 'Izmjena profila';
-$lang['btn_reset']     = 'Reset';
-$lang['btn_resendpwd'] = 'Pošalji lozinku';
-
-$lang['loggedinas'] = 'Prijavljen kao';
-$lang['user']       = 'KorisniÄko ime';
-$lang['pass']       = 'Lozinka';
-$lang['newpass']    = 'Nova lozinka';
-$lang['oldpass']    = 'Confirm current password';
-$lang['passchk']    = 'Ponovi';
-$lang['remember']   = 'Zapamti me';
-$lang['fullname']   = 'Ime i prezime';
-$lang['email']      = 'Email';
-$lang['register']   = 'Registracija';
-$lang['profile']    = 'Profil korisnika';
-$lang['badlogin']   = 'Krivo korisniÄko ime ili lozinka.';
-$lang['minoredit']  = 'Manja promjena';
-
-$lang['regmissing'] = 'Morate popuniti sva polja.';
-$lang['reguexists'] = 'Korisnik s tim korisniÄkim imenom već postoji.';
-$lang['regsuccess'] = 'Novi korisnik je uspješno unesen i poslana mu je lozinka mailom.';
-$lang['regsuccess2']= 'Korisnik je uspješno.';
-$lang['regmailfail']= 'Došlo je do greške pri slanju lozinke. Molimo Vas da kontaktirate administratora!';
-$lang['regbadmail'] = 'Email adreasa nije ispravna';
-$lang['regbadpass'] = 'Unesene lozinke nisu jednake!';
-$lang['regpwmail']  = 'Vaša DokuWiki lozinka';
-$lang['reghere']    = 'Nemate joÅ¡ korisniÄko ime? Registrirajte se.';
-
-$lang['profna']       = 'Nije dopušteno mijenjati korisnikov profil';
-$lang['profnochange'] = 'Nije bilo izmjena.';
-$lang['profnoempty']  = 'Nije ispunjeno polje za ime i/ili email.';
-$lang['profchanged']  = 'Korisnikov profil uredno izmijenjen.';
-
-$lang['pwdforget'] = 'Izgubili ste lozinku?';
-$lang['resendna']  = 'Nije dopušteno slanje lozinke emailom.';
-$lang['resendpwd'] = 'Slanje nove lozinke za';
-$lang['resendpwdmissing'] = 'Molimo Vas da ispunite sva polja.';
-$lang['resendpwdnouser']  = 'Korisnik nije nađen.';
-$lang['resendpwdsuccess'] = 'Nova lozinka je poslana emailom.';
-
-$lang['txt_upload']   = 'Odaberite datoteku za upload';
-$lang['txt_filename'] = 'Upload kao (nije obavezno)';
-$lang['txt_overwrt']  = 'Preko već postojeće datoteke';
-$lang['lockedby']     = 'ZakljuÄano od strane korisnika';
-$lang['lockexpire']   = 'ZakljuÄano do';
-$lang['willexpire']   = 'Dokument kojeg mijenjate će biti zakljuÄan joÅ¡ 1 minutu. Ukoliko želite i dalje raditi izmjene na dokumentu - molimo Vas da kliknete na "Pregled".'; // TODO
-
-$lang['notsavedyet'] = 'Vaše izmjene že ostati izgubljene.\nZaista želite nastaviti?';
-$lang['rssfailed']   = 'Došlo je do greške prilikom preuzimanja ovog feed-a: ';
-$lang['nothingfound']= 'Ništa nije nađeno.';
-
-$lang['mediaselect'] = 'Mediafile izbor';
-$lang['fileupload']  = 'Mediafile upload';
-$lang['uploadsucc']  = 'Upload uspješan';
-$lang['uploadfail']  = 'Upload neuspješan. Možda nešto ne valja s dozvolama na serveru?';
-$lang['uploadwrong'] = 'Upload nije dopušten - nedozvoljena ekstenzija!';
-$lang['uploadexist'] = 'Datoteka već postoji.';
-$lang['deletesucc']  = 'Datoteka "%s" je obrisana.';
-$lang['deletefail']  = '"%s" ne može biti obrisana - provjerite dozvole na serveru.';
-$lang['mediainuse']  = 'Datoteka "%s" nije obrisana - još uvijek se koristi.';
-$lang['namespaces']  = 'Namespaces';
-$lang['mediafiles']  = 'Datoteke u';
-
-$lang['reference']   = 'Reference za';
-$lang['ref_inuse']   = 'Datoteka ne može biti obrisana jer se još uvijek koristi u sljedećim stranicama:';
-$lang['ref_hidden']  = 'Neke reference su na stranicama koje nemate dozvolu ćitati';
-
-$lang['hits']       = 'Nađeno';
-$lang['quickhits']  = 'Nađeno po imenima stranica';
-$lang['toc']        = 'Sadržaj';
-$lang['current']    = 'trenutno';
-$lang['yours']      = 'Vaša verzija';
-$lang['diff']       = 'prikaži razlike u odnosu na trenutnu verziju';
-$lang['line']       = 'Redak';
-$lang['breadcrumb'] = 'Trace';
-$lang['youarehere'] = 'Vi ste ovdje';
-$lang['lastmod']    = 'Zadnja izmjena';
-$lang['by']         = 'od';
-$lang['deleted']    = 'obrisano';
-$lang['created']    = 'kreirano';
-$lang['restored']   = 'old revision restored';
-$lang['summary']    = 'Sažetak izmjena';
-
-$lang['mail_newpage'] = 'stranica dodana:';
-$lang['mail_changed'] = 'stranica kreirana:';
-
-$lang['js']['nosmblinks'] = "Linkovi na share-ane foldere rade samo s Internet Explorerom. ";
-
-$lang['qb_alert']   = 'Unesite tekst kojeg želite formatirati.\nBiti će dodan na kraju dokumenta.';
-$lang['qb_bold']    = 'Podebljani tekst';
-$lang['qb_italic']  = 'Ukošeni tekst';
-$lang['qb_underl']  = 'Potcrtani tekst';
-$lang['qb_code']    = 'Kod';
-$lang['qb_strike']  = 'Precrtani tekst';
-$lang['qb_h1']      = 'Naslov - nivo 1';
-$lang['qb_h2']      = 'Naslov - nivo 2';
-$lang['qb_h3']      = 'Naslov - nivo 3';
-$lang['qb_h4']      = 'Naslov - nivo 4';
-$lang['qb_h5']      = 'Naslov - nivo 5';
-$lang['qb_link']    = 'Interni link';
-$lang['qb_extlink'] = 'Eksterni link';
-$lang['qb_hr']      = 'Vodoravna crta';
-$lang['qb_ol']      = 'Pobrojana lista';
-$lang['qb_ul']      = 'Lista';
-$lang['qb_media']   = 'Slike';
-$lang['qb_sig']     = 'Potpis';
-$lang['qb_smileys'] = 'Smile-ovi';
-$lang['qb_chars']   = 'Posebni znakovi';
-
-$lang['del_confirm']= 'Jeste li sigurni da ćelite obrisati?';
-$lang['admin_register']= 'Dodavanje korisnika';
-
-$lang['metaedit']    = 'Izmjena metapodataka';
-$lang['metasaveerr'] = 'Izmjena metapodataka nije uspjela';
-$lang['metasaveok']  = 'Meta';
-$lang['img_backto']  = 'Povratak na';
-$lang['img_title']   = 'Naslov';
-$lang['img_caption'] = 'Caption';
-$lang['img_date']    = 'Datum';
-$lang['img_fname']   = 'Ime datoteke';
-$lang['img_fsize']   = 'VeliÄina';
-$lang['img_artist']  = 'Fotograf';
-$lang['img_copyr']   = 'Copyright';
-$lang['img_format']  = 'Format';
-$lang['img_camera']  = 'Kamera';
-$lang['img_keywords']= 'KljuÄne rijeÄi';
-
-$lang['subscribe_success']  = 'Dodan korisnik %s kao pretplatnik na %s';
-$lang['subscribe_error']    = 'Greška pri dodavanju korisnika %s kao pretplatnika na %s';
-$lang['subscribe_noaddress']= 'Nema email adrese za vaÅ¡e korisniÄko ime, ne možete biti dodani na listu pretplatnika';
-$lang['unsubscribe_success']= 'Maknut %s sa liste pretplatnika %s';
-$lang['unsubscribe_error']  = 'Greška pri micanju korisnika %s s liste pretplatnika za %s';
-
-/* auth.class language support */
-$lang['authmodfailed']   = 'Greška pri konfiguraciji za autentifikaciju. Molimo Vas da kontaktirate administratora.';
-$lang['authtempfail']    = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = 'â€';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Izmijeni dokument';
+$lang['btn_source']            = 'Prikaži kod dokumenta';
+$lang['btn_show']              = 'Prikaži dokument';
+$lang['btn_create']            = 'Novi dokument';
+$lang['btn_search']            = 'Pretraži';
+$lang['btn_save']              = 'Snimi';
+$lang['btn_preview']           = 'Prikaži';
+$lang['btn_top']               = 'Na vrh';
+$lang['btn_newer']             = '<< noviji';
+$lang['btn_older']             = 'stariji >>';
+$lang['btn_revs']              = 'Stare inaÄice';
+$lang['btn_recent']            = 'Nedavne izmjene';
+$lang['btn_upload']            = 'Postavi';
+$lang['btn_cancel']            = 'Odustani';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Izmjeni';
+$lang['btn_login']             = 'Prijavi se';
+$lang['btn_logout']            = 'Odjavi se';
+$lang['btn_admin']             = 'Administriranje';
+$lang['btn_update']            = 'Ažuriraj';
+$lang['btn_delete']            = 'Obriši';
+$lang['btn_back']              = 'Povratak';
+$lang['btn_backlink']          = 'Povratni linkovi';
+$lang['btn_backtomedia']       = 'Povratak na Mediafile izbornik';
+$lang['btn_subscribe']         = 'Pretplati se na promjene dokumenta';
+$lang['btn_unsubscribe']       = 'Odjavi pretplatu o promjenama dokumenta';
+$lang['btn_subscribens']       = 'Pretplati se na promjene imenskog prostora';
+$lang['btn_unsubscribens']     = 'Odjavi pretplatu o promjenama imenskog prostora';
+$lang['btn_profile']           = 'Ažuriraj profil';
+$lang['btn_reset']             = 'Poništi promjene';
+$lang['btn_resendpwd']         = 'Pošalji novu lozinku';
+$lang['btn_draft']             = 'Uredi nacrt dokumenta';
+$lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
+$lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
+$lang['loggedinas']            = 'Prijavljen kao';
+$lang['user']                  = 'KorisniÄko ime';
+$lang['pass']                  = 'Lozinka';
+$lang['newpass']               = 'Nova lozinka';
+$lang['oldpass']               = 'Potvrdi trenutnu lozinku';
+$lang['passchk']               = 'Ponoviti';
+$lang['remember']              = 'Zapamti me';
+$lang['fullname']              = 'Ime i prezime';
+$lang['email']                 = 'Email';
+$lang['register']              = 'Registracija';
+$lang['profile']               = 'KorisniÄki profil';
+$lang['badlogin']              = 'Ne ispravno korisniÄko ime ili lozinka.';
+$lang['minoredit']             = 'Manje izmjene';
+$lang['draftdate']             = 'Nacrt dokumenta je automatski spremljen u ';
+$lang['nosecedit']             = 'Stranica se u meÄ‘uvremenu promijenila. Informacija o odjeljku je ostarila pa je uÄitana kompletna stranica.';
+$lang['regmissing']            = 'Morate popuniti sva polja.';
+$lang['reguexists']            = 'Korisnik s tim korisniÄkim imenom već postoji.';
+$lang['regsuccess']            = 'Korisnik je uspješno stvoren i poslana je lozinka emailom.';
+$lang['regsuccess2']           = 'Korisnik je uspješno stvoren.';
+$lang['regmailfail']           = 'Pojavila se greška prilikom slanja lozinke emailom. Kontaktirajte administratora!';
+$lang['regbadmail']            = 'Email adresa nije ispravna, ukoliko ovo smatrate greškom, kontaktirajte administratora.';
+$lang['regbadpass']            = 'Unesene lozinke nisu jednake, pokušajte ponovno.';
+$lang['regpwmail']             = 'Vaša DokuWiki lozinka';
+$lang['reghere']               = 'JoÅ¡ uvijek nemate korisniÄki raÄun? Registrirajte se.';
+$lang['profna']                = 'Ovaj wiki ne dopuÅ¡ta izmjene korisniÄkog profila.';
+$lang['profnochange']          = 'Nema izmjena.';
+$lang['profnoempty']           = 'Prazno korisniÄko ime ili email nisu dopuÅ¡teni.';
+$lang['profchanged']           = 'KorisniÄki profil je uspjeÅ¡no izmijenjen.';
+$lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
+$lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.';
+$lang['resendpwd']             = 'Poslati novu lozinku za';
+$lang['resendpwdmissing']      = 'Ispunite sva polja.';
+$lang['resendpwdnouser']       = 'Nije moguće pronaći korisnika.';
+$lang['resendpwdbadauth']      = 'Neispravan autorizacijski kod. Provjerite da li ste koristili potpun potvrdni link.';
+$lang['resendpwdconfirm']      = 'Potvrdni link je poslan emailom.';
+$lang['resendpwdsuccess']      = 'Nova lozinka je poslana emailom.';
+$lang['license']               = 'Osim na mjestima gdje je naznaÄeno drugaÄije, sadržaj ovog wikija je licenciran sljedećom licencom:';
+$lang['licenseok']             = 'Pažnja: promjenom ovog dokumenta pristajete licencirati sadržaj sljedećom licencom: ';
+$lang['txt_upload']            = 'Odaberite datoteku za postavljanje';
+$lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
+$lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
+$lang['lockedby']              = 'ZakljuÄao';
+$lang['lockexpire']            = 'ZakljuÄano do';
+$lang['willexpire']            = 'Dokument kojeg mijenjate će biti zakljuÄan joÅ¡ 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['notsavedyet']           = 'Vaše izmjene će se izgubiti.\nŽelite li nastaviti?';
+$lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
+$lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
+$lang['mediaselect']           = 'Mediafile datoteke';
+$lang['fileupload']            = 'Mediafile postavljanje';
+$lang['uploadsucc']            = 'Postavljanje uspješno';
+$lang['uploadfail']            = 'Neuspješno postavljanje. Možda dozvole na poslužitelju nisu ispravne?';
+$lang['uploadwrong']           = 'Postavljanje nije dopušteno. Nastavak datoteke je zabranjen!';
+$lang['uploadexist']           = 'Datoteka već postoji.';
+$lang['uploadbadcontent']      = 'Postavljeni sadržaj ne odgovara ekstenziji %s datoteke.';
+$lang['uploadspam']            = 'Postavljanje je blokirano spam crnom listom.';
+$lang['uploadxss']             = 'Postavljanje je blokirano zbog mogućeg zlonamjernog sadržaja.';
+$lang['uploadsize']            = 'Postavljena datoteka je prevelika (max. %s)';
+$lang['deletesucc']            = 'Datoteka "%s" je obrisana.';
+$lang['deletefail']            = '"%s" se ne može obrisati - provjerite dozvole na poslužitelju.';
+$lang['mediainuse']            = 'Datoteka "%s" nije obrisana - još uvijek se koristi.';
+$lang['namespaces']            = 'Imenski prostori';
+$lang['mediafiles']            = 'Datoteke u';
+$lang['js']['keepopen']        = 'Ostavi prozor otvoren nakon izbora';
+$lang['js']['hidedetails']     = 'Sakrij detalje';
+$lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s Internet Explorerom. Link je još uvijek moguće kopirati i zalijepiti.';
+$lang['js']['mu_btn']          = 'Postavi više datoteka odjednom';
+$lang['mediausage']            = 'Koristi sljedeću sintaksu za referenciranje ove datoteke:';
+$lang['mediaview']             = 'Pregledaj originalnu datoteku';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Postavi datoteku u odabrani imenski prostor. Podimenski prostori se stvaraju dodavanjem istih kao prefiks naziva datoteke u "Postavi kao" polju, tako da se odvoje dvotoÄkama.';
+$lang['mediaextchange']        = 'Ekstenzija datoteke promijenjena iz .%s u .%s!';
+$lang['reference']             = 'Reference za';
+$lang['ref_inuse']             = 'Datoteka se ne može obrisati jer se još uvijek koristi u sljedećim dokumentima:';
+$lang['ref_hidden']            = 'Neke reference se nalaze na dokumentima koje nemate dozvolu Äitati';
+$lang['hits']                  = 'Pronađeno';
+$lang['quickhits']             = 'Pronađeno po nazivima dokumenata';
+$lang['toc']                   = 'Sadržaj';
+$lang['current']               = 'trenutno';
+$lang['yours']                 = 'VaÅ¡a inaÄica';
+$lang['diff']                  = 'Prikaži razlike u odnosu na trenutnu inaÄicu';
+$lang['diff2']                 = 'Pokaži razlike izmeÄ‘u odabranih inaÄica';
+$lang['line']                  = 'Redak';
+$lang['breadcrumb']            = 'Putanja';
+$lang['youarehere']            = 'Vi ste ovdje';
+$lang['lastmod']               = 'Zadnja izmjena';
+$lang['by']                    = 'od';
+$lang['deleted']               = 'obrisano';
+$lang['created']               = 'stvoreno';
+$lang['restored']              = 'vraćena prijaÅ¡nja inaÄica';
+$lang['external_edit']         = 'vanjsko uređivanje';
+$lang['summary']               = 'Sažetak izmjena';
+$lang['noflash']               = 'Za prikazivanje ovog sadržaja potreban je Adobe Flash Plugin';
+$lang['mail_newpage']          = 'stranica dodana:';
+$lang['mail_changed']          = 'stranica izmjenjena:';
+$lang['mail_new_user']         = 'novi korisnik:';
+$lang['mail_upload']           = 'datoteka postavljena:';
+$lang['qb_bold']               = 'Podebljani tekst';
+$lang['qb_italic']             = 'Ukošeni tekst';
+$lang['qb_underl']             = 'Podcrtani tekst';
+$lang['qb_code']               = 'Kod';
+$lang['qb_strike']             = 'Precrtani tekst';
+$lang['qb_h1']                 = 'Naslov - razina 1';
+$lang['qb_h2']                 = 'Naslov - razina 2';
+$lang['qb_h3']                 = 'Naslov - razina 3';
+$lang['qb_h4']                 = 'Naslov - razina 4';
+$lang['qb_h5']                 = 'Naslov - razina 5';
+$lang['qb_h']                  = 'Naslov';
+$lang['qb_hs']                 = 'Odaberite naslov';
+$lang['qb_hplus']              = 'Naslov više razine';
+$lang['qb_hminus']             = 'Naslov niže razine';
+$lang['qb_hequal']             = 'Naslov iste razine';
+$lang['qb_link']               = 'Interni link';
+$lang['qb_extlink']            = 'Vanjski link';
+$lang['qb_hr']                 = 'Vodoravna crta';
+$lang['qb_ol']                 = 'Pobrojana lista';
+$lang['qb_ul']                 = 'Lista';
+$lang['qb_media']              = 'Dodaj slike i ostale datoteke';
+$lang['qb_sig']                = 'Potpis';
+$lang['qb_smileys']            = 'Smiješkići';
+$lang['qb_chars']              = 'Posebni znakovi';
+$lang['js']['del_confirm']           = 'Zbilja želite obrisati odabrane stavke?';
+$lang['admin_register']        = 'Dodaj novog korisnika';
+$lang['metaedit']              = 'Uredi metapodatake';
+$lang['metasaveerr']           = 'Neuspješno zapisivanje metapodataka';
+$lang['metasaveok']            = 'Spremljeni metapdaci';
+$lang['img_backto']            = 'Povratak na';
+$lang['img_title']             = 'Naziv';
+$lang['img_caption']           = 'Naslov';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Ime datoteke';
+$lang['img_fsize']             = 'VeliÄina';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Autorsko pravo';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'KljuÄne rijeÄi';
+$lang['subscribe_success']     = 'Dodan %s na listu preplata za %s';
+$lang['subscribe_error']       = 'Greška prilikom dodavanju %s na listu pretplata za %s';
+$lang['subscribe_noaddress']   = 'Nije postavljena email adresa za vaÅ¡ korisniÄki profil, nije Vas moguće dodati na listu pretplata';
+$lang['unsubscribe_success']   = 'Izbrisan %s s liste pretplata za %s';
+$lang['unsubscribe_error']     = 'Greška prilikom brisanja %s s liste pretplatnika za %s';
+$lang['authmodfailed']         = 'GreÅ¡ka u konfiguraciji korisniÄke autentifikacije. Molimo Vas da kontaktirate administratora.';
+$lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
+$lang['i_chooselang']          = 'Izaberite vaš jezik';
+$lang['i_installer']           = 'DokuWiki instalacija';
+$lang['i_wikiname']            = 'Naziv Wikija';
+$lang['i_enableacl']           = 'Omogući ACL (preporuÄeno)';
+$lang['i_superuser']           = 'Superkorisnik';
+$lang['i_problems']            = 'Instalacija je pronaÅ¡la probleme koji su naznaÄeni ispod. Nije moguće nastaviti dok se ti problemi ne rijeÅ¡e.';
+$lang['i_modified']            = 'Zbog sigurnosnih razlog, ova skripta ce raditi samo sa novim i nepromijenjenim instalacijama dokuWikija. Preporucujemo da ili re-ekstraktirate fajlove iz downloadovanog paketa ili konsultujete pune a href="http://dokuwiki.org/install">Instrukcije za instalaciju Dokuwikija';
diff -Naur dokuwiki-2009-02-14/inc/lang/hr/login.txt dokuwiki-rc2009-12-02/inc/lang/hr/login.txt
--- dokuwiki-2009-02-14/inc/lang/hr/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hr/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Prijava ======
 
-UpiÅ¡ite korisniÄko ime i lozinku da biste se prijavili. 
+UpiÅ¡ite korisniÄko ime i lozinku da biste se prijavili.
diff -Naur dokuwiki-2009-02-14/inc/lang/hr/register.txt dokuwiki-rc2009-12-02/inc/lang/hr/register.txt
--- dokuwiki-2009-02-14/inc/lang/hr/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hr/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Prijava novog korisnika ======
 
-Ispunite potrebne podatke da biste dobili korisniÄki raÄun na wikiju. Posebno obratite pažnju da ste unijeli valjani email. 
+Ispunite potrebne podatke da biste dobili korisniÄki raÄun na wikiju. Posebno obratite pažnju da ste unijeli valjani email.
diff -Naur dokuwiki-2009-02-14/inc/lang/hr/revisions.txt dokuwiki-rc2009-12-02/inc/lang/hr/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/hr/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hr/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Stare verzije ======
 
-Slijedi spisak starih verzija za traženi dokument. 
+Slijedi spisak starih verzija za traženi dokument.
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/hu/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/hu/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== További modulok =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/admin.txt dokuwiki-rc2009-12-02/inc/lang/hu/admin.txt
--- dokuwiki-2009-02-14/inc/lang/hu/admin.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-===== Adminisztrálás ======
+===== Adminisztrálás =====
 
 Itt találod a DokuWiki adminisztrálási lehetőségeit.
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/conflict.txt dokuwiki-rc2009-12-02/inc/lang/hu/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/hu/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Újabb változat létezik ======
 
-Az általad szerkesztett dokumentumnak egy újabb változata létezik. Ez akkor történik, ha egy másik felhasználó megváltoztatta a dokumentumot, amíg szerkesztetted. 
+Az általad szerkesztett dokumentumnak egy újabb változata létezik. Ez akkor történik, ha egy másik felhasználó megváltoztatta a dokumentumot, amíg szerkesztetted.
 
 Nézd át gondosan a lenti eltéréseket, aztán dönts arról, melyik változatot tartod meg. Ha ''Mentés'' gombot választod, akkor a Te változatod kerül mentésre. Nyomj ''Mégsem'' gombot a jelenlegi változat megtartásához.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/denied.txt dokuwiki-rc2009-12-02/inc/lang/hu/denied.txt
--- dokuwiki-2009-02-14/inc/lang/hu/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Hozzáférés megtagadva======
+====== Hozzáférés megtagadva ======
 
 Sajnáljuk, nincs jogod a folytatáshoz. Esetleg elfelejtettél bejelentkezni?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/diff.txt dokuwiki-rc2009-12-02/inc/lang/hu/diff.txt
--- dokuwiki-2009-02-14/inc/lang/hu/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Különbségek======
+====== Különbségek ======
 
 A kiválasztott változat és az aktuális verzió közötti különbséget mutatjuk.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/draft.txt dokuwiki-rc2009-12-02/inc/lang/hu/draft.txt
--- dokuwiki-2009-02-14/inc/lang/hu/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-===== Pisztozatot találtunk =====
+===== Piszkozatot találtunk =====
 
 Az oldal utolsó szerkesztését nem fejezted be rendesen. A DokuWiki elmentette piszkozatként, így most folytathatod a szerkesztést. Lent látható, amit az utolsó szerkesztésből elmentettünk.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/lang.php dokuwiki-rc2009-12-02/inc/lang/hu/lang.php
--- dokuwiki-2009-02-14/inc/lang/hu/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -6,6 +6,8 @@
  * @author Ziegler Gábor 
  * @author Sandor TIHANYI 
  * @author Siaynoq Siaynoq 
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +50,7 @@
 $lang['btn_draft']             = 'Piszkozat szerkesztése';
 $lang['btn_recover']           = 'Piszkozat folytatása';
 $lang['btn_draftdel']          = 'Piszkozat törlése';
+$lang['btn_revert']            = 'Helyreállítás';
 $lang['loggedinas']            = 'Belépett felhasználó: ';
 $lang['user']                  = 'Azonosító';
 $lang['pass']                  = 'Jelszó';
@@ -86,6 +89,8 @@
 $lang['resendpwdsuccess']      = 'Az új jelszavadat elküldtük e-mailben.';
 $lang['license']               = 'Hacsak máshol nincs egyéb rendelkezés, ezen wiki tartalma a következő licenc alatt érhető el:';
 $lang['licenseok']             = 'Megjegyzés: az oldal szerkesztésével elfogadja, hogy a tartalom a következő licenc alatt lesz elérhető:';
+$lang['searchmedia']           = 'Keresett fájl neve:';
+$lang['searchmedia_in']        = 'Keresés a következőben: %s';
 $lang['txt_upload']            = 'Válaszd ki a feltöltendő fájlt';
 $lang['txt_filename']          = 'feltöltési név (elhagyható)';
 $lang['txt_overwrt']           = 'Létező fájl felülírása';
@@ -110,10 +115,14 @@
 $lang['mediainuse']            = 'A "%s" fájl nem törlődött - még használat alatt van.';
 $lang['namespaces']            = 'Névtér';
 $lang['mediafiles']            = 'Elérhető fájlok itt:';
+$lang['js']['searchmedia']     = 'Fájlok keresése';
 $lang['js']['keepopen']        = 'Tartsd nyitva ezt az ablakot a kijelöléshez!';
 $lang['js']['hidedetails']     = 'Részletek elrejtése';
 $lang['js']['nosmblinks']      = 'A Windows megosztott könyvtárak kereszthivatkozása csak  Microsoft Internet Explorerben működik közvetlenül.
 A hivatkozást másolni és beszúrni ettől fügetlenül mndig tudod.';
+$lang['js']['linkwiz']         = 'Hivatkozás varázsló';
+$lang['js']['linkto']          = 'Hivatkozás erre:';
+$lang['js']['del_confirm']     = 'Valóban törölni akarod a kiválasztott elem(ek)et?';
 $lang['js']['mu_btn']          = 'Több fájl feltöltése egyszerre';
 $lang['mediausage']            = 'A következő formában hivatkozhatsz erre az állományra:';
 $lang['mediaview']             = 'Eredeti állomány megtekintése';
@@ -141,21 +150,26 @@
 $lang['external_edit']         = 'külső szerkesztés';
 $lang['summary']               = 'A változások összefoglalása';
 $lang['noflash']               = 'Ennek a tartalomnak a megtekintéséhez Adobe Flash Plugin szükséges.';
+$lang['download']              = 'Kódrészlet letöltése';
 $lang['mail_newpage']          = 'új oldal jött létre:';
 $lang['mail_changed']          = 'oldal megváltozott:';
 $lang['mail_new_user']         = 'Új felhasználó:';
 $lang['mail_upload']           = 'állományt töltöttek fel:';
-$lang['qb_alert']              = 'Ãrd be a formázandó szöveget.\nEz a dokumentum szövegének végéhez fog hozzáadódni.';
 $lang['qb_bold']               = 'Félkövér szöveg';
 $lang['qb_italic']             = 'Dőlt szöveg';
 $lang['qb_underl']             = 'Aláhúzott szöveg';
 $lang['qb_code']               = 'Forráskód szöveg';
 $lang['qb_strike']             = 'Ãthúzott szöveg';
-$lang['qb_h1']                 = '1. színtű címsor';
-$lang['qb_h2']                 = '2. színtű címsor';
-$lang['qb_h3']                 = '3. színtű címsor';
-$lang['qb_h4']                 = '4. színtű címsor';
-$lang['qb_h5']                 = '5. színtű címsor';
+$lang['qb_h1']                 = '1. szintű címsor';
+$lang['qb_h2']                 = '2. szintű címsor';
+$lang['qb_h3']                 = '3. szintű címsor';
+$lang['qb_h4']                 = '4. szintű címsor';
+$lang['qb_h5']                 = '5. szintű címsor';
+$lang['qb_h']                  = 'Címsor';
+$lang['qb_hs']                 = 'Címsor kiválasztása';
+$lang['qb_hplus']              = 'Nagyobb címsor';
+$lang['qb_hminus']             = 'Kisebb címsor';
+$lang['qb_hequal']             = 'Azonos szintű címsor';
 $lang['qb_link']               = 'Belső hivatkozás';
 $lang['qb_extlink']            = 'Külső hivatkozás';
 $lang['qb_hr']                 = 'Vízszintes elválasztó vonal';
@@ -165,7 +179,7 @@
 $lang['qb_sig']                = 'Aláírás beszúrása';
 $lang['qb_smileys']            = 'Szmájlik';
 $lang['qb_chars']              = 'Speciális karakterek';
-$lang['del_confirm']           = 'Valóban törölni akarod a kiválasztott elem(ek)et?';
+$lang['upperns']               = 'Ugrás a szülő névtérhez';
 $lang['admin_register']        = 'Új felhasználó';
 $lang['metaedit']              = 'Meta-adatok szerkesztése';
 $lang['metasaveerr']           = 'A meta-adatok írása meghiúsult ';
@@ -207,7 +221,7 @@
 $lang['i_failure']             = 'Hiba lépett fel a konfigurációs állományok írásakor. Ki kell javítanod kézzel, mielőtt használni kezded az új DokuWikidet.';
 $lang['i_policy']              = 'Kezdeti hozzáférési politika';
 $lang['i_pol0']                = 'Nyitott Wiki (mindenki olvashatja, írhatja, és fájlokat tölthet fel)';
-$lang['i_pol1']                = 'Publikus Wiki (mindenki olvashatja, de csak regisztrált felhasználók írhatják, és tölthetnek fel fáljokat)';
+$lang['i_pol1']                = 'Publikus Wiki (mindenki olvashatja, de csak regisztrált felhasználók írhatják, és tölthetnek fel fájlokat)';
 $lang['i_pol2']                = 'Zárt Wiki (csak regisztrált felhasználók olvashatják, írhatják és tölthetnek fel fájlokat)';
 $lang['i_retry']               = 'Újra';
 $lang['mu_intro']              = 'Itt több fájlt is fel tudsz tölteni egyszerre. Kattints a "Kiválaszt" gombra és add hozzá a listához. Nyomd meg a Feltöltés gombot, amikor elkészültél.';
@@ -223,4 +237,13 @@
 $lang['mu_authfail']           = 'session lejárt';
 $lang['mu_progress']           = '@PCT@% feltöltve';
 $lang['mu_filetypes']          = 'Megengedett fájltípusok';
+$lang['mu_info']               = 'Fájlok feltöltve.';
+$lang['mu_lasterr']            = 'Utolsó hiba:';
 $lang['recent_global']         = 'Jelenleg csak a %s névtér friss változásai látszanak. Megtekinthetők a teljes wiki friss változásai is.';
+$lang['years']                 = '%d évvel ezelőtt';
+$lang['months']                = '%d hónappal ezelőtt';
+$lang['weeks']                 = '%d héttel ezelőtt';
+$lang['days']                  = '%d nappal ezelőtt';
+$lang['hours']                 = '%d órával ezelőtt';
+$lang['minutes']               = '%d perccel ezelőtt';
+$lang['seconds']               = '%d másodperccel ezelőtt';
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/newpage.txt dokuwiki-rc2009-12-02/inc/lang/hu/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/hu/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Ilyen oldal még nem létezik======
+====== Ilyen oldal még nem létezik ======
 
 Egy nem létező oldalra tévedtél. Létrehozhatod az ''Oldal létrehozása'' gombra kattintva.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/norev.txt dokuwiki-rc2009-12-02/inc/lang/hu/norev.txt
--- dokuwiki-2009-02-14/inc/lang/hu/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Nincs ilyen változat======
+====== Nincs ilyen változat ======
 
 A megadott változat nem létezik. Használd az ''Előző változatok'' nyomógombot az előzmények listájának megtekintéséhez.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/preview.txt dokuwiki-rc2009-12-02/inc/lang/hu/preview.txt
--- dokuwiki-2009-02-14/inc/lang/hu/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Előnézet======
+====== Előnézet ======
 
 Ez a szöveged előnézete, így fog kinézni. Figyelj jól: ez **még nincs elmentve**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/hu/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/hu/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 
 Ha nem kértél ilyet, hagyd figyelmen kívül ezt a levelet.
 
-Ha Te voltál, az új jelszó kérelmed megerősítéséhez a 
+Ha Te voltál, az új jelszó kérelmed megerősítéséhez a
 következő linkre kattints, vagy másold a böngésződbe:
 
 @CONFIRM@
 
---
+-- 
 Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki generálta.
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/recent.txt dokuwiki-rc2009-12-02/inc/lang/hu/recent.txt
--- dokuwiki-2009-02-14/inc/lang/hu/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Legutóbbi változások======
+====== Legutóbbi változások ======
 
 Az alábbi oldalak változtak legutoljára.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/revisions.txt dokuwiki-rc2009-12-02/inc/lang/hu/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/hu/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Előző változatok======
+====== Előző változatok ======
 
 Ezek az előző változatai az aktuális dokumentumnak. Egy előző változathoz való visszatéréshez nyomd meg az ''Oldal szerkesztése'' gombot, majd mentsd el.
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/hu/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/hu/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Keresés======
+====== Keresés ======
 
 A keresés eredményét lentebb láthatod. Ha nem találtad meg amit kerestél, akkor létrehozhatsz egy új oldalt a keresésed alapján ''Az oldal szerkesztése''  gombbal.
 
-=====Eredmény(ek)=====
\ Brak znaku nowej linii na końcu pliku
+===== Eredmény(ek) =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/hu/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/hu/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,9 +7,9 @@
 @DIFF@
 --------------------------------------------------------
 
-Ha le szeretnél iratkozni ennek az oldalnak a változás-követéséről, 
-lépj be a wikibe ezen a címen: 
-@DOKUWIKIURL@, majd keresd meg a(z) 
+Ha le szeretnél iratkozni ennek az oldalnak a változás-követéséről,
+lépj be a wikibe ezen a címen:
+@DOKUWIKIURL@, majd keresd meg a(z)
 @NEWPAGE@ oldalt
 és válaszd a 'Oldalváltozások-hírlevél leiratkozás' gombot.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/hu/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/hu/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/hu/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/hu/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
-======SPAM szűrés======
+====== SPAM szűrés ======
 
-A változtatásaid **nem** mentettük, mert egy vagy több tiltott szót tartalmaz. Ha kéretlen reklám anyagot ("SPAM") próbáltál erre a Wikire rakni, akkor szégyelld magad. 
+A változtatásaid **nem** mentettük, mert egy vagy több tiltott szót tartalmaz. Ha kéretlen reklám anyagot ("SPAM") próbáltál erre a Wikire rakni, akkor szégyelld magad.
 
 Ha azt gondolod, hogy valami hibáról, vagy félreértésről van szó, akkor lépj kapcsolatba a Wiki-gazdával.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/denied.txt dokuwiki-rc2009-12-02/inc/lang/id/denied.txt
--- dokuwiki-2009-02-14/inc/lang/id/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Akses Ditolak======
+====== Akses Ditolak ======
 
 Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. Apakah Anda belum login?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/diff.txt dokuwiki-rc2009-12-02/inc/lang/id/diff.txt
--- dokuwiki-2009-02-14/inc/lang/id/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Perbedaan======
+====== Perbedaan ======
 
 Ini menunjukkan perbedaan antara versi yang terpilih dengan versi yang sedang aktif.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/lang.php dokuwiki-rc2009-12-02/inc/lang/id/lang.php
--- dokuwiki-2009-02-14/inc/lang/id/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -135,7 +135,6 @@
 $lang['mail_new_user']         = 'User baru:';
 $lang['mail_upload']           = 'Berkas di-upload:';
 $lang['js']['nosmblinks']            = "Link ke share Windows hanya bekerja di Microsoft Internet Explorer.\nAnda masih dapat mengcopy and paste linknya.";
-$lang['qb_alert']              = 'Masukkan text yang akan diformat.\n Text ini akan ditambahkan di akhir dokumen.';
 $lang['qb_bold']               = 'Tebal';
 $lang['qb_italic']             = 'Miring';
 $lang['qb_underl']             = 'Garis Bawah';
@@ -155,7 +154,7 @@
 $lang['qb_sig']                = 'Sisipkan tanda tangan';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Karakter Khusus';
-$lang['del_confirm']           = 'Hapus tulisan ini?';
+$lang['js']['del_confirm']           = 'Hapus tulisan ini?';
 $lang['admin_register']        = 'Tambah user baru';
 $lang['metaedit']              = 'Edit Metadata';
 $lang['metasaveerr']           = 'Gagal menulis metadata';
diff -Naur dokuwiki-2009-02-14/inc/lang/id/newpage.txt dokuwiki-rc2009-12-02/inc/lang/id/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/id/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Topik ini belum tersedia======
+====== Topik ini belum tersedia ======
 
 Belum ada artikel di halaman ini. Anda dapat membuat tulisan-tulisan baru di halaman ini dengan menekan tombol "Buat Halaman Baru" (lihat dibagian bawah...!)
diff -Naur dokuwiki-2009-02-14/inc/lang/id/norev.txt dokuwiki-rc2009-12-02/inc/lang/id/norev.txt
--- dokuwiki-2009-02-14/inc/lang/id/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisi tidak tersedia======
+====== Revisi tidak tersedia ======
 
 Revisi yang diinginkan tidak ada. Gunakan tombol ''Revisi Lama'' untuk menampilkan daftar revisi lama dari dokumen ini.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/preview.txt dokuwiki-rc2009-12-02/inc/lang/id/preview.txt
--- dokuwiki-2009-02-14/inc/lang/id/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Preview======
+====== Preview ======
 
 Ini adalah preview tentang bagimana tulisan Anda akan ditampilkan. Ingat: tulisan ini **belum disimpan**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/id/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/id/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Email ini dibuat otomatis  oleh DokuWiki
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/id/recent.txt dokuwiki-rc2009-12-02/inc/lang/id/recent.txt
--- dokuwiki-2009-02-14/inc/lang/id/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Perubahan======
+====== Perubahan ======
 
 Berikut ini adalah halaman-halaman yang baru saja diubah.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/revisions.txt dokuwiki-rc2009-12-02/inc/lang/id/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/id/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisi Lama======
+====== Revisi Lama ======
 
 Ini adalah revisi-revisi lama dari dokumen ini. Untuk mengaktifkan kembali revisi lama, pilih dokumen revisi, kemudikan tekan "Edit halaman ini" lalu Simpan.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/id/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/id/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/id/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Pencarian======
+====== Pencarian ======
 
 Anda dapat menemukan hasil pencarian dibawah ini. Jika Anda tidak menemukan apa yang diinginkan, Anda dapat membuat halaman baru, dengan nama sesuai "text pencarian" Anda. Gunakan tombol "Edit halaman ini".
 
-=====Hasil Pencarian=====
\ Brak znaku nowej linii na końcu pliku
+===== Hasil Pencarian =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/id/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/id/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/id/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Type : @MIME@
 User : @USER@
 
---
+-- 
 Email ini dibuat otomatis oleh DokuWiki
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/id/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/id/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/id/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/id/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM blocked======
+====== SPAM blocked ======
 
 Maaf, tulisan Anda **tidak disimpan** karena terdapat satu atau lebih kata-kata yang **tabu**. Jika Anda mencoba melakukan SPAM wiki ini -- Bangsat lu! Tetapi, jika Anda pikir ini adalah kesalahan sistem, harap hubungi administrator wiki ini.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/is/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/is/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/is/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Aðrar viðbætur =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/is/diff.txt dokuwiki-rc2009-12-02/inc/lang/is/diff.txt
--- dokuwiki-2009-02-14/inc/lang/is/diff.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+===== Breytingar =====
+
+Hér sést hvað hefur breyst á milli útgáfna.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/is/lang.php dokuwiki-rc2009-12-02/inc/lang/is/lang.php
--- dokuwiki-2009-02-14/inc/lang/is/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,196 @@
+
+ * @author Ólafur Gunnlaugsson 
+ * @author Erik Bjørn Pedersen 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Breyta þessari síðu';
+$lang['btn_source']            = 'Skoða wikikóða';
+$lang['btn_show']              = 'Sýna síðu';
+$lang['btn_create']            = 'Búa til þessa síðu';
+$lang['btn_search']            = 'Leit';
+$lang['btn_save']              = 'Vista';
+$lang['btn_preview']           = 'Forskoða';
+$lang['btn_top']               = 'Efst á síðu';
+$lang['btn_newer']             = '<< nýrra';
+$lang['btn_older']             = 'eldra >>';
+$lang['btn_revs']              = 'breytingaskrá';
+$lang['btn_recent']            = 'Nýlegar breytingar';
+$lang['btn_upload']            = 'Hlaða upp';
+$lang['btn_cancel']            = 'Hætta við';
+$lang['btn_index']             = 'Atriðaskrá';
+$lang['btn_secedit']           = 'Breyta';
+$lang['btn_login']             = 'Innskrá';
+$lang['btn_logout']            = 'Útskrá';
+$lang['btn_admin']             = 'Stjórnandi';
+$lang['btn_update']            = 'Uppfæra';
+$lang['btn_delete']            = 'Eyða';
+$lang['btn_back']              = 'Til baka';
+$lang['btn_backlink']          = 'Hvað tengist hingað';
+$lang['btn_backtomedia']       = 'Aftur til miðlaskrá';
+$lang['btn_subscribe']         = 'Vakta';
+$lang['btn_unsubscribe']       = 'Afvakta';
+$lang['btn_subscribens']       = 'Vakta breytingar á nafnrými';
+$lang['btn_unsubscribens']     = 'Afvakta breytingar á nafnrými';
+$lang['btn_profile']           = 'Uppfæra notanda';
+$lang['btn_reset']             = 'Endurstilla';
+$lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
+$lang['btn_draft']             = 'Breyta uppkasti';
+$lang['btn_recover']           = 'Endurheimta uppkast';
+$lang['btn_draftdel']          = 'Eyða uppkasti';
+$lang['btn_revert']            = 'Endurheimta';
+$lang['loggedinas']            = 'Innskráning sem';
+$lang['user']                  = 'Notendanafn';
+$lang['pass']                  = 'Aðgangsorð';
+$lang['newpass']               = 'Nýtt aðgangsorð';
+$lang['oldpass']               = 'Staðfesta núverandi (gamla) aðgangsorðið';
+$lang['passchk']               = 'Aðgangsorð (aftur)';
+$lang['remember']              = 'Muna.';
+$lang['fullname']              = 'Fullt nafn þitt*';
+$lang['email']                 = 'Tölvupóstfangið þitt*';
+$lang['register']              = 'Skráning';
+$lang['profile']               = 'Notendastillingar';
+$lang['badlogin']              = 'Því miður, notandanafn eða aðgangsorð var rangur.';
+$lang['minoredit']             = 'Minniháttar breyting';
+$lang['draftdate']             = 'Uppkast vistað sjálfkrafa';
+$lang['nosecedit']             = 'Síðunni var breytt á meðan, upplýsingar um svæðið voru úreltar og öll síðan því endurhlaðin.';
+$lang['regmissing']            = 'Afsakið, en þú verður að fylla út í allar eyður.';
+$lang['reguexists']            = 'Afsakið, notandi með þessu nafni er þegar skráður inn.';
+$lang['regsuccess']            = 'Notandi hefur verið búinn til og aðgangsorð sent í tölvupósti.';
+$lang['regsuccess2']           = 'Notandi hefur verið búinn til.';
+$lang['regmailfail']           = 'Það lítur út fyrir villu við sendingu aðgangsorðs. Vinsamlegast hafðu samband við stjórnanda.';
+$lang['regbadmail']            = 'Uppgefinn tölvupóstur virðist ógildur - teljir þú þetta vera villu, hafðu þá samband við stjórnanda.';
+$lang['regbadpass']            = 'Aðgangsorðin tvö eru ekki eins, vinsamlegast reyndu aftur.';
+$lang['regpwmail']             = 'DokuWiki aðgangsorðið þitt';
+$lang['reghere']               = 'Ertu ekki með reikning? Skráðu þig';
+$lang['profna']                = 'Þessi wiki leyfir ekki breytingar á notendaupplýsingum';
+$lang['profnochange']          = 'Enga breytingar vistaðar';
+$lang['profnoempty']           = 'Það er ekki leyfilegt að skilja nafn og póstfang eftir óútfyllt';
+$lang['profchanged']           = 'Notendaupplýsingum breytt';
+$lang['pwdforget']             = 'Gleymt aðgangsorð? Fáðu nýtt';
+$lang['resendna']              = 'Þessi wiki styður ekki endursendingar aðgangsorðs';
+$lang['resendpwd']             = 'Senda nýtt aðgangsorð fyrir';
+$lang['resendpwdmissing']      = 'Afsakið, þú verður að út eyðublaðið allt';
+$lang['resendpwdnouser']       = 'Afsakið, notandi finnst ekki.';
+$lang['resendpwdbadauth']      = 'Afsakið, þessi sannvottunorð er ekki gild. Gakktu úr skugga um að þú notaðir að ljúka staðfesting hlekkur.';
+$lang['resendpwdconfirm']      = 'Staðfesting hlekkur hefur verið send með tölvupósti.';
+$lang['resendpwdsuccess']      = 'Nýja aðgangsorðið hefur verið sent með tölvupósti.';
+$lang['license']               = 'Nema annað sé tekið fram, efni á þessari wiki er leyfð undir eftirfarandi leyfi:';
+$lang['licenseok']             = 'Athugið: Með því að breyta þessari síðu samþykkir þú að leyfisveitandi efni undir eftirfarandi leyfi:';
+$lang['searchmedia']           = 'Leit skrárheiti:';
+$lang['searchmedia_in']        = 'Leit í %s';
+$lang['txt_upload']            = 'Veldu skrá til innhleðslu';
+$lang['txt_filename']          = 'Innhlaða sem (valfrjálst)';
+$lang['txt_overwrt']           = 'Skrifa yfir skrá sem þegar er til';
+$lang['lockedby']              = 'Læstur af';
+$lang['lockexpire']            = 'Læsing rennur út eftir';
+$lang['nothingfound']          = 'Ekkert fannst';
+$lang['mediaselect']           = 'Miðlaskrá';
+$lang['fileupload']            = 'Hlaða inn miðlaskrá';
+$lang['uploadsucc']            = 'Innhlaðning tókst';
+$lang['uploadfail']            = 'Villa í innhlaðningu';
+$lang['uploadwrong']           = 'Innhleðslu neitað. Skrár með þessari endingu eru ekki leyfðar.';
+$lang['uploadexist']           = 'Skrá var þegar til staðar.';
+$lang['uploadbadcontent']      = 'Innhlaðið efni var ekki við að %s skrárendingu.';
+$lang['uploadspam']            = 'Þessi innhlaðning er útilokuð vegna ruslpósts svarturlisti.';
+$lang['uploadxss']             = 'Þessi innhlaðning er útilokuð vegna hugsanlega skaðlegum efni.';
+$lang['uploadsize']            = 'Innhlaðið skrá var of stór. (Hámark eru %s)';
+$lang['deletesucc']            = 'Skrá %s hefur verið eytt.';
+$lang['namespaces']            = 'Nafnrýmar';
+$lang['mediafiles']            = 'Tiltækar skrár í';
+$lang['js']['searchmedia']     = 'Leita að skrám';
+$lang['js']['hidedetails']     = 'Fela upplýsingar';
+$lang['js']['linkwiz']         = 'Tengill-leiðsagnarforrit';
+$lang['js']['linkto']          = 'Tengja';
+$lang['js']['del_confirm']     = 'à örugglega að eyða valdar skrár?';
+$lang['mediaview']             = 'Sjá upprunalega skrá';
+$lang['mediaroot']             = 'rót';
+$lang['mediaextchange']        = 'Skrárending var breytt úr .%s til .%s!';
+$lang['reference']             = 'Tilvísanir til';
+$lang['ref_inuse']             = 'Ekki hægt að eyða skráin, því það er enn notað af eftirfarandi síðum:';
+$lang['ref_hidden']            = 'Sumar tilvísanir eru að síður sem þú hefur ekki leyfi til að lesa';
+$lang['hits']                  = 'Samsvör';
+$lang['quickhits']             = 'Samsvörun síðunöfn';
+$lang['toc']                   = 'Efnisyfirlit';
+$lang['current']               = 'nú';
+$lang['yours']                 = 'Þín útgáfa';
+$lang['diff']                  = 'Sýna ágreiningur til núverandi endurskoðun';
+$lang['diff2']                 = 'Sýna ágreiningur meðal valið endurskoðun';
+$lang['line']                  = 'Lína';
+$lang['breadcrumb']            = 'Snefill';
+$lang['youarehere']            = 'Þú ert hér';
+$lang['lastmod']               = 'Síðast breytt';
+$lang['by']                    = 'af';
+$lang['deleted']               = 'eytt';
+$lang['created']               = 'myndað';
+$lang['restored']              = 'Breytt aftur til fyrri útgáfu';
+$lang['external_edit']         = 'utanaðkomandi breyta';
+$lang['summary']               = 'Forskoða';
+$lang['noflash']               = 'Það þarf Adobe Flash viðbót til að sýna sumt efnið á þessari síðu';
+$lang['download']              = 'Hlaða niður til kóðabút';
+$lang['mail_newpage']          = 'síðu bætt við:';
+$lang['mail_changed']          = 'síðu breytt:';
+$lang['mail_new_user']         = 'nýr notandi:';
+$lang['mail_upload']           = 'Innhlaðið skrá:';
+$lang['qb_bold']               = 'Feitletraður texti';
+$lang['qb_italic']             = 'Skáletraður texti';
+$lang['qb_underl']             = 'Undirstrikaður texti';
+$lang['qb_code']               = 'Kóðatraður texti';
+$lang['qb_strike']             = 'Yfirstrikaður texti';
+$lang['qb_h1']                 = 'Fyrsta stigs fyrirsögn';
+$lang['qb_h2']                 = 'Annars stigs fyrirsögn';
+$lang['qb_h3']                 = 'Þriðja stigs fyrirsögn';
+$lang['qb_h4']                 = 'Fjórða stigs fyrirsögn';
+$lang['qb_h5']                 = 'Fimmta stigs fyrirsögn';
+$lang['qb_h']                  = 'Fyrirsögn';
+$lang['qb_hs']                 = 'Veldu fyrirsögn';
+$lang['qb_hplus']              = 'Hærra stigs fyrirsögn';
+$lang['qb_hminus']             = 'Lægri stigs fyrirsögn';
+$lang['qb_hequal']             = 'Sama stigs fyrirsögn';
+$lang['qb_link']               = 'Innri tengill';
+$lang['qb_extlink']            = 'Ytri tengill (muna að setja http:// á undan)';
+$lang['qb_hr']                 = 'Lárétt lína (notist sparlega)';
+$lang['qb_ol']                 = 'Númeraðaðan listatriði';
+$lang['qb_ul']                 = 'Ónúmeraðaðan listatriði';
+$lang['qb_media']              = 'Bæta inn myndum og öðrum skrám';
+$lang['qb_sig']                = 'Undirskrift þín auk tímasetningu';
+$lang['qb_smileys']            = 'Broskallar';
+$lang['qb_chars']              = 'Sértækir stafir';
+$lang['admin_register']        = 'Setja nýjan notenda inn';
+$lang['metaedit']              = 'Breyta lýsigögnum';
+$lang['metasaveerr']           = 'Vistun lýsigagna mistókst';
+$lang['metasaveok']            = 'Lýsigögn vistuð';
+$lang['img_backto']            = 'Aftur til';
+$lang['img_title']             = 'Heiti';
+$lang['img_caption']           = 'Skýringartexti';
+$lang['img_date']              = 'Dagsetning';
+$lang['img_fname']             = 'Skrárheiti';
+$lang['img_fsize']             = 'Stærð';
+$lang['img_artist']            = 'Myndsmiður';
+$lang['img_copyr']             = 'Útgáfuréttur';
+$lang['img_format']            = 'Forsnið';
+$lang['img_camera']            = 'Myndavél';
+$lang['img_keywords']          = 'Lykilorðir';
+$lang['i_retry']               = 'Reyna aftur';
+$lang['mu_gridsize']           = 'Stærð';
+$lang['mu_toobig']             = 'of stór';
+$lang['mu_ready']              = 'tilbúin til upphleðslu';
+$lang['mu_done']               = 'lokið';
+$lang['mu_fail']               = 'mistókst';
+$lang['mu_info']               = 'Skrár innhlaðnar.';
+$lang['mu_lasterr']            = 'Síðasta villa:';
diff -Naur dokuwiki-2009-02-14/inc/lang/is/login.txt dokuwiki-rc2009-12-02/inc/lang/is/login.txt
--- dokuwiki-2009-02-14/inc/lang/is/login.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+===== Innskráning =====
+
+Þú ert ekki skráður inn! Skráuðu þig inn hér að neðan. Athugaðu að vafrinn sem að þú notar verður að styðja móttöku smákaka.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/is/recent.txt dokuwiki-rc2009-12-02/inc/lang/is/recent.txt
--- dokuwiki-2009-02-14/inc/lang/is/recent.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+===== Nýlegar Breytingar =====
+
+Eftirfarandi síðum hefur nýlega verið breytt.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/is/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/is/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/is/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Senda nýtt aðgangsorð ======
+
+Vinsamlegast sláðu inn notendanafn þitt í formið hér fyrir neðan til að biðja um nýtt aðgangsorð fyrir reikninginn þinn í þessu wiki. A staðfesting hlekkur verður sendast á skráð netfang.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/is/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/is/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/is/subscribermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/is/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,23 @@
+Hæ
+
+@PAGE@ síðan í @TITLE@ hefur breyst.
+Hér eru breytingarnar:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dagsetning : @DATE@
+Notandi : @USER@
+Samantekt : @SUMMARY@
+Eldri útgáfa: @OLDPAGE@
+Ný útgáfa: @NEWPAGE@
+
+Ef þú vilt ekki lengur fá tilkynningar um breytingar á síðum, skráðu þig þá inn á
+@DOKUWIKIURL@, heimsóttu síðan
+@NEWPAGE@
+og afskráðu þig af tilkynningum fyrir síður og/ eða rými fyrir heiti.
+
+-- 
+Pósturinn var myndaður af DokuWiki að
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/it/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/it/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/it/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugin addizionali =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/it/denied.txt dokuwiki-rc2009-12-02/inc/lang/it/denied.txt
--- dokuwiki-2009-02-14/inc/lang/it/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Accesso negato======
+====== Accesso negato ======
 
 Non hai i diritti per continuare. Hai forse dimenticato di effettuare il login?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/it/diff.txt dokuwiki-rc2009-12-02/inc/lang/it/diff.txt
--- dokuwiki-2009-02-14/inc/lang/it/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Differenze======
+====== Differenze ======
 
 Queste sono le differenze tra la revisione selezionata e la versione corrente della pagina.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/it/lang.php dokuwiki-rc2009-12-02/inc/lang/it/lang.php
--- dokuwiki-2009-02-14/inc/lang/it/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,8 @@
  * @author Diego Pierotto ita.translations@tiscali.it
  * @author ita.translations@tiscali.it
  * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -145,11 +147,11 @@
 $lang['external_edit']         = 'modifica esterna';
 $lang['summary']               = 'Oggetto della modifica';
 $lang['noflash']               = 'E\' necessario Adobe Flash Plugin per visualizzare questo contenuto.';
+$lang['download']              = 'Scarica lo "snippet"';
 $lang['mail_newpage']          = 'pagina aggiunta:';
 $lang['mail_changed']          = 'pagina modificata:';
 $lang['mail_new_user']         = 'Nuovo utente:';
 $lang['mail_upload']           = 'file caricato:';
-$lang['qb_alert']              = 'Puoi inserire il testo che vuoi formattare.\nSarà  aggiunto alla fine del documento.';
 $lang['qb_bold']               = 'Grassetto';
 $lang['qb_italic']             = 'Corsivo';
 $lang['qb_underl']             = 'Sottolineato';
@@ -160,6 +162,11 @@
 $lang['qb_h3']                 = 'Intestazione di livello 3';
 $lang['qb_h4']                 = 'Intestazione di livello 4';
 $lang['qb_h5']                 = 'Intestazione di livello 5';
+$lang['qb_h']                  = 'Titolo';
+$lang['qb_hs']                 = 'Seleziona il titolo';
+$lang['qb_hplus']              = 'Titolo superiore';
+$lang['qb_hminus']             = 'Titolo inferiore';
+$lang['qb_hequal']             = 'Titolo dello stesso livello';
 $lang['qb_link']               = 'Collegamento interno';
 $lang['qb_extlink']            = 'Collegamento esterno';
 $lang['qb_hr']                 = 'Riga orizzontale';
@@ -169,7 +176,7 @@
 $lang['qb_sig']                = 'Inserisci la firma';
 $lang['qb_smileys']            = 'Smiley';
 $lang['qb_chars']              = 'Caratteri speciali';
-$lang['del_confirm']           = 'Cancellare questa voce?';
+$lang['js']['del_confirm']           = 'Cancellare questa voce?';
 $lang['admin_register']        = 'Aggiungi un nuovo utente';
 $lang['metaedit']              = 'Modifica metadati';
 $lang['metasaveerr']           = 'Scrittura metadati fallita';
@@ -229,4 +236,5 @@
 $lang['mu_authfail']           = 'sessione scaduta';
 $lang['mu_progress']           = '@PCT@% caricato';
 $lang['mu_filetypes']          = 'Tipi di file permessi';
+$lang['mu_info']               = 'file caricati.';
 $lang['recent_global']         = 'Stai attualmente vedendo le modifiche dentro l\'area %s. Puoi anche vedere le modifiche recenti dell\'intero wiki.';
diff -Naur dokuwiki-2009-02-14/inc/lang/it/newpage.txt dokuwiki-rc2009-12-02/inc/lang/it/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/it/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Questo argomento non esiste ancora======
+====== Questo argomento non esiste ancora ======
 
 Hai seguito un collegamento ad un argomento che non è ancora stato creato. Se vuoi puoi crearlo tu stesso usando il pulsante ''Crea questa pagina''.
diff -Naur dokuwiki-2009-02-14/inc/lang/it/norev.txt dokuwiki-rc2009-12-02/inc/lang/it/norev.txt
--- dokuwiki-2009-02-14/inc/lang/it/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Revisione inesistente======
+====== Revisione inesistente ======
 
 La revisione richiesta non esiste. Usa il pulsante ''Revisioni precedenti'' per ottenere una lista di revisioni precedenti di questo documento.
diff -Naur dokuwiki-2009-02-14/inc/lang/it/preview.txt dokuwiki-rc2009-12-02/inc/lang/it/preview.txt
--- dokuwiki-2009-02-14/inc/lang/it/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Anteprima======
+====== Anteprima ======
 
 Questa è un'anteprima di come apparirà il tuo testo. Attenzione: **la pagina non è ancora stata salvata**!.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/it/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/it/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/it/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,6 @@
 
 @CONFIRM@
 
---
+-- 
 Questa mail è stata generata da DokuWiki su
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/it/recent.txt dokuwiki-rc2009-12-02/inc/lang/it/recent.txt
--- dokuwiki-2009-02-14/inc/lang/it/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ultime modifiche======
+====== Ultime modifiche ======
 
 Queste sono le ultime pagine modificate.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/it/revisions.txt dokuwiki-rc2009-12-02/inc/lang/it/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/it/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Versione precedente======
+====== Versione precedente ======
 
 Queste sono le precedenti versioni del documento corrente. Per ripristinare una versione precedente, seleziona la versione, modificala usando il pulsante ''Modifica questa pagina'' e salvala.
diff -Naur dokuwiki-2009-02-14/inc/lang/it/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/it/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/it/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Cerca======
+====== Cerca ======
 
 Questi sono i risultati della ricerca. Se non hai trovato quello che cercavi, puoi creare una nuova pagina con questo titolo usando il pulsante ''Crea questa pagina''.
 
-=====Risultati=====
+===== Risultati =====
diff -Naur dokuwiki-2009-02-14/inc/lang/it/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/it/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/it/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,7 +7,7 @@
 @DIFF@
 --------------------------------------------------------
 
-Per cancellare la tua sottoscrizione alla lista di controllo 
+Per cancellare la tua sottoscrizione alla lista di controllo
 per questa pagina collegati al wiki
 @DOKUWIKIURL@ poi spostati su
 @NEWPAGE@
diff -Naur dokuwiki-2009-02-14/inc/lang/it/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/it/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/it/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Type : @MIME@
 Utente : @USER@
 
---
+-- 
 Questa email è stata generata dal DokuWiki di
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/it/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/it/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/it/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/it/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Modifica bloccata======
+====== Modifica bloccata ======
 
 Le tue modifiche **non sono state salvate** perché contengono una o più parole vietate. Se hai cercato di spammare il Wiki -- bambino cattivo! Se pensi che sia un errore contatta l'amministratore di questo Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ja/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/ja/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/ja/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ja/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== 追加プラグイン =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ja/lang.php dokuwiki-rc2009-12-02/inc/lang/ja/lang.php
--- dokuwiki-2009-02-14/inc/lang/ja/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ja/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Yuji Takenaka 
  * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -47,6 +48,7 @@
 $lang['btn_draft']             = 'ドラフトを編集';
 $lang['btn_recover']           = 'ドラフトを復元';
 $lang['btn_draftdel']          = 'ドラフトを削除';
+$lang['btn_revert']            = 'å…ƒã«æˆ»ã™';
 $lang['loggedinas']            = 'よã†ã“ã';
 $lang['user']                  = 'ユーザーå';
 $lang['pass']                  = 'パスワード';
@@ -85,6 +87,8 @@
 $lang['resendpwdsuccess']      = 'æ–°ã—ã„パスワードãŒãƒ¡ãƒ¼ãƒ«ã§é€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚';
 $lang['license']               = '特ã«æ˜Žç¤ºã•ã‚Œã¦ã„ãªã„é™ã‚Šã€æœ¬Wikiã®å†…容ã¯æ¬¡ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«å¾“ã„ã¾ã™ï¼š';
 $lang['licenseok']             = '注æ„： 本ページを編集ã™ã‚‹ã“ã¨ã¯ã€ã‚ãªãŸã®ç·¨é›†ã—ãŸå†…容ãŒæ¬¡ã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«å¾“ã†ã“ã¨ã«åŒæ„ã—ãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ï¼š';
+$lang['searchmedia']           = '検索ファイルå：';
+$lang['searchmedia_in']        = '%s 内を検索';
 $lang['txt_upload']            = 'アップロードã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸ã‚“ã§ãã ã•ã„。';
 $lang['txt_filename']          = 'åå‰ã‚’変更ã—ã¦ã‚¢ãƒƒãƒ—ロード（オプション）';
 $lang['txt_overwrt']           = '既存ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’上書ã';
@@ -109,10 +113,14 @@
 $lang['mediainuse']            = 'ファイル "%s" ã¯ä½¿ç”¨ä¸­ã®ãŸã‚ã€å‰Šé™¤ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚';
 $lang['namespaces']            = 'åå‰ç©ºé–“';
 $lang['mediafiles']            = '有効ãªãƒ•ã‚¡ã‚¤ãƒ«ï¼š';
+$lang['js']['searchmedia']     = 'ファイル検索';
 $lang['js']['keepopen']        = 'é¸æŠžä¸­ã¯ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ãªã„';
 $lang['js']['hidedetails']     = '詳細をéžè¡¨ç¤º';
 $lang['js']['nosmblinks']      = 'ウィンドウズã®å…±æœ‰ãƒ•ã‚©ãƒ«ãƒ€ã¸ãƒªãƒ³ã‚¯ã¯ Microsoft Internet Explorer ã§ã®ã¿å¯èƒ½ã¨ãªã‚Šã¾ã™ã€‚
 当然ã€ã‚«ãƒƒãƒˆã‚¢ãƒ³ãƒ‰ãƒšãƒ¼ã‚¹ãƒˆãŒä½¿ç”¨ã§ãã¾ã™ã€‚';
+$lang['js']['linkwiz']         = 'リンクウィザード';
+$lang['js']['linkto']          = 'リンク先：';
+$lang['js']['del_confirm']     = 'é¸æŠžã—ãŸé …目を本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ';
 $lang['js']['mu_btn']          = '複数ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’一度ã«ã‚¢ãƒƒãƒ—ロード';
 $lang['mediausage']            = 'ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã™ã‚‹ãŸã‚ã«ã¯æ¬¡ã®æ–‡æ³•ã‚’使用ã™ã‚‹ï¼š';
 $lang['mediaview']             = 'オリジナルファイルを閲覧';
@@ -140,11 +148,11 @@
 $lang['external_edit']         = '外部編集';
 $lang['summary']               = 'サマリーを編集';
 $lang['noflash']               = 'ã“ã®å†…容を表示ã™ã‚‹ãŸã‚ã«ã¯ Adobe Flash Plugin ãŒå¿…è¦ã§ã™ã€‚';
+$lang['download']              = 'ダウンロードスニペット';
 $lang['mail_newpage']          = '文書ã®è¿½åŠ ï¼š';
 $lang['mail_changed']          = '文書ã®å¤‰æ›´ï¼š';
 $lang['mail_new_user']         = 'æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ï¼š';
 $lang['mail_upload']           = 'ファイルã®ã‚¢ãƒƒãƒ—ロード：';
-$lang['qb_alert']              = '文書ã®æœ€å¾Œã«æŒ¿å…¥ã—ãŸã„定型文書を入力ã—ã¦ä¸‹ã•ã„。';
 $lang['qb_bold']               = '太字';
 $lang['qb_italic']             = '斜体';
 $lang['qb_underl']             = '下線';
@@ -155,6 +163,11 @@
 $lang['qb_h3']                 = '第三見出ã—';
 $lang['qb_h4']                 = '第四見出ã—';
 $lang['qb_h5']                 = '第五見出ã—';
+$lang['qb_h']                  = '見出ã—';
+$lang['qb_hs']                 = '見出ã—é¸æŠž';
+$lang['qb_hplus']              = '上ã®éšŽå±¤ã®è¦‹å‡ºã—';
+$lang['qb_hminus']             = '下ã®éšŽå±¤ã®è¦‹å‡ºã—';
+$lang['qb_hequal']             = 'åŒã˜éšŽå±¤ã®è¦‹å‡ºã—';
 $lang['qb_link']               = '内部リンク';
 $lang['qb_extlink']            = '外部リンク';
 $lang['qb_hr']                 = '横罫線';
@@ -164,7 +177,7 @@
 $lang['qb_sig']                = 'ç½²åã®æŒ¿å…¥';
 $lang['qb_smileys']            = 'スマイリー';
 $lang['qb_chars']              = '特殊文字';
-$lang['del_confirm']           = 'é¸æŠžã—ãŸé …目を本当ã«å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ';
+$lang['upperns']               = '上ã®éšŽå±¤ã®åå‰ç©ºé–“ã¸';
 $lang['admin_register']        = 'æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ä½œæˆ';
 $lang['metaedit']              = 'メタデータ編集';
 $lang['metasaveerr']           = 'メタデータã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ';
@@ -223,4 +236,13 @@
 $lang['mu_authfail']           = 'セッション期é™åˆ‡ã‚Œ';
 $lang['mu_progress']           = '@PCT@% アップロード完了';
 $lang['mu_filetypes']          = '使用ã§ãるファイル形å¼';
+$lang['mu_info']               = 'ファイルアップロー完了';
+$lang['mu_lasterr']            = 'ç›´è¿‘ã®ã‚¨ãƒ©ãƒ¼ï¼š';
 $lang['recent_global']         = 'ç¾åœ¨ã€%s åå‰ç©ºé–“内ã®å¤‰æ›´ç‚¹ã‚’閲覧中ã§ã™ã€‚Wiki全体ã®æœ€è¿‘ã®å¤‰æ›´ç‚¹ã‚’確èªã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚';
+$lang['years']                 = '%då¹´å‰';
+$lang['months']                = '%dカ月å‰';
+$lang['weeks']                 = '%d週間å‰';
+$lang['days']                  = '%dæ—¥å‰';
+$lang['hours']                 = '%d時間å‰';
+$lang['minutes']               = '%d分å‰';
+$lang['seconds']               = '%d秒å‰';
diff -Naur dokuwiki-2009-02-14/inc/lang/ja/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ja/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ja/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ja/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ja/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ja/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ja/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ja/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIMEタイプ  : @MIME@
 ãƒ¦ãƒ¼ã‚¶ãƒ¼å  : @USER@
 
---
+-- 
 ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯æ¬¡ã®DokuWikiより自動的ã«é€ä¿¡ã•ã‚Œã¦ã„ã¾ã™ã€‚
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/km/admin.txt dokuwiki-rc2009-12-02/inc/lang/km/admin.txt
--- dokuwiki-2009-02-14/inc/lang/km/admin.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== អ្នកគ្រោង ======
+ážáž¶áž„ក្រោមជាប្រដបប្រដារបស់អ្នកគ្រោង ឌោគូវីគី។
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/km/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/km/backlinks.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== ážáŸ’សែដំណរក្រោយ ======
+áž“áŸáŸ‡áž‡áž¶áž‘ំពáŸážšážŠáŸ‚លមានដំណរបណ្ážáž–ីទំពáŸážšáž¥áž¡áž¼ážœáŸ”
+====== Backlinks ======
+This is a list of pages that seem to link back to the current page.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/conflict.txt dokuwiki-rc2009-12-02/inc/lang/km/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/km/conflict.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== មានបុនរាព្រឹážáŸ’ážáž·ážáŸ’មីៗ ======
+មានបុនរាព្រឹážáŸ’ážáž·ážáŸ’មី
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/denied.txt dokuwiki-rc2009-12-02/inc/lang/km/denied.txt
--- dokuwiki-2009-02-14/inc/lang/km/denied.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== បដិសáŸáž’អនុញ្ញាហ======
+សូមទុស អ្នកគ្មានអនុញ្ញាážáž‘ៅបណ្ážáž‘áŸáŸ”
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/editrev.txt dokuwiki-rc2009-12-02/inc/lang/km/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/km/editrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**អ្នក ឯក្សារចាស់!**  បើអ្នករក្សាវា អ្នកគុង់ážáŸ‚បង្កើហážáŸ’មីជាមួយទិន្ននáŸáž™áž“áŸáŸ‡áŸ”
+----
diff -Naur dokuwiki-2009-02-14/inc/lang/km/edit.txt dokuwiki-rc2009-12-02/inc/lang/km/edit.txt
--- dokuwiki-2009-02-14/inc/lang/km/edit.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+កែážáž˜áŸ’រូវទំពáŸážšáž“áŸáŸ‡áž áž¾áž™ ចុច«រក្សាážáž»áž€Â»áŸ”  មើល [[wiki:syntax|វាក្យ​សម្ពន្ធ]] ជាកម្នូវីគី។
+សំកែសម្រួលបើអ្នកអាច**ច្នៃចរើន**វា។  បើអ្នកចង់សាកពិសោážáž¢áŸ’វីមួយ សំរៀននៅក្នុង
+[[playground:playground|playground]]។
diff -Naur dokuwiki-2009-02-14/inc/lang/km/index.txt dokuwiki-rc2009-12-02/inc/lang/km/index.txt
--- dokuwiki-2009-02-14/inc/lang/km/index.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+====== លិបិក្រម ======
+áž“áŸáŸ‡áž‡áž¶áž›áž·áž”ិក្រមទំពáŸážšáž‘ាំងឡាយបញ្ជាដោយ [[doku>wiki:namespaces|នាមážáž¶áž“]]។
diff -Naur dokuwiki-2009-02-14/inc/lang/km/lang.php dokuwiki-rc2009-12-02/inc/lang/km/lang.php
--- dokuwiki-2009-02-14/inc/lang/km/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,230 @@
+
+ * @author     Anika Henke 
+ * @author     Matthias Grimm 
+ * @author     Ratana Lim 
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '«';
+$lang['doublequoteclosing']  = '»';
+$lang['singlequoteopening']  = '‘';//‘
+$lang['singlequoteclosing']  = '’';//’
+$lang['apostrophe']          = '’';//’
+
+$lang['btn_edit']   = 'កែទំពáŸážšáž“áŸáŸ‡';
+$lang['btn_source'] = 'បង្ហាងប្រភពទំពáŸážš';
+$lang['btn_show']   = 'បង្ហាងទំពáŸážš';
+$lang['btn_create'] = 'បង្កើážáž‘ំពáŸážšáž“áŸáŸ‡';
+$lang['btn_search'] = 'ស្វែងរក';
+$lang['btn_save']   = 'រក្សាទុក';
+$lang['btn_preview']= 'បង្ហាញ';
+$lang['btn_top']    = 'ទៅលើ';
+$lang['btn_newer']  = '<<ទំពáŸážšáž‘ំនើប';
+$lang['btn_older']  = 'ទំពáŸážšážáŸ’មែសមáŸáž™>>';
+$lang['btn_revs']   = 'ទំពáŸážšáž…ាស់ៗ';
+$lang['btn_recent'] = 'ទំពáŸážšážáŸ’មីៗ';
+$lang['btn_upload'] = 'ដាកលើង';
+$lang['btn_cancel'] = 'បោះបង់';
+$lang['btn_index']  = 'លិបិក្រម';
+$lang['btn_secedit']= 'កែ';
+$lang['btn_login']  = 'កážáŸ‹áž…ូល';
+$lang['btn_logout'] = 'កážáŸ‹áž…áŸáž‰';
+$lang['btn_admin']  = 'អ្នកគ្រប់គ្រង';
+$lang['btn_update'] = 'កែឡើង';
+$lang['btn_delete'] = 'លុបចោល';
+$lang['btn_back']   = 'ážáŸ’រឡប់';
+$lang['btn_backlink']    = 'ážáŸ’សែចំណងក្រោយ';
+$lang['btn_backtomedia'] = 'ទៅប្រពáŸáž“ឯកសាវិញ';
+$lang['btn_subscribe']   = 'ដាក់ដំណឹងផ្លស់ប្ážáž¼ážš';
+$lang['btn_unsubscribe'] = 'ដកដំណឹងផ្លស់ប្ážáž¼ážš';
+$lang['btn_profile']     = 'កែប្រវážáŸ’ážáž·ážšáž¼áž”';
+$lang['btn_reset']       = 'កមណážáŸ‹áž¡áž¾áž„រិញ';
+$lang['btn_resendpwd']   = 'ផ្ញើពាក្សសម្ងាážáŸ‹';
+$lang['btn_draft']    = 'កែគំរោង';
+$lang['btn_recover']  = 'ស្រោះគំរោងឡើង';
+$lang['btn_draftdel'] = 'លុបគំរោង';
+
+$lang['loggedinas'] = 'អ្នកប្រើ';
+$lang['user']       = 'នាមបម្រើ';
+$lang['pass']       = 'ពាក្សសម្ងážáŸ‹';
+$lang['newpass']    = 'ពាក្សសម្ងាážáŸ‹ážáŸ’មី';
+$lang['oldpass']    = 'បន្ជាកពាក្សសម្ងាážáŸ‹';
+$lang['passchk']    = 'ម្ដងទាáž';
+$lang['remember']   = 'ចំណាំážáŸ’ញុំ';
+$lang['fullname']   = 'នាមážáŸ’រគោល';
+$lang['email']      = 'អ៊ីមែល';
+$lang['register']   = 'ចុះឈ្មោះ';//'Register';
+$lang['profile']    = 'ប្រវážáŸ’ážáž·ážšáž¼áž”';// 'User Profile';
+$lang['badlogin']   = 'សុំអាទោស​ នាមបំរើ ឬ ពាក្សសម្ងាážáž˜áž·áž“ážáŸ’រវទáŸáŸ”';
+$lang['minoredit']  = 'កែបបណ្ážáž·áž…បណ្ážáž½áž…';// 'Minor Changes';
+$lang['draftdate']  = 'គំរោង កážáŸ‹ážŸáŸ’ážœáŸáž™áž”្រវážáŸ’áž';
+
+$lang['regmissing'] = 'សុំអាទោស​ អ្នកážáŸ’រវបំពáŸáž‰áž€áŸ’របវាល។';
+$lang['reguexists'] = 'សុំអាទោស​ នាមប្រើនáŸáŸ‡áž˜áž¶áž“រួចហើ។';
+$lang['regsuccess'] = 'អ្នកប្រើបានបង្កើážáž áž¾áž™ និងពាក្សសម្ងាážáž€áŸáž”ានផ្ញើទៀážáŸ”';
+$lang['regsuccess2']= 'អ្នកប្រើបានបង្កើážáž áž¾áž™áŸ”';
+$lang['regmailfail']= 'មើលទៅដុចជាមានកំហុសក្នុង....សុំទាកទងអ្នកក្របក្រង';
+$lang['regbadmail'] = 'អ៊ីមáŸáž›áž¢áŸ’នកសាសáŸáž˜áž·áž“ážáŸ’រូវបញ្ជរ—បើអ្នកកិážážáž¶áž“áŸáŸ‡áž‡áž¶áž€áŸ†áž áž»ážŸáž”ដិបážáŸ’ážáž· សុំទាកទងអ្នកក្របគ្រោង។';
+$lang['regbadpass'] = 'គូពាក្សសម្ងាážáž˜áž·áž“ដូចគ្នាទ០សមសាកទៀážáŸ”';
+$lang['regpwmail']  = 'ពាក្សសម្ងាážáž¢áŸ’នក';
+$lang['reghere']    = 'អ្នកឥážáž˜áž¶áž“បញ្ជីនាមបម្រើទáŸ?  សុំចល់ចុះឈ្មោះធ្វើគណនីសម្របប្រើប្រស';
+
+$lang['profna']       = 'មិនអាចកែ';
+$lang['profnochange'] = 'ឥážáž•áŸ’លាស់ប្ដូរ ក្មានអ្វីធ្វើទáŸáŸ”';
+$lang['profnoempty']  = 'នាមáŸáž¬áž¢áž¸áž˜áŸáž›áž‘áž‘áŸ';
+$lang['profchanged']  = 'ប្រវážáŸ’ážáž·ážšáž¼áž”អ្នកប្រើបាន ។';
+
+$lang['pwdforget'] = 'ភ្លិចពាក្សសម្ងាážáŸ‹ យកមួយទាážáŸ”';
+$lang['resendna']  = 'វីគីនáŸáŸ‡áž˜áž·áž“ឧបរំផ្ញើពាក្សសម្ងាážáž˜áŸ’ដងទៀážáž‘áŸáŸ”';
+$lang['resendpwd'] = 'ផ្ញើពាក្សសម្ងាážáž²áŸ’áž™';
+$lang['resendpwdmissing'] = 'សុំអាទោស​ អ្នកážáŸ’រវបំពáŸáž‰ážœáž¶áž›áŸ”';
+$lang['resendpwdnouser']  = 'សុំអាទោស​ យាងរកអ្នកប្រើមិនឃើងទáŸáŸ”';
+$lang['resendpwdbadauth'] = 'សុំអាទោស​ រហស្សលáŸážáž¢áž“ុញ្ញាážáž–ំអាចប្រើបានទáŸáŸ” ážáŸ’សែបន្áž';
+$lang['resendpwdconfirm'] ='ážáŸ’សែបន្áž';
+$lang['resendpwdsuccess'] = 'ពាក្សសម្ងាážáž¢áŸ’នកបានផ្ញើហើយ។';
+
+$lang['txt_upload']   = 'ជ្រើសឯកសារដែលរុញ​ឡើង';
+$lang['txt_filename'] = 'រុញឡើងជា (ស្រáŸáž…​ចិážáŸ’áž)';
+$lang['txt_overwrt']  = 'កážáŸ‹áž–ីលើ';//'Overwrite existing file';
+$lang['lockedby']     = 'ឥឡូវនáŸáŸ‡áž…កជាប់​';
+$lang['lockexpire']   = 'សោជាប់ផុážâ€‹áž€áŸ†ážŽážáŸ‹áž˜áŸ‰áŸ„áž„';
+$lang['willexpire']   = 'សោអ្នកចំពោះកែážáž˜áŸ’រូវទំពáŸážšáž“áŸáŸ‡ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណážáŸ‹â€‹áž¡áž¾áž„​វិញ។';
+
+$lang['notsavedyet'] = 'កម្រែមិនទានរុក្សាទកážáŸ’រូវបោះបង់។\nបន្ážáž‘ៅទាឬទáŸ?';
+$lang['rssfailed']   = 'មានកំហុសពáŸáž›áž‘ៅ​ប្រមូល​យកមážáž·â€‹áž–áŸážáŸŒáž˜áž¶áž“៖ ';
+$lang['nothingfound']= 'រកមិនឃើញអ្វីទáŸáŸ”';
+
+$lang['mediaselect'] = 'ឯកសារមីឌៀ';
+$lang['fileupload']  = 'រុញឯកសារមីឌៀឡើង';
+$lang['uploadsucc']  = 'រុញចូលមានជáŸáž™';
+$lang['uploadfail']  = 'រុញឡើងបរាជáŸáž™áŸ” ប្រហែលážáž»ážŸážŸáž·áž‘្ឋានុញ្ញាáž?';
+$lang['uploadwrong'] = 'រុញឡើងážáŸ’រូវ​បាន​បដិសáŸáž’។ ឯកសារ';
+$lang['uploadexist'] = 'ឯកសារមានហើយ។ ឥážáž˜áž¶áž“ធ្វើអ្វីទáŸáŸ”';
+$lang['uploadbadcontent'] = 'ធាážáž»áž…ំរុញឡើងមិនážáŸ’រូវកន្ទុយឯកសារ %s áž‘áŸáŸ”';
+$lang['uploadspam']  = 'ចំរុញឡើង បង្ážáž¶áŸ†áž„ ដៅយ  ';
+$lang['uploadxss']   = 'ចំរុញឡើង បង្ážáž¶áŸ†áž„  ';
+$lang['deletesucc']  = 'ឯកសារ «%s» បានលុបហើយ។';
+$lang['deletefail']  = '«%s» មិនអាចលុបទáŸ&mdashមើល';
+$lang['mediainuse']  = 'ឯកសារ «%s» ឥážáž‘ានលុបទáŸ&mdashមានគáŸáž€áŸ†áž—áž„áž‘áŸáž‡áž¶áž”់ប្រើ។';
+$lang['namespaces']  = 'នាមដ្ឋាន';
+$lang['mediafiles']  = 'ឯកសារទំនáŸáž“ៅក្នុង';
+
+$lang['js']['keepopen']    = 'ទុកបង្អួចបើក áž–áŸáž›áž€áž¶ážšáž‡áž˜áŸ’រើស';
+$lang['js']['hidedetails'] = 'បាំង';
+$lang['mediausage']  = 'ប្រើ';
+$lang['mediaview']   = 'មើលឯកសារដើម';
+$lang['mediaroot']   = 'ឫស';
+$lang['mediaupload'] = 'រុញឯកសារឡើងទៅនាមដ្ឋាននáŸáŸ‡áŸ” នាមដ្ឋាន «រុញឡើង»';
+$lang['mediaextchange'] = 'កន្ទុយឯកសារផ្លាសពី «%s» ទៅ «%s»!';
+
+$lang['reference']   = 'អនុសាសនចំពោះ';
+$lang['ref_inuse']   = 'ឯកសារមិនអាចលុបពីព្រោះវានៅចាប់ប្រើដៅទំពáŸážšáŸ–';
+$lang['ref_hidden']  = 'អនុសាសនážáŸ’លះនៅលើទំពáŸážšáž¢áŸ’នកគ្មានសáŸáž’អនុញ្ញាáž';
+
+$lang['hits']       = 'ážáŸ’រូវ';
+$lang['quickhits']  = 'ឈ្មោះទំពáŸážšáž”្រៀបដូច';
+$lang['toc']        = 'មាážáž·áž€áž¶';
+$lang['current']    = 'ឥឡៅវ';
+$lang['yours']      = 'ážáŸ†ážŽáŸ‚អ្នាក';
+$lang['diff']       = 'បង្ហាងអសទិសភាពជាមួយážáŸ†ážŽáŸ‚ឥឡូវ ';
+$lang['line']       = 'ážáŸ’សែ';
+$lang['breadcrumb'] = 'ដាន';
+$lang['youarehere'] = 'ដាន';
+$lang['lastmod']    = 'áž–áŸáž›áž€áŸ‚ចុងក្រោយ';
+$lang['by']         = 'និពន្ឋដោយ';
+$lang['deleted']    = 'យកចáŸáž‰';
+$lang['created']    = 'បង្កើáž';
+$lang['restored']   = 'ស្ដារបុនរាព្រឹážáž…ាស់';
+$lang['external_edit'] = 'កំរáŸáž–ីក្រៅ';
+$lang['summary']    = 'កែážáž˜áŸ’រា';
+
+$lang['mail_newpage']  = 'ážáŸ‚មទំពáŸážš';
+$lang['mail_changed']  = 'ទំពáŸážšáž”្រែប្រួល';
+$lang['mail_new_user'] = 'អ្នកប្រើážáŸ’មី';
+$lang['mail_upload']   = 'រុញអក្សាលើង';
+
+$lang['nosmblinks'] = 'ážáŸ’សែបន្ážáž‘ៅ «Windows share» ប្រើបានក្នុង «Microsoft IE»។ អ្នកអាច កាážáŸ‹áž¬áž”áž·áž ážáŸ’សែនáŸáŸ‡áŸ”';
+
+$lang['qb_bold']    = 'ឃ្វាមក្រស';
+$lang['qb_italic']  = 'ឃ្វាមជ្រៀង';
+$lang['qb_underl']  = 'ឃ្វាម';
+$lang['qb_code']    = 'ឃ្វាមក្បួន';
+$lang['qb_strike']  = 'ឃ្វាម';
+$lang['qb_h1']      = 'áž“áž·ážœáŸáž‘áž“áŸáž‘ី១';
+$lang['qb_h2']      = 'áž“áž·ážœáŸáž‘áž“áŸáž‘ី២';
+$lang['qb_h3']      = 'áž“áž·ážœáŸáž‘áž“áŸáž‘ី៣';
+$lang['qb_h4']      = 'áž“áž·ážœáŸáž‘áž“áŸáž‘ី៤';
+$lang['qb_h5']      = 'áž“áž·ážœáŸáž‘áž“áŸáž‘ី៥';
+$lang['qb_link']    = 'ážáŸ’សែបន្ážáž€áŸ’នុង';
+$lang['qb_extlink'] = 'ážáŸ’សែបន្ážáž€áŸ’រៅ';
+$lang['qb_hr']      = 'បន្ទាផ្ដáŸáž€';
+$lang['qb_ol']      = 'ážáž¶ážšáž¶áž„ážáŸ’រៀប';
+$lang['qb_ul']      = 'ážáž¶ážšáž¶áž„អážáŸ’រៀប';
+$lang['qb_media']   = 'បន្ážáŸ‚មរូនឹងឯកសារឥទៀáž';
+$lang['qb_sig']     = 'ស៊កហážáŸ’ážáž›áŸážáž¶';
+$lang['qb_smileys'] = 'សញ្ញាអារម្មណáŸ';
+$lang['qb_chars']   = 'អក្ážážšáŸˆáž–ិសáŸážŸ';
+
+$lang['js']['del_confirm']= 'លុប';
+$lang['admin_register']= 'ážáŸ‚មអ្នកប្រើ';//'Add new user';
+
+$lang['spell_start'] = 'áž–áž·áž“áž·ážáŸ’យអក្ážážšáž¶ážœáž·ážšáž»áž‘្ធ';//'Check Spelling';
+$lang['spell_stop']  = 'បណ្ážáž€áŸ†ážšáŸ‚'; 'Resume Editing';
+$lang['spell_wait']  = 'សូមចាំ';//'Please wait...';
+$lang['spell_noerr'] = 'ឥážáž˜áž¶áž“ážáž»áŸ‡áž‘áŸ';
+$lang['spell_nosug'] = 'ឥážáž˜áž¶áž“យោបល់';
+$lang['spell_change']= 'ដូរជំនួស';//'Change';
+
+$lang['metaedit']    = 'កែទិន្ននáŸáž™áž¢ážšáž¼áž”';//'Edit Metadata';
+$lang['metasaveerr'] = 'ពំអាចកážáŸ‹ážšáž‘ិន្ននáŸáž™áž¢ážšáž¼áž”';//'Writing metadata failed';
+$lang['metasaveok']  = 'ទិន្ននáŸáž™áž¢ážšáž¼áž”';
+$lang['img_backto']  = 'ážáž™áž€áŸ’រោយ';
+$lang['img_title']   = 'អភិធáŸáž™áŸ’áž™';
+$lang['img_caption'] = 'ចំណងជើង';
+$lang['img_date']    = 'ážáŸ’ងៃážáŸ‚';//'Date';
+$lang['img_fname']   = 'ឈ្មោះឯកសារ';
+$lang['img_fsize']   = 'ទំហំ';//'Size';
+$lang['img_artist']  = 'អ្នកážážážšáž¼áž”';
+$lang['img_copyr']   = 'រក្សា​សិទ្ធិ';
+$lang['img_format']  = 'ធុនប្រភáŸáž‘';
+$lang['img_camera']  = 'គ្រឿងážáž';
+$lang['img_keywords']= 'មáŸáž–ាក្ស';//'Keywords';
+
+$lang['subscribe_success']  = ' ដកážáŸ‚ម %s ចូលបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['subscribe_error']    = 'មានកំហុសពáŸáž›áž”ន្ážáŸ‚ម %s ចូលបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['subscribe_noaddress']= 'ឥážáž˜áž¶áž“អាសយដ្ឋាន អ្នកមិនអាចកážáŸ‹áž…ុល';
+$lang['unsubscribe_success']= 'ដក %s áž…áŸáž‰áž–ីបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['unsubscribe_error']  = 'មានកំហុសពáŸáž›ážŠáž€ %s​  áž…áŸáž‰áž–ីបញ្ជីបរិវិសកមចំពោះ %s';
+
+/* auth.class language support */
+$lang['authmodfailed']   = 'និនផ្ទៀងផ្ទាážáŸ‹â€‹áž—ាព​​ážáŸ’រឹមážáŸ’រូវបានទáŸáŸ” សុំទាកទងអ្នកក្របគ្រោង។';
+$lang['authtempfail']    = 'ការផ្ទៀងផ្ទាážáŸ‹â€‹áž—ាព​​ážáŸ’រឹមážáŸ’រូវឥážážŠáŸ†áž“áŸáŸ” ប្រើ ....';
+
+/* installer strings */
+$lang['i_chooselang'] = 'រើសពាស្សាអ្នក';
+$lang['i_installer']  = 'ដំឡើងឌោគូវីគី';
+$lang['i_wikiname']   = 'នាមវីគី';
+$lang['i_enableacl']  = 'បើកប្រើ (អនុសាស)';
+$lang['i_superuser']  = 'អ្នកកំពូល';
+$lang['i_problems']   = 'កម្មវិធី​ដំឡើងបានប៉ះឧបសគ្គ។ អ្នកមិនអាចបន្ážáž‘ៅទៀហដល់អ្នកជួសជុលវា។';
+$lang['i_modified']   = '';
+$lang['i_funcna']     = '%s ';
+$lang['i_phpver']     = 'PHP ប្រវážáŸ‹áž›áŸáž%s ជា';
+$lang['i_permfail']   = '%s មិនអាចសាស';
+$lang['i_confexists'] = '%s មានហាយ';
+$lang['i_writeerr']   = 'មិនអាចបណ្កើ%s។ អ្នកážáŸ’រវការពិនិážáŸ’យអធិក្រឹážáž·ážšáž”ស់ážážáž“ឹងឯកសារ។';
+$lang['i_badhash']    = '(hash=%s)';
+$lang['i_badval']     = '%s—';
+$lang['i_success']    = '';
+$lang['i_failure']    = 'ពលសាសារ';
+$lang['i_policy']     = 'បញ្ជីអនុញ្ញážáž•áŸ’ដើម';
+$lang['i_pol0']       = 'វីគីបើកចំហ';
+$lang['i_pol1']       = 'វីគីសធារណៈ';
+$lang['i_pol2']       = 'វីគីបិទជិáž';
+
+$lang['i_retry']      = 'ម្ážáž„ទៀáž';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/lang/km/login.txt dokuwiki-rc2009-12-02/inc/lang/km/login.txt
--- dokuwiki-2009-02-14/inc/lang/km/login.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== កážáŸ‹áž…ូល ======
+
+អ្នកមិនទាន់។
+អ្នកážáŸ’រូវការអនុញ្ញាឲ្យកážáŸ‹ážáž“ំបានចូល។
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/newpage.txt dokuwiki-rc2009-12-02/inc/lang/km/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/km/newpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== ឥážáž‘ានមានទ០======
+អ្នកážáž¶áž˜ážáŸ’រសៃážáŸ’សែដែលគ្មានទំពáŸážšáŸ”
+បើ
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/norev.txt dokuwiki-rc2009-12-02/inc/lang/km/norev.txt
--- dokuwiki-2009-02-14/inc/lang/km/norev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+====== ឥážáž˜áž¶áž“បុនរាព្រឹážáŸ’ážáž·áž‘០======
+បុនរាព្រឹážáŸ’ážáž·áž–ុំមានទáŸáŸ” សុំប្រើ «ទំពáŸážšáž…ាស់ៗ» ទៅមើលបញ្ជីប្រវážáŸ’ážáž‘ំពáŸážšáž…ាស់រូបស់អážáŸ’ážáž”áž‘áž“áŸáŸ‡áŸ”
diff -Naur dokuwiki-2009-02-14/inc/lang/km/password.txt dokuwiki-rc2009-12-02/inc/lang/km/password.txt
--- dokuwiki-2009-02-14/inc/lang/km/password.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,10 @@
+សួរស្ដី @FULLNAME@!
+
+áž“áŸáŸ‡áž‡áž¶áž”ញ្ជីប្រើប្រះរុបស @TITLE@ នៅ @DOKUWIKIURL@
+
+នាមបង្រើ៖  @LOGIN@
+ពាក្សសម្ងាážáŸ– @PASSWORD@
+
+-- 
+អ៊ីមáŸáž›áž“áŸáŸ‡áž”ន្ចáŸáž¢áž–ីឌោគូវីគីនៅ
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/km/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/km/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/km/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,13 @@
+សួស្ដី @FULLNAME@!
+
+មានគáŸážŸáž»áž˜ážŸáŸ’នើពាក្យ​សម្ងាážáŸ‹â€‹ážšáž»áž”សឲ្យ@TITLE@ នៅ @DOKUWIKIURL@។
+បើអ្នកមិនជាអ្នកសុមពាក្យ​សម្ងាážáŸ‹áž‘០សុំបស់ចល់អ៊ីមáŸáž›áž“áŸáŸ‡áŸ”
+
+
+សុំអះអាងដែលសំណើនáŸáŸ‡ážŠáŸ„យទៅážáž¶áž˜ážáŸ’សែ
+
+@CONFIRM@
+
+-- 
+អ៊ីមáŸáž›áž“áŸáŸ‡áž”ង្កើážáž–ីឌក្គូវីគីនៅ
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/km/recent.txt dokuwiki-rc2009-12-02/inc/lang/km/recent.txt
--- dokuwiki-2009-02-14/inc/lang/km/recent.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ប្រវážáŸ’ážáž·áž‘ំពáŸážšáž”ច្ចុប្បន្ន ======
+ទំពáŸážšáž‘ាំងនáŸáŸ‡áž‚ឺទំពáŸážšáž€áŸ‚ប្រែ
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/register.txt dokuwiki-rc2009-12-02/inc/lang/km/register.txt
--- dokuwiki-2009-02-14/inc/lang/km/register.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,7 @@
+====== អ្នកប្រើážáŸ’មី ======
+
+Fill in all the information below to create a new account in this wiki.
+Make sure you supply a **valid e-mail address** - if you are not asked
+to enter a password here, a new one will be sent to that address.
+The login name should be a valid [[doku>wiki:pagename|pagename]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/km/revisions.txt dokuwiki-rc2009-12-02/inc/lang/km/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/km/revisions.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/km/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== ប្រវážáŸ’ážáž·áž‘ំពáŸážšáž…ាស់ ======
+ទាំងនáŸáŸ‡áž‚ឺប្រវážáŸ’ážáž·áž‘ំពáŸážšáž…ាស់រុបសអážáŸ’ážáž”áž‘áž“áŸáŸ‡áŸ”
+ជ្រើសážáŸ’សែទំពáŸážšáž–ីážáž¶áž„ក្រោមហើយ ចុហ«កែទំពáŸážšáž“áŸáŸ‡Â» រួចហើយរក្សាវាទុក។
+
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/denied.txt dokuwiki-rc2009-12-02/inc/lang/ko/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ko/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======권한 거절======
+====== 권한 거절 ======
 
 계ì†í•  수 있는 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤. 로그ì¸í•˜ì‹­ì‹œì˜¤.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/diff.txt dokuwiki-rc2009-12-02/inc/lang/ko/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ko/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======ì°¨ì´ì ======
+====== ì°¨ì´ì  ======
 
 ì´ íŽ˜ì´ì§€ì˜ ì„ íƒí•œ ì´ì „ 버전과 현재 버전 사ì´ì˜ ì°¨ì´ì ì„ ë³´ì—¬ì¤ë‹ˆë‹¤.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/lang.php dokuwiki-rc2009-12-02/inc/lang/ko/lang.php
--- dokuwiki-2009-02-14/inc/lang/ko/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -147,7 +147,6 @@
 $lang['mail_changed']          = '페ì´ì§€ 변경:';
 $lang['mail_new_user']         = '새로운 사용ìž:';
 $lang['mail_upload']           = 'íŒŒì¼ ì²¨ë¶€:';
-$lang['qb_alert']              = 'í¬ë§·í•˜ë ¤ëŠ” í…스트를 ì„ íƒí•˜ì„¸ìš”.\n문서 맨 ëì— ì¶”ê°€ë©ë‹ˆë‹¤.';
 $lang['qb_bold']               = 'êµµì€ ê¸€';
 $lang['qb_italic']             = 'ì´íƒ¤ë¦­ì²´ 글';
 $lang['qb_underl']             = '밑줄 그어진 글';
@@ -167,7 +166,7 @@
 $lang['qb_sig']                = '서명 추가';
 $lang['qb_smileys']            = 'ì´ëª¨í‹°ì½˜';
 $lang['qb_chars']              = '특수문ìž';
-$lang['del_confirm']           = 'ì •ë§ë¡œ ì„ íƒëœ 항목(들)ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?';
+$lang['js']['del_confirm']           = 'ì •ë§ë¡œ ì„ íƒëœ 항목(들)ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?';
 $lang['admin_register']        = '새로운 ì‚¬ìš©ìž ì¶”ê°€';
 $lang['metaedit']              = '메타 ë°ì´íƒ€ë¥¼ 편집합니다.';
 $lang['metasaveerr']           = '메타 ë°ì´íƒ€ 쓰기가 실패했습니다.';
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ko/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ko/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======ì´ í† í”½ì€ ì•„ì§ ì—†ìŠµë‹ˆë‹¤======
+====== ì´ í† í”½ì€ ì•„ì§ ì—†ìŠµë‹ˆë‹¤ ======
 
-ì•„ì§ ì—†ëŠ” 토픽 ë§í¬ë¥¼ ë”°ë¼ì˜¤ì…¨ìŠµë‹ˆë‹¤. **페ì´ì§€ 만들기** ë²„íŠ¼ì„ ì´ìš©í•˜ì—¬ 새로 만들 수 있습니다. 
+ì•„ì§ ì—†ëŠ” 토픽 ë§í¬ë¥¼ ë”°ë¼ì˜¤ì…¨ìŠµë‹ˆë‹¤. **페ì´ì§€ 만들기** ë²„íŠ¼ì„ ì´ìš©í•˜ì—¬ 새로 만들 수 있습니다.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/norev.txt dokuwiki-rc2009-12-02/inc/lang/ko/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ko/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======지정한 버전 ì—†ìŒ======
+====== 지정한 버전 ì—†ìŒ ======
 
 지정한 ë²„ì „ì´ ì—†ìŠµë‹ˆë‹¤. **과거 버전** ë²„íŠ¼ì„ ì‚¬ìš©í•˜ì—¬ ì´ ë¬¸ì„œì˜ ë²„ì „ 목ë¡ì„ 보십시오.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/password.txt dokuwiki-rc2009-12-02/inc/lang/ko/password.txt
--- dokuwiki-2009-02-14/inc/lang/ko/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -6,5 +6,5 @@
 패스워드 : @PASSWORD@
 
 -- 
-ì´ ì´ë©”ì¼ì€ @DOKUWIKIURL@ ì˜ DokuWiki ê°€ 
+ì´ ì´ë©”ì¼ì€ @DOKUWIKIURL@ ì˜ DokuWiki ê°€
 ìƒì„±í•œ 것입니다.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/preview.txt dokuwiki-rc2009-12-02/inc/lang/ko/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ko/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======미리보기======
+====== 미리보기 ======
 
 ì´ê²ƒì€ 입력하신 ë‚´ìš©ì´ ì–´ë–»ê²Œ ë³´ì¼ì§€ 미리보기하는 곳입니다.  ì•„ì§ì€ **저장ë˜ì§€ 않았다**는 ì ì„ 기억하십시오.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ko/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ko/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -6,6 +6,6 @@
 
 @CONFIRM@ì—ì„œ ì •ë§ë¡œ 본ì¸ì´ 그런 ìš”ì²­ì„ í–ˆì—ˆëŠ”ì§€ 확ì¸í•´ 보기 ë°”ëžë‹ˆë‹¤.
 
---
+-- 
 
 @DOKUWIKIURL@ì˜ DokuWikiê°€ ìžë™ìœ¼ë¡œ 만들어낸 ë©”ì¼ìž…니다.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/recent.txt dokuwiki-rc2009-12-02/inc/lang/ko/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ko/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======최근 변경======
+====== 최근 변경 ======
 
 ì•„ëž˜ì˜ íŽ˜ì´ì§€ëŠ” ìµœê·¼ì— ë³€ê²½ëœ ê²ƒìž…ë‹ˆë‹¤.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/registermail.txt dokuwiki-rc2009-12-02/inc/lang/ko/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/ko/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 IP주소         : @IPADDRESS@
 호스트 ì´ë¦„     : @HOSTNAME@
 
---
+-- 
 
 @DOKUWIKIURL@ì˜ DokuWikiê°€ ìžë™ìœ¼ë¡œ 만들어낸 ë©”ì¼ìž…니다.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ko/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ko/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======ì´ì „ 버전======
+====== ì´ì „ 버전 ======
 
 ì´ ë¬¸ì„œì˜ ì˜›ë‚  ë²„ì „ì€ ë‹¤ìŒê³¼ 같습니다. ì´ì „ 버전으로 ëŒì•„가려면, 아래ì—ì„œ ì„ íƒí•œ 다ìŒ, **페ì´ì§€ 편집**ì„ í´ë¦­í•œ 아후 저장하십시오.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ko/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ko/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======찾기======
+====== 찾기 ======
 
 찾기 결과를 아래ì—ì„œ ë³¼ 수 있습니다. ë§Œì¼ ì›í•˜ëŠ” ê²ƒì„ ì°¾ì§€ 못하였다면, **페ì´ì§€ 편집** ë²„íŠ¼ì„ ì´ìš©í•˜ì—¬ ì§ˆì˜ ë‚´ìš©ê³¼ ê°™ì€ ì´ë¦„ì˜ íŽ˜ì´ì§€ë¥¼ 만들 수 있습니다.
 
-=====ê²°ê³¼=====
+===== ê²°ê³¼ =====
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/ko/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/ko/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 # 색ì¸ì´ 만들어 지지 않는 단어 목ë¡ìž…니다.(í•œì¤„ì— í•œë‹¨ì–´)
-# ì´ íŒŒì¼ì„ 편집한다면 UNIX줄 종료문ìžë¥¼ 사용해야합니다.(ë‹¨ì¼ ê°œí–‰ë¬¸ìž) 
+# ì´ íŒŒì¼ì„ 편집한다면 UNIX줄 종료문ìžë¥¼ 사용해야합니다.(ë‹¨ì¼ ê°œí–‰ë¬¸ìž)
 # 3문ìžì´í•˜ 단어는 ìžë™ìœ¼ë¡œ 무시ë˜ë¯€ë¡œ 3문ìžë³´ë‹¤ ì§§ì€ ë‹¨ì–´ëŠ” í¬í•¨ì‹œí‚¬ 필요가 없습니다.
 # http://www.ranks.nl/stopwords/ì„ ê¸°ì¤€ìœ¼ë¡œ 만들어진 목ë¡ìž…니다.
 about
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ko/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ko/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,6 @@
 @DOKUWIKIURL@ì˜ ì´ íŽ˜ì´ì§€ 구ë…ì‹ ì²­ì„ í•´ì§€í•˜ë ¤ë©´  @NEWPAGE@를 방문하여
 '구ë…ì‹ ì²­ 해지'를 ì„ íƒí•˜ì„¸ìš”.
 
---
+-- 
 
 @DOKUWIKIURL@ì˜ DokuWikiê°€ ìžë™ìœ¼ë¡œ 만들어낸 ë©”ì¼ìž…니다.
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ko/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ko/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-DokuWikiê°€ 파ì¼ì„ 업로드하였습니다. 
+DokuWikiê°€ 파ì¼ì„ 업로드하였습니다.
 
 ìžì„¸í•œ ì •ë³´:
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ko/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ko/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ko/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ko/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======스팸 차단======
+====== 스팸 차단 ======
 
 하나 í˜¹ì€ ê·¸ ì´ìƒì˜ ì°¨ë‹¨ëœ ë‹¨ì–´ê°€ í¬í•¨ë˜ì–´ 있으므로 변경 ë‚´ìš©ì´ ì €ìž¥ë˜ì§€ **않았습니다.** ë‚˜ìœ ë¡œë´‡ 같으니! 스팸ì´ë‚˜ 추가하려 하고! ë§Œì¼ ë¡œë´‡ì´ ì•„ë‹ˆë¼ ì‚¬ëžŒì´ê³ , 오류ë¼ê³  ìƒê°í•˜ì‹ ë‹¤ë©´, 관리ìžì—게 문ì˜í•˜ì‹­ì‹œì˜¤.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/ku/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/ku/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Girêdanên paş ======
 
-Di rûpelên di vê lîsteyê de girêdanên ji vê rûpelê re hene. 
+Di rûpelên di vê lîsteyê de girêdanên ji vê rûpelê re hene.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/conflict.txt dokuwiki-rc2009-12-02/inc/lang/ku/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/ku/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Guhertoyeke nûtir heye ======
 
-Guhertoyeke nûtir a belgeya ku tu biguherînî heye. Sedema wê, bikarhênerkê/î din di hema demê de belge diguherîne. 
+Guhertoyeke nûtir a belgeya ku tu biguherînî heye. Sedema wê, bikarhênerkê/î din di hema demê de belge diguherîne.
 
 Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/denied.txt dokuwiki-rc2009-12-02/inc/lang/ku/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ku/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Permission Denied======
+====== Permission Denied ======
 
 Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/diff.txt dokuwiki-rc2009-12-02/inc/lang/ku/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ku/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Cuyawazî======
+====== Cuyawazî ======
 
 Li vê derê cuyawaziyên nav revîziyona hilbijartî û verziyona aniha tên nîşan dan.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/lang.php dokuwiki-rc2009-12-02/inc/lang/ku/lang.php
--- dokuwiki-2009-02-14/inc/lang/ku/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -103,7 +103,6 @@
 
 $lang['js']['nosmblinks'] = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
 
-$lang['qb_alert']   = 'Please enter the text you want to format.\nIt will be appended to the end of the document.';
 $lang['qb_bold']    = 'Bold Text';
 $lang['qb_italic']  = 'Italic Text';
 $lang['qb_underl']  = 'Underlined Text';
@@ -122,7 +121,7 @@
 $lang['qb_media']   = 'Add Images and other files';
 $lang['qb_sig']     = 'Insert Signature';
 
-$lang['del_confirm']= 'Delete this entry?';
+$lang['js']['del_confirm']= 'Delete this entry?';
 
 $lang['admin_acl']  = 'Access Control List Management...';
 $lang['admin_register']= 'Add new user...';
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ku/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ku/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Ev rûpel hîn nehat nivîsandin======
+====== Ev rûpel hîn nehat nivîsandin ======
 
 Rûpela tu hatî hîn nehat nivîsandin. Tu dikarî niha dest bi nivîsandina vê rûpelê bikî. Ji bo vê, ''Dest pê bike'' bitikîne.
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/norev.txt dokuwiki-rc2009-12-02/inc/lang/ku/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ku/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======No such revision======
+====== No such revision ======
 
 The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/preview.txt dokuwiki-rc2009-12-02/inc/lang/ku/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ku/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Pêşdîtin======
+====== Pêşdîtin ======
 
 Li vê derê tu dikarî bibîni ku nivîsa te dê çawa xuya bibe. Ji bîr neke: Hîn **nehat tomar kirin**!
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/recent.txt dokuwiki-rc2009-12-02/inc/lang/ku/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ku/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Guherandinên dawî======
+====== Guherandinên dawî ======
 
 Ev rûpel di dema nêzîk de hatin guherandin.
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ku/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ku/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Old Revisions======
+====== Old Revisions ======
 
 These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ku/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ku/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Lêbigere======
+====== Lêbigere ======
 
 Jêr encamên lêgerandina te tên nîşan dan. Heke tiştek nehatibe dîtin, tu dikarî dest bi nivîsandina rûpelekê nû bikî. Ji bo vê, ''Vê rûpelê biguherîne'' bitikîne.
 
-=====Encam=====
\ Brak znaku nowej linii na końcu pliku
+===== Encam =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ku/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ku/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ku/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ku/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM blocked======
+====== SPAM blocked ======
 
 Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/lang.php dokuwiki-rc2009-12-02/inc/lang/lt/lang.php
--- dokuwiki-2009-02-14/inc/lang/lt/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -3,181 +3,205 @@
  * lithuanian language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Linas Valiukas 
- * @author     Edmondas Girkantas 
- * @author     Arūnas Vaitekūnas 
+ * @author Linas Valiukas 
+ * @author Edmondas Girkantas 
+ * @author Arūnas Vaitekūnas 
+ * @author audrius.klevas@gmail.com
+ * @author Arunas Vaitekunas 
  */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-$lang['doublequoteopening']  = '„';//„
-$lang['doublequoteclosing']  = '“';//“
-$lang['singlequoteopening']  = '‚';//‚
-$lang['singlequoteclosing']  = '‘';//‘
-
-$lang['btn_edit']   = 'Redaguoti šį puslapį';
-$lang['btn_source'] = 'Parodyti puslapio kodÄ…';
-$lang['btn_show']   = 'Parodyti puslapį';
-$lang['btn_create'] = 'Sukurti šį puslapį';
-$lang['btn_search'] = 'Paieška';
-$lang['btn_save']   = 'IÅ¡saugoti';
-$lang['btn_preview']= 'Peržiūra';
-$lang['btn_top']    = 'Į viršų';
-$lang['btn_newer']  = '<< naujesnÄ—';
-$lang['btn_older']  = 'senesnÄ— >>';
-$lang['btn_revs']   = 'Senos versijos';
-$lang['btn_recent'] = 'Naujausi keitimai';
-$lang['btn_upload'] = 'Atsiųsti bylą';
-$lang['btn_cancel'] = 'Atšaukti';
-$lang['btn_index']  = 'Indeksas';
-$lang['btn_secedit']= 'Redaguoti';
-$lang['btn_login']  = 'Prisijungti';
-$lang['btn_logout'] = 'Atsijungti';
-$lang['btn_admin']  = 'Administracija';
-$lang['btn_update'] = 'Atnaujinti';
-$lang['btn_delete'] = 'IÅ¡trinti';
-$lang['btn_back']   = 'Atgal';
-$lang['btn_backlink'] = 'AtgalinÄ—s nuorodos';
-$lang['btn_backtomedia'] = 'Atgal į Mediabylos išsirinkimą';
-$lang['btn_subscribe'] = 'Užsisakyti keitimų prenumeratą';
-$lang['btn_unsubscribe'] = 'Atsisakyti keitimų prenumeratos';
-$lang['btn_profile']     = 'Atnaujinti profilį';
-$lang['btn_reset']       = 'Atstata';
-$lang['btn_resendpwd']   = 'Išsiųsti naują slaptažodį';
-$lang['btn_draft']    = 'Redaguoti juodraštį';
-$lang['btn_recover']  = 'Atkurti juodraštį';
-$lang['btn_draftdel'] = 'Šalinti juodraštį';
-$lang['draftdate']  = 'Juodraštis automatiškai išsaugotas';
-
-$lang['loggedinas'] = 'Prisijungęs kaip';
-$lang['user']       = 'Vartotojo vardas';
-$lang['pass']       = 'Slaptažodis';
-$lang['newpass']    = 'Naujas slaptažodis';
-$lang['oldpass']    = 'Patvirtinti esamą slaptažodį';
-$lang['passchk']    = 'dar kartÄ…';
-$lang['remember']   = 'Prisiminti mane';
-$lang['fullname']   = 'Visas vardas';
-$lang['email']      = 'El. pašto adresas';
-$lang['register']   = 'Registruotis';
-$lang['profile']    = 'Vartotojo profilis';
-$lang['badlogin']   = 'Nurodėte blogą vartotojo vardą arba slaptažodį.';
-$lang['minoredit']  = 'Nedidelis pataisymas';
-
-$lang['regmissing'] = 'Turite užpildyti visus laukus.';
-$lang['reguexists'] = 'Vartotojas su pasirinktu prisijungimo vardu jau egzistuoja.';
-$lang['regsuccess'] = 'Vartotojas sukurtas, slaptažodis išsiųstas el. paštu.';
-$lang['regsuccess2']= 'Vartotojas sukurtas.';
-$lang['regmailfail']= 'SiunÄiant slaptažodį el. paÅ¡tu įvyko klaida - susisiekite su administracija!';
-$lang['regbadmail'] = 'Nurodytas el. pašto adresas yra neteisingas - jei manote, kad tai klaida, susisiekite su administracija';
-$lang['regbadpass'] = 'Įvesti slaptažodžiai nesutampa, bandykite dar kartą.';
-$lang['regpwmail']  = 'Jūsų DokuWiki slaptažodis';
-$lang['reghere']    = 'Dar neužsiregistravote? Padarykite tai dabar';
-
-$lang['profna']       = 'Ši vikisvetainė neleidžia pakeisti profilio';
-$lang['profnochange'] = 'Nėra pakeitimų, todėl nėra ką atlikti.';
-$lang['profnoempty']  = 'TuÅ¡Äias vardo arba el. paÅ¡to adreso laukas nÄ—ra leidžiamas.';
-$lang['profchanged']  = 'Vartotojo profilis sÄ—kmingai atnaujintas.';
-
-$lang['pwdforget'] = 'Pamiršote slaptažodį? Gaukite naują';
-$lang['resendna']  = 'Ši vikisvetainė neleidžia persiųsti slaptažodžių.';
-$lang['resendpwd'] = 'Atsiųsti naują slaptažodį';
-$lang['resendpwdmissing'] = 'Jūs turite užpildyti visus laukus.';
-$lang['resendpwdnouser']  = 'Tokio vartotojo nėra duomenų bazėje.';
-$lang['resendpwdsuccess'] = 'Jūsų naujas slaptažodis buvo išsiųstas el. paštu.';
-
-$lang['txt_upload']   = 'IÅ¡sirinkite atsiunÄiamÄ… bylÄ…';
-$lang['txt_filename'] = 'Įveskite wikivardą (nebūtina)';
-$lang['txt_overwrt']  = 'PerraÅ¡yti egzistuojanÄiÄ… bylÄ…';
-$lang['lockedby']     = 'Užrakintas vartotojo';
-$lang['lockexpire']   = 'Užraktas bus nuimtas';
-$lang['willexpire']   = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
-
-$lang['notsavedyet'] = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
-$lang['rssfailed']   = 'SiunÄiant šį feed\'Ä… įvyko klaida: ';
-$lang['nothingfound']= 'Paieškos rezultatų nėra.';
-
-$lang['mediaselect'] = 'Mediabylos išsirinkimas';
-$lang['fileupload']  = 'Mediabylos atsiuntimas';
-$lang['uploadsucc']  = 'Atsiuntimas pavyko';
-$lang['uploadfail']  = 'Atsiuntimas nepavyko. Blogi priÄ—jimo leidimai??';
-$lang['uploadwrong'] = 'Atsiuntimas atmestas. Bylos tipas neleistinas';
-$lang['uploadexist'] = 'Tokia byla jau egzistuoja. Veiksmai atšaukti.';
-$lang['deletesucc']  = 'Byla "%s" ištrinta.';
-$lang['deletefail']  = 'Byla "%s" negali būti ištrinta - patikrinkite leidimus.';
-$lang['mediainuse']  = 'Byla "%s" nebuvo ištrinta - ji vis dar naudojama.';
-$lang['namespaces']  = 'Pavadinimai';
-$lang['mediafiles']  = 'Prieinamos bylos';
-
-$lang['reference']   = 'PaminÄ—jimai';
-$lang['ref_inuse']   = 'Byla negali būti ištrinta, nes ji vis dar yra naudojama šiuose puslapiuose:';
-$lang['ref_hidden']  = 'Kai kurie paminėjimai yra puslapiuose, kurių jums neleista skaityti.';
-
-$lang['hits']       = 'Atidarymai';
-$lang['quickhits']  = 'Sutampantys pavadinimai';
-$lang['toc']        = 'Turinys';
-$lang['current']    = 'esamas';
-$lang['yours']      = 'Jūsų versija';
-$lang['diff']       = 'rodyti skirtumus tarp Å¡ios ir esamos versijos';
-$lang['line']       = 'Linija';
-$lang['breadcrumb'] = 'Kelias';
-$lang['youarehere'] = 'JÅ«s esate Äia';
-$lang['lastmod']    = 'Keista';
-$lang['by']         = 'vartotojo';
-$lang['deleted']    = 'ištrintas';
-$lang['created']    = 'sukurtas';
-$lang['restored']   = 'atstatyta sena versija';
-$lang['summary']    = 'Redaguoti santraukÄ…';
-
-$lang['mail_newpage'] = '[DokuWiki] puslapis pridÄ—tas:';
-$lang['mail_changed'] = '[DokuWiki] puslapis pakeistas:';
-
-$lang['js']['nosmblinks'] = "Nurodos į \"Windows shares\" veikia tik su Microsoft Internet Explorer naršykle.\nVis dėlto, jūs galite nukopijuoti šią nuorodą.";
-
-$lang['qb_alert']   = 'Ä®veskite formatuojamÄ… tekstÄ….\nJis bus pridÄ—tas dokumento apaÄioje.';
-$lang['qb_bold']    = 'Pusjuodis';
-$lang['qb_italic']  = 'Kursyvas';
-$lang['qb_underl']  = 'Pabrauktas';
-$lang['qb_code']    = 'Kodas';
-$lang['qb_strike']  = 'Perbraukta';
-$lang['qb_h1']      = 'Pirmo lygio antraštė';
-$lang['qb_h2']      = 'Antro lygio antraštė';
-$lang['qb_h3']      = 'TreÄio lygio antraÅ¡tÄ—';
-$lang['qb_h4']      = 'Ketvirto lygio antraštė';
-$lang['qb_h5']      = 'Penkto lygio antraštė';
-$lang['qb_link']    = 'VidinÄ— nuoroda';
-$lang['qb_extlink'] = 'IÅ¡orinÄ— nuoroda';
-$lang['qb_hr']      = 'Horizontali linija';
-$lang['qb_ol']      = 'Numeruotas sąrašas';
-$lang['qb_ul']      = 'Nenumetuotas sąrašas';
-$lang['qb_media']   = 'PaveikslÄ—liai ir kitos bylos';
-$lang['qb_sig']     = 'Įterpti parašą';
-$lang['qb_smileys'] = 'Å ypsenÄ—lÄ—s';
-$lang['qb_chars']   = 'Specialūs simboliai';
-
-$lang['del_confirm']= 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
-$lang['admin_register']= 'Sukurti naujÄ… vartotojÄ…';
-
-$lang['metaedit'] = 'Redaguoti metaduomenis';
-$lang['metasaveerr'] = 'Nepavyko išsaugoti metaduomenų';
-$lang['metasaveok'] = 'Metaduomenys išsaugoti';
-$lang['img_backto'] = 'Atgal į';
-$lang['img_title'] = 'Pavadinimas';
-$lang['img_caption'] = 'Antraštė';
-$lang['img_date'] = 'Data';
-$lang['img_fname'] = 'Bylos pavadinimas';
-$lang['img_fsize'] = 'Dydis';
-$lang['img_artist'] = 'Fotografas';
-$lang['img_copyr'] = 'AutorinÄ—s teisÄ—s';
-$lang['img_format'] = 'Formatas';
-$lang['img_camera'] = 'Kamera';
-$lang['img_keywords'] = 'Raktiniai žodžiai';
-
-$lang['subscribe_success']  = '%s užsakyta "%s" prenumerata';
-$lang['subscribe_error']    = '%s užsakant "%s" prenumeratą įvyko klaida';
-$lang['subscribe_noaddress']= 'Jūs nesatė nurodęs el. pašto adreso, todėl negalima Jums užsakyti prenumeratos';
-$lang['unsubscribe_success']= '%s ištrintas iš "%s" prenumeratos';
-$lang['unsubscribe_error']  = '%s trinant iš "%s" prenumeratos įvyko klaida';
-
-$lang['authmodfailed']   = 'Bloga vartotojo tapatumo nustatymo konfigūracija. Praneškite apie tai savo administratoriui.';
-$lang['authtempfail']    = 'Vartotojo tapatumo nustatymas laikinai nepasiekiamas. Jei ši situacija kartojasi, tai praneškite savo administratoriui.';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Redaguoti šį puslapį';
+$lang['btn_source']            = 'Parodyti puslapio kodÄ…';
+$lang['btn_show']              = 'Parodyti puslapį';
+$lang['btn_create']            = 'Sukurti šį puslapį';
+$lang['btn_search']            = 'Paieška';
+$lang['btn_save']              = 'IÅ¡saugoti';
+$lang['btn_preview']           = 'Peržiūra';
+$lang['btn_top']               = 'Į viršų';
+$lang['btn_newer']             = '<< naujesnÄ—';
+$lang['btn_older']             = 'senesnÄ— >>';
+$lang['btn_revs']              = 'Senos versijos';
+$lang['btn_recent']            = 'Naujausi keitimai';
+$lang['btn_upload']            = 'Atsiųsti bylą';
+$lang['btn_cancel']            = 'Atšaukti';
+$lang['btn_index']             = 'Indeksas';
+$lang['btn_secedit']           = 'Redaguoti';
+$lang['btn_login']             = 'Prisijungti';
+$lang['btn_logout']            = 'Atsijungti';
+$lang['btn_admin']             = 'Administracija';
+$lang['btn_update']            = 'Atnaujinti';
+$lang['btn_delete']            = 'IÅ¡trinti';
+$lang['btn_back']              = 'Atgal';
+$lang['btn_backlink']          = 'AtgalinÄ—s nuorodos';
+$lang['btn_backtomedia']       = 'Atgal į Mediabylos išsirinkimą';
+$lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
+$lang['btn_unsubscribe']       = 'Atsisakyti keitimų prenumeratos';
+$lang['btn_subscribens']       = 'Užsakyti vardų srities prenumeratą';
+$lang['btn_unsubscribens']     = 'Atsisakyti vardų srities prenumeratos';
+$lang['btn_profile']           = 'Atnaujinti profilį';
+$lang['btn_reset']             = 'Atstata';
+$lang['btn_resendpwd']         = 'Išsiųsti naują slaptažodį';
+$lang['btn_draft']             = 'Redaguoti juodraštį';
+$lang['btn_recover']           = 'Atkurti juodraštį';
+$lang['btn_draftdel']          = 'Šalinti juodraštį';
+$lang['loggedinas']            = 'Prisijungęs kaip';
+$lang['user']                  = 'Vartotojo vardas';
+$lang['pass']                  = 'Slaptažodis';
+$lang['newpass']               = 'Naujas slaptažodis';
+$lang['oldpass']               = 'Patvirtinti esamą slaptažodį';
+$lang['passchk']               = 'dar kartÄ…';
+$lang['remember']              = 'Prisiminti mane';
+$lang['fullname']              = 'Visas vardas';
+$lang['email']                 = 'El. pašto adresas';
+$lang['register']              = 'Registruotis';
+$lang['profile']               = 'Vartotojo profilis';
+$lang['badlogin']              = 'Nurodėte blogą vartotojo vardą arba slaptažodį.';
+$lang['minoredit']             = 'Nedidelis pataisymas';
+$lang['draftdate']             = 'Juodraštis automatiškai išsaugotas';
+$lang['nosecedit']             = 'Puslapis buvo kažkieno pataisytas, teksto dalies informacija tapo pasenusi, todėl pakrautas visas puslapis.';
+$lang['regmissing']            = 'Turite užpildyti visus laukus.';
+$lang['reguexists']            = 'Vartotojas su pasirinktu prisijungimo vardu jau egzistuoja.';
+$lang['regsuccess']            = 'Vartotojas sukurtas, slaptažodis išsiųstas el. paštu.';
+$lang['regsuccess2']           = 'Vartotojas sukurtas.';
+$lang['regmailfail']           = 'SiunÄiant slaptažodį el. paÅ¡tu įvyko klaida - susisiekite su administracija!';
+$lang['regbadmail']            = 'Nurodytas el. pašto adresas yra neteisingas - jei manote, kad tai klaida, susisiekite su administracija';
+$lang['regbadpass']            = 'Įvesti slaptažodžiai nesutampa, bandykite dar kartą.';
+$lang['regpwmail']             = 'Jūsų DokuWiki slaptažodis';
+$lang['reghere']               = 'Dar neužsiregistravote? Padarykite tai dabar';
+$lang['profna']                = 'Ši vikisvetainė neleidžia pakeisti profilio';
+$lang['profnochange']          = 'Nėra pakeitimų, todėl nėra ką atlikti.';
+$lang['profnoempty']           = 'TuÅ¡Äias vardo arba el. paÅ¡to adreso laukas nÄ—ra leidžiamas.';
+$lang['profchanged']           = 'Vartotojo profilis sÄ—kmingai atnaujintas.';
+$lang['pwdforget']             = 'Pamiršote slaptažodį? Gaukite naują';
+$lang['resendna']              = 'Ši vikisvetainė neleidžia persiųsti slaptažodžių.';
+$lang['resendpwd']             = 'Atsiųsti naują slaptažodį';
+$lang['resendpwdmissing']      = 'Jūs turite užpildyti visus laukus.';
+$lang['resendpwdnouser']       = 'Tokio vartotojo nėra duomenų bazėje.';
+$lang['resendpwdbadauth']      = 'Atsiprašome, bet šis tapatybės nustatymo kodas netinkamas. Įsitikinkite, kad panaudojote pilną patvirtinimo nuorodą.';
+$lang['resendpwdconfirm']      = 'Patvirtinimo nuoroda išsiųsta el. paštu.';
+$lang['resendpwdsuccess']      = 'Jūsų naujas slaptažodis buvo išsiųstas el. paštu.';
+$lang['license']               = 'Jei nenurodyta kitaip, Å¡io wiki turinys ginamas tokia licencija:';
+$lang['licenseok']             = 'Pastaba: Redaguodami šį puslapį jūs sutinkate jog jūsų turinys atitinka licencijavima pagal šią licenciją';
+$lang['txt_upload']            = 'IÅ¡sirinkite atsiunÄiamÄ… bylÄ…';
+$lang['txt_filename']          = 'Įveskite wikivardą (nebūtina)';
+$lang['txt_overwrt']           = 'PerraÅ¡yti egzistuojanÄiÄ… bylÄ…';
+$lang['lockedby']              = 'Užrakintas vartotojo';
+$lang['lockexpire']            = 'Užraktas bus nuimtas';
+$lang['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
+$lang['notsavedyet']           = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
+$lang['rssfailed']             = 'SiunÄiant šį feed\'Ä… įvyko klaida: ';
+$lang['nothingfound']          = 'Paieškos rezultatų nėra.';
+$lang['mediaselect']           = 'Mediabylos išsirinkimas';
+$lang['fileupload']            = 'Mediabylos atsiuntimas';
+$lang['uploadsucc']            = 'Atsiuntimas pavyko';
+$lang['uploadfail']            = 'Atsiuntimas nepavyko. Blogi priÄ—jimo leidimai??';
+$lang['uploadwrong']           = 'Atsiuntimas atmestas. Bylos tipas neleistinas';
+$lang['uploadexist']           = 'Tokia byla jau egzistuoja. Veiksmai atšaukti.';
+$lang['uploadbadcontent']      = 'Įkeltas turinys neatitinka %s failo išplėtimo.';
+$lang['uploadspam']            = 'Įkėlimas blokuotas pagal šiukšlintojų juodajį šąrašą.';
+$lang['uploadxss']             = 'Ä®kÄ—limas blokuotas greiÄiausiai dÄ—l netinkamo teksto.';
+$lang['uploadsize']            = 'Įkeltas failas per didelis (maks. %s)';
+$lang['deletesucc']            = 'Byla "%s" ištrinta.';
+$lang['deletefail']            = 'Byla "%s" negali būti ištrinta - patikrinkite leidimus.';
+$lang['mediainuse']            = 'Byla "%s" nebuvo ištrinta - ji vis dar naudojama.';
+$lang['namespaces']            = 'Pavadinimai';
+$lang['mediafiles']            = 'Prieinamos bylos';
+$lang['js']['keepopen']        = 'Pažymėjus palikti langą atvertą';
+$lang['js']['hidedetails']     = 'PaslÄ—pti Detales';
+$lang['js']['nosmblinks']      = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle.
+Vis dėlto, jūs galite nukopijuoti šią nuorodą.';
+$lang['js']['mu_btn']          = 'Pateikite kelis failus vienu ypu';
+$lang['mediausage']            = 'Failo nuorodai užrašyti naudokite tokią sintaksę:';
+$lang['mediaview']             = 'Žiūrėti pirminį failą';
+$lang['mediaroot']             = 'pradžia (root)';
+$lang['mediaextchange']        = 'Failo galūnė pasikeitė iš .%s į .%s!';
+$lang['reference']             = 'PaminÄ—jimai';
+$lang['ref_inuse']             = 'Byla negali būti ištrinta, nes ji vis dar yra naudojama šiuose puslapiuose:';
+$lang['ref_hidden']            = 'Kai kurie paminėjimai yra puslapiuose, kurių jums neleista skaityti.';
+$lang['hits']                  = 'Atidarymai';
+$lang['quickhits']             = 'Sutampantys pavadinimai';
+$lang['toc']                   = 'Turinys';
+$lang['current']               = 'esamas';
+$lang['yours']                 = 'Jūsų versija';
+$lang['diff']                  = 'rodyti skirtumus tarp Å¡ios ir esamos versijos';
+$lang['diff2']                 = 'Parodyti skirtumus tarp pasirinktų versijų';
+$lang['line']                  = 'Linija';
+$lang['breadcrumb']            = 'Kelias';
+$lang['youarehere']            = 'JÅ«s esate Äia';
+$lang['lastmod']               = 'Keista';
+$lang['by']                    = 'vartotojo';
+$lang['deleted']               = 'ištrintas';
+$lang['created']               = 'sukurtas';
+$lang['restored']              = 'atstatyta sena versija';
+$lang['external_edit']         = 'redaguoti papildomomis priemonÄ—mis';
+$lang['summary']               = 'Redaguoti santraukÄ…';
+$lang['noflash']               = 'Adobe Flash Plugin reikalingas šios medžiagos peržiūrai.';
+$lang['mail_newpage']          = '[DokuWiki] puslapis pridÄ—tas:';
+$lang['mail_changed']          = '[DokuWiki] puslapis pakeistas:';
+$lang['mail_new_user']         = 'naujas vartotojas:';
+$lang['mail_upload']           = 'failas įkeltas:';
+$lang['qb_bold']               = 'Pusjuodis';
+$lang['qb_italic']             = 'Kursyvas';
+$lang['qb_underl']             = 'Pabrauktas';
+$lang['qb_code']               = 'Kodas';
+$lang['qb_strike']             = 'Perbraukta';
+$lang['qb_h1']                 = 'Pirmo lygio antraštė';
+$lang['qb_h2']                 = 'Antro lygio antraštė';
+$lang['qb_h3']                 = 'TreÄio lygio antraÅ¡tÄ—';
+$lang['qb_h4']                 = 'Ketvirto lygio antraštė';
+$lang['qb_h5']                 = 'Penkto lygio antraštė';
+$lang['qb_link']               = 'VidinÄ— nuoroda';
+$lang['qb_extlink']            = 'IÅ¡orinÄ— nuoroda';
+$lang['qb_hr']                 = 'Horizontali linija';
+$lang['qb_ol']                 = 'Numeruotas sąrašas';
+$lang['qb_ul']                 = 'Nenumetuotas sąrašas';
+$lang['qb_media']              = 'PaveikslÄ—liai ir kitos bylos';
+$lang['qb_sig']                = 'Įterpti parašą';
+$lang['qb_smileys']            = 'Å ypsenÄ—lÄ—s';
+$lang['qb_chars']              = 'Specialūs simboliai';
+$lang['js']['del_confirm']           = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
+$lang['admin_register']        = 'Sukurti naujÄ… vartotojÄ…';
+$lang['metaedit']              = 'Redaguoti metaduomenis';
+$lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
+$lang['metasaveok']            = 'Metaduomenys išsaugoti';
+$lang['img_backto']            = 'Atgal į';
+$lang['img_title']             = 'Pavadinimas';
+$lang['img_caption']           = 'Antraštė';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Bylos pavadinimas';
+$lang['img_fsize']             = 'Dydis';
+$lang['img_artist']            = 'Fotografas';
+$lang['img_copyr']             = 'AutorinÄ—s teisÄ—s';
+$lang['img_format']            = 'Formatas';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Raktiniai žodžiai';
+$lang['subscribe_success']     = '%s užsakyta "%s" prenumerata';
+$lang['subscribe_error']       = '%s užsakant "%s" prenumeratą įvyko klaida';
+$lang['subscribe_noaddress']   = 'Jūs nesatė nurodęs el. pašto adreso, todėl negalima Jums užsakyti prenumeratos';
+$lang['unsubscribe_success']   = '%s ištrintas iš "%s" prenumeratos';
+$lang['unsubscribe_error']     = '%s trinant iš "%s" prenumeratos įvyko klaida';
+$lang['authmodfailed']         = 'Bloga vartotojo tapatumo nustatymo konfigūracija. Praneškite apie tai savo administratoriui.';
+$lang['authtempfail']          = 'Vartotojo tapatumo nustatymas laikinai nepasiekiamas. Jei ši situacija kartojasi, tai praneškite savo administratoriui.';
+$lang['i_chooselang']          = 'Pasirinkite kalbÄ…';
+$lang['i_installer']           = 'DokuWiki Instaliatorius';
+$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['mu_gridname']           = 'Failo vardas';
+$lang['mu_gridsize']           = 'Dydis';
+$lang['mu_gridstat']           = 'Statusas';
+$lang['mu_namespace']          = 'Vardų sritis';
+$lang['mu_browse']             = 'Browse';
+$lang['mu_toobig']             = 'perdidelis';
+$lang['mu_ready']              = 'paruošta įkrovimui';
+$lang['mu_done']               = 'užbaigta';
+$lang['mu_fail']               = 'nepavyko';
+$lang['mu_authfail']           = 'sesija nutraukta';
+$lang['mu_filetypes']          = 'Leidžiami failų tipai';
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/newpage.txt dokuwiki-rc2009-12-02/inc/lang/lt/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/lt/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Å is puslapis dar neegzistuoja======
+====== Å is puslapis dar neegzistuoja ======
 
 Nuoroda, kurią jūs paspaudėte, atvedė į dar neegzistuojantį puslapį. Jūs galite jį sukurti paspausdami ''Sukurti šį puslapį'' mygtuką.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/norev.txt dokuwiki-rc2009-12-02/inc/lang/lt/norev.txt
--- dokuwiki-2009-02-14/inc/lang/lt/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Tokios versijos nÄ—ra======
+====== Tokios versijos nÄ—ra ======
 
 Nurodyta versija neegzistuoja. NorÄ—dami pamatyti visas dokumento versijas, paspauskite ''Senos versijos'' mygtukÄ…
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/preview.txt dokuwiki-rc2009-12-02/inc/lang/lt/preview.txt
--- dokuwiki-2009-02-14/inc/lang/lt/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Peržiūra======
+====== Peržiūra ======
 
 Čia matote, kaip atrodo jūsų pakeitimai. **Pakeitimai dar nėra išsaugoti!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/recent.txt dokuwiki-rc2009-12-02/inc/lang/lt/recent.txt
--- dokuwiki-2009-02-14/inc/lang/lt/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Naujausi keitimai======
+====== Naujausi keitimai ======
 
 Å ie puslapiai buvo neseniai pakeisti.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/revisions.txt dokuwiki-rc2009-12-02/inc/lang/lt/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/lt/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Senos versijos======
+====== Senos versijos ======
 
 Čia matote senas šio dokumento versijas. Jei norite atstatyti dokumentą į jo senesniąją versiją, paspauskite "Redaguoti šį puslapį" prie norimos versijos ir išsaugokite ją.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/lt/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/lt/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Paieška======
+====== Paieška ======
 
 Žemiau matote Jūsų atliktos paieškos rezultatus. Jeigu neradote to, ko ieškojote, galite sukurti naują puslapį šiuo pavadinimu paspausdami "Redaguoti šį puslapį".
 
-=====Rezultatai=====
\ Brak znaku nowej linii na końcu pliku
+===== Rezultatai =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/lt/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/lt/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/lt/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lt/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======NESPAM'INK!======
+====== NESPAM'INK! ======
 
 JÅ«sų pakeitimai **nebuvo iÅ¡saugoti**, nes juose rasta vienas ar daugiau užblokuotų žodžių. Jeigu manote, kad tai klaida, susisiekite su administracija. Jeigu sugalvojote Äia spam'inti - pyzdink nachui iÅ¡ Äia, byby bled!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/lv/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/lv/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Papildu moduļi =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/denied.txt dokuwiki-rc2009-12-02/inc/lang/lv/denied.txt
--- dokuwiki-2009-02-14/inc/lang/lv/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Piekļuve aizliegta======
+====== Piekļuve aizliegta ======
 
 Atvaino, tev nav tiesÄ«bu turpinÄt. VarbÅ«t aizmirsi ielogoties?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/diff.txt dokuwiki-rc2009-12-02/inc/lang/lv/diff.txt
--- dokuwiki-2009-02-14/inc/lang/lv/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Atšķirības======
+====== Atšķirības ======
 
 NorÄdÄ«tais vecais variants no patreizÄ“jÄs lapas atÅ¡Ä·iras ar:
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/lang.php dokuwiki-rc2009-12-02/inc/lang/lv/lang.php
--- dokuwiki-2009-02-14/inc/lang/lv/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -46,6 +46,7 @@
 $lang['btn_draft']             = 'Labot melnrakstu';
 $lang['btn_recover']           = 'Atjaunot melnrakstu';
 $lang['btn_draftdel']          = 'Dzēst melnrakstu';
+$lang['btn_revert']            = 'Atjaunot';
 $lang['loggedinas']            = 'Pieteicies kÄ';
 $lang['user']                  = 'LietotÄjvÄrds';
 $lang['pass']                  = 'Parole';
@@ -67,7 +68,7 @@
 $lang['regsuccess2']           = 'LietotÄjs izveidots.';
 $lang['regmailfail']           = 'Šķiet, ka ir problēmas nosūtīt pastu. Lūdzu sazinies ar administratoru!';
 $lang['regbadmail']            = 'UzdotÄ epasta adrese izskatÄs aplama. Ja tas nav tiesa, sazinies ar administratoru.';
-$lang['regbadpass']            = 'Abas ierakstÄ«tÄs paroles nav vienÄdas, lÅ«duz atkÄrto.';
+$lang['regbadpass']            = 'Abas ierakstÄ«tÄs paroles nav vienÄdas, lÅ«dzu atkÄrto.';
 $lang['regpwmail']             = 'Tava DokuWiki parole';
 $lang['reghere']               = 'Tev vēl nav sava konta? Izveido!';
 $lang['profna']                = 'Labot profilu nav iespējams';
@@ -75,7 +76,7 @@
 $lang['profnoempty']           = 'Bez vÄrda vai e-pasta adreses nevar.';
 $lang['profchanged']           = 'Profils veiksmīgi izlabots.';
 $lang['pwdforget']             = 'Aizmirsi paroli? Saņem jaunu';
-$lang['resendna']              = 'Paroļu izsÄ«tÄ«Å¡anu nepiedÄvÄju.';
+$lang['resendna']              = 'Paroļu izsÅ«tÄ«Å¡anu nepiedÄvÄju.';
 $lang['resendpwd']             = 'NosÅ«tÄ«t jaunu paroli lietotÄjam';
 $lang['resendpwdmissing']      = 'Atvaino, jÄizpilda visas ailes.';
 $lang['resendpwdnouser']       = 'Atvaino, tÄda lietotÄja nav.';
@@ -84,8 +85,10 @@
 $lang['resendpwdsuccess']      = 'JaunÄ parole nosÅ«tÄ«ta pa e-pastu.';
 $lang['license']               = 'Ja nav norÄdÄ«ts citÄdi, viki saturs pieejams ar Å¡Ädas licenzes  noteikumiem:';
 $lang['licenseok']             = 'IevÄ“ro: Labojot lapu, tu piekrÄ«ti Å¡Ädiem licenzes noteikumiem.';
+$lang['searchmedia']           = 'MeklÄ“tais faila vÄrds: ';
+$lang['searchmedia_in']        = 'Meklēt iekš %s';
 $lang['txt_upload']            = 'NorÄdi augÅ¡upielÄdÄ“jamo failu';
-$lang['txt_filename']          = 'Ievadi wikivÄrdu (nav obligÄts)';
+$lang['txt_filename']          = 'Ievadi vikivÄrdu (nav obligÄts)';
 $lang['txt_overwrt']           = 'AizstÄt esoÅ¡o failu';
 $lang['lockedby']              = 'Patlaban bloÄ·Ä“jis ';
 $lang['lockexpire']            = 'BloÄ·Ä“jums beigsies ';
@@ -97,7 +100,7 @@
 $lang['fileupload']            = 'MÄ“diju faila augÅ¡upielÄde';
 $lang['uploadsucc']            = 'VeiksmÄ«gi ielÄdÄ“ts';
 $lang['uploadfail']            = 'IelÄdes kļūme. VarbÅ«t aplamas tiesÄ«bas?';
-$lang['uploadwrong']           = 'IelÄde aizliegta. Neatļauts faila palÅ¡inÄjums';
+$lang['uploadwrong']           = 'IelÄde aizliegta. Neatļauts faila paplaÅ¡inÄjums';
 $lang['uploadexist']           = 'Neko nedarīju, jo fails jau ir.';
 $lang['uploadbadcontent']      = 'AugÅ¡upielÄdÄ“tÄ saturs neatbilst faila paplaÅ¡inÄjumam %s.';
 $lang['uploadspam']            = 'AugÅ¡upielÄde bloÄ·Ä“ta ar melno sarakstu.';
@@ -108,10 +111,14 @@
 $lang['mediainuse']            = 'Fails "%s" nav izdzēsts, to lieto.';
 $lang['namespaces']            = 'Nodaļas';
 $lang['mediafiles']            = 'Pieejamie faili';
+$lang['js']['searchmedia']     = 'Meklēt failus';
 $lang['js']['keepopen']        = 'Pēc faila izvēles logu paturēt atvērtu';
 $lang['js']['hidedetails']     = 'Slēpt detaļas';
 $lang['js']['nosmblinks']      = 'Saites uz Windows resursiem darbojas tikai Microsoft Internet Explorer.
 Protams, ka vari saiti kopÄ“t un iespraust citÄ programmÄ.';
+$lang['js']['linkwiz']         = 'Saišu vednis';
+$lang['js']['linkto']          = 'Saite uz: ';
+$lang['js']['del_confirm']     = 'Dzēst šo šķirkli?';
 $lang['js']['mu_btn']          = 'AugÅ¡uplÄdÄ“t uzreiz vairÄkus failus.';
 $lang['mediausage']            = 'Atsaucei uz failu lietot Å¡Ädu sintaksi:';
 $lang['mediaview']             = 'SkatÄ«t oriÄ£inÄlo failu';
@@ -143,7 +150,6 @@
 $lang['mail_changed']          = 'lapa mainīta:';
 $lang['mail_new_user']         = 'Jauns lietotÄjs:';
 $lang['mail_upload']           = 'augÅ¡upielÄdÄ“tais fails:';
-$lang['qb_alert']              = 'LÅ«dzu ieraksti formatÄ“jamo teku.\nTo pievienos dokumenta galÄ.';
 $lang['qb_bold']               = 'TrekninÄjums';
 $lang['qb_italic']             = 'Kursīvs';
 $lang['qb_underl']             = 'Pasvītrojums';
@@ -154,6 +160,11 @@
 $lang['qb_h3']                 = '3. līmeņa virsraksts';
 $lang['qb_h4']                 = '4. līmeņa virsraksts';
 $lang['qb_h5']                 = '5. līmeņa virsraksts';
+$lang['qb_h']                  = 'Virsraksts';
+$lang['qb_hs']                 = 'Izraudzīties virsrakstu';
+$lang['qb_hplus']              = 'LielÄks virsraksts';
+$lang['qb_hminus']             = 'MazÄks virsraksts';
+$lang['qb_hequal']             = 'TÄds pats virsraksts';
 $lang['qb_link']               = 'Iekšēja saite';
 $lang['qb_extlink']            = 'Ārēja saite';
 $lang['qb_hr']                 = 'HorizontÄla lÄ«nija';
@@ -163,7 +174,7 @@
 $lang['qb_sig']                = 'Ievietot parakstu';
 $lang['qb_smileys']            = 'Emotikoni';
 $lang['qb_chars']              = 'ĪpaÅ¡Äs zÄ«mes';
-$lang['del_confirm']           = 'Dzēst šo šķirkli?';
+$lang['upperns']               = 'vienu nodaļu lÄ«meni augstÄk';
 $lang['admin_register']        = 'Pievienot jaunu lietotÄju';
 $lang['metaedit']              = 'Labot metadatus';
 $lang['metasaveerr']           = 'Metadati nav saglabÄti';
@@ -193,18 +204,16 @@
 $lang['i_superuser']           = 'Superuser';
 $lang['i_problems']            = 'InstalÄ“tÄjs atrada zemÄk minÄ“tÄs problÄ“mas. KamÄ“r tÄs nenovÄ“rÅ¡, nav iespÄ“jam turpinÄt.';
 $lang['i_modified']            = 'DroÅ¡Ä«bas nolÅ«kos Å¡is skripts darbosies tika ar jaunu nemodificÄ“tu Dokuwiki instalÄciju.
-                         Vai nu no jauna jÄatarhivÄ“ faili no lejupielÄdÄ“tÄs pakas vai jÄraugÄs pÄ“c padoma pilnÄ Dokuwiki instalÄcijas instrukcijÄ 
-                         ';
+Vai nu no jauna jÄatarhivÄ“ faili no lejupielÄdÄ“tÄs pakas vai jÄraugÄs pÄ“c padoma pilnÄ Dokuwiki instalÄcijas instrukcijÄ ';
 $lang['i_funcna']              = 'PHP funkcija %s nav pieejama. VarbÅ«t jÅ«su servera Ä«paÅ¡nieks to kÄda iemesla dēļ atslÄ“dzis?';
 $lang['i_phpver']              = 'JÅ«su PHP versija %s ir par vecu. Vajag versiju %s. Atjaunojiet savu PHP instalÄciju.';
 $lang['i_permfail']            = 'Dokuwiki nevar ierakstÄ«t %s. JÄlabo direktorijas tiesÄ«bas!';
 $lang['i_confexists']          = '%s jau ir';
 $lang['i_writeerr']            = 'Nevar izveidot %s. JÄpÄrbauda direktorijas/faila tiesÄ«bas un fails jÄizveido paÅ¡am.';
-$lang['i_badhash']             = 'nepazīstams via izmainīts dokuwiki.php (hash=%s)';
+$lang['i_badhash']             = 'nepazīstams vai izmainīts dokuwiki.php fails (hash=%s)';
 $lang['i_badval']              = '%s - neatļauta vai tukša vērtība';
 $lang['i_success']             = 'KonfigurÄ“Å¡ana veiksmÄ«gi pabeigta. Tagad vari nodzÄ“st failu install.php. TÄlÄk turpini savÄ jaunajÄ DokuWiki.';
-$lang['i_failure']             = 'Rakstot konfigurÄcijas failu, gadÄ«jÄs dažas kļūmes. 
-                         Pirms lieto savu jauno DokuWiki, tÄs varbÅ«t jÄizlabo.';
+$lang['i_failure']             = 'Rakstot konfigurÄcijas failu, gadÄ«jÄs dažas kļūmes. Pirms lieto savu jauno DokuWiki, tÄs varbÅ«t jÄizlabo.';
 $lang['i_policy']              = 'SÄkotnÄ“jÄ ACL politika';
 $lang['i_pol0']                = 'AtvÄ“rts Wiki (raksta, lasa un augÅ¡upielÄdÄ“ ikviens)';
 $lang['i_pol1']                = 'Publisks Wiki (lasa ikviens, raksta un augÅ¡upielÄdÄ“ reÄ£istrÄ“ti lietotÄji)';
@@ -223,4 +232,13 @@
 $lang['mu_authfail']           = 'sesijas laiks iztecējis';
 $lang['mu_progress']           = '@PCT@% augÅ¡upielÄdÄ“ts';
 $lang['mu_filetypes']          = 'Atļautie failu tipi';
+$lang['mu_info']               = 'faili ir augÅ¡upielÄdÄ“ti.';
+$lang['mu_lasterr']            = 'PÄ“dÄ“jÄ Ä·Ä¼Å«da.';
 $lang['recent_global']         = 'Tu skati izmaiņas nodaÄ¼Ä %s. Ir iespÄ“jams skatÄ«t jaunÄkos grozÄ«jums visÄ viki. ';
+$lang['years']                 = 'pirms %d gadiem';
+$lang['months']                = 'pirms %d mēnešiem';
+$lang['weeks']                 = 'pirms % nedēļÄm';
+$lang['days']                  = 'pirms %d  dienÄm';
+$lang['hours']                 = 'pirms %d stundÄm';
+$lang['minutes']               = 'pirms %d minūtēm';
+$lang['seconds']               = 'pirms %d sekundēm';
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/lv/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/lv/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -13,6 +13,6 @@
 
 
 -- 
-Vēstuli nosūtījusi DokuWiki programma no 
+Vēstuli nosūtījusi DokuWiki programma no
 @DOKUWIKIURL@ datora
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/newpage.txt dokuwiki-rc2009-12-02/inc/lang/lv/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/lv/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Šķirklis vēl nav izveidots======
+====== Šķirklis vēl nav izveidots ======
 
-Tu izvēlējies saiti uz vēl neizveidotu šķirkli. Ja tiesības ļauj, vari to izveidot, uzklikšķinot uz pogas ''Izveidot lapu''. 
+Tu izvēlējies saiti uz vēl neizveidotu šķirkli. Ja tiesības ļauj, vari to izveidot, uzklikšķinot uz pogas ''Izveidot lapu''.
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/norev.txt dokuwiki-rc2009-12-02/inc/lang/lv/norev.txt
--- dokuwiki-2009-02-14/inc/lang/lv/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Nav Å¡Ädas versijas======
+====== Nav Å¡Ädas versijas ======
 
 NorÄdÄ«tÄs lapas versijas nav. Lieto pogu ''VecÄs versijas'', lai redzÄ“tu dokumenta veco versiju sarakstu.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/preview.txt dokuwiki-rc2009-12-02/inc/lang/lv/preview.txt
--- dokuwiki-2009-02-14/inc/lang/lv/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Priekšskats======
+====== Priekšskats ======
 
 Tavs teksts izskatÄ«sies Å¡Ädi. IevÄ“ro, tas vÄ“l **nav saglabÄts** !
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/lv/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/lv/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 Sveiki, @FULLNAME@!
 
-KÄds pieprasÄ«jis jaunu paroli tavam @TITLE@ kontam 
+KÄds pieprasÄ«jis jaunu paroli tavam @TITLE@ kontam
 @DOKUWIKIURL@ sistÄ“mÄ.
 
 Ja paroli neesi prasījis, ignorē šo vēstuli.
@@ -10,5 +10,5 @@
 @CONFIRM@
 
 -- 
-Šo vēstuli ģenerējusi DokuWiki no 
+Šo vēstuli ģenerējusi DokuWiki no
 @DOKUWIKIURL
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/recent.txt dokuwiki-rc2009-12-02/inc/lang/lv/recent.txt
--- dokuwiki-2009-02-14/inc/lang/lv/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======JaunÄkie grozÄ«jumi======
+====== JaunÄkie grozÄ«jumi ======
 
 JaunÄkie labojumi ir:
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/registermail.txt dokuwiki-rc2009-12-02/inc/lang/lv/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/lv/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,5 +10,5 @@
 Datora vÄrds: @HOSTNAME@
 
 -- 
-Šo vēstuli ģenerējis DokuWiki no 
+Šo vēstuli ģenerējis DokuWiki no
 @DOKUWIKIURL
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/revisions.txt dokuwiki-rc2009-12-02/inc/lang/lv/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/lv/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======VecÄs versijas======
+====== VecÄs versijas ======
 
 Dokumentam ir Å¡Ädas vecÄs versijas. Lai atgrieztos pie vecÄ varianta, izvÄ“lies to no saraksta,  uzklikÅ¡Ä·ini uz "Labot Å¡o lapu" un saglabÄ to.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/lv/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/lv/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Meklēšana======
+====== Meklēšana ======
 
-Te vari redzÄ“t meklÄ“Å¡anas rezultÄtus. Ja neatradi meklÄ“to, nospiežot pogu "Labot lapu", vari izveidot jaunu lapu ar tevis meklÄ“tajiem atslÄ“gvÄrdiem nosaukumÄ.   
-=====Atrasts======
+Te vari redzÄ“t meklÄ“Å¡anas rezultÄtus. Ja neatradi meklÄ“to, nospiežot pogu "Labot lapu", vari izveidot jaunu lapu ar tevis meklÄ“tajiem atslÄ“gvÄrdiem nosaukumÄ.
+===== Atrasts =====
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/lv/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/lv/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,24 +2,47 @@
 # Labojot failu ievÄ“ro, ja jÄlieto UNIX rindu aplauzumi (single newline)
 # Nevajag likt sarakstÄ par 3 burtiem Ä«sÄkus vÄrdus, tos tÄ pat neņem vÄ“rÄ
 # Angļu valodai saraksts ņemts no http://www.ranks.nl/stopwords/
-gar 
+gar
 par
 pÄr
-pret 
+pret
 starp
 caur
-vai
-nav
-aiz 
+uz
+aiz
 apakš
 bez
-dēļ
+iz
+kopš
+no
 pēc
-pie 
+pie
 pirms
 priekš
-
-
- 
+uz
+virs
+zem
+apakšpus
+Ärpus
+augšpus
+iekšpus
+lejpus
+otrpus
+Å¡aipus
+viņpus
+virspus
+dēļ
+labad
+pēc 
+līdz 
+pa
+vai
+jÄ
+nē
+kaut 
+nav
+itin
+jo 
+taÄu
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/lv/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/lv/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,10 +8,16 @@
 @DIFF@
 --------------------------------------------------------
 
-Lai atteiktos no Å¡Ä«m vÄ“stulÄ“m, ielogojies wiki sistÄ“mÄ 
+Datums : @DATE@
+LietotÄjs : @USER@
+Izmaiņu anotÄcija: @SUMMARY@
+VecÄ versijan: @OLDPAGE@
+JaunÄ versija: @NEWPAGE@
+
+Lai atteiktos no Å¡Ä«m vÄ“stulÄ“m, ielogojies wiki sistÄ“mÄ
 @DOKUWIKIURL@, tad apmeklē @NEWPAGE@
 uz izvēlies 'Atteikties no izmaiņu paziņojumiem'.
 
 -- 
-Vestuli izveidoja 
+Vestuli izveidoja
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/lv/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/lv/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,5 +10,5 @@
 LietotÄjs     : @USER@
 
 -- 
-Vēstuli nosūtījusi DokuWiki programma no 
+Vēstuli nosūtījusi DokuWiki programma no
 @DOKUWIKIURL@ datora.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/lv/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/lv/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/lv/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/lv/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAMs bloÄ·Ä“ts======
+====== SPAMs bloÄ·Ä“ts ======
 
 Tavas izmaiņas **nav** saglabÄtas, jo satur vienu vai vairÄkus aizliegtos vÄrdus. Ja uzskati, ka tÄ ir kļūda, sazinies ar administratoru.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/mg/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/mg/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-====== Verindrohy ======
-
-Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
-
-
+====== Verindrohy ======
+
+Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/conflict.txt dokuwiki-rc2009-12-02/inc/lang/mg/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/mg/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
-====== A newer version exists ======
-
-Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
-
-Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
-
+====== A newer version exists ======
+
+Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
+
+Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/denied.txt dokuwiki-rc2009-12-02/inc/lang/mg/denied.txt
--- dokuwiki-2009-02-14/inc/lang/mg/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Tsy tafiditra======
-
-Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
-
+====== Tsy tafiditra ======
+
+Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/diff.txt dokuwiki-rc2009-12-02/inc/lang/mg/diff.txt
--- dokuwiki-2009-02-14/inc/lang/mg/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Tsy fitoviana======
-
-Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
-
+====== Tsy fitoviana ======
+
+Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/editrev.txt dokuwiki-rc2009-12-02/inc/lang/mg/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/mg/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
+**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
 ----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/index.txt dokuwiki-rc2009-12-02/inc/lang/mg/index.txt
--- dokuwiki-2009-02-14/inc/lang/mg/index.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Index ======
-
-Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>namespaces|namespaces]].
-
+====== Index ======
+
+Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>namespaces|namespaces]].
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/lang.php dokuwiki-rc2009-12-02/inc/lang/mg/lang.php
--- dokuwiki-2009-02-14/inc/lang/mg/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -1,136 +1,135 @@
->';
-$lang['btn_revs']   = 'Kinova taloha';
-$lang['btn_recent'] = 'Fiovana farany';
-$lang['btn_upload'] = 'Alefaso';
-$lang['btn_cancel'] = 'Aoka ihany';
-$lang['btn_index']  = 'Index';
-$lang['btn_secedit']= 'Edit';
-$lang['btn_login']  = 'Hiditra';
-$lang['btn_logout'] = 'Hivoaka';
-$lang['btn_admin']  = 'Admin';
-$lang['btn_update'] = 'Update';
-$lang['btn_delete'] = 'Fafao';
-$lang['btn_back']   = 'Miverina';
-$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
-
-$lang['loggedinas'] = 'Anaranao:';
-$lang['user']       = 'Anarana';
-$lang['pass']       = 'Alahidy';
-$lang['passchk']    = 'Ataovy indray';
-$lang['remember']   = 'Tsarovy';
-$lang['fullname']   = 'Anarana feno';
-$lang['email']      = 'Imailaka';
-$lang['register']   = 'Hisoratra';
-$lang['badlogin']   = 'Miala tsiny fa misy diso ny anarana na ny alahidy.';
-
-$lang['regmissing'] = 'Tsy maintsy fenoina ny saha rehetra.';
-$lang['reguexists'] = 'Indrisy fa efa nisy namandrika io anarana io.';
-$lang['regsuccess'] = 'Voaforona ny kaontinao, halefa any imailaka ny alahidy.';
-$lang['regsuccess2']= 'Voaforona ilay kaonty.';
-$lang['regmailfail']= 'Ohatra ny nisy olana ny nandefasana imailaka. Miangavy anao hilaza ny Admin!';
-$lang['regbadmail'] = 'Toa tsy mandeha ny imailaka nomenao - Raha heverinao fa erreur io dia ilazao ny admin';
-$lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
-$lang['regpwmail']  = 'Ny alahidy Wiki-nao';
-$lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
-
-$lang['txt_upload']   = 'Misafidiana rakitra halefa';
-$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
-$lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
-$lang['lockedby']     = 'Mbola voahidin\'i';
-$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
-$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
-
-$lang['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
-$lang['rssfailed']   = 'An error occured while fetching this feed: ';
-$lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
-
-$lang['mediaselect'] = 'Safidy rakitra Media';
-$lang['fileupload']  = 'Fandefasana rakitra Media';
-$lang['uploadsucc']  = 'Voalefa soa aman-tsara';
-$lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
-$lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
-$lang['uploadexist'] = 'Efa misy ilay rakitra. Tsy nisy inona natao.';
-$lang['deletesucc']  = 'Voafafa ny rakitra "%s" .';
-$lang['deletefail']  = 'Tsy afaka nofafana ny "%s" - Hamarino ny alalana.';
-$lang['mediainuse']  = 'Tsy voafafa ny rakitra "%s" - mbola misy mampiasa io.';
-$lang['namespaces']  = 'Namespaces';
-$lang['mediafiles']  = 'Rakitra misy amin\'ny';
-
-$lang['reference']   = 'References for';
-$lang['ref_inuse']   = 'Tsy afaka fafana io rakitra io, satria mbola ampiasain\'ireto pejy ireto:';
-$lang['ref_hidden']  = 'Misy references  vitsivitsy amina pejy tsy anananao alalana hamaky';
-
-$lang['hits']       = 'Hits';
-$lang['quickhits']  = 'Anaram-pejy mifanaraka';
-$lang['toc']        = 'Fizahan-takila';
-$lang['current']    = 'current';
-$lang['yours']      = 'Kinova-nao';
-$lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
-$lang['line']       = 'Andalana';
-$lang['breadcrumb'] = 'Taiza ianao';
-$lang['lastmod']    = 'Novaina farany:';
-$lang['by']         = '/';
-$lang['deleted']    = 'voafafa';
-$lang['created']    = 'Voamboatra';
-$lang['restored']   = 'Naverina tamin\'ny kinova taloha';
-$lang['summary']    = 'Fanovana teo';
-
-$lang['mail_newpage'] = 'pejy niampy:';
-$lang['mail_changed'] = 'pejy niova:';
-
-$lang['js']['nosmblinks'] = "rohy mankamin\'ny fizarana Windows dia amin\'ny Microsoft Internet Explorer ihany no miasa.\nAzo atao ihany anefa ny manao dika-petaka ny rohy.";
-
-$lang['qb_alert']   = 'Ampidiro ny soratra tianao hamboarina format.\n Hiampy any @ farany izy avy eo.';
-$lang['qb_bold']    = 'Matavy';
-$lang['qb_italic']  = 'Mandry';
-$lang['qb_underl']  = 'Voatsipika';
-$lang['qb_code']    = 'Code programa';
-$lang['qb_strike']  = 'Disoina';
-$lang['qb_h1']      = 'Lohateny laharana 1';
-$lang['qb_h2']      = 'Lohateny laharana 2';
-$lang['qb_h3']      = 'Lohateny laharana 3';
-$lang['qb_h4']      = 'Lohateny laharana 4';
-$lang['qb_h5']      = 'Lohateny laharana 5';
-$lang['qb_link']    = 'Rohy ato anatiny';
-$lang['qb_extlink'] = 'Rohy mivoaka';
-$lang['qb_hr']      = 'Tsipika marindrano';
-$lang['qb_ol']      = 'Tanisa milahatra';
-$lang['qb_ul']      = 'Tanisa tsy milahatra';
-$lang['qb_media']   = 'Hanampy sary na rakitra hafa';
-$lang['qb_sig']     = 'Manisy sonia';
-
-$lang['del_confirm']= 'Hofafana ilay andalana?';
-
-$lang['admin_acl']  = 'Fitantanana ACL (Access Control List)...';
-$lang['admin_register']= 'Ampio mpampiasa vaovao...';
-
-$lang['acl_group']  = 'Vondrona';
-$lang['acl_user']   = 'Mpampiasa';
-$lang['acl_perms']  = 'Alalana @';
-$lang['page']       = 'Pejy';
-$lang['namespace']  = 'Namespace';
-
-$lang['acl_perm1']  = 'Mamaky';
-$lang['acl_perm2']  = 'Manova';
-$lang['acl_perm4']  = 'Manamboatra';
-$lang['acl_perm8']  = 'Mandefa rakitra';
-$lang['acl_perm16'] = 'Mamafa';
-$lang['acl_new']    = 'Ampio andalana vaovao';
-

-//Setup VIM: ex: et ts=2 enc=utf-8 :
+>';
+$lang['btn_revs']   = 'Kinova taloha';
+$lang['btn_recent'] = 'Fiovana farany';
+$lang['btn_upload'] = 'Alefaso';
+$lang['btn_cancel'] = 'Aoka ihany';
+$lang['btn_index']  = 'Index';
+$lang['btn_secedit']= 'Edit';
+$lang['btn_login']  = 'Hiditra';
+$lang['btn_logout'] = 'Hivoaka';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Update';
+$lang['btn_delete'] = 'Fafao';
+$lang['btn_back']   = 'Miverina';
+$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
+
+$lang['loggedinas'] = 'Anaranao:';
+$lang['user']       = 'Anarana';
+$lang['pass']       = 'Alahidy';
+$lang['passchk']    = 'Ataovy indray';
+$lang['remember']   = 'Tsarovy';
+$lang['fullname']   = 'Anarana feno';
+$lang['email']      = 'Imailaka';
+$lang['register']   = 'Hisoratra';
+$lang['badlogin']   = 'Miala tsiny fa misy diso ny anarana na ny alahidy.';
+
+$lang['regmissing'] = 'Tsy maintsy fenoina ny saha rehetra.';
+$lang['reguexists'] = 'Indrisy fa efa nisy namandrika io anarana io.';
+$lang['regsuccess'] = 'Voaforona ny kaontinao, halefa any imailaka ny alahidy.';
+$lang['regsuccess2']= 'Voaforona ilay kaonty.';
+$lang['regmailfail']= 'Ohatra ny nisy olana ny nandefasana imailaka. Miangavy anao hilaza ny Admin!';
+$lang['regbadmail'] = 'Toa tsy mandeha ny imailaka nomenao - Raha heverinao fa erreur io dia ilazao ny admin';
+$lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
+$lang['regpwmail']  = 'Ny alahidy Wiki-nao';
+$lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
+
+$lang['txt_upload']   = 'Misafidiana rakitra halefa';
+$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
+$lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
+$lang['lockedby']     = 'Mbola voahidin\'i';
+$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
+$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
+
+$lang['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
+$lang['rssfailed']   = 'An error occured while fetching this feed: ';
+$lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
+
+$lang['mediaselect'] = 'Safidy rakitra Media';
+$lang['fileupload']  = 'Fandefasana rakitra Media';
+$lang['uploadsucc']  = 'Voalefa soa aman-tsara';
+$lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
+$lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
+$lang['uploadexist'] = 'Efa misy ilay rakitra. Tsy nisy inona natao.';
+$lang['deletesucc']  = 'Voafafa ny rakitra "%s" .';
+$lang['deletefail']  = 'Tsy afaka nofafana ny "%s" - Hamarino ny alalana.';
+$lang['mediainuse']  = 'Tsy voafafa ny rakitra "%s" - mbola misy mampiasa io.';
+$lang['namespaces']  = 'Namespaces';
+$lang['mediafiles']  = 'Rakitra misy amin\'ny';
+
+$lang['reference']   = 'References for';
+$lang['ref_inuse']   = 'Tsy afaka fafana io rakitra io, satria mbola ampiasain\'ireto pejy ireto:';
+$lang['ref_hidden']  = 'Misy references  vitsivitsy amina pejy tsy anananao alalana hamaky';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Anaram-pejy mifanaraka';
+$lang['toc']        = 'Fizahan-takila';
+$lang['current']    = 'current';
+$lang['yours']      = 'Kinova-nao';
+$lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
+$lang['line']       = 'Andalana';
+$lang['breadcrumb'] = 'Taiza ianao';
+$lang['lastmod']    = 'Novaina farany:';
+$lang['by']         = '/';
+$lang['deleted']    = 'voafafa';
+$lang['created']    = 'Voamboatra';
+$lang['restored']   = 'Naverina tamin\'ny kinova taloha';
+$lang['summary']    = 'Fanovana teo';
+
+$lang['mail_newpage'] = 'pejy niampy:';
+$lang['mail_changed'] = 'pejy niova:';
+
+$lang['js']['nosmblinks'] = "rohy mankamin\'ny fizarana Windows dia amin\'ny Microsoft Internet Explorer ihany no miasa.\nAzo atao ihany anefa ny manao dika-petaka ny rohy.";
+
+$lang['qb_bold']    = 'Matavy';
+$lang['qb_italic']  = 'Mandry';
+$lang['qb_underl']  = 'Voatsipika';
+$lang['qb_code']    = 'Code programa';
+$lang['qb_strike']  = 'Disoina';
+$lang['qb_h1']      = 'Lohateny laharana 1';
+$lang['qb_h2']      = 'Lohateny laharana 2';
+$lang['qb_h3']      = 'Lohateny laharana 3';
+$lang['qb_h4']      = 'Lohateny laharana 4';
+$lang['qb_h5']      = 'Lohateny laharana 5';
+$lang['qb_link']    = 'Rohy ato anatiny';
+$lang['qb_extlink'] = 'Rohy mivoaka';
+$lang['qb_hr']      = 'Tsipika marindrano';
+$lang['qb_ol']      = 'Tanisa milahatra';
+$lang['qb_ul']      = 'Tanisa tsy milahatra';
+$lang['qb_media']   = 'Hanampy sary na rakitra hafa';
+$lang['qb_sig']     = 'Manisy sonia';
+
+$lang['js']['del_confirm']= 'Hofafana ilay andalana?';
+
+$lang['admin_acl']  = 'Fitantanana ACL (Access Control List)...';
+$lang['admin_register']= 'Ampio mpampiasa vaovao...';
+
+$lang['acl_group']  = 'Vondrona';
+$lang['acl_user']   = 'Mpampiasa';
+$lang['acl_perms']  = 'Alalana @';
+$lang['page']       = 'Pejy';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = 'Mamaky';
+$lang['acl_perm2']  = 'Manova';
+$lang['acl_perm4']  = 'Manamboatra';
+$lang['acl_perm8']  = 'Mandefa rakitra';
+$lang['acl_perm16'] = 'Mamafa';
+$lang['acl_new']    = 'Ampio andalana vaovao';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/locked.txt dokuwiki-rc2009-12-02/inc/lang/mg/locked.txt
--- dokuwiki-2009-02-14/inc/lang/mg/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Pejy voahidy ======
-
-Mbola ovain'olona hafa ity pejy ity ka voahidy aloha. Andraso kely ho vitany ny azy, na ho lany fotoana ilay hidy.
-
+====== Pejy voahidy ======
+
+Mbola ovain'olona hafa ity pejy ity ka voahidy aloha. Andraso kely ho vitany ny azy, na ho lany fotoana ilay hidy.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/login.txt dokuwiki-rc2009-12-02/inc/lang/mg/login.txt
--- dokuwiki-2009-02-14/inc/lang/mg/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== Login ======
-
-Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
-
+====== Login ======
+
+Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/mg/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/mg/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,17 +1,17 @@
-Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
-
-Date        : @DATE@
-Browser     : @BROWSER@
-Adiresy IP  : @IPADDRESS@
-Hostname    : @HOSTNAME@
-Taloha      : @OLDPAGE@
-Vaovao      : @NEWPAGE@
-Fiovana     : @SUMMARY@
-Novain'i    : @USER@
-
-@DIFF@
-
-
--- 
-Ity imailaka ity dia navoakan'ny wiki tao amin'ny
-@DOKUWIKIURL@
+Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+Adiresy IP  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Taloha      : @OLDPAGE@
+Vaovao      : @NEWPAGE@
+Fiovana     : @SUMMARY@
+Novain'i    : @USER@
+
+@DIFF@
+
+
+-- 
+Ity imailaka ity dia navoakan'ny wiki tao amin'ny
+@DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/newpage.txt dokuwiki-rc2009-12-02/inc/lang/mg/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/mg/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Mbola tsy misy an'io pejy io======
-
-Nanindry rohy manondro pejy mbola tsy misy ianao. Afaka amboarinao io pejy io, tsindrio ny bokotra ''Amboary ity pejy''
+====== Mbola tsy misy an'io pejy io ======
+
+Nanindry rohy manondro pejy mbola tsy misy ianao. Afaka amboarinao io pejy io, tsindrio ny bokotra ''Amboary ity pejy''
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/norev.txt dokuwiki-rc2009-12-02/inc/lang/mg/norev.txt
--- dokuwiki-2009-02-14/inc/lang/mg/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Tsy misy io kinova io======
-
-Tsy misy ny kinova voalaza. Ampiasao ny bokotra ''Kinova taloha'' hampisehoana ireo karazana fanovana natao tamin'ity pejy ity.
-
+====== Tsy misy io kinova io ======
+
+Tsy misy ny kinova voalaza. Ampiasao ny bokotra ''Kinova taloha'' hampisehoana ireo karazana fanovana natao tamin'ity pejy ity.
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/password.txt dokuwiki-rc2009-12-02/inc/lang/mg/password.txt
--- dokuwiki-2009-02-14/inc/lang/mg/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,11 +1,11 @@
-Miarahaba an'i @FULLNAME@!
-
-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@
-
+Miarahaba an'i @FULLNAME@!
+
+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 -Naur dokuwiki-2009-02-14/inc/lang/mg/preview.txt dokuwiki-rc2009-12-02/inc/lang/mg/preview.txt
--- dokuwiki-2009-02-14/inc/lang/mg/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Topi-maso======
-
-Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
-
-
+====== Topi-maso ======
+
+Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/read.txt dokuwiki-rc2009-12-02/inc/lang/mg/read.txt
--- dokuwiki-2009-02-14/inc/lang/mg/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
-
-
+Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/recent.txt dokuwiki-rc2009-12-02/inc/lang/mg/recent.txt
--- dokuwiki-2009-02-14/inc/lang/mg/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Fiovana farany======
-
-Ireto pejy ireto no niova vao haingana.
-
-
+====== Fiovana farany ======
+
+Ireto pejy ireto no niova vao haingana.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/register.txt dokuwiki-rc2009-12-02/inc/lang/mg/register.txt
--- dokuwiki-2009-02-14/inc/lang/mg/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-====== Hanokatra kaonty vaovao ======
-
-Fenoy ny saha rehetra eto ambany raha hanokatra kaonty amin'ity wiki ity. Hamarino fa adiresy imailaka mandeha no omenao - halefa any mantsy ny alahidy. Ny anarana dia tsy maintsy manaraka ny fepetran'ny [[doku>pagename|pagename]].
-
-
+====== Hanokatra kaonty vaovao ======
+
+Fenoy ny saha rehetra eto ambany raha hanokatra kaonty amin'ity wiki ity. Hamarino fa adiresy imailaka mandeha no omenao - halefa any mantsy ny alahidy. Ny anarana dia tsy maintsy manaraka ny fepetran'ny [[doku>pagename|pagename]].
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/revisions.txt dokuwiki-rc2009-12-02/inc/lang/mg/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/mg/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Kinova taloha======
-
-Ireto ny kinovan'ny pejy taloha. Raha te hamerina kinova taloha ianao, tsongay eo ambany izy hisokatra, avy eo tsindrio ny bokotra ''Hanova ny pejy'' ary ''Soraty''.
-
-
+====== Kinova taloha ======
+
+Ireto ny kinovan'ny pejy taloha. Raha te hamerina kinova taloha ianao, tsongay eo ambany izy hisokatra, avy eo tsindrio ny bokotra ''Hanova ny pejy'' ary ''Soraty''.
+
+
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/mg/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/mg/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
-======Karoka======
-
-Ireto ambany ireto ny valin'ny fikarohanao. 
-
-Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.
-
-=====Vokatry ny fikarohana=====
\ Brak znaku nowej linii na końcu pliku
+====== Karoka ======
+
+Ireto ambany ireto ny valin'ny fikarohanao.
+
+Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.
+
+===== Vokatry ny fikarohana =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/showrev.txt dokuwiki-rc2009-12-02/inc/lang/mg/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/mg/showrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/showrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Ity dia kinovan'ny pejy taloha!**
-----
+**Ity dia kinovan'ny pejy taloha!**
+----
diff -Naur dokuwiki-2009-02-14/inc/lang/mg/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/mg/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/mg/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mg/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM Voasakana======
+====== SPAM Voasakana ======
 
 Tsy voarakitra ny fanovana nataonao satria misy teny voarara ao. Raha nanandrana nandefa spam ny wiki ianao dia -- Alika maty! Raha heverinao fa error dia ilazao ny Admin.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/lang.php dokuwiki-rc2009-12-02/inc/lang/mr/lang.php
--- dokuwiki-2009-02-14/inc/lang/mr/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -44,6 +44,10 @@
 $lang['btn_back']              = 'मागॆ';
 $lang['btn_backlink']          = 'येथे काय जोडले आहे';
 $lang['btn_backtomedia']       = 'परत माधà¥à¤¯à¤® फाइल निवडीकड़े';
+$lang['btn_subscribe']         = 'पृषà¥à¤ à¤¾à¤šà¥à¤¯à¤¾ बदलांची पà¥à¤°à¤µà¤£à¥€ (फीड) लावा ';
+$lang['btn_unsubscribe']       = 'पृषà¥à¤ à¤¾à¤šà¥à¤¯à¤¾ बदलांची पà¥à¤°à¤µà¤£à¥€ (फीड) बंद करा';
+$lang['btn_subscribens']       = 'नामसमà¥à¤¹à¤¾à¤šà¥à¤¯à¤¾ (नेमसà¥à¤ªà¥‡à¤¸) बदलांची पà¥à¤°à¤µà¤£à¥€ (फीड) लावा';
+$lang['btn_unsubscribens']     = 'नामसमà¥à¤¹à¤¾à¤šà¥à¤¯à¤¾ (नेमसà¥à¤ªà¥‡à¤¸) बदलांची पà¥à¤°à¤µà¤£à¥€ (फीड) बंद करा';
 $lang['btn_profile']           = 'पà¥à¤°à¥‹à¤«à¤¾à¤‡à¤² अदà¥à¤¯à¤¯à¤¾à¤µà¤¤ करा';
 $lang['btn_reset']             = 'रिसेट';
 $lang['btn_resendpwd']         = 'कृपया परवलीचा नवीन शबà¥à¤¦ माà¤à¥à¤¯à¤¾ इमेल पतà¥à¤¤à¥à¤¯à¤¾à¤µà¤° पाठविणे.';
@@ -70,6 +74,7 @@
 $lang['regsuccess']            = 'सदसà¥à¤¯à¤¾à¤šà¥€ नोंदणी à¤à¤¾à¤²à¥€ आहे आणि परवलीचा शबà¥à¤¦ इमेल केला आहे.';
 $lang['regsuccess2']           = 'सदसà¥à¤¯à¤¾à¤šà¥€ नोंदणी à¤à¤¾à¤²à¥€.';
 $lang['regmailfail']           = 'परवलीचा शबà¥à¤¦à¤¾à¤šà¥€ इमेल पाठवणà¥à¤¯à¤¾à¤¤ चूक à¤à¤¾à¤²à¥€ आहे, कà¥à¤°à¥à¤ªà¤¯à¤¾ संचालकांशी संपरà¥à¤• साधा.';
+$lang['regbadmail']            = 'तà¥à¤®à¥à¤¹à¥€ दिलेला ईमेल बरोबर नाही असे दिसते - तà¥à¤®à¤šà¥à¤¯à¤¾ मते ही चूक असलà¥à¤¯à¤¾à¤¸ साईटचà¥à¤¯à¤¾ वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤•à¤¾à¤¶à¥€ संपरà¥à¤• साधा.';
 $lang['regbadpass']            = 'आपला परवलीचा शबà¥à¤¦ चà¥à¤•à¥€à¤šà¤¾ आहे.';
 $lang['regpwmail']             = 'तà¥à¤®à¤šà¤¾ डोकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿ परवली.';
 $lang['reghere']               = 'अजà¥à¤¨ तà¥à¤®à¤šà¥‡ खाते नाही ? à¤à¤• उघडून टाका.';
@@ -105,10 +110,12 @@
 $lang['uploadbadcontent']      = 'अपलोड केलेली माहिती %s फाइल à¤à¤•à¥à¤¸à¤Ÿà¥‡à¤‚शनशी मिळतिजà¥à¤³à¤¤à¤¿ नाही.';
 $lang['uploadspam']            = 'अपलोड सà¥à¤ªà¥…म बà¥à¤²à¥…कलिसà¥à¤Ÿà¤®à¥à¤³à¥‡ थोपवला आहे.';
 $lang['uploadxss']             = 'अपलोड संशयित हानिकारक मजकूर असलà¥à¤¯à¤¾à¤¨à¥‡ थोपवला आहे.';
+$lang['uploadsize']            = 'अपलोड केलेली फाइल जासà¥à¤¤à¥€à¤š मोठी होती. (जासà¥à¤¤à¥€à¤¤ जासà¥à¤¤ %s)';
 $lang['deletesucc']            = '%s ही फाइल नषà¥à¤Ÿ करणà¥à¤¯à¤¾à¤¤ आलेली आहे.';
 $lang['deletefail']            = '%s ही फाइल नषà¥à¤Ÿ करू शकलो नाही - कृपया परवानगà¥à¤¯à¤¾ तपासा.';
 $lang['mediainuse']            = '%s ही फाइल नषà¥à¤Ÿ केली नाही - ती अजà¥à¤¨ वापरात आहे.';
 $lang['namespaces']            = 'नेमसà¥à¤ªà¥‡à¤¸';
+$lang['mediafiles']            = 'मधà¥à¤¯à¥‡ उपलबà¥à¤§ असलेलà¥à¤¯à¤¾ फाइल';
 $lang['js']['keepopen']        = 'निवड केलà¥à¤¯à¤¾à¤µà¤° विणà¥à¤¡à¥‹ उघडी ठेवा';
 $lang['js']['hidedetails']     = 'सविसà¥à¤¤à¤° मजकूर लपवा';
 $lang['js']['nosmblinks']      = 'विनà¥à¤¡à¥‹à¤œà¤¼ शेअर ला लिंक केलà¥à¤¯à¤¾à¤¸ ते फकà¥à¤¤ मायकà¥à¤°à¥‹à¤¸à¥‰à¥žà¥à¤Ÿ इनà¥à¤Ÿà¤°à¤¨à¥‡à¤Ÿ à¤à¤•à¥à¤¸à¥à¤ªà¥à¤²à¥‹à¤°à¤° वरच चालते. तरी तà¥à¤®à¥à¤¹à¥€ लिंक कॉपी करू शकता.';
@@ -118,12 +125,16 @@
 $lang['mediaroot']             = 'रूट';
 $lang['mediaupload']           = 'सधà¥à¤¯à¤¾à¤šà¥à¤¯à¤¾ नेमसà¥à¤ªà¥‡à¤¸à¤®à¤§à¥‡ इथेच फाइल अपलोड करा. उप-नेमसà¥à¤ªà¥‡à¤¸ बनवणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¤¿ तà¥à¤¯à¤¾à¤šà¥‡ नाव तà¥à¤®à¤šà¥à¤¯à¤¾ "अपलोड उरà¥à¤«à¤¼" मधे दिलेलà¥à¤¯à¤¾ फाइल नावाचà¥à¤¯à¤¾ आधी विसरà¥à¤—चिनà¥à¤¹à¤¾à¤¨à¥‡ वेगळे करून ते वापरा.';
 $lang['mediaextchange']        = 'फाइलचे à¤à¤•à¥à¤¸à¤Ÿà¥‡à¤‚शन .%s चे बदलून  .%s केले आहे.';
+$lang['reference']             = 'चà¥à¤¯à¤¾ साठी संदरà¥à¤­';
 $lang['ref_inuse']             = 'फाइल नषà¥à¤Ÿ केली जाऊ शकत नाही. ती अजà¥à¤¨ खालील पृषà¥à¤ à¥‡ वापरत आहेत :';
 $lang['ref_hidden']            = 'काही संदरà¥à¤­ तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ वाचणà¥à¤¯à¤¾à¤šà¥€ परवानगी नसलेलà¥à¤¯à¤¾ पृषà¥à¤ à¤¾à¤µà¤° आहेत';
+$lang['hits']                  = 'हिटà¥à¤¸';
 $lang['quickhits']             = 'जà¥à¤³à¤£à¤¾à¤°à¤¿ पाने';
 $lang['toc']                   = 'अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾';
 $lang['current']               = 'चालू';
 $lang['yours']                 = 'तà¥à¤®à¤šà¥€ आवृतà¥à¤¤à¤¿';
+$lang['diff']                  = 'सधà¥à¤¯à¤¾à¤šà¥à¤¯à¤¾ आवृतà¥à¤¤à¤¿à¤‚शी फरक दाखवा';
+$lang['diff2']                 = 'निवडलेलà¥à¤¯à¤¾ आवृतà¥à¤¤à¤¿à¤‚मधील फरक दाखवा';
 $lang['line']                  = 'ओळ';
 $lang['breadcrumb']            = 'मागमूस';
 $lang['youarehere']            = 'तà¥à¤®à¥à¤¹à¥€ इथे आहात';
@@ -131,26 +142,34 @@
 $lang['by']                    = 'दà¥à¤µà¤¾à¤°à¤¾';
 $lang['deleted']               = 'काढून टाकले';
 $lang['created']               = 'निरà¥à¤®à¤¾à¤£ केले';
+$lang['restored']              = 'जà¥à¤¨à¥€ आवृतà¥à¤¤à¤¿ पà¥à¤¨à¤°à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ केली';
 $lang['external_edit']         = 'बाहेरून संपादित';
 $lang['summary']               = 'सारांश बदला';
+$lang['noflash']               = 'ही माहिती दाखवणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ अडोब फà¥à¤²à¥…श पà¥à¤²à¥‡à¤…र ची गरज आहे.';
 $lang['mail_newpage']          = 'पृषà¥à¤  जोडले : ';
 $lang['mail_changed']          = 'पृषà¥à¤  बदलले : ';
 $lang['mail_new_user']         = 'नवीन सदसà¥à¤¯ : ';
 $lang['mail_upload']           = 'फाइल अपलोड केली : ';
-$lang['qb_alert']              = 'तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ फॉरमॅट करायचा मजकूर टाका. \n तो दसà¥à¤¤à¤¾à¤µà¥‡à¤œà¤¾à¤šà¥à¤¯à¤¾ शेवटी जोडला जाइल.';
 $lang['qb_bold']               = 'ठळक मजकूर';
 $lang['qb_italic']             = 'तिरका मजकूर';
 $lang['qb_underl']             = 'अधोरेखित मजकूर';
 $lang['qb_code']               = 'कोड मजकूर';
 $lang['qb_strike']             = 'रदà¥à¤¦ मजकूर';
+$lang['qb_h1']                 = 'पहिलà¥à¤¯à¤¾ पातळीचे शीरà¥à¤·à¤•';
+$lang['qb_h2']                 = 'दà¥à¤¸à¤°à¥à¤¯à¤¾ पातळीचे शीरà¥à¤·à¤•';
+$lang['qb_h3']                 = 'तिसरà¥à¤¯à¤¾ पातळीचे शीरà¥à¤·à¤•';
+$lang['qb_h4']                 = 'चवथà¥à¤¯à¤¾ पातळीचे शीरà¥à¤·à¤•';
+$lang['qb_h5']                 = 'पाचवà¥à¤¯à¤¾ पातळीचे शीरà¥à¤·à¤•';
 $lang['qb_link']               = 'अंतरà¥à¤—त लिंक';
 $lang['qb_extlink']            = 'बाहà¥à¤¯ लिंक';
 $lang['qb_hr']                 = 'आडवी पटà¥à¤Ÿà¥€';
+$lang['qb_ol']                 = 'अनà¥à¤•à¥à¤°à¤®à¤¿à¤¤ यादीतील वसà¥à¤¤à¥';
+$lang['qb_ul']                 = 'साधà¥à¤¯à¤¾ यादीतील वसà¥à¤¤à¥';
 $lang['qb_media']              = 'पà¥à¤°à¤¤à¤¿à¤®à¤¾ आणि इतर फाइल टाका';
 $lang['qb_sig']                = 'सà¥à¤µà¤¾à¤•à¥à¤·à¤°à¥€ टाका';
 $lang['qb_smileys']            = 'सà¥à¤®à¤¾à¤‡à¤²à¥€';
 $lang['qb_chars']              = 'ख़ास चिनà¥à¤¹';
-$lang['del_confirm']           = 'निवडलेलà¥à¤¯à¤¾ गोषà¥à¤Ÿà¥€ नकà¥à¤•à¥€ नषà¥à¤Ÿ करू का ?';
+$lang['js']['del_confirm']           = 'निवडलेलà¥à¤¯à¤¾ गोषà¥à¤Ÿà¥€ नकà¥à¤•à¥€ नषà¥à¤Ÿ करू का ?';
 $lang['admin_register']        = 'नवीन सदसà¥à¤¯';
 $lang['metaedit']              = 'मेटाडेटा बदला';
 $lang['metasaveerr']           = 'मेटाडेटा सà¥à¤°à¤•à¥à¤·à¤¿à¤¤ à¤à¤¾à¤²à¤¾ नाही';
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/mr/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/mr/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,5 +11,5 @@
 
 @DIFF@
 
---
+-- 
 हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/password.txt dokuwiki-rc2009-12-02/inc/lang/mr/password.txt
--- dokuwiki-2009-02-14/inc/lang/mr/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,5 +5,5 @@
 लॉगिन :  @LOGIN@
 पासवरà¥à¤¡ : @PASSWORD@
 
---
+-- 
 हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/registermail.txt dokuwiki-rc2009-12-02/inc/lang/mr/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/mr/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,5 +9,5 @@
 IP-पतà¥à¤¤à¤¾ : @IPADDRESS@
 होसà¥à¤Ÿ नाम : @HOSTNAME@
 
---
+-- 
 हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/mr/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/mr/stopwords.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,39 @@
+# ही अशा शबà¥à¤¦à¤¾à¤‚ची यादी आहे जी अनà¥à¤•à¥à¤°à¤®à¤• (इंडेकà¥à¤¸à¤°) दà¥à¤°à¥à¤²à¤•à¥à¤·à¤¿à¤¤ करतो, जर à¤à¤• ओळित à¤à¤• शबà¥à¤¦ आला तरच.
+# ही यादी बदललà¥à¤¯à¤¾à¤¸ केवळ यूनिकà¥à¤¸ पदà¥à¤§à¤¤à¥€à¤šà¥€ लाइन à¤à¤‚डिंग वापरा. तीन अकà¥à¤·à¤°à¤¾à¤ªà¥‡à¤•à¥à¤·à¤¾ लहान शबà¥à¤¦ टाकणà¥à¤¯à¤¾à¤šà¥€
+# गरज नाही - ते आपोआपच दà¥à¤°à¥à¤²à¤•à¥à¤·à¤¿à¤¤ केले जातात. ही यादी http://www.ranks.nl/stopwords/ येथील यादीवर
+# आधारित आहे.
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/mr/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/mr/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -13,9 +13,9 @@
 जà¥à¤¨à¥€ आवृतà¥à¤¤à¥€ : @OLDPAGE@
 नवीन आवृतà¥à¤¤à¥€ : @NEWPAGE@
 
-पानाचà¥à¤¯à¤¾ बदलाविषयिचà¥à¤¯à¤¾ सूचना तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ नको असतील तर 
-@DOKUWIKIURL@ या विकी वर लॉगिन करा आणि 
+पानाचà¥à¤¯à¤¾ बदलाविषयिचà¥à¤¯à¤¾ सूचना तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ नको असतील तर
+@DOKUWIKIURL@ या विकी वर लॉगिन करा आणि
 @NEWPAGE@ पानावर जा व तà¥à¤¯à¤¾ पान/नेमसà¥à¤ªà¥‡à¤¸ विषयीचà¥à¤¯à¤¾ सूचना बंद ( unsubscribe ) करा.
 
---
+-- 
 हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/mr/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/mr/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/mr/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/mr/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,5 +9,5 @@
 MIME टाइप : @MIME@
 सदसà¥à¤¯ : @USER@
 
---
+-- 
 हा ईमेल @DOKUWIKIURL@ येथील डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤¦à¥à¤µà¤¾à¤°à¤¾ आपोआप तयार केला गेला आहे.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/conflict.txt dokuwiki-rc2009-12-02/inc/lang/ne/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/ne/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-====== नयाठसंसà¥à¤•à¤°à¤£ उपलबà¥à¤§ छ======
+====== नयाठसंसà¥à¤•à¤°à¤£ उपलबà¥à¤§ छ ======
 
 तपाईले समà¥à¤ªà¤¾à¤¦à¤¨ गरà¥à¤¨à¥à¤­à¤à¤•à¥‹ पाठको नयाठससà¥à¤•à¤°à¤£ उपलबà¥à¤§ छ। तपाईले समà¥à¤ªà¤¾à¤¦à¤¨ गरिरहनॠभà¤à¤•à¥‹ समयमा अरà¥à¤•à¥‹ पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾à¤²à¥‡ यो पाठ परिवरà¥à¤¤à¤¨ गरेकोले यसà¥à¤¤à¥‹ भà¤à¤•à¥‹ हो ।
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/denied.txt dokuwiki-rc2009-12-02/inc/lang/ne/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ne/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======अनà¥à¤®à¤¤à¤¿ अमानà¥à¤¯======
+====== अनà¥à¤®à¤¤à¤¿ अमानà¥à¤¯ ======
 
 माफ गरà¥à¤¨à¥à¤¹à¥‹à¤²à¤¾ तपाईलाई अगाडि बढà¥à¤¨ अनà¥à¤®à¤¤à¤¿ छैन। समà¥à¤­à¤µà¤¤: तपाईले पà¥à¤°à¤µà¥‡à¤¶ गरà¥à¤¨ भà¥à¤²à¥à¤¨à¥ भयो।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/diff.txt dokuwiki-rc2009-12-02/inc/lang/ne/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ne/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======भिनà¥à¤¨à¤¤à¤¾à¤¹à¤°à¥======
+====== भिनà¥à¤¨à¤¤à¤¾à¤¹à¤°à¥ ======
 
 यसले यो पृषà¥à¤ à¤•à¥‹  छानिà¤à¤•à¥‹ संसà¥à¤•à¤°à¤£ र हालको संकरण बीच भिनà¥à¤¨à¤¤à¤¾à¤¹à¤°à¥ देखाउà¤à¤› ।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/editrev.txt dokuwiki-rc2009-12-02/inc/lang/ne/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/ne/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-** तपाईले यस कागजातको पà¥à¤°à¤¾à¤¨à¥‹ संसà¥à¤•à¤°à¤£ खोलà¥à¤¨à¥ भà¤à¤•à¥‹ छ ।** यदि यसलाई वचत गरà¥à¤¨à¥à¤­à¤¯à¥‹ भने यसैसामगà¥à¤°à¥€à¤¬à¤¾à¤Ÿ नयाठसंसà¥à¤•à¤°à¤£à¤•à¥‹ निरà¥à¤®à¤¾à¤£ हà¥à¤¨à¥‡à¤› । 
+** तपाईले यस कागजातको पà¥à¤°à¤¾à¤¨à¥‹ संसà¥à¤•à¤°à¤£ खोलà¥à¤¨à¥ भà¤à¤•à¥‹ छ ।** यदि यसलाई वचत गरà¥à¤¨à¥à¤­à¤¯à¥‹ भने यसैसामगà¥à¤°à¥€à¤¬à¤¾à¤Ÿ नयाठसंसà¥à¤•à¤°à¤£à¤•à¥‹ निरà¥à¤®à¤¾à¤£ हà¥à¤¨à¥‡à¤› ।
 ----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/lang.php dokuwiki-rc2009-12-02/inc/lang/ne/lang.php
--- dokuwiki-2009-02-14/inc/lang/ne/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -141,7 +141,6 @@
 $lang['mail_changed']          = 'परिवरà¥à¤¤à¤¿à¤¤ पृषà¥à¤ ';
 $lang['mail_new_user']         = 'नयाठपà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ ';
 $lang['mail_upload']           = 'अपलोड गरिà¤à¤•à¥‹ फाइल';
-$lang['qb_alert']              = 'तपाईले  ढाचाबदà¥à¤§ गरà¥à¤¨ चाहनॠभà¤à¤•à¥‹  पाठ पà¥à¤°à¤µà¤¿à¤·à¥à¤  गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥  ।\n यो कागजातको अनà¥à¤¤à¤®à¤¾ जोडिने छ।';
 $lang['qb_bold']               = 'मोटो पाठ(बोलà¥à¤¡)';
 $lang['qb_italic']             = 'इटालिक पाठ';
 $lang['qb_underl']             = 'निमà¥à¤¨ रेखांकित(अनà¥à¤¡à¤°à¤²à¤¾à¤‡à¤¨) पाठ';
@@ -161,7 +160,7 @@
 $lang['qb_sig']                = 'हसà¥à¤¤à¤¾à¤•à¥à¤·à¤° थपà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ';
 $lang['qb_smileys']            = 'सà¥à¤®à¤¾à¤‡à¤²à¥€à¤¹à¤°à¥ ';
 $lang['qb_chars']              = 'विशेष वरà¥à¤£à¤¹à¤°à¥ ';
-$lang['del_confirm']           = 'साचà¥à¤šà¥ˆ छानिà¤à¤•à¤¾ वसà¥à¤¤à¥à¤¹à¤°à¥ मेटà¥à¤¨à¥‡ हो ?';
+$lang['js']['del_confirm']           = 'साचà¥à¤šà¥ˆ छानिà¤à¤•à¤¾ वसà¥à¤¤à¥à¤¹à¤°à¥ मेटà¥à¤¨à¥‡ हो ?';
 $lang['admin_register']        = 'नयाठपà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾ थपà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ';
 $lang['metaedit']              = 'मेटाडेटा समà¥à¤ªà¤¾à¤¦à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥';
 $lang['metasaveerr']           = 'मेटाडाटा लेखन असफल';
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/locked.txt dokuwiki-rc2009-12-02/inc/lang/ne/locked.txt
--- dokuwiki-2009-02-14/inc/lang/ne/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======पृषà¥à¤ à¤®à¤¾ ताला लगाà¤à¤•à¥‹ छ======
+====== पृषà¥à¤ à¤®à¤¾ ताला लगाà¤à¤•à¥‹ छ ======
 
 यो पृषà¥à¤  अरà¥à¤•à¥‹ पà¥à¤°à¤¯à¥‹à¤—करà¥à¤¤à¤¾à¤¦à¥à¤µà¤¾à¤°à¤¾ समà¥à¤ªà¤¾à¤¦à¤¨à¤•à¤¾ लागि ताला लगाइà¤à¤•à¥‹ छ । तपाईले समà¥à¤ªà¤¾à¤¦à¤¨ समापà¥à¤¤ नहà¥à¤¨à¥à¤œà¥‡à¤² या तालाको समय समापà¥à¤¤ नहà¥à¤¨à¥à¤œà¥‡à¤² समà¥à¤® पà¥à¤°à¤¤à¤¿à¤•à¥à¤·à¤¾à¤—रà¥à¤¨à¥ परà¥à¤› ।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/norev.txt dokuwiki-rc2009-12-02/inc/lang/ne/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ne/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-======कà¥à¤¨à¥ˆ तà¥à¤¯à¤¸à¥à¤¤à¥‹ पà¥à¤¨:संसà¥à¤•à¤°à¤£ भेटिà¤à¤¨======
+====== कà¥à¤¨à¥ˆ तà¥à¤¯à¤¸à¥à¤¤à¥‹ पà¥à¤¨:संसà¥à¤•à¤°à¤£ भेटिà¤à¤¨ ======
 खà¥à¤²à¤¾à¤‡à¤à¤•à¥‹ पà¥à¤¨:संसà¥à¤•à¤°à¤£ असà¥à¤¤à¤¿à¤¤à¥à¤µà¤®à¤¾ छैन ।यस कागजातको समà¥à¤ªà¥‚रà¥à¤£ संसà¥à¤•à¤°à¤£à¤•à¥‹  सà¥à¤šà¥€à¤•à¥‹ लागि  "पà¥à¤°à¤¾à¤¨à¥‹ पà¥à¤¨:संसà¥à¤•à¤°à¤£" बटन पà¥à¤°à¤¯à¥‹à¤—  गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ ।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ne/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ne/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 नमसà¥à¤•à¤¾à¤° @FULLNAME@!
 
-कसैदà¥à¤µà¤¾à¤°à¤¾ तपाईको @TITLE@ को लागि नयाठपà¥à¤°à¤µà¥‡à¤¶à¤¶à¤¬à¥à¤¦ माग भà¤à¤•à¥‹ छ ।@DOKUWIKIURL@मा पà¥à¤°à¤µà¥‡à¤¶  । 
+कसैदà¥à¤µà¤¾à¤°à¤¾ तपाईको @TITLE@ को लागि नयाठपà¥à¤°à¤µà¥‡à¤¶à¤¶à¤¬à¥à¤¦ माग भà¤à¤•à¥‹ छ ।@DOKUWIKIURL@मा पà¥à¤°à¤µà¥‡à¤¶  ।
 
 यदि तपाईले नयाठपà¥à¤°à¤µà¥‡à¤¶à¤¶à¤¬à¥à¤¦à¤•à¥‹ माग गरà¥à¤¨à¥à¤­à¤à¤•à¥‹ हैन भने यस इमेललाई वेवासà¥à¤¤à¤¾ गरà¥à¤¨ सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ।
 
@@ -8,5 +8,5 @@
 
 @CONFIRM@
 
---
+-- 
 यो पतà¥à¤° DokuWiki ले  @DOKUWIKIURL@ मा तयार पारेको हो ।
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/recent.txt dokuwiki-rc2009-12-02/inc/lang/ne/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ne/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-======हालैको परिवरà¥à¤¤à¤¨======
+====== हालैको परिवरà¥à¤¤à¤¨ ======
 निमà¥à¤¨ पृषà¥à¤ à¤¹à¤°à¥ हालै परिवरà¥à¤¤à¤¨ गरिà¤à¤•à¤¾ छनॠ।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ne/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ne/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======खोज======
+====== खोज ======
 तपाईले आफà¥à¤¨à¥‹ खोजको निमà¥à¤¨ नतिजा  पाउन सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›à¥¤ यदि तपाईले आफà¥à¤²à¥‡ खोजेको पाउनà¥à¤­à¤à¤¨ भने, तपाईलेको उपयà¥à¤•à¥à¤¤ बटन पà¥à¤°à¤¯à¥‹à¤— गरी खोज सà¤à¤— समà¥à¤¬à¤¨à¥à¤§à¤¿à¤¤ शिरà¥à¤·à¤•à¤¹à¤°à¥ भà¤à¤•à¤¾ पृषà¥à¤  सृजना या समà¥à¤ªà¤¾à¤¦à¤¨ गरà¥à¤¨ सकà¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ।
-=====नतिजा=====
\ Brak znaku nowej linii na końcu pliku
+===== नतिजा =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ne/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ne/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ne/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ne/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-नमसà¥à¤•à¤¾à¤° ! 
+नमसà¥à¤•à¤¾à¤° !
 @TITLE@ शिरà¥à¤·à¤• रहेको यो पृषà¥à¤  @PAGE@ परिवरà¥à¤¤à¤¨ भà¤à¤•à¥‹ छ ।
 --------------------------------------------------------
 @DIFF@
@@ -9,11 +9,11 @@
 पà¥à¤°à¤¾à¤¨à¥‹ संसà¥à¤•à¤°à¤£  : @OLDPAGE@
 नविन संसà¥à¤•à¤°à¤£: @NEWPAGE@
 
-यसà¥à¤¤à¤¾ जानकारीहरॠरदà¥à¤¦ गरà¥à¤¨à¤•à¥‹ लागि 
+यसà¥à¤¤à¤¾ जानकारीहरॠरदà¥à¤¦ गरà¥à¤¨à¤•à¥‹ लागि
 @DOKUWIKIURL@ मा पà¥à¤°à¤µà¥‡à¤¶ गरी
-@NEWPAGE@ अवलोकन पशà¥à¤šà¤¾à¤¤ 
+@NEWPAGE@ अवलोकन पशà¥à¤šà¤¾à¤¤
 पृषà¥à¤  या नेमसà¥à¤ªà¥‡à¤¸ परिवरà¥à¤¤à¤¨ जानकारी गà¥à¤°à¤¾à¤¹à¥à¤¯à¤¤à¤¾ बदर गरà¥à¤¨à¥à¤¹à¥‹
 
 -- 
-यो पतà¥à¤°  DokuWiki ले 
+यो पतà¥à¤°  DokuWiki ले
 @DOKUWIKIURL@ मा सà¥à¤µà¤¤: बनाà¤à¤•à¥‹ हो ।
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/nl/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/nl/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Additionele plugins =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/denied.txt dokuwiki-rc2009-12-02/inc/lang/nl/denied.txt
--- dokuwiki-2009-02-14/inc/lang/nl/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Toegang geweigerd======
+====== Toegang geweigerd ======
 
 Sorry: je hebt niet voldoende rechten om verder te gaan. Misschien ben je vergeten in te loggen?
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/diff.txt dokuwiki-rc2009-12-02/inc/lang/nl/diff.txt
--- dokuwiki-2009-02-14/inc/lang/nl/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Verschillen======
+====== Verschillen ======
 
 Dit geeft de verschillen weer tussen de geselecteerde revisie en de huidige revisie van de pagina.
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/lang.php dokuwiki-rc2009-12-02/inc/lang/nl/lang.php
--- dokuwiki-2009-02-14/inc/lang/nl/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,9 @@
  * @author Wouter Schoot 
  * @author John de Graaff 
  * @author Dion Nicolaas 
+ * @author Danny Rotsaert 
+ * @author Marijn Hofstra hofstra.m@gmail.com
+ * @author Matthias Carchon webmaster@c-mattic.be
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -52,6 +55,7 @@
 $lang['btn_draft']             = 'Bewerk concept';
 $lang['btn_recover']           = 'Herstel concept';
 $lang['btn_draftdel']          = 'Verwijder concept';
+$lang['btn_revert']            = 'Herstellen';
 $lang['loggedinas']            = 'Ingelogd als';
 $lang['user']                  = 'Gebruikersnaam';
 $lang['pass']                  = 'Wachtwoord';
@@ -66,7 +70,7 @@
 $lang['badlogin']              = 'Sorry, gebruikersnaam of wachtwoord onjuist';
 $lang['minoredit']             = 'Kleine wijziging';
 $lang['draftdate']             = 'Concept automatisch opgeslagen op';
-$lang['nosecedit']             = 'De pagina is tussentijds veranderd, sectie informatie was verouderd, volledige pagina geladen.';
+$lang['nosecedit']             = 'De pagina is tussentijds veranderd, sectie-informatie was verouderd, volledige pagina geladen.';
 $lang['regmissing']            = 'Vul alle velden in';
 $lang['reguexists']            = 'Er bestaat al een gebruiker met deze loginnaam.';
 $lang['regsuccess']            = 'De gebruiker is aangemaakt. Het wachtwoord is per e-mail verzonden.';
@@ -88,8 +92,10 @@
 $lang['resendpwdbadauth']      = 'Sorry, deze authentiecatiecode is niet geldig. Controleer of je de volledige bevestigings-link hebt gebruikt.';
 $lang['resendpwdconfirm']      = 'Een bevestigingslink is per e-mail verzonden.';
 $lang['resendpwdsuccess']      = 'Je nieuwe wachtwoord is per e-mail verzonden.';
-$lang['license']               = 'Tenzij anders vermeld, inhoud van deze wiki is voorzien van de volgende licentie:';
-$lang['licenseok']             = 'Let op: Door deze pagina aan te passen ga je akkoord met het licenseren van de inhoud onder de volgende licentie:';
+$lang['license']               = 'Tenzij anders vermeld valt de inhoud van deze wiki onder de volgende licentie:';
+$lang['licenseok']             = 'Let op: Door deze pagina aan te passen geef je de inhoud vrij onder de volgende licentie:';
+$lang['searchmedia']           = 'Bestandsnaam zoeken:';
+$lang['searchmedia_in']        = 'Zoek in %s';
 $lang['txt_upload']            = 'Selecteer een bestand om te uploaden';
 $lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
 $lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
@@ -114,10 +120,14 @@
 $lang['mediainuse']            = 'Het bestand "%s" is niet verwijderd - het is nog in gebruik.';
 $lang['namespaces']            = 'Namespaces';
 $lang['mediafiles']            = 'Beschikbare bestanden in';
+$lang['js']['searchmedia']     = 'Zoek naar bestanden';
 $lang['js']['keepopen']        = 'Houd scherm open bij selectie';
 $lang['js']['hidedetails']     = 'Verberg details';
 $lang['js']['nosmblinks']      = 'Linken naar Windows shares werkt alleen in Microsoft Internet Explorer.
 Je kan de link wel kopiëren en plakken.';
+$lang['js']['linkwiz']         = 'Linkwizard';
+$lang['js']['linkto']          = 'Link naar:';
+$lang['js']['del_confirm']     = 'Item(s) verwijderen?';
 $lang['js']['mu_btn']          = 'Meerdere files tegelijk uploaden';
 $lang['mediausage']            = 'Gebruik de volgende syntax om aan het bestand te refereren:';
 $lang['mediaview']             = 'Bekijk het orginele bestand';
@@ -145,11 +155,11 @@
 $lang['external_edit']         = 'Externe bewerking';
 $lang['summary']               = 'Samenvatting wijziging';
 $lang['noflash']               = 'De Adobe Flash Plugin is vereist om de pagina te kunnen weergeven.';
+$lang['download']              = 'Download fragment';
 $lang['mail_newpage']          = 'pagina toegevoegd:';
 $lang['mail_changed']          = 'pagina aangepast:';
 $lang['mail_new_user']         = 'nieuwe gebruiker:';
 $lang['mail_upload']           = 'bestand geüpload:';
-$lang['qb_alert']              = 'Voer de tekst in die je wilt opmaken.\nDe tekst wordt toegevoegd aan het eind van het document.';
 $lang['qb_bold']               = 'Vette tekst';
 $lang['qb_italic']             = 'Cursieve tekst';
 $lang['qb_underl']             = 'Onderstreepte tekst';
@@ -160,6 +170,11 @@
 $lang['qb_h3']                 = 'Niveau 3 kop';
 $lang['qb_h4']                 = 'Niveau 4 kop';
 $lang['qb_h5']                 = 'Niveau 5 kop';
+$lang['qb_h']                  = 'Koptekst';
+$lang['qb_hs']                 = 'Kies koptekst';
+$lang['qb_hplus']              = 'Hogere koptekst';
+$lang['qb_hminus']             = 'Lagere koptekst';
+$lang['qb_hequal']             = 'Koptekst op zelfde niveau';
 $lang['qb_link']               = 'Interne link';
 $lang['qb_extlink']            = 'Externe link';
 $lang['qb_hr']                 = 'Horizontale lijn';
@@ -169,7 +184,7 @@
 $lang['qb_sig']                = 'Handtekening invoegen';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Speciale tekens';
-$lang['del_confirm']           = 'Item(s) verwijderen?';
+$lang['upperns']               = 'Spring naar bovenliggende namespace';
 $lang['admin_register']        = 'Nieuwe gebruiker toevoegen';
 $lang['metaedit']              = 'Metadata wijzigen';
 $lang['metasaveerr']           = 'Schrijven van metadata mislukt';
@@ -226,4 +241,13 @@
 $lang['mu_authfail']           = 'sessie beëindigd';
 $lang['mu_progress']           = '@PCT@% geüpload';
 $lang['mu_filetypes']          = 'Toegestane bestandstypes';
+$lang['mu_info']               = 'bestanden geüpload.';
+$lang['mu_lasterr']            = 'Laatste foutmelding:';
 $lang['recent_global']         = 'Je bekijkt momenteel de wijzigingen binnen de %s namespace. Je kunt ook de recente wijzigingen van de hele wiki bekijken.';
+$lang['years']                 = '%d jaar geleden';
+$lang['months']                = '%d maand geleden';
+$lang['weeks']                 = '%d weken geleden';
+$lang['days']                  = '%d dagen geleden';
+$lang['hours']                 = '%d uren geleden';
+$lang['minutes']               = '%d minuten geleden';
+$lang['seconds']               = '%d seconden geleden';
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/newpage.txt dokuwiki-rc2009-12-02/inc/lang/nl/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/nl/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Dit onderwerp bestaat nog niet======
+====== Dit onderwerp bestaat nog niet ======
 
 De pagina over dit onderwerp bestaat nog niet. Aanmaken kan door op de ''Maak deze pagina aan'' te klikken.
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/norev.txt dokuwiki-rc2009-12-02/inc/lang/nl/norev.txt
--- dokuwiki-2009-02-14/inc/lang/nl/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisie bestaat niet======
+====== Revisie bestaat niet ======
 
 De opgegeven revisie bestaat niet. Klik op ''Oude revisies'' voor een lijst van oude revisies van dit document.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/preview.txt dokuwiki-rc2009-12-02/inc/lang/nl/preview.txt
--- dokuwiki-2009-02-14/inc/lang/nl/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Preview======
+====== Preview ======
 
 Dit is een preview van de tekst zoals hij er uit komt te zien. Let op: het is nog **niet opgeslagen!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/recent.txt dokuwiki-rc2009-12-02/inc/lang/nl/recent.txt
--- dokuwiki-2009-02-14/inc/lang/nl/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Recente wijzigingen======
+====== Recente wijzigingen ======
 
 De volgende pagina's zijn recent aangepast.
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/registermail.txt dokuwiki-rc2009-12-02/inc/lang/nl/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/nl/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 IP-adres      : @IPADDRESS@
 Hostname      : @HOSTNAME@
 
---
+-- 
 Dit bericht is gegenereerd door DokuWiki op
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/nl/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/nl/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-==== Verstuur een nieuw wachtwoord =====
+==== Verstuur een nieuw wachtwoord ====
 
 Voer uw gebruikersnaam in het formulier hieronder in om een nieuw wachtwoord aan te vragen voor deze wiki. Een bevestigingslink zal worden verzonden naar het geregistreerde e-mailadres.
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/revisions.txt dokuwiki-rc2009-12-02/inc/lang/nl/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/nl/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Oude revisies======
+====== Oude revisies ======
 
 Dit zijn de oude revisies van het document. Om terug te keren naar een oude revisie selecteer je hem hieronder en klik je op de ''Pagina aanpassen'' en vervolgens op ''Opslaan''.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/nl/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/nl/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Zoeken======
+====== Zoeken ======
 
 Hieronder zijn de resultaten van de zoekopdracht. Niks gevonden? Maak een nieuwe pagina met als naam je zoekopdracht. Klik hiervoor op ''Pagina aanpassen''.
 
-=====Resultaten=====
+===== Resultaten =====
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/nl/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/nl/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,6 @@
 @NEWPAGE@
 en kies 'Opzeggen wijzigingen'.
 
---
+-- 
 Dit bericht is gegenereerd door DokuWiki op
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/nl/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/nl/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME type: @MIME@
 Gebruiker: @USER@
 
---
+-- 
 Dit bericht is gegenereerd door DokuWiki op
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/nl/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/nl/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/nl/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/nl/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM geblokkeerd======
+====== SPAM geblokkeerd ======
 
 Je wijzigingen zijn **niet** opgeslagen omdat ze een of meer geblokkeerde woorden bevatten. Als je probeerde de Wiki te spammen -- Foei stouterd! Als je denkt dat dit een fout is neem dan contact op met de beheerder van deze Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/no/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/no/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+====== Ekstra tilleggene ======
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/no/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/no/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/no/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Tilbakelinker======
+====== Tilbakelinker ======
 
 Dette er en liste over sider som ser ut til å linke tilbake til den aktuelle siden.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/no/conflict.txt dokuwiki-rc2009-12-02/inc/lang/no/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/no/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Det fins en nyere versjon======
+====== Det fins en nyere versjon ======
 
 Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/denied.txt dokuwiki-rc2009-12-02/inc/lang/no/denied.txt
--- dokuwiki-2009-02-14/inc/lang/no/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Adgang forbudt======
+====== Adgang forbudt ======
 
 Adgang forbudt. Kanskje du har glemt å logge deg inn?
diff -Naur dokuwiki-2009-02-14/inc/lang/no/diff.txt dokuwiki-rc2009-12-02/inc/lang/no/diff.txt
--- dokuwiki-2009-02-14/inc/lang/no/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Forskjeller======
+====== Forskjeller ======
 
 Her vises forskjeller mellom den valgte versjonen og den nåværende versjonen av dokumentet.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/install.html dokuwiki-rc2009-12-02/inc/lang/no/install.html
--- dokuwiki-2009-02-14/inc/lang/no/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -13,7 +13,7 @@
 
 
    Denne installasjonen vil sette opp din DokuWiki-konfigurasjon for
 ACL, som igjen tillater administrator
-innlogging og tilgang til DokuWikiens administratormeny for installasjon av utvidelser,
+innlogging og tilgang til DokuWikiens administratormeny for installasjon av tillegg,
 brukerbehandling, adgangskontrollbehandling til wikisider og endring av konfigurasjon.
 Det er ikke påkrevd for at DokuWiki skal virke, men det vil gjøre Dokuwiki enklere å
 administrere.
    
diff -Naur dokuwiki-2009-02-14/inc/lang/no/lang.php dokuwiki-rc2009-12-02/inc/lang/no/lang.php
--- dokuwiki-2009-02-14/inc/lang/no/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,10 @@
  * @author Rune M. Andersen 
  * @author Jakob Vad Nielsen (me@jakobnielsen.net)
  * @author Kjell Tore Næsgaard  
+ * @author Knut Staring 
+ * @author Lisa Ditlefsen 
+ * @author Erik Pedersen 
+ * @author Erik Bjørn Pedersen 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -42,7 +46,7 @@
 $lang['btn_update']            = 'Oppdater';
 $lang['btn_delete']            = 'Slett';
 $lang['btn_back']              = 'Tilbake';
-$lang['btn_backlink']          = 'Tilbakelinker';
+$lang['btn_backlink']          = 'Tilbakelenker';
 $lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
 $lang['btn_subscribe']         = 'Abonner på endringer';
 $lang['btn_unsubscribe']       = 'Ikke abonner på endringer';
@@ -54,6 +58,7 @@
 $lang['btn_draft']             = 'Rediger kladd';
 $lang['btn_recover']           = 'Gjennvinn kladd';
 $lang['btn_draftdel']          = 'Slett kladd';
+$lang['btn_revert']            = 'Gjenopprette';
 $lang['loggedinas']            = 'Innlogget som';
 $lang['user']                  = 'Brukernavn';
 $lang['pass']                  = 'Passord';
@@ -92,6 +97,8 @@
 $lang['resendpwdsuccess']      = 'Ditt nye passord er blitt sendt på e-post.';
 $lang['license']               = 'Der annet ikke er særskilt beskrevet, er innholdet på denne wiki regulert av følgende lisens:';
 $lang['licenseok']             = 'Merk: Ved å endre på denne siden godtar du at ditt innhold blir regulert av følgende lisens:';
+$lang['searchmedia']           = 'Søk filnavn';
+$lang['searchmedia_in']        = 'Søk i %s';
 $lang['txt_upload']            = 'Velg fil som skal lastes opp';
 $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
@@ -110,15 +117,20 @@
 $lang['uploadbadcontent']      = 'Det opplastede innholdet passer ikke til filendelsen %s.';
 $lang['uploadspam']            = 'Opplastingen ble blokkert av svartelisten for spam.';
 $lang['uploadxss']             = 'Opplastingen ble blokkert på grunn av mulig skadelig innhold.';
+$lang['uploadsize']            = 'Den opplastede filen var for stor. (max. %s)';
 $lang['deletesucc']            = 'Filen "%s" har blitt slettet.';
 $lang['deletefail']            = '"%s" kunne ikke slettes - sjekk rettighetene.';
 $lang['mediainuse']            = 'Filen "%s" har ikke biltt slettet - den er fortsatt i bruk.';
 $lang['namespaces']            = 'Navnerom';
 $lang['mediafiles']            = 'Tilgjengelige filer i';
+$lang['js']['searchmedia']     = 'Søk for filer';
 $lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
 $lang['js']['hidedetails']     = 'Skjul detaljer';
 $lang['js']['nosmblinks']      = 'Lenker til Windows-ressurser fungerer bare i Microsoft sin Internet Explorer.
 Du kan fortsatt kopiere og lime inn lenken.';
+$lang['js']['linkwiz']         = 'guide til lenker';
+$lang['js']['linkto']          = 'Lenke til:';
+$lang['js']['del_confirm']     = 'Slett denne oppføringen?';
 $lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
 $lang['mediausage']            = 'Bruk følgende syntaks til å refferer til denne filen:';
 $lang['mediaview']             = 'Vis original fil';
@@ -145,11 +157,12 @@
 $lang['restored']              = 'gjenopprettet til en tidligere versjon';
 $lang['external_edit']         = 'ekstern redigering';
 $lang['summary']               = 'Redigeringskommentar';
+$lang['noflash']               = 'For at dette innholdet skal vises må du ha Adobe Flash Plugin.';
+$lang['download']              = 'Last ned utdraget';
 $lang['mail_newpage']          = 'side lagt til:';
 $lang['mail_changed']          = 'side endret:';
 $lang['mail_new_user']         = 'ny bruker:';
 $lang['mail_upload']           = 'fil opplastet:';
-$lang['qb_alert']              = 'Vennligst skriv inn teksten du ønsker å formatere.\nDen vil bli lagt til mot slutten av dokumentet.';
 $lang['qb_bold']               = 'Fet tekst';
 $lang['qb_italic']             = 'Kursiv tekst';
 $lang['qb_underl']             = 'Understreket tekst';
@@ -160,6 +173,11 @@
 $lang['qb_h3']                 = 'Overskrift nivå 3';
 $lang['qb_h4']                 = 'Overskrift nivå 4';
 $lang['qb_h5']                 = 'Overskrift nivå 5';
+$lang['qb_h']                  = 'Overskrift';
+$lang['qb_hs']                 = 'Velg overskrift';
+$lang['qb_hplus']              = 'Høyere overskrift';
+$lang['qb_hminus']             = 'Lavere overskrift';
+$lang['qb_hequal']             = 'Overskrift på samme nivå';
 $lang['qb_link']               = 'Intern lenke';
 $lang['qb_extlink']            = 'Ekstern lenke';
 $lang['qb_hr']                 = 'Horisontal linje';
@@ -169,7 +187,7 @@
 $lang['qb_sig']                = 'Føy til signatur';
 $lang['qb_smileys']            = 'Smilefjes';
 $lang['qb_chars']              = 'Spesialtegn';
-$lang['del_confirm']           = 'Slett denne oppføringen?';
+$lang['upperns']               = 'gå til overordnet navnerom';
 $lang['admin_register']        = 'Legg til ny bruker';
 $lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skriving av metadata feilet';
@@ -230,4 +248,13 @@
 $lang['mu_authfail']           = 'sesjonen har utløpt';
 $lang['mu_progress']           = '@PCT@% lastet opp';
 $lang['mu_filetypes']          = 'Tillatte filtyper';
+$lang['mu_info']               = 'filer lastet opp.';
+$lang['mu_lasterr']            = 'Siste feilen:';
 $lang['recent_global']         = 'Du ser nå på endringene i navnerommet %s. Du kan ogsåse på nylig foretatte endringer for hele wikien.';
+$lang['years']                 = '%d år siden';
+$lang['months']                = '%d måneder siden';
+$lang['weeks']                 = '%d uker siden';
+$lang['days']                  = '%d dager siden';
+$lang['hours']                 = '%d timer siden';
+$lang['minutes']               = '%d minutter siden';
+$lang['seconds']               = '%d sekunder siden';
diff -Naur dokuwiki-2009-02-14/inc/lang/no/locked.txt dokuwiki-rc2009-12-02/inc/lang/no/locked.txt
--- dokuwiki-2009-02-14/inc/lang/no/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Dokumentet er låst======
+====== Dokumentet er låst ======
 
 Dette dokumentet er for tiden låst for redigering av en annen bruker. Du må vente til denne brukeren er ferdig med sin redigering, eller til dokumentlåsen opphører å gjelde.
diff -Naur dokuwiki-2009-02-14/inc/lang/no/login.txt dokuwiki-rc2009-12-02/inc/lang/no/login.txt
--- dokuwiki-2009-02-14/inc/lang/no/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Logg inn======
+====== Logg inn ======
 
 Du er ikke innlogget! Angi ditt brukernavn og passord nedenfor for å logge inn. Støtte for såkalte "cookies" må være aktivert i din nettleser for at du skal kunne logge inn.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/no/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/no/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,6 @@
 @DIFF@
 
 
---
+-- 
 Denne meldingen ble laget av DokuWiki
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/no/newpage.txt dokuwiki-rc2009-12-02/inc/lang/no/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/no/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Det fins ikke noe innhold======
+====== Det fins ikke noe innhold ======
 
 Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''.
diff -Naur dokuwiki-2009-02-14/inc/lang/no/norev.txt dokuwiki-rc2009-12-02/inc/lang/no/norev.txt
--- dokuwiki-2009-02-14/inc/lang/no/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Det fins ingen slik versjon======
+====== Det fins ingen slik versjon ======
 
 Den angitte versjonen fins ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/preview.txt dokuwiki-rc2009-12-02/inc/lang/no/preview.txt
--- dokuwiki-2009-02-14/inc/lang/no/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Forhåndsvisning======
+====== Forhåndsvisning ======
 
 Dette er en forhåndsvisning av hvordan din tekst kommer til å se ut når den blir vist. Husk at den er **ikke lagret** ennå!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/no/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/no/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,6 @@
 
 @CONFIRM@
 
---
+-- 
 Denne e-posten ble generert av DokuWiki på
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/no/recent.txt dokuwiki-rc2009-12-02/inc/lang/no/recent.txt
--- dokuwiki-2009-02-14/inc/lang/no/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Siste nytt======
+====== Siste nytt ======
 
 Følgende sider/dokumenter har nylig blitt oppdatert.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/register.txt dokuwiki-rc2009-12-02/inc/lang/no/register.txt
--- dokuwiki-2009-02-14/inc/lang/no/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Registrer deg som bruker======
+====== Registrer deg som bruker ======
 
 Angi all informasjon som det blir spurt om nedenfor for å skape en ny brukerkonto for denne wiki. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]].
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/revisions.txt dokuwiki-rc2009-12-02/inc/lang/no/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/no/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Historikk======
+====== Historikk ======
 
 Her vises tidligere versjoner av dokumentet. For å sette dette dokumentet tilbake til en tidligere versjon kan du velge den ønskede versjonen nedenfor, klikke på **''Rediger denne siden''** og lagre dokumentet.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/no/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/no/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/no/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Søk======
+====== Søk ======
 
 Du ser resultatet av dette søket nedenfor. Hvis du ikke finner det du leter etter, så kan du skape en ny side med samme navn som ditt søk ved å klikke på ''**Lag denne siden**''-knappen.
 
-=====Resultat=====
+===== Resultat =====
diff -Naur dokuwiki-2009-02-14/inc/lang/no/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/no/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/no/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,6 @@
 på wikien på @DOKUWIKIURL@, besøk deretter @NEWPAGE@
 og velg 'Ikke abonner på endringer'.
 
---
+-- 
 Denne mailen ble generert av DokuWiki på
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/no/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/no/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/no/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME-type : @MIME@
 Bruker : @USER@
 
---
+-- 
 Denne e-posten ble generert av DokuWiki på
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/no/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/no/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/no/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/no/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ordsperre======
+====== Ordsperre ======
 
 Dine endringer har **ikke** blitt lagret på grunn av at de inneholder ett eller flere ord som er sperret. Hvis du har forsøkt å lagre søppel, eller såkalt ''spam'' -- Fy deg! Hvis du anser denne beskjeden som feilaktig kan du kontakte administratoren til denne wikien.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/pl/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/pl/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Dodatkowe Wtyczki =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/lang.php dokuwiki-rc2009-12-02/inc/lang/pl/lang.php
--- dokuwiki-2009-02-14/inc/lang/pl/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -6,6 +6,7 @@
  * @author Grzegorz Żur 
  * @author Mariusz Kujawski 
  * @author Maciej Kurczewski 
+ * @author SÅ‚awomir Boczek 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -48,6 +49,7 @@
 $lang['btn_draft']             = 'Edytuj szkic';
 $lang['btn_recover']           = 'Przywróć szkic';
 $lang['btn_draftdel']          = 'Usuń szkic';
+$lang['btn_revert']            = 'Przywróć';
 $lang['loggedinas']            = 'Zalogowany jako';
 $lang['user']                  = 'Użytkownik';
 $lang['pass']                  = 'Hasło';
@@ -86,6 +88,8 @@
 $lang['resendpwdsuccess']      = 'Nowe hasło zostało wysłane pocztą.';
 $lang['license']               = 'Wszystkie treści w tym wiki, którym nie przyporządkowano licencji, podlegają licencji:';
 $lang['licenseok']             = 'Uwaga: edytując tę stronę zgadzasz się na publikowanie jej treści pod licencją:';
+$lang['searchmedia']           = 'Szukaj pliku o nazwie:';
+$lang['searchmedia_in']        = 'Szukaj w  %s';
 $lang['txt_upload']            = 'Wybierz plik do wysłania';
 $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
@@ -104,15 +108,20 @@
 $lang['uploadbadcontent']      = 'Typ pliku "%s" nie odpowiadał jego rozszerzeniu.';
 $lang['uploadspam']            = 'Plik zablokowany przez filtr antyspamowy.';
 $lang['uploadxss']             = 'Plik zablokowany ze względu na podejrzaną zawartość.';
+$lang['uploadsize']            = 'Plik jest za duży (maksymalny rozmiar %s)';
 $lang['deletesucc']            = 'Plik "%s" został usunięty.';
 $lang['deletefail']            = 'Plik "%s" nie został usunięty, sprawdź uprawnienia.';
 $lang['mediainuse']            = 'Plik "%s" nie został usunięty, ponieważ jest używany.';
 $lang['namespaces']            = 'Katalogi';
 $lang['mediafiles']            = 'Dostępne pliki';
+$lang['js']['searchmedia']     = 'Szukaj plików';
 $lang['js']['keepopen']        = 'Nie zamykaj okna po wyborze';
 $lang['js']['hidedetails']     = 'Ukryj szczegóły';
-$lang['js']['nosmblinks']      = 'Odnośniki do zasobów sieci Windows działają tylko w przeglądarce Internet Explorer. 
+$lang['js']['nosmblinks']      = 'Odnośniki do zasobów sieci Windows działają tylko w przeglądarce Internet Explorer.
 Możesz skopiować odnośnik.';
+$lang['js']['linkwiz']         = 'Tworzenie odnośników';
+$lang['js']['linkto']          = 'Link do';
+$lang['js']['del_confirm']     = 'Czy na pewno usunąć?';
 $lang['js']['mu_btn']          = 'Wyślij wiele plików na raz';
 $lang['mediausage']            = 'Użyj następującej składni w odnośniku do tego pliku:';
 $lang['mediaview']             = 'Pokaż oryginalny plik';
@@ -140,11 +149,11 @@
 $lang['external_edit']         = 'edycja zewnętrzna';
 $lang['summary']               = 'Opis zmian';
 $lang['noflash']               = 'Plugin Adobe Flash Plugin jest niezbędny do obejrzenia tej zawartości.';
+$lang['download']              = 'Pobierz zrzut';
 $lang['mail_newpage']          = 'Strona dodana:';
 $lang['mail_changed']          = 'Strona zmieniona:';
 $lang['mail_new_user']         = 'Nowy użytkownik:';
 $lang['mail_upload']           = 'Umieszczono plik:';
-$lang['qb_alert']              = 'Wpisz tekst, który chcesz sformatować. \nBędzie on dołączony na koniec strony.';
 $lang['qb_bold']               = 'Pogrubienie';
 $lang['qb_italic']             = 'Pochylenie';
 $lang['qb_underl']             = 'Podkreślenie';
@@ -155,6 +164,11 @@
 $lang['qb_h3']                 = 'Nagłówek 3 stopnia';
 $lang['qb_h4']                 = 'Nagłówek 4 stopnia';
 $lang['qb_h5']                 = 'Nagłówek 5 stopnia';
+$lang['qb_h']                  = 'Nagłówek';
+$lang['qb_hs']                 = 'Wybierz nagłówek';
+$lang['qb_hplus']              = 'Nagłówek wyższego stopnia';
+$lang['qb_hminus']             = 'Nagłówek niższego stopnia';
+$lang['qb_hequal']             = 'Nagłówek tego samego stopnia';
 $lang['qb_link']               = 'Odnośnik wewnętrzny';
 $lang['qb_extlink']            = 'Odnośnik zewnętrzny';
 $lang['qb_hr']                 = 'Linia pozioma';
@@ -164,7 +178,7 @@
 $lang['qb_sig']                = 'Wstaw podpis';
 $lang['qb_smileys']            = 'Emotikony';
 $lang['qb_chars']              = 'Znaki specjalne';
-$lang['del_confirm']           = 'Czy na pewno usunąć?';
+$lang['upperns']               = 'Skok piętro wyżej';
 $lang['admin_register']        = 'Dodawanie użytkownika';
 $lang['metaedit']              = 'Edytuj metadane';
 $lang['metasaveerr']           = 'Zapis metadanych nie powiódł się';
@@ -222,4 +236,13 @@
 $lang['mu_authfail']           = 'sesja wygasła';
 $lang['mu_progress']           = '@PCT@% wysłano';
 $lang['mu_filetypes']          = 'Dozwolone typy plików';
+$lang['mu_info']               = 'wysłanych plików.';
+$lang['mu_lasterr']            = 'Ostatni błąd:';
 $lang['recent_global']         = 'W tej chwili przeglądasz zmiany w katalogu %s. Możesz przejrzeć także zmiany w całym wiki.';
+$lang['years']                 = '%d lat temu';
+$lang['months']                = '%d miesięcy temu';
+$lang['weeks']                 = '%d tygodni temu';
+$lang['days']                  = '%d dni temu';
+$lang['hours']                 = '%d godzin temu';
+$lang['minutes']               = '%d minut temu';
+$lang['seconds']               = '%d sekund temu';
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/pl/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/pl/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-Strona w Twoim DokuWiki została dodana lub zmieniona. 
+Strona w Twoim DokuWiki została dodana lub zmieniona.
 Szczegółowe informacje:
 
 Data         : @DATE@
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/pl/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/pl/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 List został wygenerowany przez DokuWiki pod adresem
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/revisions.txt dokuwiki-rc2009-12-02/inc/lang/pl/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/pl/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Poprzednie wersje ======
 
-Poprzednie wersje tej strony. Aby przywrócić poprzednią wersję wybierz ją, rozpocznij edycję a potem zapisz. 
+Poprzednie wersje tej strony. Aby przywrócić poprzednią wersję wybierz ją, rozpocznij edycję a potem zapisz.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/pl/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/pl/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,6 @@
 Typ MIME     : @MIME@
 Użytkownik   : @USER@
 
---
+-- 
 List został wygenerowany przez DokuWiki pod adresem
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/pl/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/pl/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/pl/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pl/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,4 @@
 ====== Blokowanie niedozwolonych treści i spamu ======
-    Twoje zmiany **nie** zostały zapisane, ponieważ zawierają niedozwolone słowa. Jeśli próbowałeś(aś) umieścić niedozwolone treści to wstydź się!
+
+Twoje zmiany **nie** zostały zapisane, ponieważ zawierają niedozwolone słowa. Jeśli próbowałeś(aś) umieścić niedozwolone treści to wstydź się!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/pt/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/pt/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/denied.txt dokuwiki-rc2009-12-02/inc/lang/pt/denied.txt
--- dokuwiki-2009-02-14/inc/lang/pt/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Permissão Negada ======
 
-Não possui direitos e permissões suficientes para continuar. Por acaso, não se esqueceu de entrar em sessão?
+Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de entrar em sessão?
 
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/lang.php dokuwiki-rc2009-12-02/inc/lang/pt/lang.php
--- dokuwiki-2009-02-14/inc/lang/pt/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -6,6 +6,8 @@
  * @author José Carlos Monteiro 
  * @author José Monteiro 
  * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -14,10 +16,10 @@
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '´';
-$lang['btn_edit']              = 'Editar Página';
-$lang['btn_source']            = 'Ver em bruto';
-$lang['btn_show']              = 'Ver Página';
-$lang['btn_create']            = 'Criar Página';
+$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_search']            = 'Pesquisar';
 $lang['btn_save']              = 'Gravar';
 $lang['btn_preview']           = 'Prever';
@@ -30,9 +32,9 @@
 $lang['btn_cancel']            = 'Cancelar';
 $lang['btn_index']             = 'Ãndice';
 $lang['btn_secedit']           = 'Editar';
-$lang['btn_login']             = 'Entrar em sessão';
-$lang['btn_logout']            = 'Sair da sessão';
-$lang['btn_admin']             = 'Gerir';
+$lang['btn_login']             = 'Entrar';
+$lang['btn_logout']            = 'Sair';
+$lang['btn_admin']             = 'Administrar';
 $lang['btn_update']            = 'Actualizar';
 $lang['btn_delete']            = 'Apagar';
 $lang['btn_back']              = 'Voltar';
@@ -41,7 +43,7 @@
 $lang['btn_subscribe']         = 'Subscrever Alterações';
 $lang['btn_unsubscribe']       = 'Não Subscrever Alterações';
 $lang['btn_subscribens']       = 'Subscrever Mudanças de Espaço de Nome';
-$lang['btn_unsubscribens']     = 'Dessubscrever Mudanças de Espaço de Nome';
+$lang['btn_unsubscribens']     = 'Cancelar Subscrição de Mudanças de Espaço de Nome';
 $lang['btn_profile']           = 'Actualizar Perfil';
 $lang['btn_reset']             = 'Limpar';
 $lang['btn_resendpwd']         = 'Enviar nova senha';
@@ -54,14 +56,15 @@
 $lang['newpass']               = 'Nova senha';
 $lang['oldpass']               = 'Confirme senha actual';
 $lang['passchk']               = 'Confirmar novamente';
-$lang['remember']              = 'Sessão Automática?';
+$lang['remember']              = 'Memorizar?';
 $lang['fullname']              = 'Nome completo';
-$lang['email']                 = 'Correio Electrónico';
-$lang['register']              = 'Inscrever';
+$lang['email']                 = 'Email';
+$lang['register']              = 'Registar';
 $lang['profile']               = 'Perfil do Utilizador';
 $lang['badlogin']              = 'O utilizador inválido ou senha inválida.';
 $lang['minoredit']             = 'Alterações Menores';
 $lang['draftdate']             = 'Rascunho automaticamente gravado em';
+$lang['nosecedit']             = 'A página foi modificada entretanto. Como a informação da secção estava desactualizada, foi carregada a página inteira.';
 $lang['regmissing']            = 'Por favor, preencha todos os campos.';
 $lang['reguexists']            = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
 $lang['regsuccess']            = 'O utilizador foi criado e a senha foi enviada para o endereço de correio electrónico usado na inscrição.';
@@ -70,19 +73,21 @@
 $lang['regbadmail']            = 'O endereço de correio electrónico é inválido. Se o endereço está correcto, e isto é um erro, por favor, contacte o administrador!';
 $lang['regbadpass']            = 'As duas senhas não são idênticas, por favor tente de novo.';
 $lang['regpwmail']             = 'A sua senha DokuWiki';
-$lang['reghere']               = 'Para se inscrever, clique em';
+$lang['reghere']               = 'Para se registar, clique em';
 $lang['profna']                = 'Este Wiki não suporta modificações aos perfis.';
 $lang['profnochange']          = 'Nada alteração, nada a fazer.';
 $lang['profnoempty']           = 'Não são permitidos nomes ou endereços em branco.';
 $lang['profchanged']           = 'Perfil do utilizador actualizado com sucesso.';
-$lang['pwdforget']             = 'Senha esquecida? Pedir nova senha';
-$lang['resendna']              = 'Este Wiki não suporta re-envio de senhas.';
+$lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
+$lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
 $lang['resendpwd']             = 'Enviar nova senha para';
 $lang['resendpwdmissing']      = 'É preciso preencher todos os campos.';
 $lang['resendpwdnouser']       = 'Não foi possível encontrar este utilizador.';
 $lang['resendpwdbadauth']      = 'O código de autenticação não é válido. Por favor, assegure-se de que o link de confirmação está completo.';
 $lang['resendpwdconfirm']      = 'O link de confirmação foi enviado por e-mail.';
 $lang['resendpwdsuccess']      = 'A nova senha foi enviada por e-mail.';
+$lang['license']               = 'Excepto menção em contrário, o conteúdo neste wiki está sob a seguinte licença:';
+$lang['licenseok']             = 'Nota: Ao editar esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
 $lang['txt_upload']            = 'Escolha ficheiro para carregar';
 $lang['txt_filename']          = 'Carregar como (opcional)';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
@@ -101,6 +106,7 @@
 $lang['uploadbadcontent']      = 'O conteúdo carregado não corresponde à extensão %s.';
 $lang['uploadspam']            = 'O carregamento foi bloqueado pela lista negra de SPAM.';
 $lang['uploadxss']             = 'O carregamento foi bloqueado porque possivelmente contem conteúdo malicioso.';
+$lang['uploadsize']            = 'O ficheiro carregado é demasiado grande. (máx. %s)';
 $lang['deletesucc']            = 'O ficheiro "%s" foi removido.';
 $lang['deletefail']            = 'O ficheiro "%s" não pode ser removido, por favor verifique as permissões.';
 $lang['mediainuse']            = 'O ficheiro "%s" não foi removido porque está ainda a ser usado.';
@@ -108,6 +114,11 @@
 $lang['mediafiles']            = 'Ficheiros disponíveis em';
 $lang['js']['keepopen']        = 'Mantenha a janela aberta durante a selecção';
 $lang['js']['hidedetails']     = 'Esconder Detalhes';
+$lang['js']['nosmblinks']      = 'Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.
+Pode no entanto copiar e colar o link.';
+$lang['js']['linkwiz']         = 'Assistente de Criação de Ligação';
+$lang['js']['linkto']          = 'Ligação para:';
+$lang['js']['del_confirm']     = 'Remover esta entrada?';
 $lang['js']['mu_btn']          = 'Enviar múltiplos ficheiros de uma vez';
 $lang['mediausage']            = 'Use a seguinte sintaxe para referenciar este ficheiro:';
 $lang['mediaview']             = 'Ver ficheiro original';
@@ -125,21 +136,21 @@
 $lang['diff']                  = 'mostrar diferenças com a versão actual';
 $lang['diff2']                 = 'mostrar diferenças entre versões escolhidas';
 $lang['line']                  = 'Linha';
-$lang['breadcrumb']            = 'Visitou';
+$lang['breadcrumb']            = 'Está em';
 $lang['youarehere']            = 'Está aqui';
-$lang['lastmod']               = 'Modificado em';
+$lang['lastmod']               = 'Esta página foi modificada pela última vez em';
 $lang['by']                    = 'por';
 $lang['deleted']               = 'Documento automaticamente removido.';
 $lang['created']               = 'Criação deste novo documento.';
 $lang['restored']              = 'Versão anterior restaurada.';
 $lang['external_edit']         = 'Edição externa';
 $lang['summary']               = 'Sumário da Edição';
+$lang['noflash']               = 'O Plugin Adobe Flash é necessário para exibir este conteúdo.';
+$lang['download']              = 'Descarregar Snippet';
 $lang['mail_newpage']          = 'documento adicionado:';
 $lang['mail_changed']          = 'documento modificado:';
 $lang['mail_new_user']         = 'Novo utilizador:';
 $lang['mail_upload']           = 'Ficheiro carregado:';
-$lang['js']['nosmblinks']            = "Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.\nPode no entanto copiar e colar o link.";
-$lang['qb_alert']              = 'Por favor, insira o texto que deseja formatar.\nSerá acrescentado ao fim do documento.';
 $lang['qb_bold']               = 'Texto com Ênfase';
 $lang['qb_italic']             = 'Texto Itálico';
 $lang['qb_underl']             = 'Texto Sublinhado';
@@ -150,6 +161,11 @@
 $lang['qb_h3']                 = 'Cabeçalho Nível 3';
 $lang['qb_h4']                 = 'Cabeçalho Nível 4';
 $lang['qb_h5']                 = 'Cabeçalho Nível 5';
+$lang['qb_h']                  = 'Cabeçalho';
+$lang['qb_hs']                 = 'Seleccionar Cabeçalho';
+$lang['qb_hplus']              = 'Cabeçalho Maior';
+$lang['qb_hminus']             = 'Cabeçalho Menor';
+$lang['qb_hequal']             = 'Cabeçalho de Nível Semelhante';
 $lang['qb_link']               = 'Ligação Interna';
 $lang['qb_extlink']            = 'Ligação Externa';
 $lang['qb_hr']                 = 'Barra Horizontal';
@@ -159,13 +175,13 @@
 $lang['qb_sig']                = 'Inserir Assinatura';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Caracteres Especiais';
-$lang['del_confirm']           = 'Remover esta entrada?';
-$lang['admin_register']        = 'Inscrever Novo Utilizador';
+$lang['upperns']               = 'Ir para o espaço de nomes parente';
+$lang['admin_register']        = 'Registar Novo Utilizador';
 $lang['metaedit']              = 'Editar Metadata';
 $lang['metasaveerr']           = 'Falhou a escrita de Metadata';
 $lang['metasaveok']            = 'Metadata gravada';
 $lang['img_backto']            = 'De volta a';
-$lang['img_title']             = 'Tírulo';
+$lang['img_title']             = 'Título';
 $lang['img_caption']           = 'Legenda';
 $lang['img_date']              = 'Data';
 $lang['img_fname']             = 'Ficheiro';
@@ -173,7 +189,7 @@
 $lang['img_artist']            = 'Fotógrafo';
 $lang['img_copyr']             = 'Copyright';
 $lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Câmera';
+$lang['img_camera']            = 'Câmara';
 $lang['img_keywords']          = 'Palavras-Chave';
 $lang['subscribe_success']     = '%s adicionado à lista de subscritores de %s';
 $lang['subscribe_error']       = 'Erro ao adicionar %s à lista de subscritores de %s';
@@ -183,11 +199,11 @@
 $lang['authmodfailed']         = 'Configuração de autenticação errada. Por favor, informe o Wiki Admin.';
 $lang['authtempfail']          = 'Autenticação temporariamente indisponível. Se a situação persistir, por favor informe o Wiki Admin.';
 $lang['i_chooselang']          = 'Escolha a linguagem';
-$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_installer']           = 'Instalador do DokuWiki';
 $lang['i_wikiname']            = 'Nome Wiki';
 $lang['i_enableacl']           = 'Activar ACL (recomendado)';
 $lang['i_superuser']           = 'Super-utilizador';
-$lang['i_problems']            = 'O Installer encontrou alguns problemas, indicados mais abaixo. Não pode continuar até que sejam corrigidos.';
+$lang['i_problems']            = 'O instalador encontrou alguns problemas, indicados mais abaixo. Não pode continuar até que sejam corrigidos.';
 $lang['i_modified']            = 'Por razões de segurança, este script só funciona em novas e não-modificadas instalações do Dokuwiki. Deve por isso re-extrair os ficheiros do pacote que descarregou ou então deve consultar as completas instruções de instalação do Dokuwiki installation instructions';
 $lang['i_funcna']              = 'A função PHP %s não está disponível. Terá o serviço de alojamento desactivado-a por alguma razão?';
 $lang['i_phpver']              = 'A versão de PHP actual %s é inferior à versão mínima %s. É preciso actualizar a instalação PHP.';
@@ -214,5 +230,8 @@
 $lang['mu_done']               = 'completo';
 $lang['mu_fail']               = 'falhou';
 $lang['mu_authfail']           = 'sessão expirada';
-$lang['mu_progress']           = '@PCT@% uploaded';
+$lang['mu_progress']           = '@PCT@% transferido';
 $lang['mu_filetypes']          = 'Tipos de Ficheiros Permitidos';
+$lang['mu_info']               = 'Ficheiros carregados.';
+$lang['mu_lasterr']            = 'Último erro:';
+$lang['recent_global']         = 'Você está a observar as alterações dentro do espaço de nomes %s. Também é possível ver as modificações recentes no wiki inteiro.';
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/login.txt dokuwiki-rc2009-12-02/inc/lang/pt/login.txt
--- dokuwiki-2009-02-14/inc/lang/pt/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
-====== Sessão ======
+====== Entrar ======
 
-Não está actualmente em sessão!\\ Introduza as suas credenciais de autenticação para entrar em sessão.
+Não está actualmente em sessão!\\ Introduza os seus dados de utilizador para entrar em sessão.
 
-**Nota**: Precisa de ter //cookies// activos no seu browser.
+**Nota**: Precisa de ter //cookies// activos no seu navegador.
 
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/newpage.txt dokuwiki-rc2009-12-02/inc/lang/pt/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/pt/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -2,6 +2,6 @@
 
 Acaba de tentar aceder a um documento que ainda não existe.
 
-Pode criar o conteúdo deste novo documento após clicar no botão .
+Pode criar o conteúdo deste novo documento após clicar no botão .
 
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/pt/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/pt/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 
 Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/revisions.txt dokuwiki-rc2009-12-02/inc/lang/pt/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/pt/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Revisões ======
 
-Estas são as revisões ao documento corrente.\\ Para reverter o documento para uma destas revisões:   * Escolha a revisão do documento da lista abaixo;   * Clique depois no botão ;   * Faça as alterações que veja necessárias - opcional;   * Grava a revisão antiga como sendo a revisão actual do documento. Após a gravação, o documento da versão actual será substituído pelo documento da revisão escolhida.
+Estas são as revisões ao documento corrente.\\ Para reverter o documento para uma destas revisões:   * Escolha a revisão do documento da lista abaixo;   * Clique depois no botão ;   * Faça as alterações que veja necessárias - opcional;   * Grava a revisão antiga como sendo a revisão actual do documento. Após a gravação, o documento da versão actual será substituído pelo documento da revisão escolhida.
 
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/pt/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/pt/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
 ====== Pesquisa ======
 
-Pode encontrar os resultados da sua pesquisa na secção mais abaixo.
+Os resultados da sua pesquisa encontram-se mais abaixo.
 
-Se não encontrou o que procurava, pode criar uma nova página com o nome da pergunta, usando o botão .
+Se não encontrou o que procurava, pode criar uma nova página com o nome da sua pesquisa, usando o botão .
 
 ===== Resultados =====
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/pt/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/pt/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,7 +1,7 @@
-# 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/
+# Esta é uma lista de plavaras que o indexador ignora, uma palavra por linha
+# Quando você edita esta lista certifique-se que usa fim de linha usado em sistemas UNIX
+# Não é necessário incluir palavras menores que 3 letras - estas são sempre ignoradas
+# Esta lista é baseada nas encontradas em http://www.ranks.nl/stopwords/
 último
 acerca
 agora
diff -Naur dokuwiki-2009-02-14/inc/lang/pt/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/pt/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/pt/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Actualize o seu perfil ======
 
-Apenas precisa de completar os campos que pretende alterar. Não é possível alterar o seu //username//.
\ Brak znaku nowej linii na końcu pliku
+Apenas precisa de completar os campos que pretende alterar. Não é possível alterar o seu nome de utilizador.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/install.html dokuwiki-rc2009-12-02/inc/lang/pt-br/install.html
--- dokuwiki-2009-02-14/inc/lang/pt-br/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -2,6 +2,6 @@
 
 
    O DokuWiki utiliza arquivos em texto simples para o armazenamento das páginas wiki e de outras informações associadas a essas páginas (ex.: imagens, índices de pesquisa, revisões antigas, etc.). Para que o DokuWiki funcione corretamente, ele precisa ter permissão de escrita aos diretórios onde esses arquivos ficarão armazenados. Esse instalador não tem capacidade de configurar as permissões de diretório. Isso normalmente é feito usando-se a linha de comando ou através do FTP ou do painel de controle da sua hospedagem (ex.: cPanel).
    
 
-
    O instalador irá definir as configurações da ACL do seu DokuWiki, o que permitirá a autenticação do administrador e o acesso ao menu de administração do sistema. Esse menu é utilizado para instalar plugins, alterar as configurações do ambiente e gerenciar usuários e acessos às páginas do wiki. Isso não é necessário para o funcionamento do DokuWiki, mas irá torna sua administração mais simples.
    
+
    O instalador irá definir as configurações da ACL do seu DokuWiki, o que permitirá a autenticação do administrador e o acesso ao menu de administração do sistema. Esse menu é utilizado para instalar plug-ins, alterar as configurações do ambiente e gerenciar usuários e acessos às páginas do wiki. Isso não é necessário para o funcionamento do DokuWiki, mas irá torna sua administração mais simples.
    
 
 
    Usuários experientes ou que necessitem efetuar configurações especiais devem utilizar os seguintes links, com instruções detalhadas da instalação e da configuração.
    
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/lang.php dokuwiki-rc2009-12-02/inc/lang/pt-br/lang.php
--- dokuwiki-2009-02-14/inc/lang/pt-br/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -14,6 +14,8 @@
  * @author jair.henrique@gmail.com
  * @author Luis Dantas 
  * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -56,6 +58,7 @@
 $lang['btn_draft']             = 'Editar o rascunho';
 $lang['btn_recover']           = 'Recuperar o rascunho';
 $lang['btn_draftdel']          = 'Excluir o rascunho';
+$lang['btn_revert']            = 'Restaure';
 $lang['loggedinas']            = 'Autenticado(a) como';
 $lang['user']                  = 'Nome de usuário';
 $lang['pass']                  = 'Senha';
@@ -122,6 +125,8 @@
 $lang['js']['hidedetails']     = 'Esconder detalhes';
 $lang['js']['nosmblinks']      = 'Atalhos para pastas compartilhadas do Windows funcionam apenas no Microsoft Internet Explorer.
 Entretanto, você ainda pode copiar e colar o atalho.';
+$lang['js']['linkto']          = 'Link para:';
+$lang['js']['del_confirm']     = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
 $lang['js']['mu_btn']          = 'Enviar vários arquivos de uma vez';
 $lang['mediausage']            = 'Use a seguinte sintaxe para referenciar esse arquivo:';
 $lang['mediaview']             = 'Ver o arquivo original';
@@ -148,12 +153,11 @@
 $lang['restored']              = 'revisão anterior restaurada';
 $lang['external_edit']         = 'edição externa';
 $lang['summary']               = 'Resumo da edição';
-$lang['noflash']               = 'O Plugin Adobe Flash é necessário para exibir este conteúdo.';
+$lang['noflash']               = 'O plug-in Adobe Flash é necessário para exibir este conteúdo.';
 $lang['mail_newpage']          = 'página adicionada:';
 $lang['mail_changed']          = 'página modificada:';
 $lang['mail_new_user']         = 'novo usuário:';
 $lang['mail_upload']           = 'arquivo enviado:';
-$lang['qb_alert']              = 'Por favor, insira o texto que você deseja formatar.\nEle será adicionado ao final do documento.';
 $lang['qb_bold']               = 'Texto em negrito';
 $lang['qb_italic']             = 'Texto em itálico';
 $lang['qb_underl']             = 'Texto sublinhado';
@@ -164,6 +168,7 @@
 $lang['qb_h3']                 = 'Cabeçalho de nível 3';
 $lang['qb_h4']                 = 'Cabeçalho de nível 4';
 $lang['qb_h5']                 = 'Cabeçalho de nível 5';
+$lang['qb_h']                  = 'Cabeçalho';
 $lang['qb_link']               = 'Link interno';
 $lang['qb_extlink']            = 'Link externo';
 $lang['qb_hr']                 = 'Linha horizontal';
@@ -173,7 +178,6 @@
 $lang['qb_sig']                = 'Inserir assinatura';
 $lang['qb_smileys']            = 'Carinhas';
 $lang['qb_chars']              = 'Caracteres especiais';
-$lang['del_confirm']           = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
 $lang['admin_register']        = 'Adicionar novo usuário';
 $lang['metaedit']              = 'Editar metadados';
 $lang['metasaveerr']           = 'Não foi possível escrever os metadados';
@@ -231,4 +235,13 @@
 $lang['mu_authfail']           = 'a sessão expirou';
 $lang['mu_progress']           = '@PCT@% enviado';
 $lang['mu_filetypes']          = 'Tipos de arquivo permitidos';
+$lang['mu_info']               = 'arquivos enviados.';
+$lang['mu_lasterr']            = 'Erro mais recente:';
 $lang['recent_global']         = 'Você está observando as alterações dentro do espaço de nomes %s. Também é possível ver as modificações recentes no wiki inteiro.';
+$lang['years']                 = '%d anos atrás';
+$lang['months']                = '%d meses atrás';
+$lang['weeks']                 = '%d semanas atrás';
+$lang['days']                  = '%d dias atrás';
+$lang['hours']                 = '%d horas atrás';
+$lang['minutes']               = '%d minutos atrás';
+$lang['seconds']               = '%d segundos atrás';
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Essa mensagem foi gerada pelo DokuWiki em
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/registermail.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 Endereço IP: @IPADDRESS@
 Nome do host: @HOSTNAME@
 
---
+-- 
 Essa mensagem foi gerada pelo DokuWiki em
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/revisions.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Revisões anteriores======
+====== Revisões anteriores ======
 
 Essas são as revisões anteriores desse documento. Para reverter a uma revisão antiga, selecione-a abaixo, clique em ''Editar esta página'' e salve-a.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Pesquisa======
+====== Pesquisa ======
 
 Você pode encontrar os resultados da sua pesquisa abaixo. Se você não encontrou o que está procurando, pode criar ou editar a página com o nome que você especificou, usando o botão apropriado.
 
-=====Resultados=====
+===== Resultados =====
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Atualize o perfil da sua conta======
+====== Atualize o perfil da sua conta ======
 
 Você precisa preencher somente os campos que você deseja alterar. Você não pode alterar o seu nome de usuário.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 Tipo MIME: @MIME@
 Usuário: @USER@
 
---
+-- 
 Essa mensagem foi gerada pelo DokuWiki em
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/pt-br/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/pt-br/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/pt-br/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/pt-br/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Bloqueio de SPAM======
+====== Bloqueio de SPAM ======
 
 Suas modificações **não** foram salvas porque elas contém uma ou mais palavras bloqueadas. Se você tentou enviar //spam// para o //wiki//, isso é feio, muito feio! Agora, se você acha que esse bloqueio foi indevido, por favor entre em contato com o administrador desse wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/ro/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/ro/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Plugin-uri Adiţionale =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/diff.txt dokuwiki-rc2009-12-02/inc/lang/ro/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ro/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Diferenţe======
+====== Diferenţe ======
 
 Aceasta arată diferenţele dintre revziile selectate şi versiunea curentă a paginii.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/lang.php dokuwiki-rc2009-12-02/inc/lang/ro/lang.php
--- dokuwiki-2009-02-14/inc/lang/ro/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -7,6 +7,9 @@
  * @author Sergiu Baltariu 
  * @author s_baltariu@yahoo.com
  * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric AndraÅŸi 
+ * @author Emanuel-Emeric Andrasi 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -49,6 +52,7 @@
 $lang['btn_draft']             = 'Editează schiţă';
 $lang['btn_recover']           = 'Recuperează schiţă';
 $lang['btn_draftdel']          = 'Şterge schiţă';
+$lang['btn_revert']            = 'Revenire';
 $lang['loggedinas']            = 'Logat ca ÅŸi';
 $lang['user']                  = 'Utilizator';
 $lang['pass']                  = 'Parola';
@@ -87,6 +91,8 @@
 $lang['resendpwdsuccess']      = 'Parola nouă';
 $lang['license']               = 'Exceptând locurile unde este altfel specificat, conţinutul acestui wiki este licenţiat sub următoarea licenţă:';
 $lang['licenseok']             = 'Notă: Prin editarea acestei pagini sunteţi de acord să vă licenţiaţi conţintul sub următoarea licenţă:';
+$lang['searchmedia']           = 'Caută numele fişierului:';
+$lang['searchmedia_in']        = 'Caută în %s';
 $lang['txt_upload']            = 'Selectează fisierul de încărcat';
 $lang['txt_filename']          = 'Încarcă fişierul ca (opţional)';
 $lang['txt_overwrt']           = 'Suprascrie fiÅŸierul existent';
@@ -111,10 +117,14 @@
 $lang['mediainuse']            = 'Fişierul "%s" nu a fost şters - este încă în uz.';
 $lang['namespaces']            = 'Spaţii de nume';
 $lang['mediafiles']            = 'Fişiere disponibile în';
+$lang['js']['searchmedia']     = 'Caută fişiere';
 $lang['js']['keepopen']        = 'Menţine fereastra deschisă la selecţie';
 $lang['js']['hidedetails']     = 'Ascunde Detalii';
 $lang['js']['nosmblinks']      = 'Legăturile către sharing-uri Windows funcţioneaza numai in Microsoft Internet Explorer.
 Puteţi însă copia şi insera legătura.';
+$lang['js']['linkwiz']         = 'Asistent legătură';
+$lang['js']['linkto']          = 'Legătură la:';
+$lang['js']['del_confirm']     = 'Doriţi într-adevăr ştergerea elementelor selectate?';
 $lang['js']['mu_btn']          = 'Încarcă mai multe fişiere simultan';
 $lang['mediausage']            = 'Folosiţi următoarea sintaxă pentru a face referinţă la acest fişier:';
 $lang['mediaview']             = 'Vizualizează fişierul original';
@@ -142,11 +152,11 @@
 $lang['external_edit']         = 'editare externă';
 $lang['summary']               = 'Editează sumarul';
 $lang['noflash']               = 'Plugin-ul Adobe Flash Plugin este necesar pentru afişarea corectă a conţinutului.';
+$lang['download']              = 'Bloc descărcări';
 $lang['mail_newpage']          = 'pagina adăugată:';
 $lang['mail_changed']          = 'page schimbată:';
 $lang['mail_new_user']         = 'utilizator nou';
 $lang['mail_upload']           = 'fişier încărcat:';
-$lang['qb_alert']              = 'Introduceţi vă rog textul care doriţi să-l formataţi.\nVa fi adăugat la sfîtşitul documentului.';
 $lang['qb_bold']               = 'Text ÃŽngroÅŸat';
 $lang['qb_italic']             = 'Text Italic';
 $lang['qb_underl']             = 'Text Subliniat';
@@ -157,6 +167,11 @@
 $lang['qb_h3']                 = 'Titlu de Nivel 3';
 $lang['qb_h4']                 = 'Titlu de Nivel 4';
 $lang['qb_h5']                 = 'Titlu de Nivel 5';
+$lang['qb_h']                  = 'Titlu';
+$lang['qb_hs']                 = 'Selectaţi Titlul';
+$lang['qb_hplus']              = 'Titlu mai mare';
+$lang['qb_hminus']             = 'Titlu mai mic';
+$lang['qb_hequal']             = 'Titlu de acelaÅŸi nivel';
 $lang['qb_link']               = 'Legătură internă';
 $lang['qb_extlink']            = 'Legătura externă';
 $lang['qb_hr']                 = 'Linie Orizontal';
@@ -166,7 +181,7 @@
 $lang['qb_sig']                = 'Inserează semnătură';
 $lang['qb_smileys']            = 'Smiley-uri';
 $lang['qb_chars']              = 'Caractere speciale';
-$lang['del_confirm']           = 'Doriţi într-adevăr ştergerea elementelor selectate?';
+$lang['upperns']               = 'sari la numele de spaţiu părinte';
 $lang['admin_register']        = 'Adaugă utilizator nou';
 $lang['metaedit']              = 'Editează Metadata';
 $lang['metasaveerr']           = 'Scrierea metadatelor a eÅŸuat';
@@ -224,4 +239,13 @@
 $lang['mu_authfail']           = 'sesiunea a expirat';
 $lang['mu_progress']           = '@PCT@% incărcat';
 $lang['mu_filetypes']          = 'Tipuri de fiÅŸiere permise';
+$lang['mu_info']               = 'fişiere încărcate';
+$lang['mu_lasterr']            = 'Ultima eroare:';
 $lang['recent_global']         = 'Acum vizualizaţi modificările în interiorul numelui de spaţiu %s. De asemenea puteţi vizualiza modificările recente ale întregului wiki.';
+$lang['years']                 = 'acum %d ani';
+$lang['months']                = 'acum %d luni';
+$lang['weeks']                 = 'acum %d săptămâni';
+$lang['days']                  = 'acum %d zile';
+$lang['hours']                 = 'acum %d ore';
+$lang['minutes']               = 'acum %d minute';
+$lang['seconds']               = 'acum %d secunde';
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/newpage.txt dokuwiki-rc2009-12-02/inc/lang/ro/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/ro/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Subiectul nu există încă====
+====== Subiectul nu există încă ======
 
 Aţi urmat o legătură către un subiect care nu există. O puteţi crea prin apăsarea butonului ''Editează această pagină''.
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/norev.txt dokuwiki-rc2009-12-02/inc/lang/ro/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ro/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Nu există versiunea======
+====== Nu există versiunea ======
 
 Versiunea specificată nu există. Foloseşte butonul ''Versiuni vechi'' pentru o listă a versiunilor acestui document.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/preview.txt dokuwiki-rc2009-12-02/inc/lang/ro/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ro/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Previzualizare======
+====== Previzualizare ======
 
-Acesta este modul în care va arăta textul. Nu uita: **Nu** e încă **salvat**! 
+Acesta este modul în care va arăta textul. Nu uita: **Nu** e încă **salvat**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ro/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ro/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
-Acest mail a fost generat de DocuWiki la 
+-- 
+Acest mail a fost generat de DocuWiki la
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/read.txt dokuwiki-rc2009-12-02/inc/lang/ro/read.txt
--- dokuwiki-2009-02-14/inc/lang/ro/read.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-Această pagină poate fi doar citită. Poţi vedea sursa, dar n-o poţi modifica. Consultă administratorul dacă crezi că e ceva în neregulă. 
+Această pagină poate fi doar citită. Poţi vedea sursa, dar n-o poţi modifica. Consultă administratorul dacă crezi că e ceva în neregulă.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/recent.txt dokuwiki-rc2009-12-02/inc/lang/ro/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ro/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Schimbări recente======
+====== Schimbări recente ======
 
 Următoarele pagini au fost schimbate recent.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ro/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ro/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Versiune veche======
+====== Versiune veche ======
 
 Acestea sînt versiunile vechi ale documentului curent. Pentru revenirea la o versiune mai veche, selecteaz-o de mai jos, clic pe ''Editează această pagină'' şi salveaz-o.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ro/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ro/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Căutare======
+====== Căutare ======
 
 Rezultatele căutării sînt afisate mai jos. Dacă n-aţi găsit ce-aţi căutat, puteţi creea o pagină nouă după căutare prin folosirea butonului ''Editează această pagină''.
 
-=====Rezultate=====
+===== Rezultate =====
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/ro/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/ro/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,11 +7,11 @@
 @DIFF@
 --------------------------------------------------------
 
-Pentru a vă dezabona, logaţi-vă la wiki la 
+Pentru a vă dezabona, logaţi-vă la wiki la
 @DOKUWIKIURL@, apoi vizitaţi
 @NEWPAGE@
 şi alegeţi 'Anulează modificările'.
 
---
+-- 
 Acest mail a fost generat automat de către DokuWiki la
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ro/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ro/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Type : @MIME@
 Utilizator : @USER@
 
---
+-- 
 Acest mail a fost generat automat de către DokuWiki la
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ro/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ro/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ro/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ro/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM blocat======
+====== SPAM blocat ======
 
 Modificările **nu** au fost salvate deoarece conţin unul sau mai multe cuvinte nepermise. Daca ai încercat să spamezi Wiki-ul -- Eşti un om rău! Dacă crezi că asta e o eroare, contactează administratorul acestui Wiki.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/ru/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/ru/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Дополнительные плагины =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/denied.txt dokuwiki-rc2009-12-02/inc/lang/ru/denied.txt
--- dokuwiki-2009-02-14/inc/lang/ru/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======ДоÑтуп запрещен======
+====== ДоÑтуп запрещен ======
 
 Извините, у Ð²Ð°Ñ Ð½Ðµ хватает прав Ð´Ð»Ñ Ñтого дейÑтвиÑ. Может быть, Ð’Ñ‹ забыли войти в вики под Ñвоим именем?
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/diff.txt dokuwiki-rc2009-12-02/inc/lang/ru/diff.txt
--- dokuwiki-2009-02-14/inc/lang/ru/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======РазличиÑ======
+====== Ð Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ ======
 
 ЗдеÑÑŒ показаны Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ выбранной ревизией и текущей верÑией данной Ñтраницы.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/lang.php dokuwiki-rc2009-12-02/inc/lang/ru/lang.php
--- dokuwiki-2009-02-14/inc/lang/ru/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,10 @@
  * @author Змей ЭтерийÑкий evil_snake@eternion.ru
  * @author Hikaru Nakajima 
  * @author Alexei Tereschenko 
+ * @author Irina Ponomareva irinaponomareva@webperfectionist.com
+ * @author Alexander Sorkin 
+ * @author Kirill Krasnov 
+ * @author Vlad Tsybenko 
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
@@ -43,16 +47,17 @@
 $lang['btn_back']              = 'Ðазад';
 $lang['btn_backlink']          = 'СÑылки Ñюда';
 $lang['btn_backtomedia']       = 'ВернутьÑÑ Ðº выбору медиа-файла';
-$lang['btn_subscribe']         = 'ПодпиÑатьÑÑ';
-$lang['btn_unsubscribe']       = 'ОтпиÑатьÑÑ';
-$lang['btn_subscribens']       = 'ПодпиÑатьÑÑ Ð½Ð° ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± изменениÑÑ… в проÑтранÑтве имён';
-$lang['btn_unsubscribens']     = 'ОтказатьÑÑ Ð¾Ñ‚ подпиÑки на ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± изменениÑÑ… в проÑтранÑтве имён';
+$lang['btn_subscribe']         = 'ПодпиÑатьÑÑ (вÑе правки)';
+$lang['btn_unsubscribe']       = 'ОтпиÑатьÑÑ (вÑе правки)';
+$lang['btn_subscribens']       = 'ПодпиÑатьÑÑ (правки Ñтого раздела)';
+$lang['btn_unsubscribens']     = 'ОтпиÑатьÑÑ (правки Ñтого раздела)';
 $lang['btn_profile']           = 'Профиль';
 $lang['btn_reset']             = 'СброÑ';
 $lang['btn_resendpwd']         = 'ПоÑлать новый пароль';
 $lang['btn_draft']             = 'Править черновик';
 $lang['btn_recover']           = 'ВоÑÑтановить черновик';
 $lang['btn_draftdel']          = 'Удалить черновик';
+$lang['btn_revert']            = 'ВоÑÑтановить';
 $lang['loggedinas']            = 'Зашли как';
 $lang['user']                  = 'Логин';
 $lang['pass']                  = 'Пароль';
@@ -91,6 +96,8 @@
 $lang['resendpwdsuccess']      = 'Ваш новый пароль был выÑлан по e-mail.';
 $lang['license']               = 'За иÑключением Ñлучаев, когда указано иное, Ñодержимое Ñтой вики предоÑтавлÑетÑÑ Ð½Ð° уÑловиÑÑ… Ñледующей лицензии:';
 $lang['licenseok']             = 'Примечание: Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÑ Ñту Ñтраницу, Ð’Ñ‹ ÑоглашаетеÑÑŒ на иÑпользование вашего вклада на уÑловиÑÑ… Ñледующей лицензии:';
+$lang['searchmedia']           = 'ПоиÑк по имени файла:';
+$lang['searchmedia_in']        = 'ПоиÑк в %s';
 $lang['txt_upload']            = 'Выберите файл Ð´Ð»Ñ Ð·Ð°ÐºÐ°Ñ‡ÐºÐ¸';
 $lang['txt_filename']          = 'Введите Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° в вики (необÑзательно)';
 $lang['txt_overwrt']           = 'ПерезапиÑать ÑущеÑтвующий файл';
@@ -115,10 +122,14 @@
 $lang['mediainuse']            = 'Файл "%s" не был удалён - файл вÑÑ‘ ещё иÑпользуетÑÑ.';
 $lang['namespaces']            = 'ПроÑтранÑтва имён';
 $lang['mediafiles']            = 'ДоÑтупные файлы';
+$lang['js']['searchmedia']     = 'ПоиÑк файлов';
 $lang['js']['keepopen']        = 'Ðе закрывать окно поÑле выбора';
 $lang['js']['hidedetails']     = 'Скрыть детали';
 $lang['js']['nosmblinks']      = 'СÑылка на Ñетевые каталоги Windows работает только из Интернет ЭкÑплорера
 Ðо Ð’Ñ‹ можете Ñкопировать ÑÑылку.';
+$lang['js']['linkwiz']         = 'МаÑтер ÑÑылок';
+$lang['js']['linkto']          = 'СÑылка на:';
+$lang['js']['del_confirm']     = 'Ð’Ñ‹ на Ñамом деле желаете удалить выбранное?';
 $lang['js']['mu_btn']          = 'Загрузить неÑколько файлов одновременно';
 $lang['mediausage']            = 'Ð”Ð»Ñ ÑÑылки на Ñтот файл иÑпользуйте Ñледующий ÑинтакÑиÑ:';
 $lang['mediaview']             = 'ПоÑмотреть иÑходный файл';
@@ -146,11 +157,11 @@
 $lang['external_edit']         = 'внешнее изменение';
 $lang['summary']               = 'Сводка изменений';
 $lang['noflash']               = 'Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñтого Ñодержимого требуетÑÑ Adobe Flash Plugin.';
+$lang['download']              = 'Скачать код';
 $lang['mail_newpage']          = 'Ñтраница добавлена:';
 $lang['mail_changed']          = 'Ñтраница изменена:';
 $lang['mail_new_user']         = 'новый пользователь:';
 $lang['mail_upload']           = 'файл закачан:';
-$lang['qb_alert']              = 'ПожалуйÑта, введите текÑÑ‚, который хотите отформатировать.\nОн будет добавлен в конец документа.';
 $lang['qb_bold']               = 'Полужирный шрифт';
 $lang['qb_italic']             = 'КурÑивный шрифт';
 $lang['qb_underl']             = 'Подчеркивание';
@@ -161,6 +172,11 @@
 $lang['qb_h3']                 = 'Заголовок ÑƒÑ€Ð¾Ð²Ð½Ñ 3';
 $lang['qb_h4']                 = 'Заголовок ÑƒÑ€Ð¾Ð²Ð½Ñ 4';
 $lang['qb_h5']                 = 'Заголовок ÑƒÑ€Ð¾Ð²Ð½Ñ 5';
+$lang['qb_h']                  = 'Заголовок';
+$lang['qb_hs']                 = 'Выбор заголовка';
+$lang['qb_hplus']              = 'Заголовок более выÑокого уровнÑ';
+$lang['qb_hminus']             = 'Заголовок более низкого ÑƒÑ€Ð¾Ð²Ð½Ñ (подзаголовок)';
+$lang['qb_hequal']             = 'Заголовок текущего уровнÑ';
 $lang['qb_link']               = 'ВнутреннÑÑ ÑÑылка';
 $lang['qb_extlink']            = 'ВнешнÑÑ ÑÑылка';
 $lang['qb_hr']                 = 'Разделитель';
@@ -170,7 +186,7 @@
 $lang['qb_sig']                = 'Ð’Ñтавить подпиÑÑŒ';
 $lang['qb_smileys']            = 'Смайлики';
 $lang['qb_chars']              = 'Специальные Ñимволы';
-$lang['del_confirm']           = 'Ð’Ñ‹ на Ñамом деле желаете удалить выбранное?';
+$lang['upperns']               = 'Перейти в родительÑкое проÑтранÑтво имен';
 $lang['admin_register']        = 'Добавить пользователÑ';
 $lang['metaedit']              = 'Править метаданные';
 $lang['metasaveerr']           = 'Ошибка запиÑи метаданных';
@@ -199,7 +215,7 @@
 $lang['i_enableacl']           = 'Разрешить ограничение прав доÑтупа (рекомендуетÑÑ)';
 $lang['i_superuser']           = 'Суперюзер';
 $lang['i_problems']            = 'Программа уÑтановки ÑтолкнулаÑÑŒ Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°Ð¼Ð¸, перечиÑленными ниже. Чтобы продолжить, вам необходимо их уÑтранить. ';
-$lang['i_modified']            = 'Из Ñоображений безопаÑноÑти Ñта программа запуÑкаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ на новой, неизменённой уÑтановке DokuWiki. 
+$lang['i_modified']            = 'Из Ñоображений безопаÑноÑти Ñта программа запуÑкаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ на новой, неизменённой уÑтановке DokuWiki.
                          Вам нужно либо заново раÑпаковать Ñкачанный пакет уÑтановки, либо обратитьÑÑ Ðº полной
                          инÑтрукции по уÑтановке DokuWiki';
 $lang['i_funcna']              = 'Ð¤ÑƒÐ½ÐºÑ†Ð¸Ñ PHP %s недоÑтупна. Может быть, она по какой-то причине заблокирована Вашим хоÑтингом?';
@@ -223,11 +239,20 @@
 $lang['mu_gridstat']           = 'СтатуÑ';
 $lang['mu_namespace']          = 'ПроÑтранÑтво имён';
 $lang['mu_browse']             = 'Обзор';
-$lang['mu_toobig']             = 'Слишком большой';
-$lang['mu_ready']              = 'Готово к загрузке';
-$lang['mu_done']               = 'Завершено';
-$lang['mu_fail']               = 'Провалено';
-$lang['mu_authfail']           = 'ИÑтекло Ð²Ñ€ÐµÐ¼Ñ ÑеÑÑии';
+$lang['mu_toobig']             = 'Ñлишком большой';
+$lang['mu_ready']              = 'готово к загрузке';
+$lang['mu_done']               = 'завершено';
+$lang['mu_fail']               = 'провалено';
+$lang['mu_authfail']           = 'иÑтекло Ð²Ñ€ÐµÐ¼Ñ ÑеÑÑии';
 $lang['mu_progress']           = '@PCT@% загружено';
 $lang['mu_filetypes']          = 'ДопуÑтимые типы файлов';
+$lang['mu_info']               = 'файлов загружено.';
+$lang['mu_lasterr']            = 'ПоÑледнÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°:';
 $lang['recent_global']         = 'Ð’Ñ‹ проÑматриваете Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² проÑтранÑтве имён %s. Ð’Ñ‹ можете также проÑмотреть недавние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° вÑей вики.';
+$lang['years']                 = '%d лет назад';
+$lang['months']                = '%d меÑÑц(ев) назад';
+$lang['weeks']                 = '%d недель назад';
+$lang['days']                  = '%d дней назад';
+$lang['hours']                 = '%d чаÑ(ов) назад';
+$lang['minutes']               = '%d минут назад';
+$lang['seconds']               = '%d Ñекунд назад';
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/norev.txt dokuwiki-rc2009-12-02/inc/lang/ru/norev.txt
--- dokuwiki-2009-02-14/inc/lang/ru/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Такой верÑии не ÑущеÑтвует======
+====== Такой верÑии не ÑущеÑтвует ======
 
 Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ñтраницы не ÑущеÑтвует. Ðажмите на кнопку ''ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ñтраницы'', чтобы получить ÑпиÑок доÑтупных предыдущих верÑий Ñтого документа.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/preview.txt dokuwiki-rc2009-12-02/inc/lang/ru/preview.txt
--- dokuwiki-2009-02-14/inc/lang/ru/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======ПроÑмотр======
+====== ПроÑмотр ======
 
 ЗдеÑÑŒ показано, как Ваш текÑÑ‚ будет выглÑдеть. Внимание: текÑÑ‚ ещё **не Ñохранён!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/ru/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/ru/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Это Ñообщение было Ñгенерировано DokuWiki по адреÑу
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/recent.txt dokuwiki-rc2009-12-02/inc/lang/ru/recent.txt
--- dokuwiki-2009-02-14/inc/lang/ru/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ðедавние изменениÑ======
+====== Ðедавние Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ======
 
 Эти Ñтраницы были изменены недавно.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/revisions.txt dokuwiki-rc2009-12-02/inc/lang/ru/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/ru/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ñтраницы======
+====== ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ñтраницы ======
 
 Перед Вами — иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð°Ð²Ð¾Ðº текущего документа. Чтобы вернутьÑÑ Ðº одной из предыдущих верÑий, выберите нужную, нажмите ''Править Ñтраницу'' и Ñохраните.
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/ru/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/ru/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======ПоиÑк======
+====== ПоиÑк ======
 
 Перед Вами — результаты поиÑка. ЕÑли Ð’Ñ‹ не нашли то, что иÑкали, Ð’Ñ‹ можете Ñоздать новую Ñтраницу Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼, Ñовпадающим Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñом. Чтобы Ñделать Ñто, проÑто нажмите на кнопку ''Создать Ñтраницу''.
 
-=====Результаты=====
\ Brak znaku nowej linii na końcu pliku
+===== Результаты =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/ru/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/ru/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 Тип MIME    : @MIME@
 Пользователь: @USER@
 
---
+-- 
 Это пиÑьмо было Ñгенерировано DokuWiki по адреÑу
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/ru/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/ru/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/ru/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/ru/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======СПÐÐœ заблокирован======
+====== СПÐÐœ заблокирован ======
 
 Ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ **не были** Ñохранены, так как они Ñодержат одно или более запрещенных Ñлов. ЕÑли Ð’Ñ‹ пыталиÑÑŒ добавить Ñпам в Вики -- ай-Ñй-Ñй!  ЕÑли Ð’Ñ‹ Ñчитаете, что Ñто какаÑ-то ошибка, обратитеÑÑŒ к админиÑтратору вики.
diff -Naur dokuwiki-2009-02-14/inc/lang/sk/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/sk/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/sk/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sk/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Spätné odkazy ======
 
-Tu je zoznam stránok, ktoré pravdepodobne odkazujú na aktuálnu stránku. 
+Tu je zoznam stránok, ktoré pravdepodobne odkazujú na aktuálnu stránku.
diff -Naur dokuwiki-2009-02-14/inc/lang/sk/lang.php dokuwiki-rc2009-12-02/inc/lang/sk/lang.php
--- dokuwiki-2009-02-14/inc/lang/sk/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sk/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -146,7 +146,6 @@
 $lang['mail_changed']          = 'stránka zmenená:';
 $lang['mail_new_user']         = 'Nový užívateľ:';
 $lang['mail_upload']           = 'nahraný súbor:';
-$lang['qb_alert']              = 'Vložte prosím text, ktorý chcete formátovať.\nTen bude pridaný na koniec dokumentu.';
 $lang['qb_bold']               = 'TuÄné';
 $lang['qb_italic']             = 'Kurzíva';
 $lang['qb_underl']             = 'PodÄiarknutie';
@@ -166,7 +165,7 @@
 $lang['qb_sig']                = 'Vložiť podpis';
 $lang['qb_smileys']            = 'Smajlíky';
 $lang['qb_chars']              = 'Špeciálne znaky';
-$lang['del_confirm']           = 'Zmazať túto položku?';
+$lang['js']['del_confirm']           = 'Zmazať túto položku?';
 $lang['admin_register']        = 'Pridaj nového užívateľa';
 $lang['metaedit']              = 'Upraviť metainformácie';
 $lang['metasaveerr']           = 'Zápis metainformácií zlyhal';
@@ -219,7 +218,10 @@
 $lang['mu_namespace']          = 'Oblasť mien';
 $lang['mu_browse']             = 'Prehľadávať';
 $lang['mu_toobig']             = 'príliš veľký';
+$lang['mu_ready']              = 'pripravený na nahratie';
 $lang['mu_done']               = 'dokonÄený';
 $lang['mu_fail']               = 'neúspešný';
+$lang['mu_authfail']           = 'spojenie vypršalo';
+$lang['mu_progress']           = '@PCT@% nahraných';
 $lang['mu_filetypes']          = 'Povolené typy súborov';
 $lang['recent_global']         = 'Práve prehliadate zmeny v mennom priestore %s. Môžete si tiež pozrieť aktuálne zmeny celej wiki.';
diff -Naur dokuwiki-2009-02-14/inc/lang/sk/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/sk/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/sk/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sk/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,7 +12,7 @@
 @NEWPAGE@
 a zvoľte 'Neposielať zmeny'.
 
---
+-- 
 Tento mail bol vygenerovaný DokuWiki na
 @DOKUWIKIURL@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sk/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/sk/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/sk/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sk/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME Typ : @MIME@
 Užívateľ : @USER@
 
---
+-- 
 Tento mail vygenerovalo DokuWiki na
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/denied.txt dokuwiki-rc2009-12-02/inc/lang/sl/denied.txt
--- dokuwiki-2009-02-14/inc/lang/sl/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Nimate dovoljenja======
+====== Nimate dovoljenja ======
 
 Oprostite, za nadaljevanje nimati dovolj dovoljenj. MogoÄe ste se pozabili prijaviti?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/diff.txt dokuwiki-rc2009-12-02/inc/lang/sl/diff.txt
--- dokuwiki-2009-02-14/inc/lang/sl/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Primerjaj izbrane razliÄice======
+====== Primerjaj izbrane razliÄice ======
 
-Prikaže se vam razlika med izbrano in trenutno razliÄico te strani.
+Prikazana je razlika med izbrano in trenutno razliÄico te strani.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/lang.php dokuwiki-rc2009-12-02/inc/lang/sl/lang.php
--- dokuwiki-2009-02-14/inc/lang/sl/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -36,6 +36,7 @@
 $lang['btn_delete']            = 'Izbriši';
 $lang['btn_back']              = 'Nazaj';
 $lang['btn_profile']           = 'Posodobi profil';
+$lang['btn_reset']             = 'Ponastavi';
 $lang['btn_resendpwd']         = 'Pošlji novo geslo';
 $lang['btn_draft']             = 'Uredi osnutek';
 $lang['btn_recover']           = 'Obnovi osnutek';
@@ -45,12 +46,15 @@
 $lang['pass']                  = 'Geslo';
 $lang['newpass']               = 'Novo geslo';
 $lang['oldpass']               = 'Potrdi trenutno geslo';
+$lang['passchk']               = 'ponovno';
 $lang['remember']              = 'Zapomni si me';
 $lang['fullname']              = 'Pravo ime';
 $lang['email']                 = 'Elektronska pošta';
 $lang['register']              = 'Odpri nov raÄun';
-$lang['profile']               = 'Profil uporabnik';
+$lang['profile']               = 'Profil uporabnika';
 $lang['badlogin']              = 'Oprostite, uporabniško ime ali geslo ni pravo.';
+$lang['minoredit']             = 'Manjše spremembe';
+$lang['draftdate']             = 'Samodejno shranjevanje osnutka vkljuÄeno';
 $lang['regmissing']            = 'Oprostite, zapolniti morate vsa polja.';
 $lang['reguexists']            = 'Oprostite, uporabnik s tem imenom že obstaja.';
 $lang['regsuccess']            = 'Uporabnik je bil ustvarjen. Geslo je bilo poslano na vaš elektronski naslov.';
@@ -60,9 +64,12 @@
 $lang['regbadpass']            = 'Gesli nista enaki.';
 $lang['regpwmail']             = 'Vaše geslo za DokuWiki';
 $lang['reghere']               = 'Nimate Å¡e raÄuna? Priskrbite si ga';
+$lang['profnochange']          = 'Brez sprememb, niÄesar za storiti.';
 $lang['profchanged']           = 'Uporabniški profil uspešno posodobljen';
 $lang['pwdforget']             = 'Pozabili geslo? Pridobite novega';
 $lang['resendpwd']             = 'Pošlji novo geslo za';
+$lang['resendpwdmissing']      = 'Se opraviÄujemo, vendar morate izpolniti vsa polja.';
+$lang['resendpwdnouser']       = 'Se opraviÄujemo, vendar tega uporabniÅ¡kega imena ni v bazi.';
 $lang['resendpwdconfirm']      = 'Potrditvena povezava je bila poslana na vaš elektronski naslov';
 $lang['resendpwdsuccess']      = 'Vaše novo geslo je bilo poslano na vaš elektronski naslov';
 $lang['txt_upload']            = 'Izberite datoteko za pošiljanje';
@@ -79,10 +86,17 @@
 $lang['uploadsucc']            = 'Pošiljanje uspelo';
 $lang['uploadfail']            = 'PoÅ¡iljanje je spodletelo. MogoÄe nimate dovoljenj?';
 $lang['uploadwrong']           = 'PoÅ¡iljanje zavrnjeno. Ta datoteÄna konÄnica je prepovedana';
+$lang['uploadexist']           = 'Dokument že obstaja. Brez sprememb.';
+$lang['uploadxss']             = 'Prenos je bil zaustavljen zaradi možne zlonamerne vsebine.';
+$lang['uploadsize']            = 'Prenesen dokument je prevelik. (max. %s)';
 $lang['deletesucc']            = 'Datoteka "%s" je bila izbrisana.';
+$lang['mediainuse']            = 'Dokument "%s" ni bil izbrisan - je Å¡e vedno v uporabi.';
 $lang['namespaces']            = 'Imenski prostori';
 $lang['mediafiles']            = 'Datoteke ki so na voljo v';
 $lang['js']['hidedetails']     = 'Skrij podrobnosti';
+$lang['js']['nosmblinks']      = 'Povezovanje do Windows deljenih datotek deluje samo v Microsoft Internet Explorer-ju.
+Å e vedno pa lahko roÄno kopirate povezavo.';
+$lang['js']['mu_btn']          = 'Prenesite veÄ dokumentov naenkrat.';
 $lang['mediaview']             = 'Poglej originalno datoteko';
 $lang['hits']                  = 'Zadetkov';
 $lang['quickhits']             = 'Ujemanja v imenih strani';
@@ -99,12 +113,11 @@
 $lang['created']               = 'ustvarjena';
 $lang['restored']              = 'stara razliÄica povrnjena';
 $lang['summary']               = 'Povzetek urejanja';
+$lang['noflash']               = 'Za prikaz vsebine potrebujete Adobe Flash Plugin';
 $lang['mail_newpage']          = '[DokuWiki] stran dodana:';
 $lang['mail_changed']          = '[DokuWiki] stran spremenjena:';
 $lang['mail_new_user']         = 'nov uporabnik.';
 $lang['mail_upload']           = 'naložena datoteka:';
-$lang['js']['nosmblinks']            = "Povezovanje do Windows deljenih datotek deluje samo v Microsoft Internet Explorer-ju.\nÅ e vedno pa lahko roÄno kopirate povezavo.";
-$lang['qb_alert']              = 'Prosimo vnesite besedilo, ki ga želite oblikovati.\nDodano bo na konec dokumenta.';
 $lang['qb_bold']               = 'Krepki tisk';
 $lang['qb_italic']             = 'LežeÄi tisk';
 $lang['qb_underl']             = 'PodÄrtano besedilo';
@@ -127,6 +140,7 @@
 $lang['admin_register']        = 'Dodaj novega uporabnika';
 $lang['metaedit']              = 'Popravi metapodatke';
 $lang['metasaveerr']           = 'Zapisovanje metapodatkov ni uspelo';
+$lang['metasaveok']            = 'Meta podatki shranjeni';
 $lang['img_backto']            = 'Nazaj na';
 $lang['img_title']             = 'Naslov';
 $lang['img_caption']           = 'Opis';
@@ -138,6 +152,11 @@
 $lang['img_camera']            = 'Fotoaparat';
 $lang['img_keywords']          = 'KljuÄne besede';
 $lang['i_chooselang']          = 'Izberite jezik';
+$lang['i_installer']           = 'DokuWiki namestitev';
+$lang['i_wikiname']            = 'Wiki ime';
+$lang['i_enableacl']           = 'OmogoÄi ACL (priporoÄeno)';
+$lang['i_superuser']           = 'Naduporabnik';
+$lang['i_confexists']          = '%s že obstaja';
 $lang['mu_gridsize']           = 'Velikost';
 $lang['mu_done']               = 'konÄano';
 $lang['mu_filetypes']          = 'Dovoljeni tipi datotek';
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/locked.txt dokuwiki-rc2009-12-02/inc/lang/sl/locked.txt
--- dokuwiki-2009-02-14/inc/lang/sl/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== Stran je zaklenjena ======
 
-To stran je nekdo zaklenjenil za urejanje. PoÄakati morate, da jo ta uporabnik neha urejati ali pa da poteÄe zaklep. 
+To stran je nekdo zaklenjenil za urejanje. PoÄakati morate, da jo ta uporabnik neha urejati ali pa da poteÄe zaklep.
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/newpage.txt dokuwiki-rc2009-12-02/inc/lang/sl/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/sl/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Ta stran Å¡e ne obstaja======
+====== Ta stran Å¡e ne obstaja ======
 
-Sledili ste povezavi na stran, ki Å¡e ne obstaja. Ustvarite jo lahko, tako da pritisnete na ''Ustvari to stran''. 
+Sledili ste povezavi na stran, ki Å¡e ne obstaja. Ustvarite jo lahko, tako da pritisnete na ''Ustvari to stran''.
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/norev.txt dokuwiki-rc2009-12-02/inc/lang/sl/norev.txt
--- dokuwiki-2009-02-14/inc/lang/sl/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ta razliÄica ne obstaja======
+====== Ta razliÄica ne obstaja ======
 
 Podana razliÄica ne obstaja. Uporabite gumb ''Stare razliÄice'' za seznam starih razliÄic tega dokumenta.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/preview.txt dokuwiki-rc2009-12-02/inc/lang/sl/preview.txt
--- dokuwiki-2009-02-14/inc/lang/sl/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Predogled======
+====== Predogled ======
 
 To je predogled strani. Lahko si ogledate kako bo izgledal dokument. Ne pozabite pa, da Å¡e ni shranjen!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/sl/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/sl/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 To sporoÄilo je ustvaril DokuWiki na
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/recent.txt dokuwiki-rc2009-12-02/inc/lang/sl/recent.txt
--- dokuwiki-2009-02-14/inc/lang/sl/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Trenutne spremembe======
+====== Trenutne spremembe ======
 
 SledeÄe strani so bile nedavno spremenjene.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/registermail.txt dokuwiki-rc2009-12-02/inc/lang/sl/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/sl/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 IP naslov: @IPADDRESS@
 Hostname: @HOSTNAME@
 
---
+-- 
 To sporoÄilo je ustvaril DokuWiki na
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/sl/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/sl/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== Pošlji novo geslo ======
+
+Za pridobitev novega gesla, vnesite vaÅ¡e uporabniÅ¡ko ime v obrazec spodaj. Na vaÅ¡ email naslov bo poslano sporoÄilo s povezavo za potrditev avtentiÄnosti.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/revisions.txt dokuwiki-rc2009-12-02/inc/lang/sl/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/sl/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Stare razliÄice======
+====== Stare razliÄice ======
 
 To so stare razliÄice tega dokumenta. Da ga povrnete na starejÅ¡o razliÄico, to prvo izberite,  pritisnite na ''Uredi to stran'' in jo Å¡e shranite.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/sl/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/sl/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======IÅ¡Äi======
+====== IÅ¡Äi ======
 
 Spodaj so prikazani rezultati vašega iskanja. Če niste našli kar ste iskali, lahko ustvarite novo stran z imenom vaše poizvedbe, tako da uporabite gumb ''Uredi to stran''.
 
-=====Rezultati=====
\ Brak znaku nowej linii na końcu pliku
+===== Rezultati =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sl/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/sl/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/sl/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sl/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Blokiran SPAM======
+====== Blokiran SPAM ======
 
 VaÅ¡e spremembe **niso** bile shranjene, ker so vsebovale eno ali veÄ prepovedanih besed. ÄŒe ste poskusili nasmetiti Wiki -- Fuj Fido! ÄŒe mislite da je to napaka, stopite v stik z administratorjem.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sr/lang.php dokuwiki-rc2009-12-02/inc/lang/sr/lang.php
--- dokuwiki-2009-02-14/inc/lang/sr/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sr/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Filip Brcic 
  * @author Иван Петровић petrovicivan@ubuntusrbija.org
+ * @author Ivan Petrovic 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -36,7 +37,7 @@
 $lang['btn_delete']            = 'Избриши';
 $lang['btn_back']              = 'Ðатраг';
 $lang['btn_backlink']          = 'Повратне везе';
-$lang['btn_backtomedia']       = 'Врати Ñе на избор медијÑког фајла';
+$lang['btn_backtomedia']       = 'Врати Ñе на избор медијÑке датотеке';
 $lang['btn_subscribe']         = 'Пријави Ñе на измене';
 $lang['btn_unsubscribe']       = 'Одјави Ñе Ñа измена';
 $lang['btn_subscribens']       = 'Претплати Ñе на промене у именÑком проÑтору';
@@ -49,18 +50,19 @@
 $lang['btn_draftdel']          = 'Обриши нацрт';
 $lang['loggedinas']            = 'Пријављен као';
 $lang['user']                  = 'КориÑничко име';
-$lang['pass']                  = 'Шифра';
+$lang['pass']                  = 'Лозинка';
 $lang['newpass']               = 'Ðова лозинка';
 $lang['oldpass']               = 'Потврди нову лозинку';
 $lang['passchk']               = 'поново';
 $lang['remember']              = 'Запамти ме';
-$lang['fullname']              = 'Пуно име';
+$lang['fullname']              = 'Име и презиме';
 $lang['email']                 = 'Е-адреÑа';
 $lang['register']              = 'РегиÑтруј Ñе';
 $lang['profile']               = 'КориÑнички профил';
 $lang['badlogin']              = 'Извините, није добро кориÑничко име или шифра.';
 $lang['minoredit']             = 'Мала измена';
 $lang['draftdate']             = 'Ðацрт је аутоматÑки Ñачуван';
+$lang['nosecedit']             = 'Страна је у међувремену промењена, поглавље је заÑтарело и поново Ñе учитава цела Ñтрана.';
 $lang['regmissing']            = 'Извините, морате да попуните Ñва поља.';
 $lang['reguexists']            = 'Извините, кориÑник Ñа иÑтим именом већ поÑтоји.';
 $lang['regsuccess']            = 'КориÑник је направљен и лозинка је поÑлата путем е-поште.';
@@ -82,6 +84,8 @@
 $lang['resendpwdbadauth']      = 'Жао ми је, потврдни код није иÑправан. Проверите да ли Ñте кориÑтили комплетан потврдни линк.';
 $lang['resendpwdconfirm']      = 'Потврдни линк је поÑтат као е-порука.';
 $lang['resendpwdsuccess']      = 'Ваша нова лозинка је поÑлата као е-порука.';
+$lang['license']               = 'ОÑим где је другачије назначено, материјал на овом викију је под Ñледећом лиценцом:';
+$lang['licenseok']             = 'Ðапомена: Изменом ове Ñтране Ñлажете Ñе да ће ваше измене бити под Ñледећом лиценцом:';
 $lang['txt_upload']            = 'Изаберите датотеку за Ñлање';
 $lang['txt_filename']          = 'УнеÑите вики-име (опционо)';
 $lang['txt_overwrt']           = 'Препишите тренутни фајл';
@@ -100,12 +104,16 @@
 $lang['uploadbadcontent']      = 'Материјал који шаљете не одговара %s ';
 $lang['uploadspam']            = 'Слање је блокирано јер Ñе налазите на црној лиÑти пошиљаоца.';
 $lang['uploadxss']             = 'Слање је блокирано јер је потенцијално малициозног Ñадржаја.';
+$lang['uploadsize']            = 'ПоÑлата датотека је превелика. (макÑимум је %s)';
 $lang['deletesucc']            = 'Фајл "%s" је избриÑан.';
 $lang['deletefail']            = '"%s" није могао да буде избриÑан - проверите дозволе.';
 $lang['mediainuse']            = 'Фајл "%s" није избриÑан - још је у употреби.';
 $lang['namespaces']            = 'ИменÑки проÑтори';
 $lang['mediafiles']            = 'ДоÑтупни фајлови у';
+$lang['js']['keepopen']        = 'Задржи отворен прозор након одабира';
 $lang['js']['hidedetails']     = 'Сакриј детаље';
+$lang['js']['nosmblinks']      = 'Повезивање Ñа Windows дељеним фолдерима ради Ñамо у МајкроÑофтовом Интернет Претраживачу.
+Ипак, можете да иÑкопирате и залепите везу.';
 $lang['js']['mu_btn']          = 'Слање више датотека одједном';
 $lang['mediausage']            = 'КориÑтите Ñледећу ÑинтакÑу за референцу ка овој датотеци:';
 $lang['mediaview']             = 'Прикажи оригиналну датотеку';
@@ -132,12 +140,11 @@
 $lang['restored']              = 'Ñтара верзија повраћена';
 $lang['external_edit']         = 'Ñпољна измена';
 $lang['summary']               = 'Сажетак измене';
+$lang['noflash']               = 'За приказивање ове врÑте материјала потребан вам је Adobe Flash Plugin.';
 $lang['mail_newpage']          = 'Ñтраница додата:';
 $lang['mail_changed']          = 'Ñтраница измењена:';
 $lang['mail_new_user']         = 'нови кориÑник:';
 $lang['mail_upload']           = 'поÑлата датотека:';
-$lang['js']['nosmblinks']            = "Повезивање Ñа Windows дељеним фолдерима ради Ñамо у МајкроÑофтовом Интернет Претраживачу.\nИпак, можете да иÑкопирате и залепите везу.";
-$lang['qb_alert']              = 'Молим ваÑ, унеÑите текÑÑ‚ који желите да форматизујете.\nБиће додат на крај документа.';
 $lang['qb_bold']               = 'МаÑтан текÑÑ‚';
 $lang['qb_italic']             = 'Курзивни текÑÑ‚';
 $lang['qb_underl']             = 'Подвучени текÑÑ‚';
@@ -157,7 +164,7 @@
 $lang['qb_sig']                = 'Убаци потпиÑ';
 $lang['qb_smileys']            = 'Смешко';
 $lang['qb_chars']              = 'ПоÑебни карактери';
-$lang['del_confirm']           = 'Обриши овај уноÑ?';
+$lang['js']['del_confirm']           = 'Обриши овај уноÑ?';
 $lang['admin_register']        = 'Додај новог кориÑника';
 $lang['metaedit']              = 'Измени мета-податке';
 $lang['metasaveerr']           = 'ЗапиÑивање мета-података није било уÑпешно';
@@ -214,3 +221,4 @@
 $lang['mu_authfail']           = 'ÑеÑија је иÑтекла';
 $lang['mu_progress']           = '@PCT@% поÑлато';
 $lang['mu_filetypes']          = 'Дозвољени типови датотека';
+$lang['recent_global']         = 'Тренутно пратите промене у именÑком проÑтору %s. Такође, можете пратити прмене на целом викију.';
diff -Naur dokuwiki-2009-02-14/inc/lang/sr/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/sr/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/sr/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sr/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Ову поруку је генериÑао DokuWiki sa
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sr/registermail.txt dokuwiki-rc2009-12-02/inc/lang/sr/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/sr/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sr/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -10,6 +10,6 @@
 Домаћин: @HOSTNAME@
 
 
---
+-- 
 Ову поруку је генериÑао DokuWiki sa
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sr/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/sr/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/sr/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sr/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME тип: @MIME@
 КориÑник: @USER@
 
---
+-- 
 Ову поруку је генериÑао DokuWiki sa
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/sv/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/sv/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+	
+===== Ytterligare Tillägg =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/lang.php dokuwiki-rc2009-12-02/inc/lang/sv/lang.php
--- dokuwiki-2009-02-14/inc/lang/sv/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,11 @@
  * @author Tormod Otter Johansson 
  * @author emil@sys.nu
  * @author Pontus Bergendahl 
+ * @author Tormod Johansson tormod.otter.johansson@gmail.com
+ * @author Emil Lind 
+ * @author Bogge Bogge 
+ * @author Peter Åström 
+ * @author HÃ¥kan Sandell 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -54,6 +59,7 @@
 $lang['btn_draft']             = 'Redigera utkast';
 $lang['btn_recover']           = 'Ã…terskapa utkast';
 $lang['btn_draftdel']          = 'Radera utkast';
+$lang['btn_revert']            = 'Återställ';
 $lang['loggedinas']            = 'Inloggad som';
 $lang['user']                  = 'Användarnamn';
 $lang['pass']                  = 'Lösenord';
@@ -92,6 +98,8 @@
 $lang['resendpwdsuccess']      = 'Ditt nya lösenord har skickats med e-post.';
 $lang['license']               = 'Om inte annat angivet, innehållet i denna wiki är licensierat under följande licenser:';
 $lang['licenseok']             = 'Notera: Genom att ändra i denna sidan så accepterar du att licensiera ditt bidrag under följande licenser:';
+$lang['searchmedia']           = 'Sök efter filnamn:';
+$lang['searchmedia_in']        = 'Sök i %s';
 $lang['txt_upload']            = 'Välj fil att ladda upp';
 $lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt)';
 $lang['txt_overwrt']           = 'Skriv över befintlig fil';
@@ -106,7 +114,7 @@
 $lang['uploadsucc']            = 'Uppladdningen lyckades';
 $lang['uploadfail']            = 'Uppladdningen misslyckades, fel filskydd?';
 $lang['uploadwrong']           = 'Uppladdning nekad. Filändelsen är inte tillåten!';
-$lang['uploadexist']           = 'Filen finns redan. Gjorde ingenting.';
+$lang['uploadexist']           = 'Filen finns redan. Ingenting gjordes.';
 $lang['uploadbadcontent']      = 'Det uppladdade innehållet stämde inte överens med filändelsen %s.';
 $lang['uploadspam']            = 'Uppladdningen stoppades av spärrlistan för spam.';
 $lang['uploadxss']             = 'Uppladdningen stoppades på grund av eventuellt skadligt innehåll.';
@@ -116,10 +124,14 @@
 $lang['mediainuse']            = 'Filen "%s" har inte raderats - den används fortfarande.';
 $lang['namespaces']            = 'Namnrymder';
 $lang['mediafiles']            = 'Tillgängliga filer i';
+$lang['js']['searchmedia']     = 'Sök efter filer';
 $lang['js']['keepopen']        = 'Lämna fönstret öppet efter val av fil';
 $lang['js']['hidedetails']     = 'Dölj detaljer';
 $lang['js']['nosmblinks']      = 'Länkning till Windowsresurser fungerar bara med Microsofts Internet Explorer.
-Du kan klippa och klistra in länken om du använder en annan webbläsare än MSIE..';
+Du kan fortfarande klippa och klistra in länken om du använder en annan webbläsare än MSIE.';
+$lang['js']['linkwiz']         = 'Snabbguide Länkar';
+$lang['js']['linkto']          = 'Länk till:';
+$lang['js']['del_confirm']     = 'Vill du verkligen radera?';
 $lang['js']['mu_btn']          = 'Ladda upp flera filer samtidigt';
 $lang['mediausage']            = 'Använd följande syntax för att referera till denna fil:';
 $lang['mediaview']             = 'Visa originalfilen';
@@ -147,11 +159,11 @@
 $lang['external_edit']         = 'extern redigering';
 $lang['summary']               = 'Redigeringskommentar';
 $lang['noflash']               = 'Adobe Flash Plugin behövs för att visa detta innehåll.';
+$lang['download']              = 'Ladda ner kodfragmentet';
 $lang['mail_newpage']          = 'sida tillagd:';
 $lang['mail_changed']          = 'sida ändrad:';
 $lang['mail_new_user']         = 'Ny användare:';
 $lang['mail_upload']           = 'fil uppladdad:';
-$lang['qb_alert']              = 'Ange den text du vill formattera.\nDen kommer att läggas till i slutet av dokumentet.';
 $lang['qb_bold']               = 'Fet text';
 $lang['qb_italic']             = 'Kursiv text';
 $lang['qb_underl']             = 'Understruken text';
@@ -162,6 +174,11 @@
 $lang['qb_h3']                 = 'Rubrik nivå 3';
 $lang['qb_h4']                 = 'Rubrik nivå 4';
 $lang['qb_h5']                 = 'Rubrik nivå 5';
+$lang['qb_h']                  = 'Rubrik';
+$lang['qb_hs']                 = 'Välj Rubrik';
+$lang['qb_hplus']              = 'Större Rubrik';
+$lang['qb_hminus']             = 'Mindre Rubrik';
+$lang['qb_hequal']             = 'Rubrik samma nivå.';
 $lang['qb_link']               = 'Intern Länk';
 $lang['qb_extlink']            = 'Extern Länk';
 $lang['qb_hr']                 = 'Horisontell linje';
@@ -171,7 +188,7 @@
 $lang['qb_sig']                = 'Infoga signatur';
 $lang['qb_smileys']            = 'Smileys';
 $lang['qb_chars']              = 'Specialtecken';
-$lang['del_confirm']           = 'Vill du verkligen radera?';
+$lang['upperns']               = 'hoppa till föräldernamnrymd';
 $lang['admin_register']        = 'Lägg till ny användare';
 $lang['metaedit']              = 'Redigera metadata';
 $lang['metasaveerr']           = 'Skrivning av metadata misslyckades';
@@ -232,4 +249,13 @@
 $lang['mu_authfail']           = 'sessionen över tid';
 $lang['mu_progress']           = '@PCT@% uppladdade';
 $lang['mu_filetypes']          = 'Tillåtna filtyper';
+$lang['mu_info']               = 'filerna uppladdade.';
+$lang['mu_lasterr']            = 'Senaste fel:';
 $lang['recent_global']         = 'Du bevakar ändringar i namnrymden %s. Du kan också titta på senaste ändringar för hela wikin.';
+$lang['years']                 = '%d år sedan';
+$lang['months']                = '%d månader sedan';
+$lang['weeks']                 = '%d veckor sedan';
+$lang['days']                  = '%d dagar sedan';
+$lang['hours']                 = '%d timmar sedan';
+$lang['minutes']               = '%d minuter sedan';
+$lang['seconds']               = '%d sekunder sedan';
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/preview.txt dokuwiki-rc2009-12-02/inc/lang/sv/preview.txt
--- dokuwiki-2009-02-14/inc/lang/sv/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Förhandsgranskning======
+====== Förhandsgranskning ======
 
 Detta är en förhandstitt på hur din text kommer att se ut när den visas. Kom ihåg: Den är **inte sparad** ännu!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/sv/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/sv/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -11,6 +11,6 @@
 
 @CONFIRM@
 
---
+-- 
 Detta meddelande har skapats av DokuWiki på
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/recent.txt dokuwiki-rc2009-12-02/inc/lang/sv/recent.txt
--- dokuwiki-2009-02-14/inc/lang/sv/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Senaste ändringarna======
+====== Senaste ändringarna ======
 
 Följande sidor/dokument har nyligen uppdaterats.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/revisions.txt dokuwiki-rc2009-12-02/inc/lang/sv/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/sv/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Historik======
+====== Historik ======
 
 Här visas tidigare versioner av detta dokument. För att återställa dokumentet till en tidigare version, välj den önskade versionen nedan, klicka på ''Redigera sida'' och spara sedan dokumentet.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/sv/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/sv/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Sök======
+====== Sök ======
 
 Nedan ser du resultatet av sökningen. Om du inte hittar det du letar efter, så kan du skapa eller redigera sidan med någon av knapparna.
 
-=====Resultat=====
+===== Resultat =====
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/sv/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/sv/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,12 +7,18 @@
 @DIFF@
 --------------------------------------------------------
 
+Datum        : @DATE@
+Användare    : @USER@
+Kommentar    : @SUMMARY@
+Gammal sida  : @OLDPAGE@
+Ny sida      : @NEWPAGE@
+
 För att säga upp prenumerationen på den här sidan,
 logga in i wikin på
 @DOKUWIKIURL@ och gå till
 @NEWPAGE@
 där du väljer 'Säg upp prenumeration på ändringar'.
 
---
+-- 
 Detta meddelande har skapats av DokuWiki på
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/sv/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/sv/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,6 +9,6 @@
 MIME-typ    : @MIME@
 Användare   : @USER@
 
---
+-- 
 Detta meddelande har skapats av DokuWiki på
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/sv/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/sv/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/sv/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/sv/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Stoppade SPAM======
+====== Stoppade SPAM ======
 
 Dina ändringar har **inte** sparats på grund av att de innehåller ett eller flera ord som spärrats. Om du har försökt att spara skräp, s k ''spam'' -- Fyyy på dig! Om du anser att det här beror på ett fel, kontakta wikins administratör.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/th/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/th/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/th/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+====== ปลั๊à¸à¸­à¸´à¸™à¹€à¸ªà¸£à¸´à¸¡ ======
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/admin.txt dokuwiki-rc2009-12-02/inc/lang/th/admin.txt
--- dokuwiki-2009-02-14/inc/lang/th/admin.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/admin.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== งานธุรà¸à¸²à¸£à¸„วบคุมระบบ ======
+
+ด้านล่างนี้คุณสามารถพบรายà¸à¸²à¸£à¸‡à¸²à¸™à¸„วบคุมระบบทั้งหมดในโดà¸à¸¸à¸§à¸´à¸à¸´
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/th/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/th/backlinks.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ลิงค์à¸à¸¥à¸±à¸š(Backlinks) ======
+
+นี่คือรายชื่อเพจที่ชี้ลิงค์à¸à¸¥à¸±à¸šà¸¡à¸²à¸¢à¸±à¸‡à¹€à¸žà¸ˆà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/conflict.txt dokuwiki-rc2009-12-02/inc/lang/th/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/th/conflict.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== มีเนื้อหารุ่นใหม่à¸à¸§à¹ˆà¸²à¹€à¸à¸´à¸”ขึ้น ======
+
+มีเอà¸à¸ªà¸²à¸£à¸£à¸¸à¹ˆà¸™à¹ƒà¸«à¸¡à¹ˆà¸à¸§à¹ˆà¸²à¸—ี่คุณได้à¹à¸à¹‰à¹„ขไว้ มันเà¸à¸´à¸”ขึ้นเมื่อผู้ใช้รายอื่นได้ทำà¸à¸²à¸£à¹à¸à¹‰à¹„ขเอà¸à¸ªà¸²à¸£à¹ƒà¸™à¸‚ณะที่ขณะเดียวà¸à¸±à¸™à¸à¸±à¸šà¸—ี่คุณà¸à¸³à¸¥à¸±à¸‡à¹à¸à¹‰à¹„ขมัน
+
+ให้ตรวจสอบความà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¸—ี่à¹à¸ªà¸”งไว้ด้านล่างนี้ให้ทั่วถึง, à¹à¸¥à¹‰à¸§à¸•à¸±à¸”สินใจว่าจะเà¸à¹‡à¸šà¸‰à¸šà¸±à¸šà¹„หนไว้ ถ้าคุณเลือภ"บันทึà¸", ฉบับของคุณจะถูà¸à¸šà¸±à¸™à¸—ึà¸à¹„ว้ หรือà¸à¸” "ยà¸à¹€à¸¥à¸´à¸" เพื่อเà¸à¹‡à¸šà¸‰à¸šà¸±à¸šà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/denied.txt dokuwiki-rc2009-12-02/inc/lang/th/denied.txt
--- dokuwiki-2009-02-14/inc/lang/th/denied.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ปà¸à¸´à¹€à¸ªà¸˜à¸ªà¸´à¸—ธิ์ ======
+
+ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินà¸à¸²à¸£à¸•à¹ˆà¸­ บางทีคุณอาจจะลืมล็อà¸à¸­à¸´à¸™?
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/diff.txt dokuwiki-rc2009-12-02/inc/lang/th/diff.txt
--- dokuwiki-2009-02-14/inc/lang/th/diff.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ความà¹à¸•à¸à¸•à¹ˆà¸²à¸‡ ======
+
+นี่เป็นà¸à¸²à¸£à¹à¸ªà¸”งความà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹€à¸žà¸ˆà¸ªà¸­à¸‡à¸£à¸¸à¹ˆà¸™
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/draft.txt dokuwiki-rc2009-12-02/inc/lang/th/draft.txt
--- dokuwiki-2009-02-14/inc/lang/th/draft.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,5 @@
+====== พบไฟล์ฉบับร่าง ======
+
+เซสชั่นที่คุณà¹à¸à¹‰à¹„ขฉบับล่าสุดในเพจนี้ไม่ถูà¸à¸ˆà¸±à¸”เà¸à¹‡à¸šà¹ƒà¸«à¹‰à¸ªà¸¡à¸šà¸¹à¸£à¸“์ โดà¸à¸¸à¸§à¸´à¸à¸´à¹„ด้ทำà¸à¸²à¸£à¸šà¸±à¸™à¸—ึà¸à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡à¹ƒà¸«à¹‰à¹‚ดยอัตโนมัติในระหว่างที่คุณà¸à¸³à¸¥à¸±à¸‡à¸—ำงาน อันซึ่งขณะนี้คุณอาจต้องà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸¡à¸±à¸™à¹€à¸žà¸·à¹ˆà¸­à¹à¸à¹‰à¹„ขต่อ ด้านล่างนี้คุณจะเห็นข้อมูลที่ถูà¸à¸šà¸±à¸™à¸—ึà¸à¹„ว้จาà¸à¸à¸²à¸£à¸—ำงานครั้งล่าสุด
+
+à¸à¸£à¸¸à¸“าตัดสินใจว่าคุณต้องà¸à¸²à¸£à¸—ี่จะ //à¸à¸¹à¹‰à¸„ืน//งานฉบับที่à¹à¸à¹‰à¹„ขล่าสุด, //ลบทิ้ง/// ตัวฉบับร่างที่ได้บันทึà¸à¸­à¸±à¸•à¹‚นมัติไว้, //ยà¸à¹€à¸¥à¸´à¸// à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¹à¸à¹‰à¹„ขนี้
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/editrev.txt dokuwiki-rc2009-12-02/inc/lang/th/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/th/editrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**คุณได้โหลดเอาเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¹€à¸à¹ˆà¸²à¸‚ึ้นมา!** ถ้าคุณบันทึà¸à¸¡à¸±à¸™ คุณจะสร้างเอà¸à¸ªà¸²à¸£à¸£à¸¸à¹ˆà¸™à¹ƒà¸«à¸¡à¹ˆà¸”้วยข้อมูลเหล่านี้
+----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/edit.txt dokuwiki-rc2009-12-02/inc/lang/th/edit.txt
--- dokuwiki-2009-02-14/inc/lang/th/edit.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/edit.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+à¹à¸à¹‰à¹„ขหน้านี้à¹à¸¥à¹‰à¸§à¸à¸” "บันทึà¸" ให้อ่าน[[wiki:syntax|ไวยà¸à¸£à¸“์วิà¸à¸´]] สำหรับค้นหาไวยà¸à¸£à¸“์ที่ใช้ในวิà¸à¸´ à¹à¸¥à¸°à¸à¸£à¸¸à¸“าà¹à¸à¹‰à¹„ขเฉพาะเพจที่คุณสามารถ**ปรับปรุง**ให้มันดีขึ้นได้, ถ้าหาà¸à¸„ุณต้องà¸à¸²à¸£à¸—ี่จะทดสอบอะไรบางอย่าง ให้ไปลองเล่นครั้งà¹à¸£à¸à¹„ด้ใน[[playground:playground|สนามเด็à¸à¹€à¸¥à¹ˆà¸™]]
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/index.txt dokuwiki-rc2009-12-02/inc/lang/th/index.txt
--- dokuwiki-2009-02-14/inc/lang/th/index.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/index.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+====== ดัชนี ======
+นี่คือดัชนีรวมทุà¸à¹€à¸žà¸ˆ เรียงตาม[[doku>namespaces|เนมสเปซ]]
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/lang.php dokuwiki-rc2009-12-02/inc/lang/th/lang.php
--- dokuwiki-2009-02-14/inc/lang/th/lang.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,242 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Arthit Suriyawongkul 
+ * @author Kittithat Arnontavilas 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“	';
+$lang['doublequoteclosing']    = 'â€';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'à¹à¸à¹‰à¹„ขหน้านี้';
+$lang['btn_source']            = 'ดูโค้ด';
+$lang['btn_show']              = 'à¹à¸ªà¸”งเพจ';
+$lang['btn_create']            = 'สร้างเพจนี้';
+$lang['btn_search']            = 'ค้นหา';
+$lang['btn_save']              = 'บันทึà¸';
+$lang['btn_preview']           = 'à¹à¸ªà¸”งตัวอย่าง';
+$lang['btn_top']               = 'à¸à¸¥à¸±à¸šà¸ªà¸¹à¹ˆà¸”้านบน';
+$lang['btn_newer']             = '<< ใหม่à¸à¸§à¹ˆà¸²';
+$lang['btn_older']             = 'เà¸à¹ˆà¸²à¸à¸§à¹ˆà¸² >>';
+$lang['btn_revs']              = 'ฉบับเà¸à¹ˆà¸²à¹†';
+$lang['btn_recent']            = 'ปรับปรุงล่าสุด';
+$lang['btn_upload']            = 'ส่งข้อมูลเข้าสู่ระบบ';
+$lang['btn_cancel']            = 'ยà¸à¹€à¸¥à¸´à¸';
+$lang['btn_index']             = 'ดัชนี';
+$lang['btn_secedit']           = 'à¹à¸à¹‰à¹„ข';
+$lang['btn_login']             = 'ล็อà¸à¸­à¸´à¸™';
+$lang['btn_logout']            = 'ล็อà¸à¹€à¸­à¸²à¸•à¹Œ';
+$lang['btn_admin']             = 'ผู้ควบคุมระบบ';
+$lang['btn_update']            = 'ปรับปรุง';
+$lang['btn_delete']            = 'ลบ';
+$lang['btn_back']              = 'ย้อนà¸à¸¥à¸±à¸š';
+$lang['btn_backlink']          = 'หน้าที่ลิงà¸à¹Œà¸¡à¸²';
+$lang['btn_backtomedia']       = 'à¸à¸¥à¸±à¸šà¹„ปยังหน้าเลือà¸à¹„ฟล์สื่อ';
+$lang['btn_subscribe']         = 'เà¸à¹‰à¸²à¸”ู';
+$lang['btn_unsubscribe']       = 'เลิà¸à¹€à¸à¹‰à¸²à¸”ู';
+$lang['btn_subscribens']       = 'สมัครเพื่อตามà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹€à¸™à¸¡à¸ªà¹€à¸›à¸‹';
+$lang['btn_unsubscribens']     = 'ยà¸à¹€à¸¥à¸´à¸à¸ªà¸¡à¸±à¸„รเพื่อตามà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹€à¸™à¸¡à¸ªà¹€à¸›à¸‹';
+$lang['btn_profile']           = 'à¹à¸à¹‰à¸‚้อมูลผู้ใช้';
+$lang['btn_reset']             = 'เริ่มใหม่';
+$lang['btn_resendpwd']         = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล';
+$lang['btn_draft']             = 'à¹à¸à¹‰à¹„ขเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡';
+$lang['btn_recover']           = 'à¸à¸¹à¹‰à¸„ืนเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡';
+$lang['btn_draftdel']          = 'ลบเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡';
+$lang['btn_revert']            = 'à¸à¸¹à¹‰à¸„ืน';
+$lang['loggedinas']            = 'ลงชื่อเข้าใช้เป็น';
+$lang['user']                  = 'ชื่อผู้ใช้:';
+$lang['pass']                  = 'รหัสผ่าน';
+$lang['newpass']               = 'รหัสผ่านใหม่';
+$lang['oldpass']               = 'รหัสผ่านเดิม:';
+$lang['passchk']               = 'พิมพ์รหัสผ่านอีà¸à¸„รั้ง:';
+$lang['remember']              = 'จำชื่อà¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™';
+$lang['fullname']              = 'ชื่อจริง:';
+$lang['email']                 = 'อีเมล:';
+$lang['register']              = 'สร้างบัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰';
+$lang['profile']               = 'ข้อมูลส่วนตัวผู้ใช้';
+$lang['badlogin']              = 'ขัดข้อง:';
+$lang['minoredit']             = 'เป็นà¸à¸²à¸£à¹à¸à¹‰à¹„ขเล็à¸à¸™à¹‰à¸­à¸¢';
+$lang['draftdate']             = 'บันทึà¸à¸‰à¸šà¸±à¸šà¸£à¹ˆà¸²à¸‡à¹€à¸¡à¸·à¹ˆà¸­';
+$lang['nosecedit']             = 'ในช่วงเวลาที่ผ่านมานี้เพจถูà¸à¹à¸à¹‰à¹„ขไปà¹à¸¥à¹‰à¸§, เนื้อหาในเซคชั่นนี้ไม่ทันสมัย à¸à¸£à¸¸à¸“าโหลดเพจใหม่ทั้งหน้าà¹à¸—น';
+$lang['regmissing']            = 'ขออภัย คุณต้องà¸à¸£à¸­à¸à¹ƒà¸«à¹‰à¸„รบทุà¸à¸Šà¹ˆà¸­à¸‡';
+$lang['reguexists']            = 'ชื่อบัà¸à¸Šà¸µà¸—ี่ใส่นั้นมีผู้อื่นได้ใช้à¹à¸¥à¹‰à¸§ à¸à¸£à¸¸à¸“าเลือà¸à¸Šà¸·à¹ˆà¸­à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸­à¸·à¹ˆà¸™';
+$lang['regsuccess']            = 'ผู้ใช้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¹à¸¥à¹‰à¸§ à¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„ด้ถูà¸à¸ªà¹ˆà¸‡à¹„ปทางอีเมลà¹à¸¥à¹‰à¸§';
+$lang['regsuccess2']           = 'ชื่อบัà¸à¸Šà¸µà¹„ด้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้น';
+$lang['regmailfail']           = 'ดูเหมือนจะมีข้อผิดพลาดในà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸—างเมล์ à¸à¸£à¸¸à¸“าติดต่อผู้ดูà¹à¸¥à¸£à¸°à¸šà¸š';
+$lang['regbadmail']            = 'รูปà¹à¸šà¸šà¸­à¸µà¹€à¸¡à¸¥à¹„ม่ถูà¸à¸•à¹‰à¸­à¸‡ ให้ใส่อีเมลให้ถูà¸à¸•à¹‰à¸­à¸‡à¸•à¸²à¸¡à¸£à¸¹à¸›à¹à¸šà¸šà¸­à¸µà¹€à¸¡à¸¥ หรือให้ทำช่องอีเมลให้ว่างà¹à¸—น';
+$lang['regbadpass']            = 'รหัสผ่านที่ใส่ไม่ถูà¸à¸•à¹‰à¸­à¸‡';
+$lang['regpwmail']             = 'รหัสผ่านเข้าโดà¸à¸¸à¸§à¸´à¸à¸´à¸‚องคุณ';
+$lang['reghere']               = 'คุณยังไม่มีบัà¸à¸Šà¸µà¸«à¸£à¸·à¸­ à¸à¹‡à¹à¸„่สร้างขึ้นมาสัà¸à¸­à¸±à¸™à¸«à¸™à¸¶à¹ˆà¸‡';
+$lang['profna']                = 'วิà¸à¸´à¸™à¸µà¹‰à¹„ม่รองรับà¸à¸²à¸£à¹à¸à¹‰à¹„ขข้อมูลส่วนตัว';
+$lang['profnochange']          = 'ไม่มีà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸‚้อมูลส่วนตัว';
+$lang['profnoempty']           = 'ไม่อนุà¸à¸²à¸•à¸´à¹ƒà¸«à¹‰à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¸Šà¸·à¹ˆà¸­ หรืออีเมล';
+$lang['profchanged']           = 'ปรับปรุงข้อมูลส่วนตัวผู้ใช้สำเร็จ';
+$lang['pwdforget']             = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ';
+$lang['resendna']              = 'วิà¸à¸´à¸™à¸µà¹‰à¹„ม่รองรับà¸à¸²à¸£à¸ªà¹ˆà¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‹à¹‰à¸³';
+$lang['resendpwd']             = 'ส่งรหัสผ่านใหม่ให้à¸à¸±à¸š';
+$lang['resendpwdmissing']      = 'ขออภัย, คุณต้องà¸à¸£à¸­à¸à¸—ุà¸à¸Šà¹ˆà¸­à¸‡';
+$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['lockedby']              = 'ตอนนี้ถูà¸à¸¥à¹Šà¸­à¸„โดย';
+$lang['lockexpire']            = 'à¸à¸²à¸£à¸¥à¹Šà¸­à¸„จะหมดอายุเมื่อ';
+$lang['willexpire']            = 'à¸à¸²à¸£à¸¥à¹Šà¸­à¸„เพื่อà¹à¸à¹‰à¹„ขหน้านี้à¸à¸³à¸¥à¸±à¸‡à¸ˆà¸°à¸«à¸¡à¸”เวลาในอีภ\n นาที เพื่อที่จะหลีà¸à¹€à¸¥à¸µà¹ˆà¸¢à¸‡à¸‚้อขัดà¹à¸¢à¹‰à¸‡à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸›à¸¸à¹ˆà¸¡ "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['notsavedyet']           = 'à¸à¸²à¸£à¹à¸à¹‰à¹„ขที่ไม่ได้บันทึà¸à¸ˆà¸°à¸ªà¸¹à¸à¸«à¸²à¸¢ \n ต้องà¸à¸²à¸£à¸—ำต่อจริงๆหรือ?';
+$lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
+$lang['nothingfound']          = 'ไม่พบสิ่งใด';
+$lang['mediaselect']           = 'ไฟล์สื่อ';
+$lang['fileupload']            = 'อัปโหลด';
+$lang['uploadsucc']            = 'อัปโหลดสำเร็จ';
+$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['mediafiles']            = 'มีไฟล์พร้อมใช้อยู่ใน';
+$lang['js']['searchmedia']     = 'ค้นหาไฟล์';
+$lang['js']['keepopen']        = 'เปิดหน้าต่างไว้ระหว่างที่เลือà¸';
+$lang['js']['hidedetails']     = 'ซ่อนรายละเอียด';
+$lang['js']['nosmblinks']      = 'เชื่อมไปยังหน้าต่างà¹à¸šà¹ˆà¸‡à¸›à¸±à¸™ ทำงานได้à¸à¸±à¸šà¹€à¸‰à¸žà¸²à¸°à¹„มโครซอฟท์อินเตอร์เน็ตเอ็à¸à¸‹à¹‚ปรเรอร์(IE) คุณยังคงสามารถคัดลอà¸à¹à¸¥à¸°à¹à¸›à¸°à¸¥à¸´à¹‰à¸‡à¸„์ได้';
+$lang['js']['linkwiz']         = 'ลิงค์วิเศษ';
+$lang['js']['linkto']          = 'ลิงค์ไป:';
+$lang['js']['del_confirm']     = 'ต้องà¸à¸²à¸£à¸¥à¸šà¸£à¸²à¸¢à¸à¸²à¸£à¸—ี่เลือà¸à¸ˆà¸£à¸´à¸‡à¹†à¸«à¸£à¸·à¸­?';
+$lang['js']['mu_btn']          = 'อัพโหลดหลายๆไฟล์ในครั้งเดียว';
+$lang['mediausage']            = 'ให้ใช้ไวยà¸à¸£à¸“์ต่อไปนี้เพื่ออ้างอิงไฟล์นี้';
+$lang['mediaview']             = 'ดูไฟล์ต้นฉบับ';
+$lang['mediaroot']             = 'ราà¸(รูท)';
+$lang['mediaupload']           = 'อัพโหลดไฟล์ไปยังเนมสเปซปัจจุบันจาà¸à¸—ี่นี่ หาà¸à¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¹€à¸™à¸¡à¸ªà¹€à¸›à¸‹à¸¢à¹ˆà¸­à¸¢ ให้พิมพ์ต่อข้อความของคุณหลังชื่อไฟล์ในช่อง "อัพโหลดเป็น" โดยให้คั่นด้วยโคล่อน(:)';
+$lang['mediaextchange']        = 'ส่วนขยายไฟล์ถูà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ˆà¸²à¸ .%s ไปเป็น .%s!';
+$lang['reference']             = 'อ้างอิงสำหรับ';
+$lang['ref_inuse']             = 'ไม่สามารถลบไฟล์ได้ เพราะมันยังคงถูà¸à¹ƒà¸Šà¹‰à¹‚ดยเพจดังต่อไปนี้:';
+$lang['ref_hidden']            = 'มีà¸à¸²à¸£à¸­à¹‰à¸²à¸‡à¸­à¸´à¸‡à¸šà¸²à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¹ƒà¸™à¹€à¸žà¸ˆ คุณไม่มีสิทธิ์ในà¸à¸²à¸£à¸­à¹ˆà¸²à¸™';
+$lang['hits']                  = 'คำที่ตรงà¸à¸±à¸™';
+$lang['quickhits']             = 'ชื่อเพจที่ตรงà¸à¸±à¸™';
+$lang['toc']                   = 'สารบัà¸';
+$lang['current']               = 'ฉบับปัจจุบัน';
+$lang['yours']                 = 'ฉบับของคุณ';
+$lang['diff']                  = 'à¹à¸ªà¸”งจุดà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¸à¸±à¸šà¸‰à¸šà¸±à¸šà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™';
+$lang['diff2']                 = 'à¹à¸ªà¸”งจุดà¹à¸•à¸à¸•à¹ˆà¸²à¸‡à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸‰à¸šà¸±à¸šà¸—ี่เลือà¸à¹„ว้';
+$lang['line']                  = 'บรรทัด';
+$lang['breadcrumb']            = 'ตามรอย';
+$lang['youarehere']            = 'คุณอยู่ที่นี่';
+$lang['lastmod']               = 'à¹à¸à¹‰à¹„ขครั้งล่าสุด';
+$lang['by']                    = 'โดย';
+$lang['deleted']               = 'ถูà¸à¸–อดออà¸';
+$lang['created']               = 'ถูà¸à¸ªà¸£à¹‰à¸²à¸‡';
+$lang['restored']              = 'ย้อนไปรุ่นà¸à¹ˆà¸­à¸™à¸«à¸™à¹‰à¸²';
+$lang['summary']               = 'สรุป(หมายเหตุ)à¸à¸²à¸£à¹à¸à¹‰à¹„ขนี้';
+$lang['noflash']               = 'ต้องà¸à¸²à¸£à¸•à¸±à¸§à¹€à¸¥à¹ˆà¸™à¹à¸Ÿà¸¥à¸Š Adobe Flash Plugin เพื่อà¹à¸ªà¸”งผลเนื้อหานี้';
+$lang['download']              = 'ดาวน์โหลดสนิปเป็ด(Snippet)';
+$lang['mail_newpage']          = 'เพิ่มเพจà¹à¸¥à¹‰à¸§:';
+$lang['mail_changed']          = 'à¹à¸à¹‰à¹„ขเพจà¹à¸¥à¹‰à¸§:';
+$lang['mail_new_user']         = 'ผู้ใช้คนใหม่:';
+$lang['mail_upload']           = 'ไฟล์อัพโหลดà¹à¸¥à¹‰à¸§:';
+$lang['qb_bold']               = 'ทำตัวหนา';
+$lang['qb_italic']             = 'ทำตัวเอียง';
+$lang['qb_underl']             = 'ขีดเส้นใต้ข้อความ';
+$lang['qb_code']               = 'ข้อความเป็นโค้ดโปรà¹à¸à¸£à¸¡';
+$lang['qb_strike']             = 'ขีดฆ่าข้อความ';
+$lang['qb_h1']                 = 'หัวเรื่องระดับที่ 1';
+$lang['qb_h2']                 = 'หัวเรื่องระดับที่ 2';
+$lang['qb_h3']                 = 'หัวเรื่องระดับที่ 3';
+$lang['qb_h4']                 = 'หัวเรื่องระดับที่ 4';
+$lang['qb_h5']                 = 'หัวเรื่องระดับที่ 5';
+$lang['qb_h']                  = 'หัวเรื่อง';
+$lang['qb_hs']                 = 'เลือà¸à¸«à¸±à¸§à¹€à¸£à¸·à¹ˆà¸­à¸‡';
+$lang['qb_hplus']              = 'หัวเรื่องที่สูงà¸à¸§à¹ˆà¸²';
+$lang['qb_hminus']             = 'หัวเรื่องที่ต่ำà¸à¸§à¹ˆà¸²';
+$lang['qb_hequal']             = 'หัวเรื่องระดับเดียวà¸à¸±à¸™';
+$lang['qb_link']               = 'ลิงà¸à¹Œà¸ à¸²à¸¢à¹ƒà¸™à¹€à¸§à¹‡à¸š';
+$lang['qb_extlink']            = 'ลิงà¸à¹Œà¹„ปที่อื่น (อย่าลืม http:// นำหน้าเสมอ)';
+$lang['qb_hr']                 = 'เส้นนอน';
+$lang['qb_ol']                 = 'รายà¸à¸²à¸£à¸—ี่เรียงลำดับà¹à¸¥à¹‰à¸§';
+$lang['qb_ul']                 = 'รายà¸à¸²à¸£à¸—ี่ยังไม่ได้เรียงลำดับ';
+$lang['qb_media']              = 'เพิ่มภาพà¹à¸¥à¸°à¹„ฟล์อื่นๆ';
+$lang['qb_sig']                = 'ลายเซ็นพร้อมลงเวลา';
+$lang['qb_smileys']            = 'ภาพà¹à¸ªà¸”งอารมณ์';
+$lang['qb_chars']              = 'อัà¸à¸‚ระพิเศษ';
+$lang['upperns']               = 'à¸à¸£à¸°à¹‚ดดขึ้นไปยังเนมสเปซà¹à¸¡à¹ˆ';
+$lang['admin_register']        = 'สร้างบัà¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰';
+$lang['metaedit']              = 'à¹à¸à¹‰à¹„ขข้อมูลเมต้า';
+$lang['metasaveerr']           = 'มีข้อผิดพลาดในà¸à¸²à¸£à¹€à¸‚ียนข้อมูลเมต้า';
+$lang['metasaveok']            = 'บันทึà¸à¹€à¸¡à¸•à¹‰à¸²à¸”าต้าà¹à¸¥à¹‰à¸§';
+$lang['img_backto']            = 'à¸à¸¥à¸±à¸šà¹„ปยัง';
+$lang['img_title']             = 'ชื่อภาพ';
+$lang['img_caption']           = 'คำบรรยายภาพ';
+$lang['img_date']              = 'วันที่';
+$lang['img_fname']             = 'ชื่อไฟล์';
+$lang['img_fsize']             = 'ขนาดภาพ';
+$lang['img_artist']            = 'ผู้สร้างสรรค์';
+$lang['img_copyr']             = 'ผู้ถือลิขสิทธิ์';
+$lang['img_format']            = 'รูปà¹à¸šà¸š';
+$lang['img_camera']            = 'à¸à¸¥à¹‰à¸­à¸‡';
+$lang['img_keywords']          = 'คำหลัà¸';
+$lang['subscribe_success']     = 'เพิ่ม %s เข้าไปในรายชื่อสมาชิà¸à¸¥à¸‡à¸—ะเบียนสำหรับ %s';
+$lang['subscribe_error']       = 'มีข้อผิดพลาดในà¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡ %s ในรายชื่อสมัครสมาชิà¸à¸ªà¸³à¸«à¸£à¸±à¸š %s';
+$lang['subscribe_noaddress']   = 'ไม่มีที่อยู่ที่ตรงà¸à¸±à¸šà¸Šà¸·à¹ˆà¸­à¸¥à¹‡à¸­à¸à¸­à¸´à¸™à¸‚องคุณ ชื่อคุณไม่สามารถถูà¸à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸‚้าไปในรายชื่อสมัครสมาชิà¸';
+$lang['unsubscribe_success']   = 'ถอด % ออà¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸­à¸ªà¸¡à¸±à¸„รสมาชิà¸à¸‚อง %s';
+$lang['unsubscribe_error']     = 'มีข้อผิดพลาดในà¸à¸²à¸£à¸–อด %s ออà¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸­à¸ªà¸¡à¸²à¸Šà¸´à¸à¸‚อง %s';
+$lang['authmodfailed']         = 'มีà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าสิทธิ์ผู้ใช้ไว้ไม่ดี à¸à¸£à¸¸à¸“าà¹à¸ˆà¹‰à¸‡à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¸§à¸´à¸à¸´à¸‚องคุณ';
+$lang['authtempfail']          = 'ระบบตรวจสอบสิทธิ์ผู้ใช้ไม่พร้อมใช้งานชั่วคราว หาà¸à¸ªà¸–านà¸à¸²à¸£à¸“์ยังไม่เปลี่ยนà¹à¸›à¸¥à¸‡ à¸à¸£à¸¸à¸“าà¹à¸ˆà¹‰à¸‡à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸§à¸´à¸à¸´à¸‚องคุณ';
+$lang['i_chooselang']          = 'เลือà¸à¸ à¸²à¸©à¸²à¸‚องคุณ';
+$lang['i_installer']           = 'ตัวติดตั้งโดà¸à¸¸à¸§à¸´à¸à¸´';
+$lang['i_wikiname']            = 'ชื่อวิà¸à¸´';
+$lang['i_enableacl']           = 'เปิดระบบ ACL(à¹à¸™à¸°à¸™à¸³)';
+$lang['i_superuser']           = 'ซุปเปอร์ยูสเซอร์';
+$lang['i_problems']            = 'ตัวติดตั้งพบปัà¸à¸«à¸²à¸šà¸²à¸‡à¸›à¸£à¸°à¸à¸²à¸£ ตามที่ระบุด้านล่าง คุณไม่สามารถทำต่อได้จนà¸à¸§à¹ˆà¸²à¸ˆà¸°à¹„ด้à¹à¸à¹‰à¹„ขสิ่งเหล่านั้น';
+$lang['i_modified']            = 'ด้วยเหตุผลด้านความปลอดภัย สคริปต์นี้จะทำงานà¸à¸±à¸šà¹€à¸‰à¸žà¸²à¸°à¹‚ดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่ติดตั้งใหม่หรือยังไม่ได้ดัดà¹à¸›à¸¥à¸‡à¹à¸à¹‰à¹„ข
+คุณควรเลือà¸à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸„ลี่ไฟล์จาà¸à¹à¸žà¸„เà¸à¸ˆà¸—ี่ได้ดาวน์โหลดมาอีà¸à¸„รั้ง หรือศึà¸à¸©à¸²à¸ˆà¸²à¸à¸„ู่มือ
+Dokuwiki installation instructions';
+$lang['i_policy']              = 'นโยบายสิทธิ์เข้าถึง(ACL)ตั้งต้น';
+$lang['i_pol0']                = 'วิà¸à¸´à¹€à¸›à¸´à¸”à¸à¸§à¹‰à¸²à¸‡ (ใครà¸à¹‡ อ่าน, เขียน, อัพโหลดได้)';
+$lang['i_pol1']                = 'วิà¸à¸´à¸ªà¸²à¸˜à¸²à¸£à¸“ะ (ทุà¸à¸„นอ่านได้, เขียน à¹à¸¥à¸° อัพโหลดเฉพาะผู้ใช้ที่ลงทะเบียนà¹à¸¥à¹‰à¸§)';
+$lang['i_pol2']                = 'วิà¸à¸´à¸ à¸²à¸¢à¹ƒà¸™ (อ่าน, เขียน, อัพโหลด สำหรับผู้ใช้ที่ลงทะเบียนà¹à¸¥à¹‰à¸§à¹€à¸—่านั้น)';
+$lang['i_retry']               = 'ลองใหม่';
+$lang['mu_intro']              = 'ที่นี่คุณสามารถอัพโหลดหลายๆไฟล์ได้พร้อมๆà¸à¸±à¸™ คลิ๊à¸à¸›à¸¸à¹ˆà¸¡à¸šà¸£à¸²à¸§à¸‹à¹Œà¹€à¸žà¸·à¹ˆà¸­à¹€à¸žà¸´à¹ˆà¸¡à¸¡à¸±à¸™à¹€à¸‚้าไปในคิว à¸à¸”ปุ่มอัพโหลดเมื่อเสร็จà¹à¸¥à¹‰à¸§';
+$lang['mu_gridname']           = 'ชื่อไฟล์';
+$lang['mu_gridsize']           = 'ขนาด';
+$lang['mu_gridstat']           = 'สถานะ';
+$lang['mu_namespace']          = 'เนมสเปซ';
+$lang['mu_browse']             = 'เรียà¸à¸”ู';
+$lang['mu_toobig']             = 'ใหà¸à¹ˆà¹„ป';
+$lang['mu_ready']              = 'พร้อมอัปโหลด';
+$lang['mu_done']               = 'เสร็จสิ้น';
+$lang['mu_fail']               = 'ล้มเหลว';
+$lang['mu_authfail']           = 'วาระหมดอายุ';
+$lang['mu_progress']           = '@PCT@% อัปโหลดà¹à¸¥à¹‰à¸§';
+$lang['mu_filetypes']          = 'ชนิดà¹à¸Ÿà¹‰à¸¡à¸—ี่อนุà¸à¸²à¸•';
+$lang['mu_info']               = 'à¹à¸Ÿà¹‰à¸¡à¸­à¸±à¸›à¹‚หลดà¹à¸¥à¹‰à¸§';
+$lang['mu_lasterr']            = 'ผิดพลาดล่าสุด:';
+$lang['years']                 = '%d ปีà¸à¹ˆà¸­à¸™';
+$lang['months']                = '%d เดือนà¸à¹ˆà¸­à¸™';
+$lang['weeks']                 = '%d สัปดาห์à¸à¹ˆà¸­à¸™';
+$lang['days']                  = '%d วันà¸à¹ˆà¸­à¸™';
+$lang['hours']                 = '%d ชั่วโมงà¸à¹ˆà¸­à¸™';
+$lang['minutes']               = '%d นาทีà¸à¹ˆà¸­à¸™';
+$lang['seconds']               = '%d วินาทีà¸à¹ˆà¸­à¸™';
diff -Naur dokuwiki-2009-02-14/inc/lang/th/locked.txt dokuwiki-rc2009-12-02/inc/lang/th/locked.txt
--- dokuwiki-2009-02-14/inc/lang/th/locked.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== เพจถูà¸à¸¥à¹Šà¸­à¸„ ======
+
+เพจนี้à¸à¸³à¸¥à¸±à¸‡à¸–ูà¸à¸¥à¹Šà¸­à¸„จาà¸à¸à¸²à¸£à¹à¸à¹‰à¹„ขโดยผู้ใช้ท่านอื่น คุณต้องรอจนà¸à¸§à¹ˆà¸²à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸„นนี้จะà¹à¸à¹‰à¹„ขเสร็จ หรือà¸à¸²à¸£à¸¥à¹Šà¸­à¸„นั้นหมดเวลา
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/login.txt dokuwiki-rc2009-12-02/inc/lang/th/login.txt
--- dokuwiki-2009-02-14/inc/lang/th/login.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== ล็อà¸à¸­à¸´à¸™ ======
+
+คุณยังไม่ได้เข้าสู่ระบบ(ล็อà¸à¸­à¸´à¸™)ในขณะนี้! à¸à¸£à¸­à¸à¸£à¸²à¸¢à¸¥à¸°à¹€à¸­à¸µà¸¢à¸”เพื่อพิสูจน์สิทธิ์ข้างล่างนี้เพื่อล็อà¸à¸­à¸´à¸™ คุณต้องเปิดคุ๊à¸à¸à¸µà¹‰à¹ƒà¸«à¹‰à¸—ำงานà¸à¹ˆà¸­à¸™à¸—ี่จะล็อà¸à¸­à¸´à¸™
+
diff -Naur dokuwiki-2009-02-14/inc/lang/th/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/th/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/th/mailtext.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,17 @@
+เพจในโดà¸à¸¸à¸§à¸´à¸à¸´à¸‚องคุณได้ถูà¸à¹€à¸žà¸´à¹ˆà¸¡ หรือà¹à¸à¹‰à¹„ข นี่คือรายละเอียด:
+
+วันที่: @DATE@
+บราวเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ฉบับเà¸à¹ˆà¸²: @OLDPAGE@
+ฉบับใหม่: @NEWPAGE@
+สรุปà¸à¸²à¸£à¹à¸à¹‰à¹„ข: @SUMMARY@
+ผู้ใช้: @USER@
+
+@DIFF@
+
+
+-- 
+จดหมายนี้สร้างขึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/newpage.txt dokuwiki-rc2009-12-02/inc/lang/th/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/th/newpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ยังไม่มีหัวข้อนี้ ======
+
+คุณได้à¸à¸”ลิ้งค์เข้ามายังหัวข้อที่ยังไม่ได้สร้าง ถ้าคุณได้รับอนุà¸à¸²à¸•à¸´ คุณอาจจะสร้างมันได้ด้วยà¸à¸²à¸£à¸à¸”ปุ่ม "สร้างเพจนี้"
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/norev.txt dokuwiki-rc2009-12-02/inc/lang/th/norev.txt
--- dokuwiki-2009-02-14/inc/lang/th/norev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ไม่มีฉบับที่ระบุ ======
+
+ฉบับที่ระบุไม่มีอยู่จริง à¸à¸£à¸¸à¸“าใช้ปุ่ม "ฉบับเà¸à¹ˆà¸²à¹†" เพื่อà¹à¸ªà¸”งรายà¸à¸²à¸£à¸£à¸¸à¹ˆà¸™à¹€à¸à¹ˆà¸²à¹†à¸‚องเอà¸à¸ªà¸²à¸£à¸™à¸µà¹‰à¸´
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/password.txt dokuwiki-rc2009-12-02/inc/lang/th/password.txt
--- dokuwiki-2009-02-14/inc/lang/th/password.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,10 @@
+สวัสดี@FULLNAME@!
+
+นี่คือข้อมูลผู้ใช้ของคุณสำหรับ @TITLE@ ที่ @DOKUWIKIURL@
+
+ล็อà¸à¸­à¸´à¸™: @LOGIN@
+รหัสผ่าน : @PASSWORD@
+
+-- 
+จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/preview.txt dokuwiki-rc2009-12-02/inc/lang/th/preview.txt
--- dokuwiki-2009-02-14/inc/lang/th/preview.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ดูตัวอย่าง ======
+
+นี่คือหน้าตัวอย่างของข้อความที่คุณà¸à¸£à¸­à¸ จำไว้ว่า: มันยัง **ไม่ได้บันทึà¸** เà¸à¹‡à¸šà¹„ว้!
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/th/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/th/pwconfirm.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+เฮ้ @FULLNAME@!
+
+มีบางคนร้องขอรหัสผ่านใหม่สำหรับ @TITLE@ ของคุณ
+เพื่อล็อà¸à¸­à¸´à¸™à¸—ี่ @DOKUWIKIURL@
+
+ถ้าคุรไม่ได้ร้องขอรหัสผ่านใหม่ à¸à¹‡à¹„ม่ต้องสนใจอีเมลนี้
+
+หาà¸à¸•à¹‰à¸­à¸‡à¸à¸²à¸£à¸¢à¸·à¸™à¸¢à¸±à¸™à¸§à¹ˆà¸²à¸™à¸µà¹ˆà¸à¸²à¸£à¸£à¹‰à¸­à¸‡à¸‚อนี้ถูà¸à¸ªà¹ˆà¸‡à¹‚ดยคุณจริงๆ à¸à¸£à¸¸à¸“าใช้ลิงค์ดังต่อไปนี้
+
+@CONFIRM@
+
+-- 
+จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/read.txt dokuwiki-rc2009-12-02/inc/lang/th/read.txt
--- dokuwiki-2009-02-14/inc/lang/th/read.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/read.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+หน้านี้มีไว้อ่านอย่างเดียว คุณสามารถอ่านข้อความต้นฉบับ ไม่สามารถà¹à¸à¹‰à¹„ขได้ ให้สอบถามผู้ดูà¹à¸¥à¸£à¸°à¸šà¸šà¸–้าคุณคิดว่านี่คือข้อผิดพลาด
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/recent.txt dokuwiki-rc2009-12-02/inc/lang/th/recent.txt
--- dokuwiki-2009-02-14/inc/lang/th/recent.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹€à¸¡à¸·à¹ˆà¸­à¹€à¸£à¹‡à¸§à¹†à¸™à¸µà¹‰ ======
+
+เพจเหล่านี้ถูà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¹€à¸¡à¸·à¹ˆà¸­à¹€à¸£à¹‡à¸§à¹†à¸™à¸µà¹‰
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/registermail.txt dokuwiki-rc2009-12-02/inc/lang/th/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/th/registermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+มีผู้ใช้คนใหม่ได้ลงทะเบียน นี่คือรายละเอียด:
+
+ชื่อผู้ใช้ : @NEWUSER@
+ชื่อเต็ม : @NEWNAME@
+อีเมล : @NEWEMAIL@
+
+วันที่ : @DATE@
+บราวเซอร์ : @BROWSER@
+ที่อยู่ไอพี : @IPADDRESS@
+ชื่อโฮสต์ : @HOSTNAME@
+
+-- 
+จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดยโดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/register.txt dokuwiki-rc2009-12-02/inc/lang/th/register.txt
--- dokuwiki-2009-02-14/inc/lang/th/register.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ลงทะเบียนเป็นผู้ใช้หน้าใหม่ ======
+
+à¸à¸£à¸­à¸à¸‚้อมูลทั้งหมดด้านล่างเพื่อสร้างบัà¸à¸Šà¸µà¹ƒà¸«à¸¡à¹ˆà¹ƒà¸™à¸§à¸´à¸à¸´à¸™à¸µà¹‰ ให้à¹à¸™à¹ˆà¹ƒà¸ˆà¸§à¹ˆà¸²à¸„ุณให้ **ที่อยู่อีเมลที่ใช้ได้จริง** ถ้าคุณไม่ถูà¸à¸–ามให้à¸à¸£à¸­à¸à¸£à¸«à¸±à¸ªà¸œà¸²à¹ˆà¸™à¸—ี่นี่, รหัสผ่านใหม่จะถูà¸à¸ªà¹ˆà¸‡à¹„ปยังที่อยู่ดังà¸à¸¥à¹ˆà¸²à¸§ ชื่อล็อà¸à¸­à¸´à¸™à¸„วรจะใช้ได้ถูà¸à¸•à¹‰à¸­à¸‡à¸•à¸²à¸¡[[doku>pagename|pagename]].
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/th/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/th/resendpwd.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ส่งรหัสผ่านใหม่ ======
+
+à¸à¸£à¸¸à¸“าà¸à¸£à¸­à¸à¸Šà¸·à¹ˆà¸­à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹ƒà¸™à¸Šà¹ˆà¸­à¸‡à¸”้านล่างเพื่อร้องขอรหัสผ่านใหม่จาà¸à¸šà¸±à¸à¸Šà¸µà¸‚องคุณในวิà¸à¸´à¸™à¸µà¹‰ ลิงค์ยืนยันจะถูà¸à¸ªà¹ˆà¸‡à¹„ปยังที่อยู่อีเมลที่คุณลงทะเบียนไว้
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/revisions.txt dokuwiki-rc2009-12-02/inc/lang/th/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/th/revisions.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ฉบับเà¸à¹ˆà¸² ======
+
+เหล่านี้เป็นรายà¸à¸²à¸£à¸‰à¸šà¸±à¸šà¹€à¸à¹ˆà¸²à¸‚องเอà¸à¸ªà¸²à¸£à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™ หาà¸à¸•à¹‰à¸­à¸‡à¸à¸²à¸£à¸„ืนสภาพฉบับเà¸à¹ˆà¸² ให้เลือà¸à¸¡à¸±à¸™à¸ˆà¸²à¸à¸”้านล่าง, คลิ๊ภ"à¹à¸à¹‰à¹„ขเพจนี้" à¹à¸¥à¹‰à¸§à¸ˆà¸¶à¸‡à¸„่อยบันทึà¸à¸¡à¸±à¸™
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/th/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/th/searchpage.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,4 @@
+====== สืบค้น ======
+คุณสามารถพบผลลัพธ์à¸à¸²à¸£à¸ªà¸·à¸šà¸„้นของคุณด้านล่าง ถ้าคุณไม่พบสิ่งที่คนมองหา คุณสามารถเลือà¸à¸—ี่จะสร้าง หรือà¹à¸à¹‰à¹„ขชื่อเพจหลังจาà¸à¸”ูผลสืบค้นà¹à¸¥à¹‰à¸§à¸”้วยปุ่มที่เหมาะสม
+
+====== ผลลัพธ์ ======
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/showrev.txt dokuwiki-rc2009-12-02/inc/lang/th/showrev.txt
--- dokuwiki-2009-02-14/inc/lang/th/showrev.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/showrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,2 @@
+**นี่คือเอà¸à¸ªà¸²à¸£à¸£à¸¸à¹ˆà¸™/ฉบับเà¸à¹ˆà¸²**
+----
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/th/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/th/subscribermail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,22 @@
+สวัสดี!
+
+เพจ @PAGE@ ในวิà¸à¸´ @TITLE@ ถูà¸à¹à¸à¹‰à¹„ข à¹à¸¥à¸°à¸™à¸µà¹ˆà¸„ือรายà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+วันที่ : @DATE@
+ผู้ใช้: @USER@
+สรุปà¸à¸²à¸£à¹à¸à¹‰à¹„ข: @SUMMARY@
+ฉบับเà¸à¹ˆà¸²: @OLDPAGE@
+ฉบับใหม่: @NEWPAGE@
+
+เพื่อยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¹ƒà¸™à¹€à¸žà¸ˆà¸™à¸µà¹‰, ให้ล็อà¸à¸­à¸´à¸™à¹€à¸‚้าไปยังวิà¸à¸´à¸—ี่
+@DOKUWIKIURL@ à¹à¸¥à¹‰à¸§à¹€à¸‚้าไปที่ยัง
+@NEWPAGE@
+à¹à¸¥à¸°à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸¥à¸‡à¸—ะเบียนเà¸à¹‰à¸²à¸”ูà¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸‚องเพจ หรือ เนมสเปซ นั้นๆ
+
+-- 
+จดหมายนี้ถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¸‚ึ้นโดย โดà¸à¸¸à¸§à¸´à¸à¸´à¸—ี่
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/th/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/th/updateprofile.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== ปรับปรุงข้อมูลส่วนตัวของบัà¸à¸Šà¸µà¸„ุณ ======
+
+คุณเพียงต้องà¸à¸²à¸£à¸à¸£à¸­à¸à¸Šà¹ˆà¸­à¸‡à¸—ี่ต้องà¸à¸²à¸£à¹à¸à¹‰à¹„ขเหล่านี้ให้ครบ à¹à¸•à¹ˆà¹„ม่สามารถเปลี่ยนชื่อผู้ใช้ได้
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/th/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/th/uploadmail.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,14 @@
+มีไฟล์ได้ถูà¸à¸­à¸±à¸žà¹‚หลดเข้าไปยังโดà¸à¸¸à¸§à¸´à¸à¸´à¸‚องคุณ นี่คือรายละเอียด:
+
+ไฟล์: @MEDIA@
+วันที่: @DATE@
+เบราเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ขนาด: @SIZE@
+MIME Type : @MIME@
+ผู้ใช้: @USER@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/th/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/th/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/th/wordblock.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/th/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,3 @@
+====== สà¹à¸›à¸¡à¸–ูà¸à¸à¸µà¸”à¸à¸±à¸™ ======
+
+à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸‚องคุณ **ไม่**ได้รับà¸à¸²à¸£à¸šà¸±à¸™à¸—ึà¸à¹€à¸žà¸£à¸²à¸°à¸¡à¸±à¸™à¸¡à¸µà¸«à¸™à¸¶à¹ˆà¸‡à¸‚้อความต้องห้ามหรือมาà¸à¸à¸§à¹ˆà¸² ถ้าคุณพยายามสà¹à¸›à¸¡à¸§à¸´à¸à¸´à¸™à¸µà¹‰ --คุณไม่น่ารัà¸à¹€à¸¥à¸¢à¸™à¸° เด็à¸à¹‚ง่! à¹à¸•à¹ˆà¸–้าคุณคิดว่านี่เป็นข้อผิดพลาดà¹à¸¥à¹‰à¸§à¸¥à¸°à¸à¹‡ ช่วยติดต่อผู้ดูà¹à¸¥à¸§à¸´à¸à¸´à¸™à¸µà¹‰à¹ƒà¸«à¹‰à¸”้วย
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/denied.txt dokuwiki-rc2009-12-02/inc/lang/tr/denied.txt
--- dokuwiki-2009-02-14/inc/lang/tr/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Yetki Reddedildi======
+====== Yetki Reddedildi ======
 
 Üzgünüz, devam etmek için yetkiniz yok. Giriş yapmayı unutmuş olabilir misiniz?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/diff.txt dokuwiki-rc2009-12-02/inc/lang/tr/diff.txt
--- dokuwiki-2009-02-14/inc/lang/tr/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Farklar======
+====== Farklar ======
 
 Bu sayfanın seçili sürümü ile mevcut sürümü arasındaki farkları gösterir.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/lang.php dokuwiki-rc2009-12-02/inc/lang/tr/lang.php
--- dokuwiki-2009-02-14/inc/lang/tr/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,7 @@
  * @author Aydın Coşkuner 
  * @author yavuzselim@gmail.com
  * @author Cihan Kahveci kahvecicihan@gmail.com
+ * @author Yavuz Selim 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -16,7 +17,7 @@
 $lang['singlequoteopening']    = '‘';
 $lang['singlequoteclosing']    = '’';
 $lang['apostrophe']            = '’';
-$lang['btn_edit']              = 'Sayfayı değiştir';
+$lang['btn_edit']              = 'Sayfayı düzenle';
 $lang['btn_source']            = 'Kaynağı göster';
 $lang['btn_show']              = 'Sayfayı göster';
 $lang['btn_create']            = 'Bu sayfayı oluştur';
@@ -31,7 +32,7 @@
 $lang['btn_upload']            = 'Yükle';
 $lang['btn_cancel']            = 'Ä°ptal';
 $lang['btn_index']             = 'Ä°ndeks';
-$lang['btn_secedit']           = 'DeÄŸiÅŸtir';
+$lang['btn_secedit']           = 'Düzenle';
 $lang['btn_login']             = 'GiriÅŸ yap';
 $lang['btn_logout']            = 'Çıkış yap';
 $lang['btn_admin']             = 'Yönetici';
@@ -146,7 +147,6 @@
 $lang['mail_changed']          = 'sayfa deÄŸiÅŸtirilme:';
 $lang['mail_new_user']         = 'yeni kullanıcı';
 $lang['mail_upload']           = 'dosya yüklendi:';
-$lang['qb_alert']              = 'Lütfen biçimlendirmek istediğin yazıyı gir.\nSayfanın sonuna eklenecektir.';
 $lang['qb_bold']               = 'Kalın Yazı';
 $lang['qb_italic']             = 'Eğik Yazı';
 $lang['qb_underl']             = 'Altı Çizgili Yazı';
@@ -166,7 +166,7 @@
 $lang['qb_sig']                = 'Ä°mza Ekle';
 $lang['qb_smileys']            = 'Gülen Yüzler';
 $lang['qb_chars']              = 'Özel Karakterler';
-$lang['del_confirm']           = 'Bu giriÅŸi sil?';
+$lang['js']['del_confirm']           = 'Bu giriÅŸi sil?';
 $lang['admin_register']        = 'Yeni kullanıcı ekle...';
 $lang['metaedit']              = 'Metaverileri DeÄŸiÅŸtir';
 $lang['metasaveerr']           = 'Metaveri yazma başarısız ';
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/newpage.txt dokuwiki-rc2009-12-02/inc/lang/tr/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/tr/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Bu başlık henüz mevcut değil======
+====== Bu başlık henüz mevcut değil ======
 
 Henüz mevcut olmayan bir başlığın linkiyle geldiniz. ''bu sayfayı oluştur'' tuşuna tıklayarak sayfayı oluşturabilirsiniz.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/norev.txt dokuwiki-rc2009-12-02/inc/lang/tr/norev.txt
--- dokuwiki-2009-02-14/inc/lang/tr/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Böyle bir sürüm yok======
+====== Böyle bir sürüm yok ======
 
 Belirtilen sürüm mevcut değil. Bu dökümanın eski sürümlerinin bir listesine ulaşmak için ''Eski sürümler'' tuşunu kullanın.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/preview.txt dokuwiki-rc2009-12-02/inc/lang/tr/preview.txt
--- dokuwiki-2009-02-14/inc/lang/tr/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Önizleme======
+====== Önizleme ======
 
 Bu yazınızın nasıl çıkacağının bir önizlemesi. Unutma: Yazı henüz **kaydedilmedi!**
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/tr/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/tr/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 Bu e-posta aşağıdaki DokuWiki tarafından otomatik olarak oluşturulmuştur.
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/recent.txt dokuwiki-rc2009-12-02/inc/lang/tr/recent.txt
--- dokuwiki-2009-02-14/inc/lang/tr/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Son deÄŸiÅŸiklikler======
+====== Son deÄŸiÅŸiklikler ======
 
 Aşağıdaki sayfalar yakın zamanda değiştirildi.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/revisions.txt dokuwiki-rc2009-12-02/inc/lang/tr/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/tr/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Eski sürümler======
+====== Eski sürümler ======
 
 Bunlar mevcut dökümanın daha eski sürümleridir. Eski bir sürüme çevirmek için, sürümü aşağıdan seçin, ''Sayfayı değiştir''e tıklayın ve kaydedin.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/tr/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/tr/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Arama======
+====== Arama ======
 
 Aşağıda aramanın sonuçları listelenmiştir. Aradığınız şeyi bulamadıysanız, ''Sayfayı değiştir'' tuşuna tıklayarak girdiğiniz sorgu adıyla yeni bir sayfa oluşturabilirsiniz .
 
-=====Sonuçlar=====
+===== Sonuçlar =====
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/tr/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/tr/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,7 +9,7 @@
 @DIFF@
 --------------------------------------------------------
 
-Bu sayfaya abonelikten çıkmak için  
+Bu sayfaya abonelikten çıkmak için
 @DOKUWIKIURL@ adresindeki wikiye gir, ardından
 @NEWPAGE@
 sayfasına git ve 'Sayfa Değişikliklerini Bildirme' butonuna tıkla.
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/tr/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/tr/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -9,5 +9,5 @@
 MIME Type : @MIME@
 Kullanıcı : @USER@
 
---
+-- 
 Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/tr/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/tr/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/tr/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/tr/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======SPAM bloke edildi======
+====== SPAM bloke edildi ======
 
 Değişiklikleriniz **kaydedilmedi**, çünkü değişikliklerinizde bir veya daha fazla engellenen kelime var. Eğer Wikiyi spamlamaya çalışıyorsan -- Oh olsun! Eğer bunun bir hata olduğunu düşünüyorsanız, bu Wiki yöneticisiyle iletişime geçin.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/adminplugins.txt dokuwiki-rc2009-12-02/inc/lang/uk/adminplugins.txt
--- dokuwiki-2009-02-14/inc/lang/uk/adminplugins.txt	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/adminplugins.txt	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1 @@
+===== Додаткові плагіни =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/backlinks.txt dokuwiki-rc2009-12-02/inc/lang/uk/backlinks.txt
--- dokuwiki-2009-02-14/inc/lang/uk/backlinks.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/backlinks.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,3 @@
 ====== Зворотні зв'Ñзки ======
 
-Це перелік Ñторінок, Ñкі, здаєтьÑÑ, поÑилаютьÑÑ Ð½Ð° поточну Ñторінку
-
+Це перелік Ñторінок, Ñкі, здаєтьÑÑ, поÑилаютьÑÑ Ð½Ð° поточну Ñторінку.
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/conflict.txt dokuwiki-rc2009-12-02/inc/lang/uk/conflict.txt
--- dokuwiki-2009-02-14/inc/lang/uk/conflict.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/conflict.txt	2009-12-02 19:50:12.000000000 +0100
@@ -3,6 +3,6 @@
 ІÑнує новіша верÑÑ–Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñƒ, що ви редагували. Це може ÑтатиÑÑ, коли інший кориÑтувач змінив документ під Ñ‡Ð°Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ редагуваннÑ.
 
 Уважно переглÑньте розбіжноÑÑ‚Ñ– та вирішіть, Ñку верÑÑ–ÑŽ залишити. Якщо ви натиÑнете
-''зберегти'', буде збережена ваша верÑÑ–Ñ. Якщо натиÑнете ''відмінити'' --- то залишитьÑÑ
+''зберегти'', буде збережена ваша верÑÑ–Ñ. Якщо натиÑнете ''ÑкаÑувати'' --- то залишитьÑÑ
 поточна верÑÑ–Ñ.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/denied.txt dokuwiki-rc2009-12-02/inc/lang/uk/denied.txt
--- dokuwiki-2009-02-14/inc/lang/uk/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======ДоÑтуп заборонено======
+====== ДоÑтуп заборонено ======
 
 Вибачте, але у Ð²Ð°Ñ Ð½Ðµ виÑтачає прав Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ. Можливо ви забули увійти в ÑиÑтему?
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/diff.txt dokuwiki-rc2009-12-02/inc/lang/uk/diff.txt
--- dokuwiki-2009-02-14/inc/lang/uk/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======РозбіжноÑÑ‚Ñ–======
+====== РозбіжноÑÑ‚Ñ– ======
 
 Тут показані розбіжноÑÑ‚Ñ– між вибраною ревізією та поточною верÑією Ñторінки.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/draft.txt dokuwiki-rc2009-12-02/inc/lang/uk/draft.txt
--- dokuwiki-2009-02-14/inc/lang/uk/draft.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/draft.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,6 +1,6 @@
 ====== Знайдено чернетку ======
 
-ОÑтаннє Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки не було завершено коректно. ДокуВікі автоматично зберегла чернетку під Ñ‡Ð°Ñ Ð²Ð°ÑˆÐ¾Ñ— роботи. Ви можете викориÑтати чернетку Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ. Ðижче ви можете побачити дані, що було збережено з попереднього ÑеанÑу.
+ОÑтаннє Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки не було завершено коректно. ДокуВікі автоматично зберегла чернетку під Ñ‡Ð°Ñ Ð²Ð°ÑˆÐ¾Ñ— роботи. Ви можете викориÑтати чернетку Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ. Ðижче ви можете побачити дані, збережені з попереднього ÑеанÑу.
 
-Будь лаÑка вирішить, чи ви бажаєте //відновити// оÑтанній ÑÐµÐ°Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ, //знищити// збережену чернетку або //відмінити// редагуваннÑ.
+Будь лаÑка вирішить, чи ви бажаєте //відновити// оÑтанній ÑÐµÐ°Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ, //знищити// збережену чернетку або //ÑкаÑувати// редагуваннÑ.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/editrev.txt dokuwiki-rc2009-12-02/inc/lang/uk/editrev.txt
--- dokuwiki-2009-02-14/inc/lang/uk/editrev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/editrev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,2 +1,2 @@
-**Ви завантажили Ñтару верÑÑ–ÑŽ документу!** Якщо ви збережете Ñ—Ñ—, ви Ñтворите нову верÑÑ–ÑŽ з ціми даними
+**Ви завантажили Ñтару верÑÑ–ÑŽ документу!** Якщо ви збережете Ñ—Ñ—, ви Ñтворите нову верÑÑ–ÑŽ з ціми даними.
 ----
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/install.html dokuwiki-rc2009-12-02/inc/lang/uk/install.html
--- dokuwiki-2009-02-14/inc/lang/uk/install.html	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/install.html	2009-12-02 19:50:12.000000000 +0100
@@ -1,11 +1,9 @@
-
    Ð¦Ñ Ñторінка допомагає при першій уÑтановці та конфігурації
-ДокуВікі. 
-Більше інформації про програму уÑтановки можна знайти на 
-Ñторінці документації.
    
+
    Ð¦Ñ Ñторінка допомагає при першій уÑтановці та наÑтройці ДокуВікі. 
+Більше інформації про програму уÑтановки можна знайти на Ñторінці документації.
    
 
 
    ДокуВікі викориÑтовую звичайні файли Ð´Ð»Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñторінок вікі та іншої інформації,
 щодо цих Ñторінок (наприклад, зображень, індекÑів пошуку, Ñтарих ревізій та ін.). ДлÑ
-уÑпішного Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð”Ð¾ÐºÑƒÐ’Ñ–ÐºÑ– має мати права на Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ Ñ‚ÐµÐº, що
+уÑпішного Ñ„ÑƒÐ½ÐºÑ†Ñ–Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð”Ð¾ÐºÑƒÐ’Ñ–ÐºÑ– має мати права на Ð·Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ Ð¿Ð°Ð¿Ð¾Ðº, що
 міÑÑ‚ÑÑ‚ÑŒ ці файли. Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° уÑтановки не може змінювати права доÑтупу. Звичайно це 
 робитьÑÑ Ð·Ð° допомогою інтерпретатора shell, або, Ñкщо ви викориÑтовуєте хоÑтинг,
 за допомогою FTP або панелі ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ñ…Ð¾Ñтингом (наприклад cPanel).
    
@@ -13,7 +11,7 @@
 
    Ð¦Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° уÑтановки налаштує вашу ДокуВікі Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ 
 ACL, що, в Ñвою чергу, 
 дозволить адмініÑтратору входити до адмініÑтративного меню Ð´Ð»Ñ ÑƒÑтановки доданків,
-ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами, ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ доÑтупу до Ñторінок вікі та змін параметрів
+ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами, ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ð²Ð°Ð¼Ð¸ доÑтупу до Ñторінок Вікі та змін параметрів
 конфігурації. Це не Ñ” обов'Ñзковим Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ ДокуВікі, але зробить Ð¶Ð¸Ñ‚Ñ‚Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора
 значно легшим.
    
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/lang.php dokuwiki-rc2009-12-02/inc/lang/uk/lang.php
--- dokuwiki-2009-02-14/inc/lang/uk/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -5,6 +5,9 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Oleksiy Voronin 
  * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia 
+ * @author Uko uko@uar.net
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -22,17 +25,17 @@
 $lang['btn_preview']           = 'ПереглÑд';
 $lang['btn_top']               = 'ПовернутиÑÑ Ð½Ð°Ð²ÐµÑ€Ñ…';
 $lang['btn_newer']             = '<< більш нові';
-$lang['btn_older']             = 'меньш нові >>';
+$lang['btn_older']             = 'більш Ñтарі >>';
 $lang['btn_revs']              = 'Старі ревізії';
 $lang['btn_recent']            = 'Ðедавні зміни';
 $lang['btn_upload']            = 'Завантажити';
-$lang['btn_cancel']            = 'Відмінити';
+$lang['btn_cancel']            = 'СкаÑувати';
 $lang['btn_index']             = 'ЗміÑÑ‚';
 $lang['btn_secedit']           = 'Редагувати';
 $lang['btn_login']             = 'Увійти';
 $lang['btn_logout']            = 'Вийти';
 $lang['btn_admin']             = 'КеруваннÑ';
-$lang['btn_update']            = 'Обновити';
+$lang['btn_update']            = 'Оновити';
 $lang['btn_delete']            = 'Знищити';
 $lang['btn_back']              = 'Ðазад';
 $lang['btn_backlink']          = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñюди';
@@ -42,16 +45,17 @@
 $lang['btn_subscribens']       = 'ПідпиÑатиÑÑ Ð½Ð° зміни в проÑторі імен';
 $lang['btn_unsubscribens']     = 'ВідпиÑатиÑÑ Ð²Ñ–Ð´ змін проÑтору імен';
 $lang['btn_profile']           = 'Оновити профіль';
-$lang['btn_reset']             = 'СброÑ';
+$lang['btn_reset']             = 'ОчиÑти';
 $lang['btn_resendpwd']         = 'ÐадіÑлати новий пароль';
 $lang['btn_draft']             = 'Редагувати чернетку';
 $lang['btn_recover']           = 'Відновити чернетку';
 $lang['btn_draftdel']          = 'Знищити чернетку';
+$lang['btn_revert']            = 'Відновити';
 $lang['loggedinas']            = 'Ви';
 $lang['user']                  = 'КориÑтувач';
 $lang['pass']                  = 'Пароль';
 $lang['newpass']               = 'Ðовий пароль';
-$lang['oldpass']               = 'Підтвердити новий пароль';
+$lang['oldpass']               = 'Поточний пароль';
 $lang['passchk']               = 'ще раз';
 $lang['remember']              = 'Запам\'Ñтати мене';
 $lang['fullname']              = 'Повне ім\'Ñ';
@@ -61,63 +65,75 @@
 $lang['badlogin']              = 'Вибачте, невірне ім\'Ñ Ñ‡Ð¸ пароль.';
 $lang['minoredit']             = 'Ðезначні зміни';
 $lang['draftdate']             = 'Чернетка збережена';
-$lang['regmissing']            = 'Вибачте, ви повинні заповнити вÑÑ– полÑ.';
-$lang['reguexists']            = 'Вибачте, кориÑтувач з таким іменем вже Ñ–Ñнує.';
-$lang['regsuccess']            = 'КориÑтувача було Ñтворено та пароль було відправлено на e-mail.';
-$lang['regsuccess2']           = 'КориÑтувача було Ñтворено.';
-$lang['regmailfail']           = 'Схоже, що при відправленні паролю відбулаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°. Зв\'ÑжітьÑÑ Ð· адмініÑтратором!';
-$lang['regbadmail']            = 'Схоже, що адреÑа e-mail невірна - Ñкщо ви вважаєте, що це помилка, зв\'ÑжітьÑÑ Ð· адмініÑтратором';
-$lang['regbadpass']            = 'Ðадані паролі не Ñпівпадають, Ñпробуйте ще раз';
+$lang['nosecedit']             = 'Сторінку змінено, дані розділу заÑтарілі. Завантажено Ñторінку повніÑÑ‚ÑŽ.';
+$lang['regmissing']            = 'Ðеобхідно заповнити вÑÑ– полÑ.';
+$lang['reguexists']            = 'КориÑтувач з таким іменем вже Ñ–Ñнує.';
+$lang['regsuccess']            = 'КориÑтувача Ñтворено. Пароль відправлено на e-mail.';
+$lang['regsuccess2']           = 'КориÑтувача Ñтворено.';
+$lang['regmailfail']           = 'При відправленні Ð¿Ð°Ñ€Ð¾Ð»Ñ ÑталаÑÑŒ помилка. Зв’ÑжітьÑÑ Ð· адмініÑтратором!';
+$lang['regbadmail']            = 'Схоже, що адреÑа e-mail невірна - Ñкщо ви вважаєте, що це помилка, зв’ÑжітьÑÑ Ð· адмініÑтратором';
+$lang['regbadpass']            = 'Ðадані паролі не Ñпівпадають, Ñпробуйте ще раз.';
 $lang['regpwmail']             = 'Пароль ДокуВікі';
 $lang['reghere']               = 'Ще не маєте облікового запиÑу? Отримайте його негайно';
-$lang['profna']                = 'Ð¦Ñ Ð²Ñ–ÐºÑ– не підтримує зміни профілÑ';
+$lang['profna']                = 'Ð¦Ñ Ð’Ñ–ÐºÑ– не підтримує зміни профілю';
 $lang['profnochange']          = 'Ðемає змін, немає що робити.';
-$lang['profnoempty']           = 'Ім\'Ñ Ð°Ð±Ð¾ e-mail не можуть бути пуÑтими.';
+$lang['profnoempty']           = 'Ð†Ð¼â€™Ñ Ð°Ð±Ð¾ e-mail не можуть бути пуÑтими.';
 $lang['profchanged']           = 'Профіль уÑпішно змінено.';
 $lang['pwdforget']             = 'Забули пароль? Отримайте новий';
-$lang['resendna']              = 'Ð¦Ñ Ð²Ñ–ÐºÑ– не підтримує повторне Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ.';
+$lang['resendna']              = 'Ð¦Ñ Ð’Ñ–ÐºÑ– не підтримує повторне Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ.';
 $lang['resendpwd']             = 'ÐадіÑлати пароль длÑ';
-$lang['resendpwdmissing']      = 'Вибачте, ви повинні заповнити уÑÑ– полÑ.';
-$lang['resendpwdnouser']       = 'Вибачте, такий кориÑтувач не Ñ–Ñнує.';
-$lang['resendpwdbadauth']      = 'Вибачте, код автентифікації невірний. Перевірте, чи ви викориÑтали повне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ.';
-$lang['resendpwdconfirm']      = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відіÑлано на email.';
-$lang['resendpwdsuccess']      = 'Ваш новий пароль було надіÑлано на email.';
+$lang['resendpwdmissing']      = 'Ðеобхідно заповнити уÑÑ– полÑ.';
+$lang['resendpwdnouser']       = 'Такий кориÑтувач не Ñ–Ñнує.';
+$lang['resendpwdbadauth']      = 'Код автентифікації невірний. Перевірте, чи ви викориÑтали повне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ.';
+$lang['resendpwdconfirm']      = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ñ–Ñлано на e-mail.';
+$lang['resendpwdsuccess']      = 'Ðовий пароль відіÑлано на e-mail.';
+$lang['license']               = 'Якщо не вказано інше, вміÑÑ‚ цієї Вікі підпадає під дію такої ліцензії:';
+$lang['licenseok']             = 'Примітка. Редагуючи ці Ñторінку, ви погоджуєтеÑÑŒ на розповÑÑŽÐ´Ð¶ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— за такою ліцензією:';
+$lang['searchmedia']           = 'Пошук файлу:';
+$lang['searchmedia_in']        = 'Шукати у %s';
 $lang['txt_upload']            = 'Виберіть файл Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ';
 $lang['txt_filename']          = 'Завантажити Ñк (не обов\'Ñзкове)';
 $lang['txt_overwrt']           = 'ПерезапиÑати Ñ–Ñнуючий файл';
 $lang['lockedby']              = 'Заблоковано';
-$lang['lockexpire']            = 'Блок завершуютьÑÑ Ð²';
-$lang['willexpire']            = 'Ваш блок Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки закінчуєтьÑÑ Ñ‡ÐµÑ€ÐµÐ· хвилину.\n Щоб уникнути конфліктів викориÑтовуйте кнопку переглÑду Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ.';
+$lang['lockexpire']            = 'Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÑƒÑ”Ñ‚ÑŒÑÑ Ð²';
+$lang['willexpire']            = 'Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ†Ñ–Ñ”Ñ— Ñторінки закінчуєтьÑÑ Ñ‡ÐµÑ€ÐµÐ· хвилину.\n Щоб уникнути конфліктів викориÑтовуйте кнопку переглÑду Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ.';
 $lang['notsavedyet']           = 'Ðезбережені зміни будуть втрачені.\n ДійÑно продовжити?';
-$lang['rssfailed']             = 'Виникла помилка під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ RSS-ленти: ';
+$lang['rssfailed']             = 'Виникла помилка під Ñ‡Ð°Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ RSS-Ñтрічки: ';
 $lang['nothingfound']          = 'Ðічого не знайдено.';
-$lang['mediaselect']           = 'Вибір медіа-файла';
-$lang['fileupload']            = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¼ÐµÐ´Ñ–Ð°-файла';
+$lang['mediaselect']           = 'Вибір медіа-файлу';
+$lang['fileupload']            = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¼ÐµÐ´Ñ–Ð°-файлу';
 $lang['uploadsucc']            = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð¹ÑˆÐ»Ð¾ уÑпішно';
-$lang['uploadfail']            = 'Помилка при завантаженні. Можливо невірні права?';
+$lang['uploadfail']            = 'Помилка при завантаженні. Можливо неправильні права?';
 $lang['uploadwrong']           = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÐµÐ½Ð¾. Таке Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ не дозволÑєтьÑÑ!';
 $lang['uploadexist']           = 'Файл вже Ñ–Ñнує. Ðічого не зроблено.';
-$lang['uploadbadcontent']      = 'Завантажений контент не відповідає розширенню %s.';
-$lang['uploadspam']            = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ Ñпам-фільтром';
-$lang['uploadxss']             = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ через можливіÑÑ‚ÑŒ злонаміреного контенту';
-$lang['deletesucc']            = 'Файл "%s" було знищено.';
-$lang['deletefail']            = 'Ðеможливо знищити "%s" - перевірте дозвіл.';
-$lang['mediainuse']            = '"%s" не було знищено - доÑÑ– викориÑтовуєтьÑÑ.';
+$lang['uploadbadcontent']      = 'Завантажений вміÑÑ‚ не відповідає розширенню %s.';
+$lang['uploadspam']            = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ Ñпам-фільтром.';
+$lang['uploadxss']             = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ через можливіÑÑ‚ÑŒ злонаміреного вміÑту.';
+$lang['uploadsize']            = 'Завантажений файл надто великий (макÑимум %s).';
+$lang['deletesucc']            = 'Файл "%s" знищено.';
+$lang['deletefail']            = 'Ðеможливо знищити "%s" - перевірте права доÑтупу.';
+$lang['mediainuse']            = '"%s" не знищено - файл викориÑтовуєтьÑÑ.';
 $lang['namespaces']            = 'ПроÑтори імен';
 $lang['mediafiles']            = 'ДоÑтупні файли';
+$lang['js']['searchmedia']     = 'Шукати файли';
 $lang['js']['keepopen']        = 'Тримати вікно відкритим під Ñ‡Ð°Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ';
 $lang['js']['hidedetails']     = 'Сховати деталі';
+$lang['js']['nosmblinks']      = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° мережеві папки працює лише в Internet Explorer.
+Ви можете Ñкопіювати поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ– відкрити його за допомогою Internet Explorer.';
+$lang['js']['linkwiz']         = 'Чарівник поÑилань';
+$lang['js']['linkto']          = 'ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð°:';
+$lang['js']['del_confirm']     = 'ДійÑно знищити обрані елементи?';
 $lang['js']['mu_btn']          = 'Завантажити одночаÑно кілька файлів';
-$lang['mediausage']            = 'Ð”Ð»Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° цей файл викориÑтовуйте такий ÑинтакÑÑ–Ñ:';
-$lang['mediaview']             = 'ПереглÑнути оригінальний файл';
+$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['quickhits']             = 'Ð¡Ð¿Ñ–Ð²Ð¿Ð°Ð´Ð°Ð½Ð½Ñ Ñƒ назвах Ñторінок';
+$lang['hits']                  = 'Збіги';
+$lang['quickhits']             = 'Збіги у назвах Ñторінок';
 $lang['toc']                   = 'ЗміÑÑ‚';
 $lang['current']               = 'поточний';
 $lang['yours']                 = 'Ваша верÑÑ–Ñ';
@@ -130,15 +146,15 @@
 $lang['by']                    = ' ';
 $lang['deleted']               = 'знищено';
 $lang['created']               = 'Ñтворено';
-$lang['restored']              = 'Ñтара Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð°';
-$lang['external_edit']         = 'Зовнішнє редагуваннÑ';
+$lang['restored']              = 'відновлено Ñтару ревізію';
+$lang['external_edit']         = 'зовнішнє редагуваннÑ';
 $lang['summary']               = 'ПідÑумок змін';
+$lang['noflash']               = 'Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду цієї Ñторінки необхідно вÑтановити Adobe Flash Plugin.';
+$lang['download']              = 'Завантажити фрагмент';
 $lang['mail_newpage']          = 'Ñторінку додано:';
 $lang['mail_changed']          = 'Ñторінку змінено:';
-$lang['mail_new_user']         = 'Ðовий кориÑтувач:';
-$lang['mail_upload']           = 'Завантажено файл:';
-$lang['js']['nosmblinks']            = "ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° мережеві теки працює тільки в Internet Explorer.\n Ðле ви можете Ñкопіювати поÑиланнÑ.";
-$lang['qb_alert']              = 'Введіть текÑÑ‚, Ñкий ви бажаєте відформатувати.\nЙого буде додано в кінець документу.';
+$lang['mail_new_user']         = 'новий кориÑтувач:';
+$lang['mail_upload']           = 'завантажено файл:';
 $lang['qb_bold']               = 'Ðапівжирний текÑÑ‚';
 $lang['qb_italic']             = 'КурÑив';
 $lang['qb_underl']             = 'ПідкреÑлений текÑÑ‚';
@@ -149,6 +165,11 @@
 $lang['qb_h3']                 = 'Заголовок 3-го рівнÑ';
 $lang['qb_h4']                 = 'Заголовок 4-го рівнÑ';
 $lang['qb_h5']                 = 'Заголовок 5-го рівнÑ';
+$lang['qb_h']                  = 'Заголовок';
+$lang['qb_hs']                 = 'Вибрати заголовок';
+$lang['qb_hplus']              = 'Заголовок вищого рівнÑ';
+$lang['qb_hminus']             = 'Заголовок нищого рівнÑ';
+$lang['qb_hequal']             = 'Заголовок того ж рівнÑ';
 $lang['qb_link']               = 'Внутрішнє поÑиланнÑ';
 $lang['qb_extlink']            = 'Зовнішнє поÑиланнÑ';
 $lang['qb_hr']                 = 'Роздільник';
@@ -158,7 +179,7 @@
 $lang['qb_sig']                = 'Додати підпиÑ';
 $lang['qb_smileys']            = 'ПоÑмішки';
 $lang['qb_chars']              = 'Спеціальні Ñимволи';
-$lang['del_confirm']           = 'ДійÑно знищити обрані елементи?';
+$lang['upperns']               = 'Перейти до батьківÑького проÑтору імен';
 $lang['admin_register']        = 'Додати нового кориÑтувача';
 $lang['metaedit']              = 'Редагувати метадані';
 $lang['metasaveerr']           = 'Помилка запиÑу метаданих';
@@ -167,47 +188,46 @@
 $lang['img_title']             = 'Ðазва';
 $lang['img_caption']           = 'ПідпиÑ';
 $lang['img_date']              = 'Дата';
-$lang['img_fname']             = 'Ðазва файла';
+$lang['img_fname']             = 'Ð†Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ';
 $lang['img_fsize']             = 'Розмір';
 $lang['img_artist']            = 'Фотограф';
 $lang['img_copyr']             = 'ÐвторÑькі права';
 $lang['img_format']            = 'Формат';
 $lang['img_camera']            = 'Камера';
 $lang['img_keywords']          = 'Ключові Ñлова';
-$lang['subscribe_success']     = '%s доданий(на) до ÑпиÑку розÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñторінки %s';
-$lang['subscribe_error']       = 'Помилка при доданні %s до ÑпиÑку розÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñторінки %s';
-$lang['subscribe_noaddress']   = 'У вашому профілі немає адреÑи e-mail, ви не можете кориÑтуватиÑÑ ÑпиÑками розÑиланнÑ';
-$lang['unsubscribe_success']   = '%s вилучено зі ÑпиÑку розÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ñторінки %s';
-$lang['unsubscribe_error']     = 'Помилка при вилученні %s зі ÑпиÑку розÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð»Ñ %s';
-$lang['authmodfailed']         = 'Ðевірна ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— кориÑтувача. Будь лаÑка повідомте про це адмініÑтратора.';
-$lang['authtempfail']          = 'ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувача тимчаÑово не доÑтупна. Якщо це буде продовжуватиÑÑŒ, будь лаÑка, повідомте адмініÑтратора';
-$lang['i_chooselang']          = 'Оберіть мову';
+$lang['subscribe_success']     = '%s доданий(на) до ÑпиÑку розÑилки Ð´Ð»Ñ Ñторінки %s';
+$lang['subscribe_error']       = 'Помилка при доданні %s до ÑпиÑку розÑилки Ð´Ð»Ñ Ñторінки %s';
+$lang['subscribe_noaddress']   = 'У вашому профілі немає адреÑи e-mail, ви не можете кориÑтуватиÑÑ ÑпиÑками розÑилки';
+$lang['unsubscribe_success']   = '%s вилучено зі ÑпиÑку розÑилки Ð´Ð»Ñ Ñторінки %s';
+$lang['unsubscribe_error']     = 'Помилка при вилученні %s зі ÑпиÑку розÑилки Ð´Ð»Ñ %s';
+$lang['authmodfailed']         = 'Ðеправильна наÑтройка автентифікації кориÑтувача. Будь лаÑка, повідомте про це адмініÑтратора.';
+$lang['authtempfail']          = 'ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувача тимчаÑово не доÑтупна. Якщо це буде продовжуватиÑÑŒ, будь лаÑка, повідомте адмініÑтратора.';
+$lang['i_chooselang']          = 'Виберіть мову';
 $lang['i_installer']           = 'Програма уÑтановки ДокуВікі';
 $lang['i_wikiname']            = 'Ðазва Вікі';
 $lang['i_enableacl']           = 'Дозволити викориÑÑ‚Ð°Ð½Ð½Ñ ACL (рекомендовано)';
 $lang['i_superuser']           = 'СуперкориÑтувач';
-$lang['i_problems']            = 'Програма уÑтановки знайшла декілька проблем, що вказані нижче. Ви не можете продовжити доки не виправите Ñ—Ñ…';
-$lang['i_modified']            = 'З причин безпеки цей Ñкрипт буде працювати тільки з новою та немодифікованою інÑталÑцією ДокуВікі
-                         Вам Ñлід або ще раз розпакувати файли з пакету, що було завантажено, або звернутиÑÑ Ð´Ð¾ повної
-                         інÑтрукції з уÑтановки ДокуВікі';
-$lang['i_funcna']              = 'Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ PHP %s не доÑтупна. Мабуть ваш хоÑтинг-провайдер відключив Ñ—Ñ— з ÑкихоÑÑŒ причин?';
-$lang['i_phpver']              = 'ВерÑÑ–Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ PHP %s менша ніж необхідно %s. Ðеобхідно оновити PHP';
-$lang['i_permfail']            = 'ДокуВікі не має прав на Ð·Ð°Ð¿Ð¸Ñ %s. Вам доведетьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупа Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— теки';
+$lang['i_problems']            = 'Програма уÑтановки знайшла декілька проблем, що вказані нижче. Ви не можете продовжити, поки не виправите Ñ—Ñ…';
+$lang['i_modified']            = 'З причин безпеки цей Ñкрипт буде працювати тільки з новою та немодифікованою уÑтановкою ДокуВікі.
+Вам Ñлід або ще раз розпакувати файли із завантаженого пакету, або звернутиÑÑ Ð´Ð¾ повної інÑтрукції з уÑтановки ДокуВікі';
+$lang['i_funcna']              = 'Ð¤ÑƒÐ½ÐºÑ†Ñ–Ñ PHP %s не доÑтупна. Можливо, хоÑтинг-провайдер відключив Ñ—Ñ— з ÑкихоÑÑŒ причин?';
+$lang['i_phpver']              = 'ВерÑÑ–Ñ PHP %s менша, ніж необхідно - %s. Ðеобхідно оновити PHP.';
+$lang['i_permfail']            = 'ДокуВікі не має прав на Ð·Ð°Ð¿Ð¸Ñ %s. Ðеобхідно змінити права доÑтупа Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— папки!';
 $lang['i_confexists']          = '%s вже Ñ–Ñнує';
-$lang['i_writeerr']            = 'Ðеможливо Ñтворити %s. Вам потрібно перевірити права доÑтупа Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð°/теки та Ñтворити файл вручну.';
+$lang['i_writeerr']            = 'Ðеможливо Ñтворити %s. Ðеобхідно перевірити права доÑтупа Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ñƒ/папки та Ñтворити файл вручну.';
 $lang['i_badhash']             = 'Ðевпізнаний або модифікований dokuwiki.php (hash=%s)';
 $lang['i_badval']              = '%s - невірне або пуÑте значеннÑ.';
-$lang['i_success']             = 'ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑпішно завершено. Ми можете знищити файл install.php. 
-			 Перейдіть до вашої нової ДокуВікі';
-$lang['i_failure']             = 'При запиÑу файла конфігурації виникли деÑкі помилки. Можливо вам доведетьÑÑ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ… ÑамоÑтійно
-                         до початку викориÑÑ‚Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ñ— нової ДокуВікі';
+$lang['i_success']             = 'ÐаÑтройку завершено. Ми можете знищити файл install.php.
+Перейдіть до вашої нової ДокуВікі';
+$lang['i_failure']             = 'При збереженні файлу конфігурації виникли помилки. Можливо вам доведетьÑÑ Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ñ—Ñ… ÑамоÑтійно
+до початку викориÑÑ‚Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ñ— нової ДокуВікі.';
 $lang['i_policy']              = 'Початкова політика ACL';
-$lang['i_pol0']                = 'Відкрита Вікі Wiki (читаннÑ, Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ Ð²ÑÑ–Ñ…)';
+$lang['i_pol0']                = 'Відкрита Вікі (читаннÑ, Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð´Ð»Ñ Ð²ÑÑ–Ñ…)';
 $lang['i_pol1']                = 'Публічна Вікі (Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²ÑÑ–Ñ…, Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ñ€ÐµÑ”Ñтрованих кориÑтувачів)';
 $lang['i_pol2']                = 'Закрита Вікі (читаннÑ, Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ð° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð´Ð»Ñ Ð·Ð°Ñ€ÐµÑ”Ñтрованих кориÑтувачів)';
 $lang['i_retry']               = 'Повторити';
 $lang['mu_intro']              = 'Тут ви можете завантажити одночаÑно кілька файлів. ÐатиÑніть кнопку "Вибрати", щоб додати файли в чергу. ПіÑÐ»Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð½Ð°Ñ‚Ð¸Ñніть кнопку "Завантажити"';
-$lang['mu_gridname']           = 'Ðазва файлу';
+$lang['mu_gridname']           = 'Ð†Ð¼â€™Ñ Ñ„Ð°Ð¹Ð»Ñƒ';
 $lang['mu_gridsize']           = 'Розмір';
 $lang['mu_gridstat']           = 'СтатуÑ';
 $lang['mu_namespace']          = 'ПроÑÑ‚Ñ–Ñ€ імен';
@@ -215,7 +235,10 @@
 $lang['mu_toobig']             = 'надто великий';
 $lang['mu_ready']              = 'готовий до завантаженнÑ';
 $lang['mu_done']               = 'закінчено';
-$lang['mu_fail']               = 'неуÑпішне';
+$lang['mu_fail']               = 'невдале';
 $lang['mu_authfail']           = 'закінчено термін дії ÑеÑÑ–Ñ—';
 $lang['mu_progress']           = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ @PCT@%';
 $lang['mu_filetypes']          = 'Дозволені типи файлів';
+$lang['mu_info']               = 'Файли завантажено';
+$lang['mu_lasterr']            = 'ОÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°:';
+$lang['recent_global']         = 'Ви переглÑдаєте зміни в межах проÑтору імен %s. Також можна переглÑнути зміни в межах уÑієї Вікі.';
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/locked.txt dokuwiki-rc2009-12-02/inc/lang/uk/locked.txt
--- dokuwiki-2009-02-14/inc/lang/uk/locked.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/locked.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-====== Сторінку блоковано ======
+====== Сторінку заблоковано ======
 
-Ð¦Ñ Ñторінка зараз заблокована іншим кориÑтувачем Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ. Вам треба зачекати доки цей кориÑтувач завершить Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ Ñ‡Ð°Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒÑÑ.
+Цю Ñторінку заблоковано іншим кориÑтувачем Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ. Зачекайте, поки цей кориÑтувач завершить Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ закінчитьÑÑ Ñ‡Ð°Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ.
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/login.txt dokuwiki-rc2009-12-02/inc/lang/uk/login.txt
--- dokuwiki-2009-02-14/inc/lang/uk/login.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/login.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== Вхід до вікі ======
 
-Ви не ввійшли до ÑиÑтеми. Введіть ваші реєÑтраційні дані Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб увійти. У вашому оглÑдачі повинні бути ввімкнені cookies.
+Ви не ввійшли до ÑиÑтеми. Введіть ваші реєÑтраційні дані Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб увійти. У вашому браузері повинні бути увімкнені файли cookies.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/uk/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/uk/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -3,10 +3,10 @@
 Дата         : @DATE@
 ОглÑдач      : @BROWSER@
 ÐдреÑа IP    : @IPADDRESS@
-Ім'Ñ Ñ…Ð¾Ñта   : @HOSTNAME@
+Ім'Ñ Ð²ÑƒÐ·Ð»Ð°   : @HOSTNAME@
 Стара ревізіÑ: @OLDPAGE@
 Ðова Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ : @NEWPAGE@
-ПідÑумок     : @SUMMARY@
+ПідÑумок змін : @SUMMARY@
 КориÑтувач   : @USER@
 
 @DIFF@
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/newpage.txt dokuwiki-rc2009-12-02/inc/lang/uk/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/uk/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ð¦Ñ Ñторінка ще не Ñ–Ñнує======
+====== Сторінка ще не Ñ–Ñнує ======
 
 Ви прийшли за поÑиланнÑм на Ñторінку, що ще не Ñ–Ñнує. Якщо ваші права дозволÑÑŽÑ‚ÑŒ, ви можете Ñтворити цю Ñторінку натиÑнувши кнопку ''Створити Ñторінку''.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/norev.txt dokuwiki-rc2009-12-02/inc/lang/uk/norev.txt
--- dokuwiki-2009-02-14/inc/lang/uk/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Ðемає такої ревізії======
+====== Ðемає такої ревізії ======
 
 Вказана Ñ€ÐµÐ²Ñ–Ð·Ñ–Ñ Ð½Ðµ Ñ–Ñнує. ВикориÑтовуйте кнопку ''Старі ревізії'', щоб отримати перелік ревізій цього документу.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/preview.txt dokuwiki-rc2009-12-02/inc/lang/uk/preview.txt
--- dokuwiki-2009-02-14/inc/lang/uk/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Попередній переглÑд======
+====== Попередній переглÑд ======
 
 Це попередній переглÑд того, Ñк буде виглÑдати ваш текÑÑ‚. Ðе забувайте, текÑÑ‚ ще **не збережено**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/uk/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/uk/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 Якщо це були не ви, ігноруйте це повідомленнÑ.
 
 Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ, що це дійÑно ви запитали новий пароль, будь лаÑка
-перейдіть по наÑтупному поÑиланню.
+перейдіть за наÑтупним поÑиланнÑм.
 
 @CONFIRM@
 
---
+-- 
 Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñтворене ДокуВікі з
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/recent.txt dokuwiki-rc2009-12-02/inc/lang/uk/recent.txt
--- dokuwiki-2009-02-14/inc/lang/uk/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,4 @@
-======Ðедавні зміні======
-
-ÐаÑтупні Ñторінки були нещодавно змінені.
+====== ОÑтанні зміни ======
 
+Вказані нижче Ñторінки було змінено нещодавно.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/registermail.txt dokuwiki-rc2009-12-02/inc/lang/uk/registermail.txt
--- dokuwiki-2009-02-14/inc/lang/uk/registermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/registermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -5,10 +5,10 @@
 E-Mail      : @NEWEMAIL@
 
 Дата        : @DATE@
-ОглÑдач     : @BROWSER@
+Браузер     : @BROWSER@
 ÐдреÑа IP   : @IPADDRESS@
 Ðазва хоÑту : @HOSTNAME@
 
---
+-- 
 Це Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñтворене ДокуВікі з
 @DOKUWIKIURL@
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/register.txt dokuwiki-rc2009-12-02/inc/lang/uk/register.txt
--- dokuwiki-2009-02-14/inc/lang/uk/register.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/register.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
 ====== РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ кориÑтувача ======
 
-Введіть необхідну інформацію Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб Ñтворити нового кориÑтувача в цій вікі. Будьте впевнені, що ви ввели **вірну адреÑу e-mail**, Ñкщо Ð²Ð°Ñ Ð½Ðµ запитають пароль, то новий пароль буде відіÑлано на цю адреÑу. Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути дозволеною [[doku>pagename|назвою Ñторінки]] вікі.
+Введіть необхідну інформацію Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб Ñтворити нового кориÑтувача у цій Вікі. ПереконайтеÑÑ. що ви ввели **правильну адреÑу e-mail** - Ñкщо ви не ввели пароль, то новий пароль буде відіÑлано на цю адреÑу. Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути дозволеною [[doku>pagename|назвою Ñторінки]] вікі.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/resendpwd.txt dokuwiki-rc2009-12-02/inc/lang/uk/resendpwd.txt
--- dokuwiki-2009-02-14/inc/lang/uk/resendpwd.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/resendpwd.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
 ====== ÐадіÑлати новий пароль ======
 
-Заповніть відомоÑÑ‚Ñ– Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб отримати новий пароль Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ кориÑтувача в цій вікі. Ðовий пароль буде надіÑлано на e-mail, що вказано у реєÑтраційних даних. Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути дозволеним іменем кориÑтувача вікі.
+Заповніть відомоÑÑ‚Ñ– Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб отримати новий пароль у цій Вікі. Ðовий пароль буде надіÑлано на e-mail, що вказано у реєÑтраційних даних. Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача повинно бути дозволеним іменем кориÑтувача Вікі.
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/revisions.txt dokuwiki-rc2009-12-02/inc/lang/uk/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/uk/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Старі ревізії======
+====== Старі ревізії ======
 
 Це Ñтарі верÑÑ–Ñ— поточного документа. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб повернутиÑÑ Ð´Ð¾ Ñтарої верÑÑ–Ñ—, виберіть Ñ—Ñ—, натиÑніть ''Редагувати'', та збережіть Ñторінку.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/uk/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/uk/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Пошук======
+====== Пошук ======
 
-ДивітьÑÑ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ пошуку нижче. Якщо ви не знайшли те, що ви шукали, ви можете Ñтворити або редагувати Ñторінку, що має таке ж ім'Ñ, що Ñ– пошуковий запит за допомогою відповідної кнопки.
+ДивітьÑÑ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ пошуку нижче. Якщо ви не знайшли те, що ви шукали, ви можете Ñтворити або редагувати Ñторінку, що має таке ж ім’Ñ, що Ñ– пошуковий запит за допомогою відповідної кнопки.
 
-=====Results=====
+===== Результати =====
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/stopwords.txt dokuwiki-rc2009-12-02/inc/lang/uk/stopwords.txt
--- dokuwiki-2009-02-14/inc/lang/uk/stopwords.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/stopwords.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-# Це ÑпиÑок ігророваних індекÑатором Ñлів, одне Ñлово в Ñ€Ñдку
-# При редагуванні цього файлу переконайтеÑÑ, що викориÑтовуєте UNIXові переводи Ñ€Ñдка (одиночні)
+# Це ÑпиÑок ігнорованих індекÑатором Ñлів, одне Ñлово в Ñ€Ñдку
+# При редагуванні цього файлу переконайтеÑÑ, що викориÑтовуєте Ñимволи Ð¿ÐµÑ€ÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ñ€Ñдку, Ñк в UNIX (одиночні)
 # Слова, коротші за 3 Ñимволи включати не треба. Вони ігноруютьÑÑ Ð² будь-Ñкому випадку
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/uk/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/uk/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,6 +7,12 @@
 @DIFF@
 --------------------------------------------------------
 
+Дата: @DATE@
+КориÑтувач : @USER@
+ПідÑумок змін: @SUMMARY@
+Стара ревізіÑ: @OLDPAGE@
+Ðова ревізцÑ: @NEWPAGE@
+
 Щоб відпиÑатиÑÑ Ð²Ñ–Ð´ цих повідомлень, увійдіть в вікі за адреÑою
 @DOKUWIKIURL@, відвідайте @NEWPAGE@
 та оберіть 'ВідпиÑатиÑÑ'
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/updateprofile.txt dokuwiki-rc2009-12-02/inc/lang/uk/updateprofile.txt
--- dokuwiki-2009-02-14/inc/lang/uk/updateprofile.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/updateprofile.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
 ====== Оновити ваш профіль ======
 
-Вам необхідно заповнити тільки Ñ‚Ñ– полÑ, Ñкі ви бажаєте змінити. Ви не можете змінити ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача.
+Ðеобхідно заповнити тільки Ñ‚Ñ– полÑ, Ñкі ви бажаєте змінити. Ви не можете змінити Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача.
 
 
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/uploadmail.txt dokuwiki-rc2009-12-02/inc/lang/uk/uploadmail.txt
--- dokuwiki-2009-02-14/inc/lang/uk/uploadmail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/uploadmail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -4,7 +4,7 @@
 Дата : @DATE@
 Браузер : @BROWSER@
 IP-ÐдреÑа : @IPADDRESS@
-Ðазва хоÑта : @HOSTNAME@
+Ðазва вузла : @HOSTNAME@
 Розмір : @SIZE@
 Тип MIME : @MIME@
 КориÑтувач : @USER@
diff -Naur dokuwiki-2009-02-14/inc/lang/uk/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/uk/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/uk/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/uk/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Заблокований СПÐÐœ======
+====== Заблокований СПÐÐœ ======
 
 Ваші зміни **не були** збережені тому що вони міÑÑ‚ÑÑ‚ÑŒ одне чи декілька заблокованих Ñлів. Якщо ви намагалиÑÑŒ додати Ñпам до вікі, то нехай вам буде Ñоромно. Якщо ви вважаєте, що це помилка, звернітьÑÑ Ð´Ð¾ адмініÑтратора цієї Вікі.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/denied.txt dokuwiki-rc2009-12-02/inc/lang/vi/denied.txt
--- dokuwiki-2009-02-14/inc/lang/vi/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Không được phép vào======
+====== Không được phép vào ======
 
 Rất tiếc là bạn không được phép để tiếp tục. Bạn quen đăng nhập hay sao?
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/diff.txt dokuwiki-rc2009-12-02/inc/lang/vi/diff.txt
--- dokuwiki-2009-02-14/inc/lang/vi/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======Khác biệt======
+====== Khác biệt ======
 
 Äây là những khác biệt giữa phiên bạn được chá»n và phiên bản hiện tại của trang này.
 
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/lang.php dokuwiki-rc2009-12-02/inc/lang/vi/lang.php
--- dokuwiki-2009-02-14/inc/lang/vi/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -83,7 +83,6 @@
 
 $lang['js']['nosmblinks'] = "Nối với các Windows shares chỉ có hiệu lực với Microsoft Internet Explorer.\nBạn vẫn có thể sao và chép các mốc nối.";
 
-$lang['qb_alert']   = 'Xin bạn Ä‘iá»n Ä‘oạn văn để định dạng.\nÄoạn này sẽ được nối vào cuối văn kiện.';
 $lang['qb_bold']    = 'Chữ đậm';
 $lang['qb_italic']  = 'Chữ nghiêng';
 $lang['qb_underl']  = 'Chữ gạch dưới';
@@ -101,7 +100,7 @@
 $lang['qb_media']   = 'Thêm ảnh và tệp khác';
 $lang['qb_sig']     = 'Äặt chữ ký';
 
-$lang['del_confirm']= 'Xoá mục này?';
+$lang['js']['del_confirm']= 'Xoá mục này?';
 
 
 //Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/newpage.txt dokuwiki-rc2009-12-02/inc/lang/vi/newpage.txt
--- dokuwiki-2009-02-14/inc/lang/vi/newpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/newpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Chưa có đỠtài này======
+====== Chưa có đỠtài này ======
 
 Bạn vừa nối vào một đỠtài chưa có. Bạn có tạo đỠtài này bằng cách bấm vào nút ''Tạo trang này''.
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/norev.txt dokuwiki-rc2009-12-02/inc/lang/vi/norev.txt
--- dokuwiki-2009-02-14/inc/lang/vi/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Phiên bản chưa có======
+====== Phiên bản chưa có ======
 
 Chưa có phiên bản được chỉ định. Xin bấm nút ''Phiên bản cũ'' để xem danh sách các phiên bản của văn kiện này.
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/preview.txt dokuwiki-rc2009-12-02/inc/lang/vi/preview.txt
--- dokuwiki-2009-02-14/inc/lang/vi/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Xem trÆ°á»›c======
+====== Xem trÆ°á»›c ======
 
 Văn kiện của bạn sẽ thể hiện như sau. Nên nhớ: Văn kiện này **chưa được bảo lưu**!
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/recent.txt dokuwiki-rc2009-12-02/inc/lang/vi/recent.txt
--- dokuwiki-2009-02-14/inc/lang/vi/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Thay đổi gần đây======
+====== Thay đổi gần đây ======
 
 Những trang sau được thay đổi gần đây.
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/revisions.txt dokuwiki-rc2009-12-02/inc/lang/vi/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/vi/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======Phiên bản cũ======
+====== Phiên bản cũ ======
 
 Sau đây là các phiên bản cÅ© của văn kiện này. Äể quây vá» má»™t phiên bản cÅ©, chá»n ở phía dÆ°á»›i, bấm vào ''Biên soạn trang này'' để bảo lÆ°u.
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/vi/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/vi/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======Tìm======
+====== Tìm ======
 
 Sau đây là kết quả của câu há»i của bạn. Nếu bạn không thấy được những gì bạn Ä‘ang tìm, bạn có thể má»™t trang má»›i, cùng tên câu há»i của bạn, bằng cách bấm vào nút ''Biên soạn trang này''.
 
-=====Kết quả=====
+===== Kết quả =====
diff -Naur dokuwiki-2009-02-14/inc/lang/vi/wordblock.txt dokuwiki-rc2009-12-02/inc/lang/vi/wordblock.txt
--- dokuwiki-2009-02-14/inc/lang/vi/wordblock.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/vi/wordblock.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======SPAM bị chận======
+====== SPAM bị chận ======
 
 Các thay đổi **không** được bảo lÆ°u vì có má»™t hoặc nhiá»u từ bị ngăn chận. Nếu muốn spam Wiki này -- ngÆ°ng liá»n! Nếu đây là má»™t sai lầm, liên lạc vá»›i ngÆ°á»i quản lý của Wiki.
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/denied.txt dokuwiki-rc2009-12-02/inc/lang/zh/denied.txt
--- dokuwiki-2009-02-14/inc/lang/zh/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======æ‹’ç»æŽˆæƒ======
+====== æ‹’ç»æŽˆæƒ ======
 
 对ä¸èµ·ï¼Œæ‚¨æ²¡æœ‰è¶³å¤Ÿæƒé™ï¼Œæ— æ³•ç»§ç»­ã€‚也许您忘了登录？
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/diff.txt dokuwiki-rc2009-12-02/inc/lang/zh/diff.txt
--- dokuwiki-2009-02-14/inc/lang/zh/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======差别======
+====== 差别 ======
 
 这里会显示出您选择的修订版和当å‰ç‰ˆæœ¬ä¹‹é—´çš„差别。
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/lang.php dokuwiki-rc2009-12-02/inc/lang/zh/lang.php
--- dokuwiki-2009-02-14/inc/lang/zh/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -2,10 +2,12 @@
 /**
  * Chinese(Simplified) language file
  *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html) 
+ * @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
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -145,7 +147,6 @@
 $lang['mail_changed']          = '更改页é¢ï¼š';
 $lang['mail_new_user']         = '新用户：';
 $lang['mail_upload']           = '已上传的文件：';
-$lang['qb_alert']              = '请输入您想格å¼åŒ–的文字。\n它将会被附加到文件的最åŽã€‚';
 $lang['qb_bold']               = '粗体';
 $lang['qb_italic']             = '斜体';
 $lang['qb_underl']             = '下划线';
@@ -165,7 +166,7 @@
 $lang['qb_sig']                = 'æ’入签å';
 $lang['qb_smileys']            = '表情符å·';
 $lang['qb_chars']              = '特殊字符';
-$lang['del_confirm']           = '真的è¦åˆ é™¤é€‰ä¸­çš„项目å—？';
+$lang['js']['del_confirm']           = '真的è¦åˆ é™¤é€‰ä¸­çš„项目å—？';
 $lang['admin_register']        = '添加新用户';
 $lang['metaedit']              = '编辑元数æ®';
 $lang['metasaveerr']           = '写入元数æ®å¤±è´¥';
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/mailtext.txt dokuwiki-rc2009-12-02/inc/lang/zh/mailtext.txt
--- dokuwiki-2009-02-14/inc/lang/zh/mailtext.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/mailtext.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,6 +12,6 @@
 @DIFF@
 
 
---
+-- 
 本邮件由 DokuWiki 自动创建
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/norev.txt dokuwiki-rc2009-12-02/inc/lang/zh/norev.txt
--- dokuwiki-2009-02-14/inc/lang/zh/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======没有该修订版======
+====== 没有该修订版 ======
 
 您指定的修订版并ä¸å­˜åœ¨ã€‚请使用“修订记录â€æŒ‰é’®æŸ¥çœ‹æœ¬é¡µé¢çš„修订记录列表。
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/password.txt dokuwiki-rc2009-12-02/inc/lang/zh/password.txt
--- dokuwiki-2009-02-14/inc/lang/zh/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -4,7 +4,7 @@
 用户å：@LOGIN@
 密ç ï¼š@PASSWORD@
 
---
+-- 
 本邮件由 DokuWiki 自动创建
 @DOKUWIKIURL@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/preview.txt dokuwiki-rc2009-12-02/inc/lang/zh/preview.txt
--- dokuwiki-2009-02-14/inc/lang/zh/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======预览======
+====== 预览 ======
 
 这是该文件的效果预览。请记ä½ï¼šå®ƒ**并没有被ä¿å­˜**ï¼
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/zh/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/zh/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,7 +8,7 @@
 
 @CONFIRM@
 
---
+-- 
 本邮件由 DokuWiki 自动创建
 @DOKUWIKIURL@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/recent.txt dokuwiki-rc2009-12-02/inc/lang/zh/recent.txt
--- dokuwiki-2009-02-14/inc/lang/zh/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======最近更新======
+====== 最近更新 ======
 
 以下的页é¢æ˜¯æœ€è¿‘æ‰æ›´æ–°çš„：
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/revisions.txt dokuwiki-rc2009-12-02/inc/lang/zh/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/zh/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======修订记录======
+====== 修订记录 ======
 
 以下是当å‰æ–‡æ¡£çš„修订记录。如果è¦å›žå¤åˆ°æŸä¸ªæ—§çš„修订版，请在下é¢é€‰æ‹©å®ƒï¼Œå¹¶ç‚¹å‡»â€œç¼–辑本页â€ï¼Œä¹‹åŽä¿å­˜å³å¯ã€‚
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/zh/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/zh/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======æœç´¢======
+====== æœç´¢ ======
 
 下é¢å°†æ˜¾ç¤ºæ‚¨çš„æœç´¢ç»“果。如果没有找到您想è¦çš„东西，您å¯ä»¥ä½¿ç”¨ç›¸åº”的按钮æ¥åˆ›å»ºæˆ–编辑该页é¢ã€‚
 
-=====æœç´¢ç»“æžœ=====
\ Brak znaku nowej linii na końcu pliku
+===== æœç´¢ç»“æžœ =====
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh/subscribermail.txt dokuwiki-rc2009-12-02/inc/lang/zh/subscribermail.txt
--- dokuwiki-2009-02-14/inc/lang/zh/subscribermail.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh/subscribermail.txt	2009-12-02 19:50:12.000000000 +0100
@@ -12,7 +12,7 @@
 @NEWPAGE@
 并选择'退订更改'。
 
---
+-- 
 本邮件由 DokuWiki 自动创建
 @DOKUWIKIURL@
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/denied.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/denied.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/denied.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/denied.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======拒絕尚未授權======
+====== 拒絕尚未授權 ======
 
 很抱歉您權é™ä¸å¤ ä»¥è‡´ç„¡æ³•ç¹¼çºŒã€‚或許您忘了先登入您的帳號嗎？
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/diff.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/diff.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/diff.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/diff.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======差異處======
+====== 差異處 ======
 
 這裡會顯示出所é¸çš„版次與目å‰ç‰ˆæ¬¡çš„差異處。
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/inc/lang/zh-tw/lang.php
--- dokuwiki-2009-02-14/inc/lang/zh-tw/lang.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/lang.php	2009-12-02 19:50:12.000000000 +0100
@@ -7,6 +7,7 @@
  * @author Li-Jiun Huang 
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San 
+ * @author Li-Jiun Huang 
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -63,6 +64,7 @@
 $lang['badlogin']              = '很抱歉，您的使用者å稱或密碼å¯èƒ½æœ‰éŒ¯èª¤';
 $lang['minoredit']             = '次è¦æ€§çš„修改';
 $lang['draftdate']             = 'è‰ç¨¿è‡ªå‹•å­˜æª”æ–¼';
+$lang['nosecedit']             = 'æ­¤é é¢å·²ç¶“åŒæ™‚被修改，部份éŽæ™‚的資料å–代了全é ã€‚';
 $lang['regmissing']            = '很抱歉，所有的欄ä½éƒ½è¦å¡«å“¦';
 $lang['reguexists']            = '很抱歉，已有人註冊該帳號了喔';
 $lang['regsuccess']            = '使用者已建立，密碼已經用 email 寄到您信箱了唷。';
@@ -84,6 +86,8 @@
 $lang['resendpwdbadauth']      = 'å°ä¸èµ·ï¼Œè©²èªè¨¼ç¢¼éŒ¯èª¤ã€‚請使用完整的確èªéˆæŽ¥ã€‚';
 $lang['resendpwdconfirm']      = '確èªéˆæŽ¥å·²ç¶“通éŽéƒµä»¶ç™¼é€çµ¦æ‚¨äº†ã€‚';
 $lang['resendpwdsuccess']      = '新密碼函已經以 email 寄出了。';
+$lang['license']               = '如未特別註明，此 wiki 上得內容都是根據以下的授權方å¼ï¼š';
+$lang['licenseok']             = '注æ„：編輯此é é¢è¡¨ç¤ºä½ å·²åŒæ„以下的授權方å¼ï¼š';
 $lang['txt_upload']            = 'è«‹é¸æ“‡è¦ä¸Šå‚³çš„檔案';
 $lang['txt_filename']          = '請輸入è¦å­˜åœ¨ wiki 內的檔案å稱 (éžå¿…è¦)';
 $lang['txt_overwrt']           = '是å¦è¦è¦†è“‹åŽŸæœ‰æª”案';
@@ -102,6 +106,7 @@
 $lang['uploadbadcontent']      = '上傳檔案的內容ä¸ç¬¦åˆ %s 檔的副檔å';
 $lang['uploadspam']            = '被SPAM黑åå–®é™åˆ¶ä¸Šå‚³';
 $lang['uploadxss']             = '因為å¯èƒ½æƒ¡æ„的內容被é™åˆ¶ä¸Šå‚³';
+$lang['uploadsize']            = '上傳的檔案尺寸éŽå¤§(最大：%s)';
 $lang['deletesucc']            = '"%s" 檔已刪除完畢。';
 $lang['deletefail']            = '"%s" 檔無法刪除，請先檢查權é™è¨­å®šã€‚';
 $lang['mediainuse']            = '"%s" 檔因還在使用中，故目å‰å°šç„¡æ³•åˆªé™¤ã€‚';
@@ -137,11 +142,11 @@
 $lang['restored']              = 'å·²æ¢å¾©ç‚ºèˆŠç‰ˆ';
 $lang['external_edit']         = '外部編輯';
 $lang['summary']               = '編輯摘è¦';
+$lang['noflash']               = '顯示此內容需è¦Adobe Flash Plugin';
 $lang['mail_newpage']          = '增加的é é¢:';
 $lang['mail_changed']          = '變更的é é¢:';
 $lang['mail_new_user']         = '新使用者:';
 $lang['mail_upload']           = '已上傳檔案:';
-$lang['qb_alert']              = '請輸入想è¦æ ¼å¼åŒ–的文字，\n這會附加到文件的çµå°¾ã€‚';
 $lang['qb_bold']               = 'ç²—é«”';
 $lang['qb_italic']             = '斜體';
 $lang['qb_underl']             = '底線';
@@ -161,7 +166,7 @@
 $lang['qb_sig']                = 'æ’入簽å';
 $lang['qb_smileys']            = '表情符號';
 $lang['qb_chars']              = '特殊字元';
-$lang['del_confirm']           = '確定è¦åˆªé™¤è©²ç®¡ç†è¦å‰‡?';
+$lang['js']['del_confirm']           = '確定è¦åˆªé™¤è©²ç®¡ç†è¦å‰‡?';
 $lang['admin_register']        = '新增使用者中';
 $lang['metaedit']              = '更改相片資料(EXIF)';
 $lang['metasaveerr']           = '相片資料(EXIF)儲存失敗喔';
@@ -221,3 +226,4 @@
 $lang['mu_authfail']           = '作業階段逾時';
 $lang['mu_progress']           = '@PCT@% 已上傳';
 $lang['mu_filetypes']          = '接å—的檔案類型';
+$lang['recent_global']         = '您正在閱讀命å空間： %s 中的變更。您亦å¯è§€çœ‹æ•´å€‹ wiki 的最近更新。';
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/norev.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/norev.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/norev.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/norev.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======很抱歉，並無該版次的======
+====== 很抱歉，並無該版次的 ======
 
 該版次的文件並ä¸å­˜åœ¨ã€‚請用 「''舊版''〠éµä¾†æª¢è¦–ç›®å‰è©²æ–‡ä»¶çš„所有舊版次。
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/password.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/password.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/password.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/password.txt	2009-12-02 19:50:12.000000000 +0100
@@ -7,5 +7,5 @@
 使用者å稱: 	@LOGIN@
 　　　密碼: 	@PASSWORD@
 
---
+-- 
 這å°ä¿¡æ˜¯ç”± @DOKUWIKIURL@ çš„ DokuWiki 自動產生。
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/preview.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/preview.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/preview.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/preview.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======é è¦½======
+====== é è¦½ ======
 
 以下是é è¦½è©²æ–‡ä»¶çš„狀態。請記ä½ï¼š**它還沒被儲存喔**!
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/pwconfirm.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/pwconfirm.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/pwconfirm.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/pwconfirm.txt	2009-12-02 19:50:12.000000000 +0100
@@ -8,6 +8,6 @@
 
 @CONFIRM@
 
---
+-- 
 本郵件由 DokuWiki 自動創建
 @DOKUWIKIURL@
\ Brak znaku nowej linii na końcu pliku
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/recent.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/recent.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/recent.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/recent.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,4 +1,4 @@
-======最近更新======
+====== 最近更新 ======
 
 以下的é é¢æ˜¯æœ€è¿‘æ‰æ›´æ–°çš„：
 
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/revisions.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/revisions.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/revisions.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/revisions.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,3 +1,3 @@
-======舊版======
+====== 舊版 ======
 
 以下是該文件的舊版本。如è¦æ¢å¾©æˆæŸå€‹èˆŠç‰ˆæ¬¡ï¼Œå°±é»žä¸‹å®ƒï¼Œç„¶å¾ŒæŒ‰ã€Œç·¨ä¿®æœ¬é ã€ï¼Œä¸¦å­˜æª”起來就å¯ä»¥äº†ã€‚
diff -Naur dokuwiki-2009-02-14/inc/lang/zh-tw/searchpage.txt dokuwiki-rc2009-12-02/inc/lang/zh-tw/searchpage.txt
--- dokuwiki-2009-02-14/inc/lang/zh-tw/searchpage.txt	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/lang/zh-tw/searchpage.txt	2009-12-02 19:50:12.000000000 +0100
@@ -1,5 +1,5 @@
-======æœå°‹ç²¾éˆ======
+====== æœå°‹ç²¾éˆ ======
 
 æ示：您å¯ä»¥åœ¨ä¸‹åˆ—找到您的æœå°‹çµæžœã€‚若沒找到妳想找的æ±è¥¿ï¼Œé‚£éº¼å¯ä»¥åœ¨å¦³æŸ¥è©¢ä¹‹å¾Œç”¨ã€Œå»ºç«‹æ­¤é ã€ä¾†å»ºç«‹æ–°çš„é é¢å“¦ã€‚
 
-=====æœå°‹çµæžœ=====
+===== æœå°‹çµæžœ =====
diff -Naur dokuwiki-2009-02-14/inc/mail.php dokuwiki-rc2009-12-02/inc/mail.php
--- dokuwiki-2009-02-14/inc/mail.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/mail.php	2009-12-02 19:50:12.000000000 +0100
@@ -27,7 +27,7 @@
  *
  * @author Chris Smith 
  * Check if a given mail address is valid
-*/
+ */
 if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-");
 if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)');
 
@@ -54,59 +54,59 @@
  */
 function mail_send($to, $subject, $body, $from='', $cc='', $bcc='', $headers=null, $params=null){
 
-  $message = compact('to','subject','body','from','cc','bcc','headers','params');
-  return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
+    $message = compact('to','subject','body','from','cc','bcc','headers','params');
+    return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
 }
 
 function _mail_send_action($data) {
 
-  // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
-  $to = $data['to'];
-  $subject = $data['subject'];
-  $body = $data['body'];
-
-  // add robustness in case plugin removes any of these optional values
-  $from = isset($data['from']) ? $data['from'] : '';
-  $cc = isset($data['cc']) ? $data['cc'] : '';
-  $bcc = isset($data['bcc']) ? $data['bcc'] : '';
-  $headers = isset($data['headers']) ? $data['headers'] : null;
-  $params = isset($data['params']) ? $data['params'] : null;
-
-  // end additional code to support event ... original mail_send() code from here
-
-  if(defined('MAILHEADER_ASCIIONLY')){
-    $subject = utf8_deaccent($subject);
-    $subject = utf8_strip($subject);
-  }
-
-  if(!utf8_isASCII($subject)) {
-    $subject = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
-    // Spaces must be encoded according to rfc2047. Use the "_" shorthand
-    $subject = preg_replace('/ /', '_', $subject);
-  }
-
-  $header  = '';
-
-  // No named recipients for To: in Windows (see FS#652)
-  $usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
-
-  $to = mail_encode_address($to,'',$usenames);
-  $header .= mail_encode_address($from,'From');
-  $header .= mail_encode_address($cc,'Cc');
-  $header .= mail_encode_address($bcc,'Bcc');
-  $header .= 'MIME-Version: 1.0'.MAILHEADER_EOL;
-  $header .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL;
-  $header .= 'Content-Transfer-Encoding: quoted-printable'.MAILHEADER_EOL;
-  $header .= $headers;
-  $header  = trim($header);
-
-  $body = mail_quotedprintable_encode($body);
-
-  if($params == null){
-    return @mail($to,$subject,$body,$header);
-  }else{
-    return @mail($to,$subject,$body,$header,$params);
-  }
+    // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
+    $to = $data['to'];
+    $subject = $data['subject'];
+    $body = $data['body'];
+
+    // add robustness in case plugin removes any of these optional values
+    $from = isset($data['from']) ? $data['from'] : '';
+    $cc = isset($data['cc']) ? $data['cc'] : '';
+    $bcc = isset($data['bcc']) ? $data['bcc'] : '';
+    $headers = isset($data['headers']) ? $data['headers'] : null;
+    $params = isset($data['params']) ? $data['params'] : null;
+
+    // end additional code to support event ... original mail_send() code from here
+
+    if(defined('MAILHEADER_ASCIIONLY')){
+        $subject = utf8_deaccent($subject);
+        $subject = utf8_strip($subject);
+    }
+
+    if(!utf8_isASCII($subject)) {
+        $subject = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
+        // Spaces must be encoded according to rfc2047. Use the "_" shorthand
+        $subject = preg_replace('/ /', '_', $subject);
+    }
+
+    $header  = '';
+
+    // No named recipients for To: in Windows (see FS#652)
+    $usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
+
+    $to = mail_encode_address($to,'',$usenames);
+    $header .= mail_encode_address($from,'From');
+    $header .= mail_encode_address($cc,'Cc');
+    $header .= mail_encode_address($bcc,'Bcc');
+    $header .= 'MIME-Version: 1.0'.MAILHEADER_EOL;
+    $header .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL;
+    $header .= 'Content-Transfer-Encoding: quoted-printable'.MAILHEADER_EOL;
+    $header .= $headers;
+    $header  = trim($header);
+
+    $body = mail_quotedprintable_encode($body);
+
+    if($params == null){
+        return @mail($to,$subject,$body,$header);
+    }else{
+        return @mail($to,$subject,$body,$header,$params);
+    }
 }
 
 /**
@@ -124,66 +124,66 @@
  * @param boolean $names  Allow named Recipients?
  */
 function mail_encode_address($string,$header='',$names=true){
-  $headers = '';
-  $parts = split(',',$string);
-  foreach ($parts as $part){
-    $part = trim($part);
-
-    // parse address
-    if(preg_match('#(.*?)<(.*?)>#',$part,$matches)){
-      $text = trim($matches[1]);
-      $addr = $matches[2];
-    }else{
-      $addr = $part;
+    $headers = '';
+    $parts = explode(',',$string);
+    foreach ($parts as $part){
+        $part = trim($part);
+
+        // parse address
+        if(preg_match('#(.*?)<(.*?)>#',$part,$matches)){
+            $text = trim($matches[1]);
+            $addr = $matches[2];
+        }else{
+            $addr = $part;
+        }
+
+        // skip empty ones
+        if(empty($addr)){
+            continue;
+        }
+
+        // FIXME: is there a way to encode the localpart of a emailaddress?
+        if(!utf8_isASCII($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not ASCII"),-1);
+            continue;
+        }
+
+        if(!mail_isvalid($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not valid"),-1);
+            continue;
+        }
+
+        // text was given
+        if(!empty($text) && $names){
+            // add address quotes
+            $addr = "<$addr>";
+
+            if(defined('MAILHEADER_ASCIIONLY')){
+                $text = utf8_deaccent($text);
+                $text = utf8_strip($text);
+            }
+
+            if(!utf8_isASCII($text)){
+                $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+            }
+        }else{
+            $text = '';
+        }
+
+        // add to header comma seperated
+        if($headers != ''){
+            $headers .= ',';
+            if($header) $headers .= MAILHEADER_EOL.' '; // avoid overlong mail headers
+        }
+        $headers .= $text.' '.$addr;
     }
 
-    // skip empty ones
-    if(empty($addr)){
-      continue;
-    }
+    if(empty($headers)) return null;
 
-    // FIXME: is there a way to encode the localpart of a emailaddress?
-    if(!utf8_isASCII($addr)){
-      msg(htmlspecialchars("E-Mail address <$addr> is not ASCII"),-1);
-      continue;
-    }
+    //if headername was given add it and close correctly
+    if($header) $headers = $header.': '.$headers.MAILHEADER_EOL;
 
-    if(!mail_isvalid($addr)){
-      msg(htmlspecialchars("E-Mail address <$addr> is not valid"),-1);
-      continue;
-    }
-
-    // text was given
-    if(!empty($text) && $names){
-      // add address quotes
-      $addr = "<$addr>";
-
-      if(defined('MAILHEADER_ASCIIONLY')){
-        $text = utf8_deaccent($text);
-        $text = utf8_strip($text);
-      }
-
-      if(!utf8_isASCII($text)){
-        $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
-      }
-    }else{
-      $text = '';
-    }
-
-    // add to header comma seperated
-    if($headers != ''){
-        $headers .= ',';
-        if($header) $headers .= MAILHEADER_EOL.' '; // avoid overlong mail headers
-    }
-    $headers .= $text.' '.$addr;
-  }
-
-  if(empty($headers)) return null;
-
-  //if headername was given add it and close correctly
-  if($header) $headers = $header.': '.$headers.MAILHEADER_EOL;
-
-  return $headers;
+    return $headers;
 }
 
 /**
@@ -204,64 +204,63 @@
  * @link   http://www.php.net/manual/en/function.imap-8bit.php#61216
  */
 function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) {
-  // split text into lines
-  $aLines= preg_split("/(?:\r\n|\r|\n)/", $sText);
-
-  for ($i=0;$i'.hsc($row).'';
             echo '
    ';
         }else
-        $hidden++;
+            $hidden++;
     }
     if ($hidden){
-      print '
    '.$lang['ref_hidden'].'
    ';
+        print '
    '.$lang['ref_hidden'].'
    ';
     }
 }
 
@@ -86,14 +86,14 @@
     static $fields = null;
     if(is_null($fields)){
 
-      foreach (array('default','local') as $config_group) {
-        if (empty($config_cascade['mediameta'][$config_group])) continue;
-        foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
-          if(@file_exists($config_file)){
-            include($config_file);
-          }
+        foreach (array('default','local') as $config_group) {
+            if (empty($config_cascade['mediameta'][$config_group])) continue;
+            foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
+                if(@file_exists($config_file)){
+                    include($config_file);
+                }
+            }
         }
-      }
     }
 
     $src = mediaFN($id);
@@ -136,9 +136,9 @@
     echo '
    '.NL;
     echo ''.NL;
     echo ''.NL;
+        '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
     echo ''.NL;
+        '" title="'.$lang['btn_cancel'].' [C]" accesskey="c" class="button" />'.NL;
     echo '
    '.NL;
     echo '
    '.NL;
 }
@@ -239,11 +239,8 @@
     $file = $_FILES['upload'];
     if(empty($id)) $id = $file['name'];
 
-    // check for data
-    if(!@filesize($file['tmp_name'])){
-        msg('No data uploaded. Disk full?',-1);
-        return false;
-    }
+    // check for errors (messages are done in lib/exe/mediamanager.php)
+    if($file['error']) return false;
 
     // check extensions
     list($fext,$fmime,$dl) = mimetype($file['name']);
@@ -401,11 +398,13 @@
     global $conf;
     if(empty($conf['notify'])) return; //notify enabled?
 
+    $ip = clientIP();
+
     $text = rawLocale('uploadmail');
-    $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
+    $text = str_replace('@DATE@',dformat(),$text);
     $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
-    $text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text);
-    $text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text);
+    $text = str_replace('@IPADDRESS@',$ip,$text);
+    $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
     $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
     $text = str_replace('@USER@',$_SERVER['REMOTE_USER'],$text);
     $text = str_replace('@MIME@',$mime,$text);
@@ -438,30 +437,68 @@
     if($auth < AUTH_READ){
         // FIXME: print permission warning here instead?
         echo '
    '.$lang['nothingfound'].'
    '.NL;
-        return;
-    }
+    }else{
+        media_uploadform($ns, $auth);
 
-    media_uploadform($ns, $auth);
+        $dir = utf8_encodeFN(str_replace(':','/',$ns));
+        $data = array();
+        search($data,$conf['mediadir'],'search_media',
+                array('showmsg'=>true,'depth'=>1),$dir);
+
+        if(!count($data)){
+            echo '
    '.$lang['nothingfound'].'
    '.NL;
+        }else foreach($data as $item){
+            media_printfile($item,$auth,$jump);
+        }
+    }
+    media_searchform($ns);
+}
 
-    $dir = utf8_encodeFN(str_replace(':','/',$ns));
-    $data = array();
-    search($data,$conf['mediadir'],'search_media',array('showmsg'=>true),$dir);
+/**
+ * List all files found by the search request
+ *
+ * @author Tobias Sarnowski 
+ * @author Andreas Gohr 
+ * @triggers MEDIA_SEARCH
+ */
+function media_searchlist($query,$ns,$auth=null){
+    global $conf;
+    global $lang;
+    $ns = cleanID($ns);
 
-    if(!count($data)){
-        echo '
    '.$lang['nothingfound'].'
    '.NL;
-        return;
+    if ($query) {
+        $evdata = array(
+                'ns'    => $ns,
+                'data'  => array(),
+                'query' => $query
+                );
+        $evt = new Doku_Event('MEDIA_SEARCH', $evdata);
+        if ($evt->advise_before()) {
+            $dir = utf8_encodeFN(str_replace(':','/',$evdata['ns']));
+            $pattern = '/'.preg_quote($evdata['query'],'/').'/i';
+            search($evdata['data'],
+                    $conf['mediadir'],
+                    'search_media',
+                    array('showmsg'=>false,'pattern'=>$pattern),
+                    $dir);
+        }
+        $evt->advise_after();
+        unset($evt);
     }
 
-    foreach($data as $item){
-        media_printfile($item,$auth,$jump);
+    echo '
    '.sprintf($lang['searchmedia_in'],hsc($ns).':*').'
    '.NL;
+    media_searchform($ns,$query);
+
+    if(!count($evdata['data'])){
+        echo '
    '.$lang['nothingfound'].'
    '.NL;
+    }else foreach($evdata['data'] as $item){
+        media_printfile($item,$item['perm'],'',true);
     }
 }
 
 /**
  * Print action links for a file depending on filetype
  * and available permissions
- *
- * @todo contains inline javascript
  */
 function media_fileactions($item,$auth){
     global $lang;
@@ -469,8 +506,7 @@
     // view button
     $link = ml($item['id'],'',true);
     echo ' ';
-
+        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" />';
 
     // no further actions if not writable
     if(!$item['writable']) return;
@@ -478,16 +514,16 @@
     // delete button
     if($auth >= AUTH_DELETE){
         echo ' '.
-             ''.$lang['btn_delete'].'';
+            '&sectok='.getSecurityToken().'" class="btn_media_delete" title="'.$item['id'].'">'.
+            ''.$lang['btn_delete'].'';
     }
 
     // edit button
     if($auth >= AUTH_UPLOAD && $item['isimg'] && $item['meta']->getField('File.Mime') == 'image/jpeg'){
         echo ' '.
-             ''.$lang['metaedit'].'';
+            ''.$lang['metaedit'].'';
     }
 
 }
@@ -495,7 +531,7 @@
 /**
  * Formats and prints one file in the list
  */
-function media_printfile($item,$auth,$jump){
+function media_printfile($item,$auth,$jump,$display_namespace=false){
     global $lang;
     global $conf;
 
@@ -513,7 +549,7 @@
     }
 
     // Prepare fileicons
-    list($ext,$mime,$dl) = mimetype($item['file']);
+    list($ext,$mime,$dl) = mimetype($item['file'],false);
     $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
     $class = 'select mediafile mf_'.$class;
 
@@ -528,13 +564,17 @@
         $info .= (int) $item['meta']->getField('File.Height');
         $info .= ' ';
     }
-    $info .= ''.strftime($conf['dformat'],$item['mtime']).'';
+    $info .= ''.dformat($item['mtime']).'';
     $info .= ' ';
     $info .= filesize_h($item['size']);
 
-    // ouput
+    // output
     echo '
    '.NL;
-    echo ''.$file.' ';
+    if (!$display_namespace) {
+        echo ''.hsc($file).' ';
+    } else {
+        echo ''.hsc($item['id']).'
    ';
+    }
     echo '('.$info.')'.NL;
     media_fileactions($item,$auth);
     echo '
    ';
@@ -568,7 +608,7 @@
     // output
     echo '
    ';
     echo '
    ';
-    echo '';
+    echo '';
     echo '';
     echo '';
     echo '
    ';
@@ -576,8 +616,8 @@
     // read EXIF/IPTC data
     $t = $item['meta']->getField(array('IPTC.Headline','xmp.dc:title'));
     $d = $item['meta']->getField(array('IPTC.Caption','EXIF.UserComment',
-                                       'EXIF.TIFFImageDescription',
-                                       'EXIF.TIFFUserComment'));
+                'EXIF.TIFFImageDescription',
+                'EXIF.TIFFUserComment'));
     if(utf8_strlen($d) > 250) $d = utf8_substr($d,0,250).'...';
     $k = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
 
@@ -603,7 +643,9 @@
     if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
 
     // The default HTML upload form
-    $form = new Doku_Form('dw__upload', DOKU_BASE.'lib/exe/mediamanager.php', false, 'multipart/form-data');
+    $form = new Doku_Form(array('id'      => 'dw__upload',
+                                'action'  => DOKU_BASE.'lib/exe/mediamanager.php',
+                                'enctype' => 'multipart/form-data'));
     $form->addElement('
    ' . $lang['mediaupload'] . '
    ');
     $form->addElement(formSecurityToken());
     $form->addHidden('ns', hsc($ns));
@@ -616,45 +658,68 @@
     $form->addElement(form_makeCloseTag('p'));
 
     if($auth >= AUTH_DELETE){
-      $form->addElement(form_makeOpenTag('p'));
-      $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check'));
-      $form->addElement(form_makeCloseTag('p'));
+        $form->addElement(form_makeOpenTag('p'));
+        $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check'));
+        $form->addElement(form_makeCloseTag('p'));
     }
     html_form('upload', $form);
 
     // prepare flashvars for multiupload
     $opt = array(
-        'L_gridname'  => $lang['mu_gridname'] ,
-        'L_gridsize'  => $lang['mu_gridsize'] ,
-        'L_gridstat'  => $lang['mu_gridstat'] ,
-        'L_namespace' => $lang['mu_namespace'] ,
-        'L_overwrite' => $lang['txt_overwrt'],
-        'L_browse'    => $lang['mu_browse'],
-        'L_upload'    => $lang['btn_upload'],
-        'L_toobig'    => $lang['mu_toobig'],
-        'L_ready'     => $lang['mu_ready'],
-        'L_done'      => $lang['mu_done'],
-        'L_fail'      => $lang['mu_fail'],
-        'L_authfail'  => $lang['mu_authfail'],
-        'L_progress'  => $lang['mu_progress'],
-        'L_filetypes' => $lang['mu_filetypes'],
-
-        'O_ns'        => ":$ns",
-        'O_backend'   => 'mediamanager.php?'.session_name().'='.session_id(),
-        'O_size'      => php_to_byte(ini_get('upload_max_filesize')),
-        'O_extensions'=> join('|',array_keys(getMimeTypes())),
-        'O_overwrite' => ($auth >= AUTH_DELETE),
-        'O_sectok'    => getSecurityToken(),
-        'O_authtok'   => auth_createToken(),
-    );
+            'L_gridname'  => $lang['mu_gridname'] ,
+            'L_gridsize'  => $lang['mu_gridsize'] ,
+            'L_gridstat'  => $lang['mu_gridstat'] ,
+            'L_namespace' => $lang['mu_namespace'] ,
+            'L_overwrite' => $lang['txt_overwrt'],
+            'L_browse'    => $lang['mu_browse'],
+            'L_upload'    => $lang['btn_upload'],
+            'L_toobig'    => $lang['mu_toobig'],
+            'L_ready'     => $lang['mu_ready'],
+            'L_done'      => $lang['mu_done'],
+            'L_fail'      => $lang['mu_fail'],
+            'L_authfail'  => $lang['mu_authfail'],
+            'L_progress'  => $lang['mu_progress'],
+            'L_filetypes' => $lang['mu_filetypes'],
+            'L_info'      => $lang['mu_info'],
+            'L_lasterr'   => $lang['mu_lasterr'],
+
+            'O_ns'        => ":$ns",
+            'O_backend'   => 'mediamanager.php?'.session_name().'='.session_id(),
+            'O_maxsize'   => php_to_byte(ini_get('upload_max_filesize')),
+            'O_extensions'=> join('|',array_keys(getMimeTypes())),
+            'O_overwrite' => ($auth >= AUTH_DELETE),
+            'O_sectok'    => getSecurityToken(),
+            'O_authtok'   => auth_createToken(),
+            );
     $var = buildURLparams($opt);
     // output the flash uploader
     ?>
-    
-    
+        
    
+        
+        
    
+        
+ */
+function media_searchform($ns,$query=''){
+    global $lang;
+
+    // The default HTML search form
+    $form = new Doku_Form(array('id' => 'dw__mediasearch', 'action' => DOKU_BASE.'lib/exe/mediamanager.php'));
+    $form->addElement('
    ' . $lang['mediasearch'] . '
    ');
+    $form->addElement(formSecurityToken());
+    $form->addHidden('ns', $ns);
+    $form->addHidden('do', 'searchlist');
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
+    $form->addElement(form_makeCloseTag('p'));
+    html_form('searchmedia', $form);
 }
 
 /**
@@ -679,7 +744,7 @@
 
     // wrap a list with the root level around the other namespaces
     $item = array( 'level' => 0, 'id' => '',
-                   'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
+            'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
 
     echo '
      ';
     echo media_nstree_li($item);
@@ -727,7 +792,7 @@
         $alt   = '+';
     }
     return '
    • '.
-           ''.$alt.'';
+        ''.$alt.'';
 }
 
 /**
@@ -736,28 +801,28 @@
  * @author  Andreas Gohr 
  */
 function media_resize_image($file, $ext, $w, $h=0){
-  global $conf;
+    global $conf;
 
-  $info = @getimagesize($file); //get original size
-  if($info == false) return $file; // that's no image - it's a spaceship!
+    $info = @getimagesize($file); //get original size
+    if($info == false) return $file; // that's no image - it's a spaceship!
 
-  if(!$h) $h = round(($w * $info[1]) / $info[0]);
+    if(!$h) $h = round(($w * $info[1]) / $info[0]);
 
-  // we wont scale up to infinity
-  if($w > 2000 || $h > 2000) return $file;
-
-  //cache
-  $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext);
-  $mtime = @filemtime($local); // 0 if not exists
-
-  if( $mtime > filemtime($file) ||
-      media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) ||
-      media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){
-    if($conf['fperm']) chmod($local, $conf['fperm']);
-    return $local;
-  }
-  //still here? resizing failed
-  return $file;
+    // we wont scale up to infinity
+    if($w > 2000 || $h > 2000) return $file;
+
+    //cache
+    $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext);
+    $mtime = @filemtime($local); // 0 if not exists
+
+    if( $mtime > filemtime($file) ||
+            media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) ||
+            media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){
+        if($conf['fperm']) chmod($local, $conf['fperm']);
+        return $local;
+    }
+    //still here? resizing failed
+    return $file;
 }
 
 /**
@@ -770,49 +835,49 @@
  * @author  Andreas Gohr 
  */
 function media_crop_image($file, $ext, $w, $h=0){
-  global $conf;
+    global $conf;
 
-  if(!$h) $h = $w;
-  $info = @getimagesize($file); //get original size
-  if($info == false) return $file; // that's no image - it's a spaceship!
-
-  // calculate crop size
-  $fr = $info[0]/$info[1];
-  $tr = $w/$h;
-  if($tr >= 1){
-    if($tr > $fr){
-        $cw = $info[0];
-        $ch = (int) $info[0]/$tr;
+    if(!$h) $h = $w;
+    $info = @getimagesize($file); //get original size
+    if($info == false) return $file; // that's no image - it's a spaceship!
+
+    // calculate crop size
+    $fr = $info[0]/$info[1];
+    $tr = $w/$h;
+    if($tr >= 1){
+        if($tr > $fr){
+            $cw = $info[0];
+            $ch = (int) $info[0]/$tr;
+        }else{
+            $cw = (int) $info[1]*$tr;
+            $ch = $info[1];
+        }
     }else{
-        $cw = (int) $info[1]*$tr;
-        $ch = $info[1];
+        if($tr < $fr){
+            $cw = (int) $info[1]*$tr;
+            $ch = $info[1];
+        }else{
+            $cw = $info[0];
+            $ch = (int) $info[0]/$tr;
+        }
     }
-  }else{
-    if($tr < $fr){
-        $cw = (int) $info[1]*$tr;
-        $ch = $info[1];
-    }else{
-        $cw = $info[0];
-        $ch = (int) $info[0]/$tr;
+    // calculate crop offset
+    $cx = (int) ($info[0]-$cw)/2;
+    $cy = (int) ($info[1]-$ch)/3;
+
+    //cache
+    $local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext);
+    $mtime = @filemtime($local); // 0 if not exists
+
+    if( $mtime > filemtime($file) ||
+            media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) ||
+            media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){
+        if($conf['fperm']) chmod($local, $conf['fperm']);
+        return media_resize_image($local,$ext, $w, $h);
     }
-  }
-  // calculate crop offset
-  $cx = (int) ($info[0]-$cw)/2;
-  $cy = (int) ($info[1]-$ch)/3;
-
-  //cache
-  $local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext);
-  $mtime = @filemtime($local); // 0 if not exists
-
-  if( $mtime > filemtime($file) ||
-      media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) ||
-      media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){
-    if($conf['fperm']) chmod($local, $conf['fperm']);
-    return media_resize_image($local,$ext, $w, $h);
-  }
 
-  //still here? cropping failed
-  return media_resize_image($file,$ext, $w, $h);
+    //still here? cropping failed
+    return media_resize_image($file,$ext, $w, $h);
 }
 
 /**
@@ -825,31 +890,31 @@
  * @author  Pavel Vitis 
  */
 function media_get_from_URL($url,$ext,$cache){
-  global $conf;
+    global $conf;
 
-  // if no cache or fetchsize just redirect
-  if ($cache==0)           return false;
-  if (!$conf['fetchsize']) return false;
-
-  $local = getCacheName(strtolower($url),".media.$ext");
-  $mtime = @filemtime($local); // 0 if not exists
-
-  //decide if download needed:
-  if( ($mtime == 0) ||                           // cache does not exist
-      ($cache != -1 && $mtime < time()-$cache)   // 'recache' and cache has expired
-    ){
-      if(media_image_download($url,$local)){
-        return $local;
-      }else{
-        return false;
-      }
-  }
+    // if no cache or fetchsize just redirect
+    if ($cache==0)           return false;
+    if (!$conf['fetchsize']) return false;
+
+    $local = getCacheName(strtolower($url),".media.$ext");
+    $mtime = @filemtime($local); // 0 if not exists
+
+    //decide if download needed:
+    if( ($mtime == 0) ||                           // cache does not exist
+            ($cache != -1 && $mtime < time()-$cache)   // 'recache' and cache has expired
+      ){
+        if(media_image_download($url,$local)){
+            return $local;
+        }else{
+            return false;
+        }
+    }
 
-  //if cache exists use it else
-  if($mtime) return $local;
+    //if cache exists use it else
+    if($mtime) return $local;
 
-  //else return false
-  return false;
+    //else return false
+    return false;
 }
 
 /**
@@ -858,30 +923,30 @@
  * @author Andreas Gohr 
  */
 function media_image_download($url,$file){
-  global $conf;
-  $http = new DokuHTTPClient();
-  $http->max_bodysize = $conf['fetchsize'];
-  $http->timeout = 25; //max. 25 sec
-  $http->header_regexp = '!\r\nContent-Type: image/(jpe?g|gif|png)!i';
-
-  $data = $http->get($url);
-  if(!$data) return false;
-
-  $fileexists = @file_exists($file);
-  $fp = @fopen($file,"w");
-  if(!$fp) return false;
-  fwrite($fp,$data);
-  fclose($fp);
-  if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
-
-  // check if it is really an image
-  $info = @getimagesize($file);
-  if(!$info){
-    @unlink($file);
-    return false;
-  }
+    global $conf;
+    $http = new DokuHTTPClient();
+    $http->max_bodysize = $conf['fetchsize'];
+    $http->timeout = 25; //max. 25 sec
+    $http->header_regexp = '!\r\nContent-Type: image/(jpe?g|gif|png)!i';
+
+    $data = $http->get($url);
+    if(!$data) return false;
+
+    $fileexists = @file_exists($file);
+    $fp = @fopen($file,"w");
+    if(!$fp) return false;
+    fwrite($fp,$data);
+    fclose($fp);
+    if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
+
+    // check if it is really an image
+    $info = @getimagesize($file);
+    if(!$info){
+        @unlink($file);
+        return false;
+    }
 
-  return true;
+    return true;
 }
 
 /**
@@ -891,22 +956,22 @@
  * @author Andreas Gohr 
  */
 function media_resize_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h){
-  global $conf;
+    global $conf;
+
+    // check if convert is configured
+    if(!$conf['im_convert']) return false;
 
-  // check if convert is configured
-  if(!$conf['im_convert']) return false;
+    // prepare command
+    $cmd  = $conf['im_convert'];
+    $cmd .= ' -resize '.$to_w.'x'.$to_h.'!';
+    if ($ext == 'jpg' || $ext == 'jpeg') {
+        $cmd .= ' -quality '.$conf['jpg_quality'];
+    }
+    $cmd .= " $from $to";
 
-  // prepare command
-  $cmd  = $conf['im_convert'];
-  $cmd .= ' -resize '.$to_w.'x'.$to_h.'!';
-  if ($ext == 'jpg' || $ext == 'jpeg') {
-      $cmd .= ' -quality '.$conf['jpg_quality'];
-  }
-  $cmd .= " $from $to";
-
-  @exec($cmd,$out,$retval);
-  if ($retval == 0) return true;
-  return false;
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
 }
 
 /**
@@ -915,22 +980,22 @@
  * @author Andreas Gohr 
  */
 function media_crop_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x,$ofs_y){
-  global $conf;
+    global $conf;
 
-  // check if convert is configured
-  if(!$conf['im_convert']) return false;
+    // check if convert is configured
+    if(!$conf['im_convert']) return false;
+
+    // prepare command
+    $cmd  = $conf['im_convert'];
+    $cmd .= ' -crop '.$to_w.'x'.$to_h.'+'.$ofs_x.'+'.$ofs_y;
+    if ($ext == 'jpg' || $ext == 'jpeg') {
+        $cmd .= ' -quality '.$conf['jpg_quality'];
+    }
+    $cmd .= " $from $to";
 
-  // prepare command
-  $cmd  = $conf['im_convert'];
-  $cmd .= ' -crop '.$to_w.'x'.$to_h.'+'.$ofs_x.'+'.$ofs_y;
-  if ($ext == 'jpg' || $ext == 'jpeg') {
-      $cmd .= ' -quality '.$conf['jpg_quality'];
-  }
-  $cmd .= " $from $to";
-
-  @exec($cmd,$out,$retval);
-  if ($retval == 0) return true;
-  return false;
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
 }
 
 /**
@@ -940,98 +1005,98 @@
  * @author Sebastian Wienecke 
  */
 function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=0,$ofs_y=0){
-  global $conf;
+    global $conf;
 
-  if($conf['gdlib'] < 1) return false; //no GDlib available or wanted
+    if($conf['gdlib'] < 1) return false; //no GDlib available or wanted
 
-  // check available memory
-  if(!is_mem_available(($from_w * $from_h * 4) + ($to_w * $to_h * 4))){
-    return false;
-  }
+    // check available memory
+    if(!is_mem_available(($from_w * $from_h * 4) + ($to_w * $to_h * 4))){
+        return false;
+    }
 
-  // create an image of the given filetype
-  if ($ext == 'jpg' || $ext == 'jpeg'){
-    if(!function_exists("imagecreatefromjpeg")) return false;
-    $image = @imagecreatefromjpeg($from);
-  }elseif($ext == 'png') {
-    if(!function_exists("imagecreatefrompng")) return false;
-    $image = @imagecreatefrompng($from);
-
-  }elseif($ext == 'gif') {
-    if(!function_exists("imagecreatefromgif")) return false;
-    $image = @imagecreatefromgif($from);
-  }
-  if(!$image) return false;
-
-  if(($conf['gdlib']>1) && function_exists("imagecreatetruecolor") && $ext != 'gif'){
-    $newimg = @imagecreatetruecolor ($to_w, $to_h);
-  }
-  if(!$newimg) $newimg = @imagecreate($to_w, $to_h);
-  if(!$newimg){
-    imagedestroy($image);
-    return false;
-  }
+    // create an image of the given filetype
+    if ($ext == 'jpg' || $ext == 'jpeg'){
+        if(!function_exists("imagecreatefromjpeg")) return false;
+        $image = @imagecreatefromjpeg($from);
+    }elseif($ext == 'png') {
+        if(!function_exists("imagecreatefrompng")) return false;
+        $image = @imagecreatefrompng($from);
+
+    }elseif($ext == 'gif') {
+        if(!function_exists("imagecreatefromgif")) return false;
+        $image = @imagecreatefromgif($from);
+    }
+    if(!$image) return false;
+
+    if(($conf['gdlib']>1) && function_exists("imagecreatetruecolor") && $ext != 'gif'){
+        $newimg = @imagecreatetruecolor ($to_w, $to_h);
+    }
+    if(!$newimg) $newimg = @imagecreate($to_w, $to_h);
+    if(!$newimg){
+        imagedestroy($image);
+        return false;
+    }
 
-  //keep png alpha channel if possible
-  if($ext == 'png' && $conf['gdlib']>1 && function_exists('imagesavealpha')){
-    imagealphablending($newimg, false);
-    imagesavealpha($newimg,true);
-  }
-
-  //keep gif transparent color if possible
-  if($ext == 'gif' && function_exists('imagefill') && function_exists('imagecolorallocate')) {
-    if(function_exists('imagecolorsforindex') && function_exists('imagecolortransparent')) {
-      $transcolorindex = @imagecolortransparent($image);
-      if($transcolorindex >= 0 ) { //transparent color exists
-        $transcolor = @imagecolorsforindex($image, $transcolorindex);
-        $transcolorindex = @imagecolorallocate($newimg, $transcolor['red'], $transcolor['green'], $transcolor['blue']);
-        @imagefill($newimg, 0, 0, $transcolorindex);
-        @imagecolortransparent($newimg, $transcolorindex);
-      }else{ //filling with white
-        $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
-        @imagefill($newimg, 0, 0, $whitecolorindex);
-      }
-    }else{ //filling with white
-      $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
-      @imagefill($newimg, 0, 0, $whitecolorindex);
-    }
-  }
-
-  //try resampling first
-  if(function_exists("imagecopyresampled")){
-    if(!@imagecopyresampled($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h)) {
-      imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
-    }
-  }else{
-    imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
-  }
-
-  $okay = false;
-  if ($ext == 'jpg' || $ext == 'jpeg'){
-    if(!function_exists('imagejpeg')){
-      $okay = false;
-    }else{
-      $okay = imagejpeg($newimg, $to, $conf['jpg_quality']);
+    //keep png alpha channel if possible
+    if($ext == 'png' && $conf['gdlib']>1 && function_exists('imagesavealpha')){
+        imagealphablending($newimg, false);
+        imagesavealpha($newimg,true);
+    }
+
+    //keep gif transparent color if possible
+    if($ext == 'gif' && function_exists('imagefill') && function_exists('imagecolorallocate')) {
+        if(function_exists('imagecolorsforindex') && function_exists('imagecolortransparent')) {
+            $transcolorindex = @imagecolortransparent($image);
+            if($transcolorindex >= 0 ) { //transparent color exists
+                $transcolor = @imagecolorsforindex($image, $transcolorindex);
+                $transcolorindex = @imagecolorallocate($newimg, $transcolor['red'], $transcolor['green'], $transcolor['blue']);
+                @imagefill($newimg, 0, 0, $transcolorindex);
+                @imagecolortransparent($newimg, $transcolorindex);
+            }else{ //filling with white
+                $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
+                @imagefill($newimg, 0, 0, $whitecolorindex);
+            }
+        }else{ //filling with white
+            $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
+            @imagefill($newimg, 0, 0, $whitecolorindex);
+        }
     }
-  }elseif($ext == 'png') {
-    if(!function_exists('imagepng')){
-      $okay = false;
+
+    //try resampling first
+    if(function_exists("imagecopyresampled")){
+        if(!@imagecopyresampled($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h)) {
+            imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
+        }
     }else{
-      $okay =  imagepng($newimg, $to);
+        imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
     }
-  }elseif($ext == 'gif') {
-    if(!function_exists('imagegif')){
-      $okay = false;
-    }else{
-      $okay = imagegif($newimg, $to);
+
+    $okay = false;
+    if ($ext == 'jpg' || $ext == 'jpeg'){
+        if(!function_exists('imagejpeg')){
+            $okay = false;
+        }else{
+            $okay = imagejpeg($newimg, $to, $conf['jpg_quality']);
+        }
+    }elseif($ext == 'png') {
+        if(!function_exists('imagepng')){
+            $okay = false;
+        }else{
+            $okay =  imagepng($newimg, $to);
+        }
+    }elseif($ext == 'gif') {
+        if(!function_exists('imagegif')){
+            $okay = false;
+        }else{
+            $okay = imagegif($newimg, $to);
+        }
     }
-  }
 
-  // destroy GD image ressources
-  if($image) imagedestroy($image);
-  if($newimg) imagedestroy($newimg);
+    // destroy GD image ressources
+    if($image) imagedestroy($image);
+    if($newimg) imagedestroy($newimg);
 
-  return $okay;
+    return $okay;
 }
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff -Naur dokuwiki-2009-02-14/inc/pageutils.php dokuwiki-rc2009-12-02/inc/pageutils.php
--- dokuwiki-2009-02-14/inc/pageutils.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/pageutils.php	2009-12-02 19:50:12.000000000 +0100
@@ -19,62 +19,68 @@
  * @author Andreas Gohr 
  */
 function getID($param='id',$clean=true){
-  global $conf;
+    global $conf;
 
-  $id = isset($_REQUEST[$param]) ? $_REQUEST[$param] : null;
+    $id = isset($_REQUEST[$param]) ? $_REQUEST[$param] : null;
 
-  //construct page id from request URI
-  if(empty($id) && $conf['userewrite'] == 2){
-    //get the script URL
-    if($conf['basedir']){
-      $relpath = '';
-      if($param != 'id') {
-        $relpath = 'lib/exe/';
-      }
-      $script = $conf['basedir'].$relpath.basename($_SERVER['SCRIPT_FILENAME']);
-    }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
-      $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
-                              $_SERVER['SCRIPT_FILENAME']);
-      $script = '/'.$script;
-    }else{
-      $script = $_SERVER['SCRIPT_NAME'];
-    }
+    $request = $_SERVER['REQUEST_URI'];
 
-    //clean script and request (fixes a windows problem)
-    $script  = preg_replace('/\/\/+/','/',$script);
-    $request = preg_replace('/\/\/+/','/',$_SERVER['REQUEST_URI']);
-
-    //remove script URL and Querystring to gain the id
-    if(preg_match('/^'.preg_quote($script,'/').'(.*)/',$request, $match)){
-      $id = preg_replace ('/\?.*/','',$match[1]);
-    }
-    $id = urldecode($id);
-    //strip leading slashes
-    $id = preg_replace('!^/+!','',$id);
-  }
-
-  // Namespace autolinking from URL
-  if(substr($id,-1) == ':' || ($conf['useslash'] && substr($id,-1) == '/')){
-    if(page_exists($id.$conf['start'])){
-      // start page inside namespace
-      $id = $id.$conf['start'];
-    }elseif(page_exists($id.noNS(cleanID($id)))){
-      // page named like the NS inside the NS
-      $id = $id.noNS(cleanID($id));
-    }elseif(page_exists($id)){
-      // page like namespace exists
-      $id = substr($id,0,-1);
-    }else{
-      // fall back to default
-      $id = $id.$conf['start'];
+    //construct page id from request URI
+    if(empty($id) && $conf['userewrite'] == 2){
+        //get the script URL
+        if($conf['basedir']){
+            $relpath = '';
+            if($param != 'id') {
+                $relpath = 'lib/exe/';
+            }
+            $script = $conf['basedir'].$relpath.basename($_SERVER['SCRIPT_FILENAME']);
+
+        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['PATH_TRANSLATED']){
+            $request = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                    $_SERVER['PATH_TRANSLATED']);
+        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
+            $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                    $_SERVER['SCRIPT_FILENAME']);
+            $script = '/'.$script;
+        }else{
+            $script = $_SERVER['SCRIPT_NAME'];
+        }
+
+        //clean script and request (fixes a windows problem)
+        $script  = preg_replace('/\/\/+/','/',$script);
+        $request = preg_replace('/\/\/+/','/',$request);
+
+        //remove script URL and Querystring to gain the id
+        if(preg_match('/^'.preg_quote($script,'/').'(.*)/',$request, $match)){
+            $id = preg_replace ('/\?.*/','',$match[1]);
+        }
+        $id = urldecode($id);
+        //strip leading slashes
+        $id = preg_replace('!^/+!','',$id);
+    }
+
+    // Namespace autolinking from URL
+    if(substr($id,-1) == ':' || ($conf['useslash'] && substr($id,-1) == '/')){
+        if(page_exists($id.$conf['start'])){
+            // start page inside namespace
+            $id = $id.$conf['start'];
+        }elseif(page_exists($id.noNS(cleanID($id)))){
+            // page named like the NS inside the NS
+            $id = $id.noNS(cleanID($id));
+        }elseif(page_exists($id)){
+            // page like namespace exists
+            $id = substr($id,0,-1);
+        }else{
+            // fall back to default
+            $id = $id.$conf['start'];
+        }
+        send_redirect(wl($id,'',true));
     }
-    send_redirect(wl($id,'',true));
-  }
 
-  if($clean) $id = cleanID($id);
-  if(empty($id) && $param=='id') $id = $conf['start'];
+    if($clean) $id = cleanID($id);
+    if(empty($id) && $param=='id') $id = $conf['start'];
 
-  return $id;
+    return $id;
 }
 
 /**
@@ -89,49 +95,49 @@
  * @param  boolean $media     Allow leading or trailing _ for media files
  */
 function cleanID($raw_id,$ascii=false,$media=false){
-  global $conf;
-  global $lang;
-  static $sepcharpat = null;
+    global $conf;
+    global $lang;
+    static $sepcharpat = null;
 
-  global $cache_cleanid;
-  $cache = & $cache_cleanid;
+    global $cache_cleanid;
+    $cache = & $cache_cleanid;
 
-  // check if it's already in the memory cache
-  if (isset($cache[(string)$raw_id])) {
-    return $cache[(string)$raw_id];
+    // check if it's already in the memory cache
+    if (isset($cache[(string)$raw_id])) {
+        return $cache[(string)$raw_id];
     }
 
-  $sepchar = $conf['sepchar'];
-  if($sepcharpat == null) // build string only once to save clock cycles
-    $sepcharpat = '#\\'.$sepchar.'+#';
+    $sepchar = $conf['sepchar'];
+    if($sepcharpat == null) // build string only once to save clock cycles
+        $sepcharpat = '#\\'.$sepchar.'+#';
 
-  $id = trim((string)$raw_id);
-  $id = utf8_strtolower($id);
+    $id = trim((string)$raw_id);
+    $id = utf8_strtolower($id);
 
-  //alternative namespace seperator
-  $id = strtr($id,';',':');
-  if($conf['useslash']){
-    $id = strtr($id,'/',':');
-  }else{
-    $id = strtr($id,'/',$sepchar);
-  }
+    //alternative namespace seperator
+    $id = strtr($id,';',':');
+    if($conf['useslash']){
+        $id = strtr($id,'/',':');
+    }else{
+        $id = strtr($id,'/',$sepchar);
+    }
 
-  if($conf['deaccent'] == 2 || $ascii) $id = utf8_romanize($id);
-  if($conf['deaccent'] || $ascii) $id = utf8_deaccent($id,-1);
+    if($conf['deaccent'] == 2 || $ascii) $id = utf8_romanize($id);
+    if($conf['deaccent'] || $ascii) $id = utf8_deaccent($id,-1);
 
-  //remove specials
-  $id = utf8_stripspecials($id,$sepchar,'\*');
+    //remove specials
+    $id = utf8_stripspecials($id,$sepchar,'\*');
 
-  if($ascii) $id = utf8_strip($id);
+    if($ascii) $id = utf8_strip($id);
 
-  //clean up
-  $id = preg_replace($sepcharpat,$sepchar,$id);
-  $id = preg_replace('#:+#',':',$id);
-  $id = ($media ? trim($id,':.-') : trim($id,':._-'));
-  $id = preg_replace('#:[:\._\-]+#',':',$id);
+    //clean up
+    $id = preg_replace($sepcharpat,$sepchar,$id);
+    $id = preg_replace('#:+#',':',$id);
+    $id = ($media ? trim($id,':.-') : trim($id,':._-'));
+    $id = preg_replace('#:[:\._\-]+#',':',$id);
 
-  $cache[(string)$raw_id] = $id;
-  return($id);
+    $cache[(string)$raw_id] = $id;
+    return($id);
 }
 
 /**
@@ -140,11 +146,11 @@
  * @author Andreas Gohr 
  */
 function getNS($id){
-  $pos = strrpos((string)$id,':');
-  if($pos!==false){
-    return substr((string)$id,0,$pos);
-  }
-  return false;
+    $pos = strrpos((string)$id,':');
+    if($pos!==false){
+        return substr((string)$id,0,$pos);
+    }
+    return false;
 }
 
 /**
@@ -153,12 +159,12 @@
  * @author Andreas Gohr 
  */
 function noNS($id) {
-  $pos = strrpos($id, ':');
-  if ($pos!==false) {
-    return substr($id, $pos+1);
-  } else {
-    return $id;
-  }
+    $pos = strrpos($id, ':');
+    if ($pos!==false) {
+        return substr($id, $pos+1);
+    } else {
+        return $id;
+    }
 }
 
 /**
@@ -196,8 +202,8 @@
  * @author Andreas Gohr 
  */
 function sectionID($title,&$check) {
-    $title = str_replace(':','',cleanID($title));
-    $new = ltrim($title,'0123456789._-');
+    $title = str_replace(array(':','.'),'',cleanID($title));
+    $new = ltrim($title,'0123456789_-');
     if(empty($new)){
         $title = 'section'.preg_replace('/[^0-9]+/','',$title); //keep numbers from headline
     }else{
@@ -219,14 +225,14 @@
 
 
 /**
- *  Wiki page existence check
+ * Wiki page existence check
  *
- *  parameters as for wikiFN
+ * parameters as for wikiFN
  *
- *  @author Chris Smith 
+ * @author Chris Smith 
  */
 function page_exists($id,$rev='',$clean=true) {
-  return @file_exists(wikiFN($id,$rev,$clean));
+    return @file_exists(wikiFN($id,$rev,$clean));
 }
 
 /**
@@ -242,39 +248,39 @@
  * @author Andreas Gohr 
  */
 function wikiFN($raw_id,$rev='',$clean=true){
-  global $conf;
+    global $conf;
 
-  global $cache_wikifn;
-  $cache = & $cache_wikifn;
+    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(empty($rev)){
-    $fn = $conf['datadir'].'/'.utf8_encodeFN($id).'.txt';
-  }else{
-    $fn = $conf['olddir'].'/'.utf8_encodeFN($id).'.'.$rev.'.txt';
-    if($conf['compression']){
-      //test for extensions here, we want to read both compressions
-       if (@file_exists($fn . '.gz')){
-          $fn .= '.gz';
-       }else if(@file_exists($fn . '.bz2')){
-          $fn .= '.bz2';
-       }else{
-          //file doesnt exist yet, so we take the configured extension
-          $fn .= '.' . $conf['compression'];
-       }
-    }
-  }
-
-  if (!isset($cache[$raw_id])) { $cache[$raw_id] = array(); }
-  $cache[$raw_id][$rev] = $fn;
-  return $fn;
+    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(empty($rev)){
+        $fn = $conf['datadir'].'/'.utf8_encodeFN($id).'.txt';
+    }else{
+        $fn = $conf['olddir'].'/'.utf8_encodeFN($id).'.'.$rev.'.txt';
+        if($conf['compression']){
+            //test for extensions here, we want to read both compressions
+            if (@file_exists($fn . '.gz')){
+                $fn .= '.gz';
+            }else if(@file_exists($fn . '.bz2')){
+                $fn .= '.bz2';
+            }else{
+                //file doesnt exist yet, so we take the configured extension
+                $fn .= '.' . $conf['compression'];
+            }
+        }
+    }
+
+    if (!isset($cache[$raw_id])) { $cache[$raw_id] = array(); }
+    $cache[$raw_id][$rev] = $fn;
+    return $fn;
 }
 
 /**
@@ -283,8 +289,8 @@
  * @author Ben Coburn 
  */
 function wikiLockFN($id) {
-  global $conf;
-  return $conf['lockdir'].'/'.md5(cleanID($id)).'.lock';
+    global $conf;
+    return $conf['lockdir'].'/'.md5(cleanID($id)).'.lock';
 }
 
 
@@ -296,11 +302,11 @@
  * @author Steven Danz 
  */
 function metaFN($id,$ext){
-  global $conf;
-  $id = cleanID($id);
-  $id = str_replace(':','/',$id);
-  $fn = $conf['metadir'].'/'.utf8_encodeFN($id).$ext;
-  return $fn;
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['metadir'].'/'.utf8_encodeFN($id).$ext;
+    return $fn;
 }
 
 /**
@@ -309,20 +315,20 @@
  * @author Esther Brunner 
  */
 function metaFiles($id){
-   $name   = noNS($id);
-   $ns     = getNS($id);
-   $dir    = ($ns) ? metaFN($ns,'').'/' : metaFN($ns,'');
-   $files  = array();
-
-   $dh = @opendir($dir);
-   if(!$dh) return $files;
-   while(($file = readdir($dh)) !== false){
-     if(strpos($file,$name.'.') === 0 && !is_dir($dir.$file))
-       $files[] = $dir.$file;
-   }
-   closedir($dh);
+    $name   = noNS($id);
+    $ns     = getNS($id);
+    $dir    = ($ns) ? metaFN($ns,'').'/' : metaFN($ns,'');
+    $files  = array();
+
+    $dh = @opendir($dir);
+    if(!$dh) return $files;
+    while(($file = readdir($dh)) !== false){
+        if(strpos($file,$name.'.') === 0 && !is_dir($dir.$file))
+            $files[] = $dir.$file;
+    }
+    closedir($dh);
 
-   return $files;
+    return $files;
 }
 
 /**
@@ -333,11 +339,11 @@
  * @author Andreas Gohr 
  */
 function mediaFN($id){
-  global $conf;
-  $id = cleanID($id);
-  $id = str_replace(':','/',$id);
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
     $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
-  return $fn;
+    return $fn;
 }
 
 /**
@@ -347,13 +353,13 @@
  * @author Andreas Gohr 
  */
 function localeFN($id){
-  global $conf;
-  $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt';
-  if(!@file_exists($file)){
-    //fall back to english
-    $file = DOKU_INC.'inc/lang/en/'.$id.'.txt';
-  }
-  return $file;
+    global $conf;
+    $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt';
+    if(!@file_exists($file)){
+        //fall back to english
+        $file = DOKU_INC.'inc/lang/en/'.$id.'.txt';
+    }
+    return $file;
 }
 
 /**
@@ -368,43 +374,43 @@
  * @author 
  */
 function resolve_id($ns,$id,$clean=true){
-  global $conf;
+    global $conf;
 
-  // some pre cleaning for useslash:
-  if($conf['useslash']) $id = str_replace('/',':',$id);
+    // some pre cleaning for useslash:
+    if($conf['useslash']) $id = str_replace('/',':',$id);
 
-  // if the id starts with a dot we need to handle the
-  // relative stuff
-  if($id{0} == '.'){
-    // normalize initial dots without a colon
-    $id = preg_replace('/^(\.+)(?=[^:\.])/','\1:',$id);
-    // prepend the current namespace
-    $id = $ns.':'.$id;
-
-    // cleanup relatives
-    $result = array();
-    $pathA  = explode(':', $id);
-    if (!$pathA[0]) $result[] = '';
-    foreach ($pathA AS $key => $dir) {
-      if ($dir == '..') {
-        if (end($result) == '..') {
-          $result[] = '..';
-        } elseif (!array_pop($result)) {
-          $result[] = '..';
+    // if the id starts with a dot we need to handle the
+    // relative stuff
+    if($id{0} == '.'){
+        // normalize initial dots without a colon
+        $id = preg_replace('/^(\.+)(?=[^:\.])/','\1:',$id);
+        // prepend the current namespace
+        $id = $ns.':'.$id;
+
+        // cleanup relatives
+        $result = array();
+        $pathA  = explode(':', $id);
+        if (!$pathA[0]) $result[] = '';
+        foreach ($pathA AS $key => $dir) {
+            if ($dir == '..') {
+                if (end($result) == '..') {
+                    $result[] = '..';
+                } elseif (!array_pop($result)) {
+                    $result[] = '..';
+                }
+            } elseif ($dir && $dir != '.') {
+                $result[] = $dir;
+            }
         }
-      } elseif ($dir && $dir != '.') {
-        $result[] = $dir;
-      }
-    }
-    if (!end($pathA)) $result[] = '';
-    $id = implode(':', $result);
-  }elseif($ns !== false && strpos($id,':') === false){
-    //if link contains no namespace. add current namespace (if any)
-    $id = $ns.':'.$id;
-  }
+        if (!end($pathA)) $result[] = '';
+        $id = implode(':', $result);
+    }elseif($ns !== false && strpos($id,':') === false){
+        //if link contains no namespace. add current namespace (if any)
+        $id = $ns.':'.$id;
+    }
 
-  if($clean) $id = cleanID($id);
-  return $id;
+    if($clean) $id = cleanID($id);
+    return $id;
 }
 
 /**
@@ -413,9 +419,9 @@
  * @author Andreas Gohr 
  */
 function resolve_mediaid($ns,&$page,&$exists){
-  $page   = resolve_id($ns,$page);
-  $file   = mediaFN($page);
-  $exists = @file_exists($file);
+    $page   = resolve_id($ns,$page);
+    $file   = mediaFN($page);
+    $exists = @file_exists($file);
 }
 
 /**
@@ -424,63 +430,63 @@
  * @author Andreas Gohr 
  */
 function resolve_pageid($ns,&$page,&$exists){
-  global $conf;
-  $exists = false;
+    global $conf;
+    $exists = false;
 
-  //keep hashlink if exists then clean both parts
-  if (strpos($page,'#')) {
-    list($page,$hash) = split('#',$page,2);
-  } else {
-    $hash = '';
-  }
-  $hash = cleanID($hash);
-  $page = resolve_id($ns,$page,false); // resolve but don't clean, yet
-
-  // get filename (calls clean itself)
-  $file = wikiFN($page);
-
-  // if ends with colon or slash we have a namespace link
-  if(substr($page,-1) == ':' || ($conf['useslash'] && substr($page,-1) == '/')){
-    if(page_exists($page.$conf['start'])){
-      // start page inside namespace
-      $page = $page.$conf['start'];
-      $exists = true;
-    }elseif(page_exists($page.noNS(cleanID($page)))){
-      // page named like the NS inside the NS
-      $page = $page.noNS(cleanID($page));
-      $exists = true;
-    }elseif(page_exists($page)){
-      // page like namespace exists
-      $page = $page;
-      $exists = true;
-    }else{
-      // fall back to default
-      $page = $page.$conf['start'];
-    }
-  }else{
-    //check alternative plural/nonplural form
-    if(!@file_exists($file)){
-      if( $conf['autoplural'] ){
-        if(substr($page,-1) == 's'){
-          $try = substr($page,0,-1);
+    //keep hashlink if exists then clean both parts
+    if (strpos($page,'#')) {
+        list($page,$hash) = explode('#',$page,2);
+    } else {
+        $hash = '';
+    }
+    $hash = cleanID($hash);
+    $page = resolve_id($ns,$page,false); // resolve but don't clean, yet
+
+    // get filename (calls clean itself)
+    $file = wikiFN($page);
+
+    // if ends with colon or slash we have a namespace link
+    if(substr($page,-1) == ':' || ($conf['useslash'] && substr($page,-1) == '/')){
+        if(page_exists($page.$conf['start'])){
+            // start page inside namespace
+            $page = $page.$conf['start'];
+            $exists = true;
+        }elseif(page_exists($page.noNS(cleanID($page)))){
+            // page named like the NS inside the NS
+            $page = $page.noNS(cleanID($page));
+            $exists = true;
+        }elseif(page_exists($page)){
+            // page like namespace exists
+            $page = $page;
+            $exists = true;
         }else{
-          $try = $page.'s';
-        }
-        if(page_exists($try)){
-          $page   = $try;
-          $exists = true;
+            // fall back to default
+            $page = $page.$conf['start'];
         }
-      }
     }else{
-      $exists = true;
+        //check alternative plural/nonplural form
+        if(!@file_exists($file)){
+            if( $conf['autoplural'] ){
+                if(substr($page,-1) == 's'){
+                    $try = substr($page,0,-1);
+                }else{
+                    $try = $page.'s';
+                }
+                if(page_exists($try)){
+                    $page   = $try;
+                    $exists = true;
+                }
+            }
+        }else{
+            $exists = true;
+        }
     }
-  }
 
-  // now make sure we have a clean page
-  $page = cleanID($page);
+    // now make sure we have a clean page
+    $page = cleanID($page);
 
-  //add hash if any
-  if(!empty($hash)) $page .= '#'.$hash;
+    //add hash if any
+    if(!empty($hash)) $page .= '#'.$hash;
 }
 
 /**
@@ -495,11 +501,11 @@
  * @return string       The filename of the cachefile
  */
 function getCacheName($data,$ext=''){
-  global $conf;
-  $md5  = md5($data);
-  $file = $conf['cachedir'].'/'.$md5{0}.'/'.$md5.$ext;
-  io_makeFileDir($file);
-  return $file;
+    global $conf;
+    $md5  = md5($data);
+    $file = $conf['cachedir'].'/'.$md5{0}.'/'.$md5.$ext;
+    io_makeFileDir($file);
+    return $file;
 }
 
 /**
@@ -508,15 +514,15 @@
  * @author Andreas Gohr 
  */
 function isHiddenPage($id){
-  global $conf;
-  global $ACT;
-  if(empty($conf['hidepages'])) return false;
-  if($ACT == 'admin') return false;
-
-  if(preg_match('/'.$conf['hidepages'].'/ui',':'.$id)){
-    return true;
-  }
-  return false;
+    global $conf;
+    global $ACT;
+    if(empty($conf['hidepages'])) return false;
+    if($ACT == 'admin') return false;
+
+    if(preg_match('/'.$conf['hidepages'].'/ui',':'.$id)){
+        return true;
+    }
+    return false;
 }
 
 /**
@@ -525,100 +531,7 @@
  * @author Andreas Gohr 
  */
 function isVisiblePage($id){
-  return !isHiddenPage($id);
-}
-
-/**
- * Checks and sets HTTP headers for conditional HTTP requests
- *
- * @author   Simon Willison 
- * @link     http://simon.incutio.com/archive/2003/04/23/conditionalGet
- * @param    timestamp $timestamp lastmodified time of the cache file
- * @returns  void or exits with previously header() commands executed
- */
-function http_conditionalRequest($timestamp){
-  // A PHP implementation of conditional get, see
-  //   http://fishbowl.pastiche.org/archives/001132.html
-  $last_modified = substr(gmdate('r', $timestamp), 0, -5).'GMT';
-  $etag = '"'.md5($last_modified).'"';
-  // Send the headers
-  header("Last-Modified: $last_modified");
-  header("ETag: $etag");
-  // See if the client has provided the required headers
-  if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
-    $if_modified_since = stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']);
-  }else{
-    $if_modified_since = false;
-  }
-
-  if (isset($_SERVER['HTTP_IF_NONE_MATCH'])){
-    $if_none_match = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
-  }else{
-    $if_none_match = false;
-  }
-
-  if (!$if_modified_since && !$if_none_match){
-    return;
-  }
-
-  // At least one of the headers is there - check them
-  if ($if_none_match && $if_none_match != $etag) {
-    return; // etag is there but doesn't match
-  }
-
-  if ($if_modified_since && $if_modified_since != $last_modified) {
-    return; // if-modified-since is there but doesn't match
-  }
-
-  // Nothing has changed since their last request - serve a 304 and exit
-  header('HTTP/1.0 304 Not Modified');
-
-  // don't produce output, even if compression is on
-  ob_end_clean();
-  exit;
+    return !isHiddenPage($id);
 }
 
-/**
- * Let the webserver send the given file vi x-sendfile method
- *
- * @author Chris Smith 
- * @returns  void or exits with previously header() commands executed
- */
-function http_sendfile($file) {
-  global $conf;
-
-  //use x-sendfile header to pass the delivery to compatible webservers
-  if($conf['xsendfile'] == 1){
-    header("X-LIGHTTPD-send-file: $file");
-    ob_end_clean();
-    exit;
-  }elseif($conf['xsendfile'] == 2){
-    header("X-Sendfile: $file");
-    ob_end_clean();
-    exit;
-  }elseif($conf['xsendfile'] == 3){
-    header("X-Accel-Redirect: $file");
-    ob_end_clean();
-    exit;
-  }
 
-  return false;
-}
-
-/**
- * Check for a gzipped version and create if necessary
- *
- * return true if there exists a gzip version of the uncompressed file
- * (samepath/samefilename.sameext.gz) created after the uncompressed file
- *
- * @author Chris Smith 
- */
-function http_gzip_valid($uncompressed_file) {
-  $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);
-  }
-
-  return true;
-}
-//Setup VIM: ex: et ts=2 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/parser/code.php dokuwiki-rc2009-12-02/inc/parser/code.php
--- dokuwiki-2009-02-14/inc/parser/code.php	1970-01-01 01:00:00.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/code.php	2009-12-02 19:50:12.000000000 +0100
@@ -0,0 +1,58 @@
+
+ */
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/parser/renderer.php';
+
+class Doku_Renderer_code extends Doku_Renderer {
+    var $_codeblock=0;
+
+    /**
+     * Send the wanted code block to the browser
+     *
+     * When the correct block was found it exits the script.
+     */
+    function code($text, $language = NULL, $filename='' ) {
+        if(!$language) $language = 'txt';
+        if(!$filename) $filename = 'snippet.'.$language;
+        $filename = basename($filename);
+
+        if($this->_codeblock == $_REQUEST['codeblock']){
+            header("Content-Type: text/plain; charset=utf-8");
+            header("Content-Disposition: attachment; filename=$filename");
+            header("X-Robots-Tag: noindex");
+            echo trim($text,"\r\n");
+            exit;
+        }
+
+        $this->_codeblock++;
+    }
+
+    /**
+     * Wraps around code()
+     */
+    function file($text, $language = NULL, $filename='') {
+        $this->code($text, $language, $filename);
+    }
+
+    /**
+     * This should never be reached, if it is send a 404
+     */
+    function document_end() {
+        header("HTTP/1.0 404 Not Found");
+        echo '404 - Not found';
+        exit;
+    }
+
+    /**
+     * Return the format of the renderer
+     *
+     * @returns string 'code'
+     */
+    function getFormat(){
+        return 'code';
+    }
+}
diff -Naur dokuwiki-2009-02-14/inc/parser/handler.php dokuwiki-rc2009-12-02/inc/parser/handler.php
--- dokuwiki-2009-02-14/inc/parser/handler.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/handler.php	2009-12-02 19:50:12.000000000 +0100
@@ -323,13 +323,6 @@
         return true;
     }
 
-    function file($match, $state, $pos) {
-        if ( $state == DOKU_LEXER_UNMATCHED ) {
-            $this->_addCall('file',array($match), $pos);
-        }
-        return true;
-    }
-
     function quote($match, $state, $pos) {
 
         switch ( $state ) {
@@ -360,23 +353,28 @@
         return true;
     }
 
-    function code($match, $state, $pos) {
-        switch ( $state ) {
-            case DOKU_LEXER_UNMATCHED:
-                $matches = preg_split('/>/u',$match,2);
-                $matches[0] = trim($matches[0]);
-                if ( trim($matches[0]) == '' ) {
-                    $matches[0] = NULL;
-                }
-                # $matches[0] contains name of programming language
-                # if available, We shortcut html here.
-                if($matches[0] == 'html') $matches[0] = 'html4strict';
-                $this->_addCall(
-                        'code',
-                        array($matches[1],$matches[0]),
-                        $pos
-                    );
-            break;
+    function file($match, $state, $pos) {
+        return $this->code($match, $state, $pos, 'file');
+    }
+
+    function code($match, $state, $pos, $type='code') {
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $matches = explode('>',$match,2);
+            $matches[0] = trim($matches[0]);
+
+            list($language,$filename) = explode(' ',$matches[0],2);
+            $language = trim($language);
+            $filename = trim($filename);
+            if ( $language == '' )  $language = null;
+            if ( $language == '-' ) $language = null;
+            if ( $filename == '' )  $filename = null;
+            # We shortcut html here.
+            if($language == 'html') $language = 'html4strict';
+            $this->_addCall(
+                    $type,
+                    array($matches[1],$language,$filename),
+                    $pos
+                );
         }
         return true;
     }
@@ -444,7 +442,7 @@
         $link = preg_replace(array('/^\[\[/','/\]\]$/u'),'',$match);
 
         // Split title from URL
-        $link = preg_split('/\|/u',$link,2);
+        $link = explode('|',$link,2);
         if ( !isset($link[1]) ) {
             $link[1] = NULL;
         } else if ( preg_match('/^\{\{[^\}]+\}\}$/',$link[1]) ) {
@@ -457,7 +455,7 @@
 
         if ( preg_match('/^[a-zA-Z0-9\.]+>{1}.*$/u',$link[0]) ) {
         // Interwiki
-            $interwiki = preg_split('/>/u',$link[0]);
+            $interwiki = explode('>',$link[0],2);
             $this->_addCall(
                 'interwikilink',
                 array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]),
@@ -586,7 +584,6 @@
                 $this->CallWriter = & $ReWriter;
 
                 $this->_addCall('table_start', array(), $pos);
-                //$this->_addCall('table_row', array(), $pos);
                 if ( trim($match) == '^' ) {
                     $this->_addCall('tableheader', array(), $pos);
                 } else {
@@ -610,6 +607,8 @@
             case DOKU_LEXER_MATCHED:
                 if ( $match == ' ' ){
                     $this->_addCall('cdata', array($match), $pos);
+                } else if ( preg_match('/:::/',$match) ) {
+                    $this->_addCall('rowspan', array($match), $pos);
                 } else if ( preg_match('/\t+/',$match) ) {
                     $this->_addCall('table_align', array($match), $pos);
                 } else if ( preg_match('/ {2,}/',$match) ) {
@@ -638,7 +637,7 @@
     $link = preg_replace(array('/^\{\{/','/\}\}$/u'),'',$match);
 
     // Split title from URL
-    $link = preg_split('/\|/u',$link,2);
+    $link = explode('|',$link,2);
 
 
     // Check alignment
@@ -803,6 +802,8 @@
         $key = count($this->calls);
         if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) {
             $this->calls[$key-1][1][0] .= $call[1][0];
+        } else if ($call[0] == 'eol') {
+            // do nothing (eol shouldn't be allowed, to counter preformatted fix in #1652 & #1699)
         } else {
             $this->calls[] = $call;
         }
@@ -997,7 +998,9 @@
         } else {
             $type = 'o';
         }
-        return count(explode('  ',str_replace("\t",'  ',$match)));
+        // Is the +1 needed? It used to be count(explode(...))
+        // but I don't think the number is seen outside this handler
+        return substr_count(str_replace("\t",'  ',$match), '  ') + 1;
     }
 }
 
@@ -1050,6 +1053,9 @@
                     if (trim($this->text)) {
                       $this->CallWriter->writeCall(array('preformatted',array($this->text),$this->pos));
                     }
+                    // see FS#1699 & FS#1652, add 'eol' instructions to ensure proper triggering of following p_open
+                    $this->CallWriter->writeCall(array('eol',array(),$this->pos));
+                    $this->CallWriter->writeCall(array('eol',array(),$this->pos));
                 break;
             }
         }
@@ -1114,7 +1120,7 @@
                         }
                     } else {
                         if ($call[0] != 'quote_start') $this->quoteCalls[] = array('linebreak',array(),$call[2]);
-                    } 
+                    }
 
                     $quoteDepth = $quoteLength;
 
@@ -1233,19 +1239,6 @@
         while ( $discard = array_pop($this->tableCalls ) ) {
 
             if ( $discard[0] == 'tablecell_open' || $discard[0] == 'tableheader_open') {
-
-                // Its a spanning element - put it back and close it
-                if ( $discard[1][0] > 1 ) {
-
-                    $this->tableCalls[] = $discard;
-                    if ( strstr($discard[0],'cell') ) {
-                        $name = 'tablecell';
-                    } else {
-                        $name = 'tableheader';
-                    }
-                    $this->tableCalls[] = array($name.'_close',array(),$call[2]);
-                }
-
                 break;
             }
         }
@@ -1269,12 +1262,12 @@
             }
 
             $this->tableCalls[] = array($this->lastCellType.'_close',array(),$call[2]);
-            $this->tableCalls[] = array($call[0].'_open',array(1,NULL),$call[2]);
+            $this->tableCalls[] = array($call[0].'_open',array(1,NULL,1),$call[2]);
             $this->lastCellType = $call[0];
 
         } else {
 
-            $this->tableCalls[] = array($call[0].'_open',array(1,NULL),$call[2]);
+            $this->tableCalls[] = array($call[0].'_open',array(1,NULL,1),$call[2]);
             $this->lastCellType = $call[0];
             $this->firstCell = false;
 
@@ -1300,6 +1293,7 @@
 
         $lastRow = 0;
         $lastCell = 0;
+        $cellKey = array();
         $toDelete = array();
 
         // Look for the colspan elements and increment the colspan on the
@@ -1309,24 +1303,32 @@
 
             if ( $call[0] == 'tablerow_open' ) {
 
-                $lastRow = $key;
+                $lastRow++;
+                $lastCell = 0;
 
             } else if ( $call[0] == 'tablecell_open' || $call[0] == 'tableheader_open' ) {
 
-                $lastCell = $key;
+                $lastCell++;
+                $cellKey[$lastRow][$lastCell] = $key;
 
             } else if ( $call[0] == 'table_align' ) {
 
+                $prev = in_array($this->tableCalls[$key-1][0], array('tablecell_open', 'tableheader_open'));
+                $next = in_array($this->tableCalls[$key+1][0], array('tablecell_close', 'tableheader_close'));
+                // If the cell is empty, align left
+                if ($prev && $next) {
+                    $this->tableCalls[$key-1][1][1] = 'left';
+
                 // If the previous element was a cell open, align right
-                if ( $this->tableCalls[$key-1][0] == 'tablecell_open' || $this->tableCalls[$key-1][0] == 'tableheader_open' ) {
+                } elseif ($prev) {
                     $this->tableCalls[$key-1][1][1] = 'right';
 
-                // If the next element if the close of an element, align either center or left
-                } else if ( $this->tableCalls[$key+1][0] == 'tablecell_close' || $this->tableCalls[$key+1][0] == 'tableheader_close' ) {
-                    if ( $this->tableCalls[$lastCell][1][1] == 'right' ) {
-                        $this->tableCalls[$lastCell][1][1] = 'center';
+                // If the next element is the close of an element, align either center or left
+                } elseif ( $next) {
+                    if ( $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] == 'right' ) {
+                        $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] = 'center';
                     } else {
-                        $this->tableCalls[$lastCell][1][1] = 'left';
+                        $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] = 'left';
                     }
 
                 }
@@ -1338,7 +1340,7 @@
 
                 $this->tableCalls[$key-1][1][0] = false;
 
-                for($i = $key-2; $i > $lastRow; $i--) {
+                for($i = $key-2; $i >= $cellKey[$lastRow][1]; $i--) {
 
                     if ( $this->tableCalls[$i][0] == 'tablecell_open' || $this->tableCalls[$i][0] == 'tableheader_open' ) {
 
@@ -1354,6 +1356,34 @@
                 $toDelete[] = $key-1;
                 $toDelete[] = $key;
                 $toDelete[] = $key+1;
+
+            } else if ( $call[0] == 'rowspan' ) {
+
+                if ( $this->tableCalls[$key-1][0] == 'cdata' ) {
+                    // ignore rowspan if previous call was cdata (text mixed with :::) we don't have to check next call as that wont match regex
+                    $this->tableCalls[$key][0] = 'cdata';
+
+                } else {
+
+                    $this->tableCalls[$key-1][1][2] = false;
+
+                    for($i = $lastRow-1; $i > 0; $i--) {
+
+                        if ( $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tablecell_open' || $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tableheader_open' ) {
+
+                            if ( false !== $this->tableCalls[$cellKey[$i][$lastCell]][1][2] ) {
+                                $this->tableCalls[$cellKey[$i][$lastCell]][1][2]++;
+                                break;
+                            }
+
+
+                        }
+                    }
+
+                    $toDelete[] = $key-1;
+                    $toDelete[] = $key;
+                    $toDelete[] = $key+1; 
+                }
             }
         }
 
@@ -1380,45 +1410,6 @@
     }
 }
 
-//------------------------------------------------------------------------
-class Doku_Handler_Section {
-
-    function process($calls) {
-
-        $sectionCalls = array();
-        $inSection = false;
-
-        foreach ( $calls as $call ) {
-
-            if ( $call[0] == 'header' ) {
-
-                if ( $inSection ) {
-                    $sectionCalls[] = array('section_close',array(), $call[2]);
-                }
-
-                $sectionCalls[] = $call;
-                $sectionCalls[] = array('section_open',array($call[1][1]), $call[2]);
-                $inSection = true;
-
-            } else {
-
-                if ($call[0] == 'section_open' )  {
-                    $inSection = true;
-                } else if ($call[0] == 'section_open' ) {
-                    $inSection = false;
-                }
-                $sectionCalls[] = $call;
-            }
-        }
-
-        if ( $inSection ) {
-            $sectionCalls[] = array('section_close',array(), $call[2]);
-        }
-
-        return $sectionCalls;
-    }
-
-}
 
 /**
  * Handler for paragraphs
@@ -1620,7 +1611,7 @@
                             $cname_plusone = $calls[$key+1][0];
                             if ($cname_plusone == 'plugin') {
                                 $cname_plusone = 'plugin'.$calls[$key+1][1][0];
-                                
+
                                 // plugin test, true if plugin has a state which precludes it requiring blockOpen or blockClose
                                 $plugin_plusone = true;
                                 $plugin_test = ($call[$key+1][1][2] == DOKU_LEXER_MATCHED) || ($call[$key+1][1][2] == DOKU_LEXER_MATCHED);
diff -Naur dokuwiki-2009-02-14/inc/parser/lexer.php dokuwiki-rc2009-12-02/inc/parser/lexer.php
--- dokuwiki-2009-02-14/inc/parser/lexer.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/lexer.php	2009-12-02 19:50:12.000000000 +0100
@@ -136,10 +136,9 @@
         }
 
         $idx = count($matches)-2;
-
         list($pre, $post) = preg_split($this->_patterns[$idx].$this->_getPerlMatchingFlags(), $subject, 2);
-
         $split = array($pre, $matches[0], $post);
+
         return isset($this->_labels[$idx]) ? $this->_labels[$idx] : true;
     }
 
@@ -157,11 +156,11 @@
             for ($i = 0; $i < $cnt; $i++) {
 
                 /*
-                 * decompose the input pattern into "(", "(?", ")", 
-                 * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"... 
+                 * decompose the input pattern into "(", "(?", ")",
+                 * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"...
                  * elements.
-                 */ 
-                preg_match_all('/\\\\.|' . 
+                 */
+                preg_match_all('/\\\\.|' .
                                '\(\?|' .
                                '[()]|' .
                                '\[\^?\]?(?:\\\\.|\[:[^]]*:\]|[^]\\\\])*\]|' .
@@ -172,7 +171,7 @@
 
                 foreach ($elts[0] as $elt) {
                     /*
-                     * for "(", ")" remember the nesting level, add "\" 
+                     * for "(", ")" remember the nesting level, add "\"
                      * only to the non-"(?" ones.
                      */
 
@@ -514,7 +513,7 @@
         // modes starting with plugin_ are all handled by the same
         // handler but with an additional parameter
         if(substr($handler,0,7)=='plugin_'){
-          list($handler,$plugin) = split('_',$handler,2);
+          list($handler,$plugin) = explode('_',$handler,2);
               return $this->_parser->$handler($content, $is_match, $pos, $plugin);
         }
 
diff -Naur dokuwiki-2009-02-14/inc/parser/metadata.php dokuwiki-rc2009-12-02/inc/parser/metadata.php
--- dokuwiki-2009-02-14/inc/parser/metadata.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/metadata.php	2009-12-02 19:50:12.000000000 +0100
@@ -30,27 +30,48 @@
   var $headers = array();
   var $capture = true;
   var $store   = '';
+  var $firstimage = '';
 
   function getFormat(){
     return 'metadata';
   }
 
   function document_start(){
+    global $ID;
+
+    $this->headers = array();
+
+    // external pages are missing create date
+    if(!$this->persistent['date']['created']){
+        $this->persistent['date']['created'] = filectime(wikiFN($ID));
+    }
+    if(!isset($this->persistent['creator'])){
+        $this->persistent['creator'] = '';
+    }
     // reset metadata to persistent values
     $this->meta = $this->persistent;
   }
 
   function document_end(){
+    global $ID;
+
     // store internal info in metadata (notoc,nocache)
     $this->meta['internal'] = $this->info;
 
-    if (!$this->meta['description']['abstract']){
+    if (!isset($this->meta['description']['abstract'])){
       // cut off too long abstracts
       $this->doc = trim($this->doc);
       if (strlen($this->doc) > 500)
         $this->doc = utf8_substr($this->doc, 0, 500).'…';
       $this->meta['description']['abstract'] = $this->doc;
     }
+
+    $this->meta['relation']['firstimage'] = $this->firstimage;
+
+    if(!isset($this->meta['date']['modified'])){
+        $this->meta['date']['modified'] = filemtime(wikiFN($ID));
+    }
+
   }
 
   function toc_additem($id, $text, $level) {
@@ -70,8 +91,7 @@
   }
 
   function header($text, $level, $pos) {
-
-    if (!$this->meta['title']) $this->meta['title'] = $text;
+    if (!isset($this->meta['title'])) $this->meta['title'] = $text;
 
     // add the header to the TOC
     $hid = $this->_headerToLink($text,'true');
@@ -207,7 +227,7 @@
     if ($this->capture) $this->doc .= $text;
   }
 
-  function file($text){
+  function file($text, $lang = null, $file = null){
     if ($this->capture){
       $this->doc .= DOKU_LF.$text;
       if (strlen($this->doc) > 250) $this->capture = false;
@@ -227,7 +247,7 @@
     }
   }
 
-  function code($text, $language = NULL){
+  function code($text, $language = NULL, $file = null){
     if ($this->capture){
       $this->doc .= DOKU_LF.$text;
       if (strlen($this->doc) > 250) $this->capture = false;
@@ -288,11 +308,14 @@
   function internallink($id, $name = NULL){
     global $ID;
 
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
     $default = $this->_simpleTitle($id);
 
     // first resolve and clean up the $id
     resolve_pageid(getNS($ID), $id, $exists);
-    list($page, $hash) = split('#', $id, 2);
+    list($page, $hash) = explode('#', $id, 2);
 
     // set metadata
     $this->meta['relation']['references'][$page] = $exists;
@@ -307,6 +330,9 @@
   }
 
   function externallink($url, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
     if ($this->capture){
       if ($name) $this->doc .= $name;
       else $this->doc .= '<'.$url.'>';
@@ -314,6 +340,9 @@
   }
 
   function interwikilink($match, $name = NULL, $wikiName, $wikiUri){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
     if ($this->capture){
       list($wikiUri, $hash) = explode('#', $wikiUri, 2);
       $name = $this->_getLinkTitle($name, $wikiName.'>'.$wikiUri);
@@ -322,6 +351,9 @@
   }
 
   function windowssharelink($url, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
     if ($this->capture){
       if ($name) $this->doc .= $name;
       else $this->doc .= '<'.$url.'>';
@@ -329,6 +361,9 @@
   }
 
   function emaillink($address, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
     if ($this->capture){
       if ($name) $this->doc .= $name;
       else $this->doc .= '<'.$address.'>';
@@ -338,11 +373,13 @@
   function internalmedia($src, $title=NULL, $align=NULL, $width=NULL,
                          $height=NULL, $cache=NULL, $linking=NULL){
     if ($this->capture && $title) $this->doc .= '['.$title.']';
+    $this->_firstimage($src);
   }
 
   function externalmedia($src, $title=NULL, $align=NULL, $width=NULL,
                          $height=NULL, $cache=NULL, $linking=NULL){
     if ($this->capture && $title) $this->doc .= '['.$title.']';
+    $this->_firstimage($src);
   }
 
   function rss($url,$params) {
@@ -360,10 +397,10 @@
   function tablerow_open(){}
   function tablerow_close(){}
 
-  function tableheader_open($colspan = 1, $align = NULL){}
+  function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){}
   function tableheader_close(){}
 
-  function tablecell_open($colspan = 1, $align = NULL){}
+  function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){}
   function tablecell_close(){}
 
   //----------------------------------------------------------
@@ -399,21 +436,12 @@
    * @author Andreas Gohr 
    */
   function _headerToLink($title, $create=false) {
-    $title = str_replace(':','',cleanID($title));
-    $title = ltrim($title,'0123456789._-');
-    if(empty($title)) $title='section';
-
-    if($create){
-      // make sure tiles are unique
-      $num = '';
-      while(in_array($title.$num,$this->headers)){
-        ($num) ? $num++ : $num = 1;
+      if($create){
+          return sectionID($title,$this->headers);
+      }else{
+          $check = false;
+          return sectionID($title,$check);
       }
-      $title = $title.$num;
-      $this->headers[] = $title;
-    }
-
-    return $title;
   }
 
   /**
@@ -434,10 +462,22 @@
     } else if (is_string($title)){
       return $title;
     } else if (is_array($title)){
-      return '['.$title.']';
+      return '['.$title['title'].']';
     }
   }
 
+  function _firstimage($src){
+    if($this->firstimage) return;
+    global $ID;
+
+    list($src,$hash) = explode('#',$src,2);
+    if(!preg_match('/^https?:\/\//i',$src)){
+        resolve_mediaid(getNS($ID),$src, $exists);
+    }
+    if(preg_match('/.(jpe?g|gif|png)$/i',$src)){
+        $this->firstimage = $src;
+    }
+  }
 }
 
 //Setup VIM: ex: et ts=4 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/parser/parser.php dokuwiki-rc2009-12-02/inc/parser/parser.php
--- dokuwiki-2009-02-14/inc/parser/parser.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/parser.php	2009-12-02 19:50:12.000000000 +0100
@@ -260,7 +260,7 @@
 class Doku_Parser_Mode_linebreak extends Doku_Parser_Mode {
 
     function connectTo($mode) {
-        $this->Lexer->addSpecialPattern('\x5C{2}(?=\s)',$mode,'linebreak');
+        $this->Lexer->addSpecialPattern('\x5C{2}(?:[ \t]|(?=\n))',$mode,'linebreak');
     }
 
     function getSort() {
@@ -276,7 +276,8 @@
         if ( in_array($mode, $badModes) ) {
             return;
         }
-        $this->Lexer->addSpecialPattern('\n',$mode,'eol');
+        // see FS#1652, pattern extended to swallow preceding whitespace to avoid issues with lines that only contain whitespace
+        $this->Lexer->addSpecialPattern('(?:^[ \t]*)?\n',$mode,'eol');
     }
 
     function getSort() {
@@ -451,7 +452,7 @@
     function postConnect() {
         $this->Lexer->addPattern('\n\^','table');
         $this->Lexer->addPattern('\n\|','table');
-        #$this->Lexer->addPattern(' {2,}','table');
+        $this->Lexer->addPattern('[\t ]*:::[\t ]*(?=[\|\^])','table');
         $this->Lexer->addPattern('[\t ]+','table');
         $this->Lexer->addPattern('\^','table');
         $this->Lexer->addPattern('\|','table');
@@ -561,7 +562,7 @@
 class Doku_Parser_Mode_file extends Doku_Parser_Mode {
 
     function connectTo($mode) {
-        $this->Lexer->addEntryPattern('(?=.*)',$mode,'file');
+        $this->Lexer->addEntryPattern(')',$mode,'file');
     }
 
     function postConnect() {
@@ -611,6 +612,7 @@
     var $pattern = '';
 
     function Doku_Parser_Mode_acronym($acronyms) {
+    	usort($acronyms,array($this,'_compare'));
         $this->acronyms = $acronyms;
     }
 
@@ -633,6 +635,21 @@
     function getSort() {
         return 240;
     }
+
+    /**
+     * sort callback to order by string length descending
+     */
+    function _compare($a,$b) {
+        $a_len = strlen($a);
+        $b_len = strlen($b);
+        if ($a_len > $b_len) {
+          return -1;
+        } else if ($a_len < $b_len) {
+          return 1;
+        }
+
+    	return 0;
+    }
 }
 
 //-------------------------------------------------------------------
@@ -743,7 +760,7 @@
     function connectTo($mode) {
 
         $this->Lexer->addSpecialPattern(
-                    '(?<=\b)\d+[xX]\d+(?=\b)',$mode,'multiplyentity'
+                    '(?<=\b)(?:[1-9]|\d{2,})[xX]\d+(?=\b)',$mode,'multiplyentity'
                 );
 
     }
diff -Naur dokuwiki-2009-02-14/inc/parser/renderer.php dokuwiki-rc2009-12-02/inc/parser/renderer.php
--- dokuwiki-2009-02-14/inc/parser/renderer.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/renderer.php	2009-12-02 19:50:12.000000000 +0100
@@ -161,13 +161,13 @@
 
     function preformatted($text) {}
 
-    function file($text) {}
-
     function quote_open() {}
 
     function quote_close() {}
 
-    function code($text, $lang = NULL) {}
+    function file($text, $lang = null, $file = null ) {}
+
+    function code($text, $lang = null, $file = null ) {}
 
     function acronym($acronym) {}
 
@@ -239,11 +239,11 @@
 
     function tablerow_close(){}
 
-    function tableheader_open($colspan = 1, $align = NULL){}
+    function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){}
 
     function tableheader_close(){}
 
-    function tablecell_open($colspan = 1, $align = NULL){}
+    function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){}
 
     function tablecell_close(){}
 
@@ -294,7 +294,7 @@
         }
 
         //split into hash and url part
-        list($wikiUri,$hash) = explode('#',$wikiUri,2);
+        list($reference,$hash) = explode('#',$reference,2);
 
         //replace placeholder
         if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){
diff -Naur dokuwiki-2009-02-14/inc/parser/xhtml.php dokuwiki-rc2009-12-02/inc/parser/xhtml.php
--- dokuwiki-2009-02-14/inc/parser/xhtml.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parser/xhtml.php	2009-12-02 19:50:12.000000000 +0100
@@ -32,10 +32,12 @@
 
     var $headers = array();
     var $footnotes = array();
-    var $lastsec = 0;
+    var $lastlevel = 0;
+    var $node = array(0,0,0,0,0);
     var $store = '';
 
-    var $_counter = array(); // used as global counter, introduced for table classes
+    var $_counter   = array(); // used as global counter, introduced for table classes
+    var $_codeblock = 0; // counts the code and file blocks, used to provide download links
 
     function getFormat(){
         return 'xhtml';
@@ -111,6 +113,15 @@
         //only add items within configured levels
         $this->toc_additem($hid, $text, $level);
 
+        // adjust $node to reflect hierarchy of levels
+        $this->node[$level-1]++;
+        if ($level < $this->lastlevel) {
+            for ($i = 0; $i < $this->lastlevel-$level; $i++) {
+                $this->node[$this->lastlevel-$i-1] = 0;
+            }
+        }
+        $this->lastlevel = $level;
+
         // write the header
         $this->doc .= DOKU_LF.'';
         $this->doc .= $this->_xmlEntities($text);
@@ -347,14 +358,6 @@
         $this->html($text, 'pre');
     }
 
-    function preformatted($text) {
-        $this->doc .= '
      ' . $this->_xmlEntities($text) . '
      '. DOKU_LF;
-    }
-
-    function file($text) {
-        $this->doc .= '
      ' . $this->_xmlEntities($text). '
      '. DOKU_LF;
-    }
-
     function quote_open() {
         $this->doc .= '
      '.DOKU_LF;
     }
@@ -363,21 +366,54 @@
         $this->doc .= '
      '.DOKU_LF;
     }
 
+    function preformatted($text) {
+        $this->doc .= '
      ' . trim($this->_xmlEntities($text),"\n\r") . '
      '. DOKU_LF;
+    }
+
+    function file($text, $language=null, $filename=null) {
+        $this->_highlight('file',$text,$language,$filename);
+    }
+
+    function code($text, $language=null, $filename=null) {
+        $this->_highlight('code',$text,$language,$filename);
+    }
+
     /**
-     * Callback for code text
-     *
-     * Uses GeSHi to highlight language syntax
+     * Use GeSHi to highlight language syntax in code and file blocks
      *
      * @author Andreas Gohr 
      */
-    function code($text, $language = NULL) {
+    function _highlight($type, $text, $language=null, $filename=null) {
         global $conf;
+        global $ID;
+        global $lang;
+
+        if($filename){
+            // add icon
+            list($ext) = mimetype($filename,false);
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $class = 'mediafile mf_'.$class;
+
+            $this->doc .= '
      '.DOKU_LF;
+            $this->doc .= '
      ';
+            $this->doc .= hsc($filename);
+            $this->doc .= '
      '.DOKU_LF.'
      ';
+        }
 
         if ( is_null($language) ) {
-            $this->preformatted($text);
+            $this->doc .= '
      '.$this->_xmlEntities($text).'
      '.DOKU_LF;
         } else {
-            $this->doc .= p_xhtml_cached_geshi($text, $language);
+            $class = 'code'; //we always need the code class to make the syntax highlighting apply
+            if($type != 'code') $class .= ' '.$type;
+
+            $this->doc .= "
      ".p_xhtml_cached_geshi($text, $language, '').'
      '.DOKU_LF;
         }
+
+        if($filename){
+            $this->doc .= '
      '.DOKU_LF;
+        }
+
+        $this->_codeblock++;
     }
 
     function acronym($acronym) {
@@ -639,7 +675,7 @@
         $link['style']  = '';
         $link['more']   = '';
 
-        $name = $this->_getLinkTitle($name, $address, $isImage);
+        $name = $this->_getLinkTitle($name, '', $isImage);
         if ( !$isImage ) {
             $link['class']='mail JSnocheck';
         } else {
@@ -653,9 +689,6 @@
         if(empty($name)){
             $name = $address;
         }
-#elseif($isImage{
-#            $name = $this->_xmlEntities($name);
-#        }
 
         if($conf['mailguard'] == 'visible') $address = rawurlencode($address);
 
@@ -677,7 +710,7 @@
         $render = ($linking == 'linkonly') ? false : true;
         $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
 
-        list($ext,$mime,$dl) = mimetype($src);
+        list($ext,$mime,$dl) = mimetype($src,false);
         if(substr($mime,0,5) == 'image' && $render){
             $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
         }elseif($mime == 'application/x-shockwave-flash' && $render){
@@ -710,16 +743,17 @@
 
         $link['url']    = ml($src,array('cache'=>$cache));
 
-        list($ext,$mime,$dl) = mimetype($src);
+        list($ext,$mime,$dl) = mimetype($src,false);
         if(substr($mime,0,5) == 'image' && $render){
-             // link only jpeg images
-             // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
+            // link only jpeg images
+            // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
         }elseif($mime == 'application/x-shockwave-flash' && $render){
-             // don't link flash movies
-             $noLink = true;
+            // don't link flash movies
+            $noLink = true;
         }else{
-             // add file icons
-             $link['class'] .= ' mediafile mf_'.$ext;
+            // add file icons
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $link['class'] .= ' mediafile mf_'.$class;
         }
 
         if($hash) $link['url'] .= '#'.$hash;
@@ -768,8 +802,10 @@
                 // support feeds without links
                 $lnkurl = $item->get_permalink();
                 if($lnkurl){
+                    // title is escaped by SimplePie, we unescape here because it
+                    // is escaped again in externallink() FS#1705
                     $this->externallink($item->get_permalink(),
-                                        $item->get_title());
+                                        htmlspecialchars_decode($item->get_title()));
                 }else{
                     $this->doc .= ' '.$item->get_title();
                 }
@@ -830,7 +866,7 @@
         $this->doc .= DOKU_LF . DOKU_TAB . '' . DOKU_LF;
     }
 
-    function tableheader_open($colspan = 1, $align = NULL){
+    function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){
         $class = 'class="col' . $this->_counter['cell_counter']++;
         if ( !is_null($align) ) {
             $class .= ' '.$align.'align';
@@ -841,6 +877,9 @@
             $this->_counter['cell_counter'] += $colspan-1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
         $this->doc .= '>';
     }
 
@@ -848,7 +887,7 @@
         $this->doc .= '';
     }
 
-    function tablecell_open($colspan = 1, $align = NULL){
+    function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){
         $class = 'class="col' . $this->_counter['cell_counter']++;
         if ( !is_null($align) ) {
             $class .= ' '.$align.'align';
@@ -859,6 +898,9 @@
             $this->_counter['cell_counter'] += $colspan-1;
             $this->doc .= ' colspan="'.$colspan.'"';
         }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
         $this->doc .= '>';
     }
 
@@ -1022,7 +1064,10 @@
         global $conf;
 
         $isImage = false;
-        if ( is_null($title) || trim($title)=='') {
+        if ( is_array($title) ) {
+            $isImage = true;
+            return $this->_imageTitle($title);
+        } elseif ( is_null($title) || trim($title)=='') {
             if (useHeading($linktype) && $id) {
                 $heading = p_get_first_heading($id,true);
                 if ($heading) {
@@ -1030,9 +1075,6 @@
                 }
             }
             return $this->_xmlEntities($default);
-        } else if ( is_array($title) ) {
-            $isImage = true;
-            return $this->_imageTitle($title);
         } else {
             return $this->_xmlEntities($title);
         }
@@ -1045,6 +1087,15 @@
      * @author Andreas Gohr 
      */
     function _imageTitle($img) {
+        global $ID;
+
+        // some fixes on $img['src']
+        // see internalmedia() and externalmedia()
+        list($img['src'],$hash) = explode('#',$img['src'],2);
+        if ($img['type'] == 'internalmedia') {
+            resolve_mediaid(getNS($ID),$img['src'],$exists);
+        }
+
         return $this->_media($img['src'],
                               $img['title'],
                               $img['align'],
@@ -1084,6 +1135,8 @@
 
         return $link;
     }
+
+
 }
 
 //Setup VIM: ex: et ts=4 enc=utf-8 :
diff -Naur dokuwiki-2009-02-14/inc/parserutils.php dokuwiki-rc2009-12-02/inc/parserutils.php
--- dokuwiki-2009-02-14/inc/parserutils.php	2009-02-14 13:13:25.000000000 +0100
+++ dokuwiki-rc2009-12-02/inc/parserutils.php	2009-12-02 19:50:12.000000000 +0100
@@ -22,32 +22,32 @@
  * @author Andreas Gohr 
  */
 function p_wiki_xhtml($id, $rev='', $excuse=true){
-  $file = wikiFN($id,$rev);
-  $ret  = '';
+    $file = wikiFN($id,$rev);
+    $ret  = '';
 
-  //ensure $id is in global $ID (needed for parsing)
-  global $ID;
-  $keep = $ID;
-  $ID   = $id;
-
-  if($rev){
-    if(@file_exists($file)){
-      $ret = p_render('xhtml',p_get_instructions(io_readWikiPage($file,$id,$rev)),$info); //no caching on old revisions
-    }elseif($excuse){
-      $ret = p_locale_xhtml('norev');
-    }
-  }else{
-    if(@file_exists($file)){
-      $ret = p_cached_output($file,'xhtml',$id);
-    }elseif($excuse){
-      $ret = p_locale_xhtml('newpage');
+    //ensure $id is in global $ID (needed for parsing)
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    if($rev){
+        if(@file_exists($file)){
+            $ret = p_render('xhtml',p_get_instructions(io_readWikiPage($file,$id,$rev)),$info); //no caching on old revisions
+        }elseif($excuse){
+            $ret = p_locale_xhtml('norev');
+        }
+    }else{
+        if(@file_exists($file)){
+            $ret = p_cached_output($file,'xhtml',$id);
+        }elseif($excuse){
+            $ret = p_locale_xhtml('newpage');
+        }
     }
-  }
 
-  //restore ID (just in case)
-  $ID = $keep;
+    //restore ID (just in case)
+    $ID = $keep;
 
-  return $ret;
+    return $ret;
 }
 
 /**
@@ -63,48 +63,48 @@
  * @author Harry Fuecks 
  */
 function p_wiki_xhtml_summary($id, &$title, $rev='', $excuse=true){
-  $file = wikiFN($id,$rev);
-  $ret  = '';
+    $file = wikiFN($id,$rev);
+    $ret  = '';
 
-  //ensure $id is in global $ID (needed for parsing)
-  global $ID;
-  $keep = $ID;
-  $ID   = $id;
+    //ensure $id is in global $ID (needed for parsing)
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    if($rev){
+        if(@file_exists($file)){
+            //no caching on old revisions
+            $ins = p_get_instructions(io_readWikiPage($file,$id,$rev));
+        }elseif($excuse){
+            $ret = p_locale_xhtml('norev');
+            //restore ID (just in case)
+            $ID = $keep;
+            return $ret;
+        }
 
-  if($rev){
-    if(@file_exists($file)){
-      //no caching on old revisions
-      $ins = p_get_instructions(io_readWikiPage($file,$id,$rev));
-    }elseif($excuse){
-      $ret = p_locale_xhtml('norev');
-      //restore ID (just in case)
-      $ID = $keep;
-      return $ret;
+    }else{
+
+        if(@file_exists($file)){
+            // The XHTML for a summary is not cached so use the instruction cache
+            $ins = p_cached_instructions($file);
+        }elseif($excuse){
+            $ret = p_locale_xhtml('newpage');
+            //restore ID (just in case)
+            $ID = $keep;
+            return $ret;
+        }
     }
 
-  }else{
+    $ret = p_render('xhtmlsummary',$ins,$info);
 
-    if(@file_exists($file)){
-      // The XHTML for a summary is not cached so use the instruction cache
-      $ins = p_cached_instructions($file);
-    }elseif($excuse){
-      $ret = p_locale_xhtml('newpage');
-      //restore ID (just in case)
-      $ID = $keep;
-      return $ret;
-    }
-  }
-
-  $ret = p_render('xhtmlsummary',$ins,$info);
-
-  if ( $info['sum_pagetitle'] ) {
-    $title = $info['sum_pagetitle'];
-  } else {
-    $title = $id;
-  }
+    if ( $info['sum_pagetitle'] ) {
+        $title = $info['sum_pagetitle'];
+    } else {
+        $title = $id;
+    }
 
-  $ID = $keep;
-  return $ret;
+    $ID = $keep;
+    return $ret;
 }
 
 /**
@@ -113,9 +113,9 @@
  * @author Andreas Gohr 
  */
 function p_locale_xhtml($id){
-  //fetch parsed locale
-  $html = p_cached_output(localeFN($id));
-  return $html;
+    //fetch parsed locale
+    $html = p_cached_output(localeFN($id));
+    return $html;
 }
 
 /**
@@ -132,7 +132,7 @@
  * @todo   rewrite to use mode instead of hardcoded XHTML
  */
 function p_cached_xhtml($file){
-  return p_cached_output($file);
+    return p_cached_output($file);
 }
 
 /**
@@ -142,25 +142,25 @@
  * @author Chris Smith 
  */
 function p_cached_output($file, $format='xhtml', $id='') {
-  global $conf;
+    global $conf;
 
-  $cache = new cache_renderer($id, $file, $format);
-  if ($cache->useCache()) {
-    $parsed = $cache->retrieveCache(false);
-    if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
-  } else {
-    $parsed = p_render($format, p_cached_instructions($file,false,$id), $info);
-
-    if ($info['cache']) {
-      $cache->storeCache($parsed);               //save cachefile
-      if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
-    }else{
-      $cache->removeCache();                     //try to delete cachefile
-      if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
+    $cache = new cache_renderer($id, $file, $format);
+    if ($cache->useCache()) {
+        $parsed = $cache->retrieveCache(false);
+        if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
+    } else {
+        $parsed = p_render($format, p_cached_instructions($file,false,$id), $info);
+
+        if ($info['cache']) {
+            $cache->storeCache($parsed);               //save cachefile
+            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
+        }else{
+            $cache->removeCache();                     //try to delete cachefile
+            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n\n";
+        }
     }
-  }
 
-  return $parsed;
+    return $parsed;
 }
 
 /**
@@ -171,26 +171,26 @@
  * @author Andreas Gohr 
  */
 function p_cached_instructions($file,$cacheonly=false,$id='') {
-  global $conf;
-  static $run = null;
-  if(is_null($run)) $run = array();
-
-  $cache = new cache_instructions($id, $file);
-
-  if ($cacheonly || $cache->useCache() || isset($run[$file])) {
-    return $cache->retrieveCache();
-  } else if (@file_exists($file)) {
-    // no cache - do some work
-    $ins = p_get_instructions(io_readWikiPage($file,$id));
-    if ($cache->storeCache($ins)) {
-      $run[$file] = true; // we won't rebuild these instructions in the same run again
-    } else {
-      msg('Unable to save cache file. Hint: disk full; file permissions; safe_mode setting.',-1);
+    global $conf;
+    static $run = null;
+    if(is_null($run)) $run = array();
+
+    $cache = new cache_instructions($id, $file);
+
+    if ($cacheonly || $cache->useCache() || isset($run[$file])) {
+        return $cache->retrieveCache();
+    } else if (@file_exists($file)) {
+        // no cache - do some work
+        $ins = p_get_instructions(io_readWikiPage($file,$id));
+        if ($cache->storeCache($ins)) {
+            $run[$file] = true; // we won't rebuild these instructions in the same run again
+        } else {
+            msg('Unable to save cache file. Hint: disk full; file permissions; safe_mode setting.',-1);
+        }
+        return $ins;
     }
-    return $ins;
-  }
 
-  return null;
+    return null;
 }
 
 /**
@@ -201,24 +201,24 @@
  */
 function p_get_instructions($text){
 
-  $modes = p_get_parsermodes();
+    $modes = p_get_parsermodes();
 
-  // Create the parser
-  $Parser = & new Doku_Parser();
+    // Create the parser
+    $Parser = & new Doku_Parser();
 
-  // Add the Handler
-  $Parser->Handler = & new Doku_Handler();
+    // Add the Handler
+    $Parser->Handler = & new Doku_Handler();
+
+    //add modes to parser
+    foreach($modes as $mode){
+        $Parser->addMode($mode['mode'],$mode['obj']);
+    }
 
-  //add modes to parser
-  foreach($modes as $mode){
-    $Parser->addMode($mode['mode'],$mode['obj']);
-  }
-
-  // Do the parsing
-  trigger_event('PARSER_WIKITEXT_PREPROCESS', $text);
-  $p = $Parser->parse($text);
-//  dbg($p);
-  return $p;
+    // Do the parsing
+    trigger_event('PARSER_WIKITEXT_PREPROCESS', $text);
+    $p = $Parser->parse($text);
+    //  dbg($p);
+    return $p;
 }
 
 /**
@@ -227,37 +227,37 @@
  * @author Esther Brunner 
  */
 function p_get_metadata($id, $key=false, $render=false){
-  global $ID, $INFO, $cache_metadata;
+    global $ID, $INFO, $cache_metadata;
 
-  // cache the current page
-  // Benchmarking shows the current page's metadata is generally the only page metadata
-  // accessed several times. This may catch a few other pages, but that shouldn't be an issue.
-  $cache = ($ID == $id);
-  $meta = p_read_metadata($id, $cache);
-
-  // metadata has never been rendered before - do it! (but not for non-existent pages)
-  if ($render && !$meta['current']['description']['abstract'] && page_exists($id)){
-    $meta = p_render_metadata($id, $meta);
-    io_saveFile(metaFN($id, '.meta'), serialize($meta));
+    // cache the current page
+    // Benchmarking shows the current page's metadata is generally the only page metadata
+    // accessed several times. This may catch a few other pages, but that shouldn't be an issue.
+    $cache = ($ID == $id);
+    $meta = p_read_metadata($id, $cache);
+
+    // metadata has never been rendered before - do it! (but not for non-existent pages)
+    if ($render && !isset($meta['current']['description']['abstract']) && page_exists($id)){
+        $meta = p_render_metadata($id, $meta);
+        io_saveFile(metaFN($id, '.meta'), serialize($meta));
+
+        // sync cached copies, including $INFO metadata
+        if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
+        if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
+    }
+
+    // filter by $key
+    if ($key){
+        list($key, $subkey) = explode(' ', $key, 2);
+        $subkey = trim($subkey);
 
-    // sync cached copies, including $INFO metadata
-    if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
-    if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
-  }
-
-  // filter by $key
-  if ($key){
-    list($key, $subkey) = explode(' ', $key, 2);
-    $subkey = trim($subkey);
+        if ($subkey) {
+            return isset($meta['current'][$key][$subkey]) ? $meta['current'][$key][$subkey] : null;
+        }
 
-    if ($subkey) {
-      return isset($meta['current'][$key][$subkey]) ? $meta['current'][$key][$subkey] : null;
+        return isset($meta['current'][$key]) ? $meta['current'][$key] : null;
     }
 
-    return isset($meta['current'][$key]) ? $meta['current'][$key] : null;
-  }
-
-  return $meta['current'];
+    return $meta['current'];
 }
 
 /**
@@ -266,59 +266,59 @@
  * @author Esther Brunner 
  */
 function p_set_metadata($id, $data, $render=false, $persistent=true){
-  if (!is_array($data)) return false;
+    if (!is_array($data)) return false;
 
-  global $ID;
+    global $ID;
 
-  // cache the current page
-  $cache = ($ID == $id);
-  $orig = p_read_metadata($id, $cache);
+    // cache the current page
+    $cache = ($ID == $id);
+    $orig = p_read_metadata($id, $cache);
 
-  // render metadata first?
-  $meta = $render ? p_render_metadata($id, $orig) : $orig;
+    // render metadata first?
+    $meta = $render ? p_render_metadata($id, $orig) : $orig;
 
-  // now add the passed metadata
-  $protected = array('description', 'date', 'contributor');
-  foreach ($data as $key => $value){
+    // now add the passed metadata
+    $protected = array('description', 'date', 'contributor');
+    foreach ($data as $key => $value){
 
-    // be careful with sub-arrays of $meta['relation']
-    if ($key == 'relation'){
+        // be careful with sub-arrays of $meta['relation']
+        if ($key == 'relation'){
 
-      foreach ($value as $subkey => $subvalue){
-        $meta['current'][$key][$subkey] = !empty($meta['current'][$key][$subkey]) ? array_merge($meta['current'][$key][$subkey], $subvalue) : $subvalue;
-        if ($persistent)
-          $meta['persistent'][$key][$subkey] = !empty($meta['persistent'][$key][$subkey]) ? array_merge($meta['persistent'][$key][$subkey], $subvalue) : $subvalue;
-      }
+            foreach ($value as $subkey => $subvalue){
+                $meta['current'][$key][$subkey] = !empty($meta['current'][$key][$subkey]) ? array_merge($meta['current'][$key][$subkey], $subvalue) : $subvalue;
+                if ($persistent)
+                    $meta['persistent'][$key][$subkey] = !empty($meta['persistent'][$key][$subkey]) ? array_merge($meta['persistent'][$key][$subkey], $subvalue) : $subvalue;
+            }
 
-    // be careful with some senisitive arrays of $meta
-    } elseif (in_array($key, $protected)){
+            // be careful with some senisitive arrays of $meta
+        } elseif (in_array($key, $protected)){
 
-      // these keys, must have subkeys - a legitimate value must be an array
-      if (is_array($value)) {
-        $meta['current'][$key] = !empty($meta['current'][$key]) ? array_merge($meta['current'][$key],$value) : $value;
+            // these keys, must have subkeys - a legitimate value must be an array
+            if (is_array($value)) {
+                $meta['current'][$key] = !empty($meta['current'][$key]) ? array_merge($meta['current'][$key],$value) : $value;
 
-        if ($persistent) {
-          $meta['persistent'][$key] = !empty($meta['persistent'][$key]) ? array_merge($meta['persistent'][$key],$value) : $value;
-        }
-      }
+                if ($persistent) {
+                    $meta['persistent'][$key] = !empty($meta['persistent'][$key]) ? array_merge($meta['persistent'][$key],$value) : $value;
+                }
+            }
 
-    // no special treatment for the rest
-    } else {
-      $meta['current'][$key] = $value;
-      if ($persistent) $meta['persistent'][$key] = $value;
+            // no special treatment for the rest
+        } else {
+            $meta['current'][$key] = $value;
+            if ($persistent) $meta['persistent'][$key] = $value;
+        }
     }
-  }
 
-  // save only if metadata changed
-  if ($meta == $orig) return true;
+    // save only if metadata changed
+    if ($meta == $orig) return true;
 
-  // sync cached copies, including $INFO metadata
-  global $cache_metadata, $INFO;
+    // sync cached copies, including $INFO metadata
+    global $cache_metadata, $INFO;
 
-  if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
-  if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
+    if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
+    if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
 
-  return io_saveFile(metaFN($id, '.meta'), serialize($meta));
+    return io_saveFile(metaFN($id, '.meta'), serialize($meta));
 }
 
 /**
@@ -356,38 +356,38 @@
  * @return   array             metadata
  */
 function p_read_metadata($id,$cache=false) {
-  global $cache_metadata;
+    global $cache_metadata;
 
-  if (isset($cache_metadata[(string)$id])) return $cache_metadata[(string)$id];
+    if (isset($cache_metadata[(string)$id])) return $cache_metadata[(string)$id];
 
-  $file = metaFN($id, '.meta');
-  $meta = @file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
+    $file = metaFN($id, '.meta');
+    $meta = @file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
 
-  // convert $meta from old format to new (current+persistent) format
-  if (!isset($meta['current'])) {
-    $meta = array('current'=>$meta,'persistent'=>$meta);
-
-    // remove non-persistent keys
-    unset($meta['persistent']['title']);
-    unset($meta['persistent']['description']['abstract']);
-    unset($meta['persistent']['description']['tableofcontents']);
-    unset($meta['persistent']['relation']['haspart']);
-    unset($meta['persistent']['relation']['references']);
-    unset($meta['persistent']['date']['valid']);
-
-    if (empty($meta['persistent']['description'])) unset($meta['persistent']['description']);
-    if (empty($meta['persistent']['relation'])) unset($meta['persistent']['relation']);
-    if (empty($meta['persistent']['date'])) unset($meta['persistent']['date']);
-
-    // save converted metadata
-    io_saveFile($file, serialize($meta));
-  }
-
-  if ($cache) {
-    $cache_metadata[(string)$id] = $meta;
-  }
+    // convert $meta from old format to new (current+persistent) format
+    if (!isset($meta['current'])) {
+        $meta = array('current'=>$meta,'persistent'=>$meta);
 
-  return $meta;
+        // remove non-persistent keys
+        unset($meta['persistent']['title']);
+        unset($meta['persistent']['description']['abstract']);
+        unset($meta['persistent']['description']['tableofcontents']);
+        unset($meta['persistent']['relation']['haspart']);
+        unset($meta['persistent']['relation']['references']);
+        unset($meta['persistent']['date']['valid']);
+
+        if (empty($meta['persistent']['description'])) unset($meta['persistent']['description']);
+        if (empty($meta['persistent']['relation'])) unset($meta['persistent']['relation']);
+        if (empty($meta['persistent']['date'])) unset($meta['persistent']['date']);
+
+        // save converted metadata
+        io_saveFile($file, serialize($meta));
+    }
+
+    if ($cache) {
+        $cache_metadata[(string)$id] = $meta;
+    }
+
+    return $meta;
 }
 
 /**
@@ -396,43 +396,42 @@
  * @author Esther Brunner 
  */
 function p_render_metadata($id, $orig){
-  // make sure the correct ID is in global ID
-  global $ID;
-  $keep = $ID;
-  $ID   = $id;
-
-
-  // add an extra key for the event - to tell event handlers the page whose metadata this is
-  $orig['page'] = $id;
-  $evt = new Doku_Event('PARSER_METADATA_RENDER', $orig);
-  if ($evt->advise_before()) {
-
-    require_once DOKU_INC."inc/parser/metadata.php";
-
-    // get instructions
-    $instructions = p_cached_instructions(wikiFN($id),false,$id);
-    if(is_null($instructions)){
-      $ID = $keep;
-      return null; // something went wrong with the instructions
-    }
+    // make sure the correct ID is in global ID
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    // add an extra key for the event - to tell event handlers the page whose metadata this is
+    $orig['page'] = $id;
+    $evt = new Doku_Event('PARSER_METADATA_RENDER', $orig);
+    if ($evt->advise_before()) {
+
+        require_once DOKU_INC."inc/parser/metadata.php";
+
+        // get instructions
+        $instructions = p_cached_instructions(wikiFN($id),false,$id);
+        if(is_null($instructions)){
+            $ID = $keep;
+            return null; // something went wrong with the instructions
+        }
 
-    // set up the renderer
-    $renderer = & new Doku_Renderer_metadata();
-    $renderer->meta = $orig['current'];
-    $renderer->persistent = $orig['persistent'];
+        // set up the renderer
+        $renderer = & new Doku_Renderer_metadata();
+        $renderer->meta = $orig['current'];
+        $renderer->persistent = $orig['persistent'];
+
+        // loop through the instructions
+        foreach ($instructions as $instruction){
+            // execute the callback against the renderer
+            call_user_func_array(array(&$renderer, $instruction[0]), $instruction[1]);
+        }
 
-    // loop through the instructions
-    foreach ($instructions as $instruction){
-      // execute the callback against the renderer
-      call_user_func_array(array(&$renderer, $instruction[0]), $instruction[1]);
+        $evt->result = array('current'=>$renderer->meta,'persistent'=>$renderer->persistent);
     }
+    $evt->advise_after();
 
-    $evt->result = array('current'=>$renderer->meta,'persistent'=>$renderer->persistent);
-  }
-  $evt->advise_after();
-
-  $ID = $keep;
-  return $evt->result;
+    $ID = $keep;
+    return $evt->result;
 }
 
 /**
@@ -441,90 +440,89 @@
  * @author Andreas Gohr 
  */
 function p_get_parsermodes(){
-  global $conf;
+    global $conf;
 
-  //reuse old data
-  static $modes = null;
-  if($modes != null){
-    return $modes;
-  }
-
-  //import parser classes and mode definitions
-  require_once DOKU_INC . 'inc/parser/parser.php';
+    //reuse old data
+    static $modes = null;
+    if($modes != null){
+        return $modes;
+    }
+
+    //import parser classes and mode definitions
+    require_once DOKU_INC . 'inc/parser/parser.php';
+
+    // we now collect all syntax modes and their objects, then they will
+    // be sorted and added to the parser in correct order
+    $modes = array();
+
+    // add syntax plugins
+    $pluginlist = plugin_list('syntax');
+    if(count($pluginlist)){
+        global $PARSER_MODES;
+        $obj = null;
+        foreach($pluginlist as $p){
+            if(!$obj =& plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj
+            $PARSER_MODES[$obj->getType()][] = "plugin_$p"; //register mode type
+            //add to modes
+            $modes[] = array(
+                    'sort' => $obj->getSort(),
+                    'mode' => "plugin_$p",
+                    'obj'  => $obj,
+                    );
+            unset($obj); //remove the reference
+        }
+    }
 
-  // we now collect all syntax modes and their objects, then they will
-  // be sorted and added to the parser in correct order
-  $modes = array();
-
-  // add syntax plugins
-  $pluginlist = plugin_list('syntax');
-  if(count($pluginlist)){
-    global $PARSER_MODES;
-    $obj = null;
-    foreach($pluginlist as $p){
-      if(!$obj =& plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj
-      $PARSER_MODES[$obj->getType()][] = "plugin_$p"; //register mode type
-      //add to modes
-      $modes[] = array(
-                   'sort' => $obj->getSort(),
-                   'mode' => "plugin_$p",
-                   'obj'  => $obj,
-                 );
-      unset($obj); //remove the reference
-    }
-  }
-
-  // add default modes
-  $std_modes = array('listblock','preformatted','notoc','nocache',
-                     'header','table','linebreak','footnote','hr',
-                     'unformatted','php','html','code','file','quote',
-                     'internallink','rss','media','externallink',
-                     'emaillink','windowssharelink','eol');
-  if($conf['typography']){
-    $std_modes[] = 'quotes';
-    $std_modes[] = 'multiplyentity';
-  }
-  foreach($std_modes as $m){
-    $class = "Doku_Parser_Mode_$m";
-    $obj   = new $class();
-    $modes[] = array(
-                 'sort' => $obj->getSort(),
-                 'mode' => $m,
-                 'obj'  => $obj
-               );
-  }
-
-  // add formatting modes
-  $fmt_modes = array('strong','emphasis','underline','monospace',
-                     'subscript','superscript','deleted');
-  foreach($fmt_modes as $m){
-    $obj   = new Doku_Parser_Mode_formatting($m);
-    $modes[] = array(
-                 'sort' => $obj->getSort(),
-                 'mode' => $m,
-                 'obj'  => $obj
-               );
-  }
-
-  // add modes which need files
-  $obj     = new Doku_Parser_Mode_smiley(array_keys(getSmileys()));
-  $modes[] = array('sort' => $obj->getSort(), 'mode' => 'smiley','obj'  => $obj );
-  $obj     = new Doku_Parser_Mode_acronym(array_keys(getAcronyms()));
-  $modes[] = array('sort' => $obj->getSort(), 'mode' => 'acronym','obj'  => $obj );
-  $obj     = new Doku_Parser_Mode_entity(array_keys(getEntities()));
-  $modes[] = array('sort' => $obj->getSort(), 'mode' => 'entity','obj'  => $obj );
-
-
-  // add optional camelcase mode
-  if($conf['camelcase']){
-    $obj     = new Doku_Parser_Mode_camelcaselink();
-    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'camelcaselink','obj'  => $obj );
-  }
+    // add default modes
+    $std_modes = array('listblock','preformatted','notoc','nocache',
+            'header','table','linebreak','footnote','hr',
+            'unformatted','php','html','code','file','quote',
+            'internallink','rss','media','externallink',
+            'emaillink','windowssharelink','eol');
+    if($conf['typography']){
+        $std_modes[] = 'quotes';
+        $std_modes[] = 'multiplyentity';
+    }
+    foreach($std_modes as $m){
+        $class = "Doku_Parser_Mode_$m";
+        $obj   = new $class();
+        $modes[] = array(
+                'sort' => $obj->getSort(),
+                'mode' => $m,
+                'obj'  => $obj
+                );
+    }
+
+    // add formatting modes
+    $fmt_modes = array('strong','emphasis','underline','monospace',
+            'subscript','superscript','deleted');
+    foreach($fmt_modes as $m){
+        $obj   = new Doku_Parser_Mode_formatting($m);
+        $modes[] = array(
+                'sort' => $obj->getSort(),
+                'mode' => $m,
+                'obj'  => $obj
+                );
+    }
+
+    // add modes which need files
+    $obj     = new Doku_Parser_Mode_smiley(array_keys(getSmileys()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'smiley','obj'  => $obj );
+    $obj     = new Doku_Parser_Mode_acronym(array_keys(getAcronyms()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'acronym','obj'  => $obj );
+    $obj     = new Doku_Parser_Mode_entity(array_keys(getEntities()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'entity','obj'  => $obj );
+
+    // add optional camelcase mode
+    if($conf['camelcase']){
+        $obj     = new Doku_Parser_Mode_camelcaselink();
+        $modes[] = array('sort' => $obj->getSort(), 'mode' => 'camelcaselink','obj'  => $obj );
+    }
 
-  //sort modes
-  usort($modes,'p_sort_modes');
+    //sort modes
+    usort($modes,'p_sort_modes');
 
-  return $modes;
+    return $modes;
 }
 
 /**
@@ -533,8 +531,8 @@
  * @author Andreas Gohr 
  */
 function p_sort_modes($a, $b){
-  if($a['sort'] == $b['sort']) return 0;
-  return ($a['sort'] < $b['sort']) ? -1 : 1;
+    if($a['sort'] == $b['sort']) return 0;
+    return ($a['sort'] < $b['sort']) ? -1 : 1;
 }
 
 /**
@@ -546,61 +544,64 @@
  * @author Andreas Gohr 
  */
 function p_render($mode,$instructions,&$info){
-  if(is_null($instructions)) return '';
+    if(is_null($instructions)) return '';
+
+    $Renderer =& p_get_renderer($mode);
+    if (is_null($Renderer)) return null;
+
+    $Renderer->reset();
 
-  $Renderer =& p_get_renderer($mode);
-  if (is_null($Renderer)) return null;
+    $Renderer->smileys = getSmileys();
+    $Renderer->entities = getEntities();
+    $Renderer->acronyms = getAcronyms();
+    $Renderer->interwiki = getInterwiki();
+
+    // Loop through the instructions
+    foreach ( $instructions as $instruction ) {
+        // Execute the callback against the Renderer
+        call_user_func_array(array(&$Renderer, $instruction[0]),$instruction[1]);
+    }
 
-  $Renderer->reset();
+    //set info array
+    $info = $Renderer->info;
 
-  $Renderer->smileys = getSmileys();
-  $Renderer->entities = getEntities();
-  $Renderer->acronyms = getAcronyms();
-  $Renderer->interwiki = getInterwiki();
-  #$Renderer->badwords = getBadWords();
-
-  // Loop through the instructions
-  foreach ( $instructions as $instruction ) {
-      // Execute the callback against the Renderer
-      call_user_func_array(array(&$Renderer, $instruction[0]),$instruction[1]);
-  }
-
-  //set info array
-  $info = $Renderer->info;
-
-  // Post process and return the output
-  $data = array($mode,& $Renderer->doc);
-  trigger_event('RENDERER_CONTENT_POSTPROCESS',$data);
-  return $Renderer->doc;
+    // Post process and return the output
+    $data = array($mode,& $Renderer->doc);
+    trigger_event('RENDERER_CONTENT_POSTPROCESS',$data);
+    return $Renderer->doc;
 }
 
 function & p_get_renderer($mode) {
-  global $conf;
+    global $conf, $plugin_controller;
 
-  $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
+    $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
+
+    // try default renderer first:
+    $file = DOKU_INC."inc/parser/$rname.php";
+    if(@file_exists($file)){
+        require_once $file;
+        $rclass = "Doku_Renderer_$rname";
+
+        if ( !class_exists($rclass) ) {
+            trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
+            msg("Renderer '$rname' for $mode not valid",-1);
+            return null;
+        }
+        $Renderer = & new $rclass();
+    }else{
+        // Maybe a plugin/component is available?
+        list($plugin, $component) = $plugin_controller->_splitName($rname);
+        if (!$plugin_controller->isdisabled($plugin)){
+            $Renderer =& $plugin_controller->load('renderer',$rname, true);
+        }
 
-  // try default renderer first:
-  $file = DOKU_INC."inc/parser/$rname.php";
-  if(@file_exists($file)){
-    require_once $file;
-    $rclass = "Doku_Renderer_$rname";
-
-    if ( !class_exists($rclass) ) {
-      trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
-      msg("Renderer '$rname' for $mode not valid",-1);
-      return null;
-    }
-    $Renderer = & new $rclass();
-  }else{
-    // Maybe a plugin is available?
-    $Renderer =& plugin_load('renderer',$rname, true);
-    if(is_null($Renderer)){
-      msg("No renderer '$rname' found for mode '$mode'",-1);
-      return null;
+        if(is_null($Renderer)){
+            msg("No renderer '$rname' found for mode '$mode'",-1);
+            return null;
+        }
     }
-  }
 
-  return $Renderer;
+    return $Renderer;
 }
 
 /**
@@ -609,7 +610,7 @@
  * @param   string   $id       dokuwiki page id
  * @param   bool     $render   rerender if first heading not known
  *                             default: true  -- must be set to false for calls from the metadata renderer to
- *                                               protects against loops and excessive resource usage when pages 
+ *                                               protects against loops and excessive resource usage when pages
  *                                               for which only a first heading is required will attempt to
  *                                               render metadata for all the pages for which they require first
  *                                               headings ... and so on.
@@ -617,7 +618,7 @@
  * @author Andreas Gohr 
  */
 function p_get_first_heading($id, $render=true){
-  return p_get_metadata($id,'title',$render);
+    return p_get_metadata($id,'title',$render);
 }
 
 /**
@@ -631,42 +632,41 @@
  * @author Andreas Gohr 
  */
 function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
-  global $conf, $config_cascade;
-  $language = strtolower($language);
+    global $conf, $config_cascade;
+    $language = strtolower($language);
 
-  // remove any leading or trailing blank lines
-  $code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
+    // remove any leading or trailing blank lines
+    $code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
 
-  $cache = getCacheName($language.$code,".code");
-  $ctime = @filemtime($cache);
-  if($ctime && !$_REQUEST['purge'] &&
-     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
-     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
-     $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
-    $highlighted_code = io_readFile($cache, false);
-
-  } else {
-
-    require_once(DOKU_INC . 'inc/geshi.php');
-
-    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-    $geshi->set_encoding('utf-8');
-    $geshi->enable_classes();
-    $geshi->set_header_type(GESHI_HEADER_PRE);
-    $geshi->set_link_target($conf['target']['extern']);
-
-    // remove GeSHi's wrapper element (we'll replace it with our own later)
-    // we need to use a GeSHi wrapper to avoid 
       throughout the highlighted text
-    $highlighted_code = preg_replace('!^]*>|
    $!','',$geshi->parse_code()); - io_saveFile($cache,$highlighted_code); - } - - // add a wrapper element if required - if ($wrapper) { - return "<$wrapper class=\"code $language\">$highlighted_code"; - } else { - return $highlighted_code; - } + $cache = getCacheName($language.$code,".code"); + $ctime = @filemtime($cache); + if($ctime && !$_REQUEST['purge'] && + $ctime > filemtime(DOKU_INC.'inc/geshi.php') && // geshi changed + $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && // language syntax definition changed + $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed + $highlighted_code = io_readFile($cache, false); + + } else { + + require_once(DOKU_INC . 'inc/geshi.php'); + + $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi'); + $geshi->set_encoding('utf-8'); + $geshi->enable_classes(); + $geshi->set_header_type(GESHI_HEADER_PRE); + $geshi->set_link_target($conf['target']['extern']); + + // remove GeSHi's wrapper element (we'll replace it with our own later) + // we need to use a GeSHi wrapper to avoid
    throughout the highlighted text + $highlighted_code = trim(preg_replace('!^]*>|$!','',$geshi->parse_code()),"\n\r"); + io_saveFile($cache,$highlighted_code); + } + + // add a wrapper element if required + if ($wrapper) { + return "<$wrapper class=\"code $language\">$highlighted_code"; + } else { + return $highlighted_code; + } } -//Setup VIM: ex: et ts=2 enc=utf-8 : diff -Naur dokuwiki-2009-02-14/inc/plugincontroller.class.php dokuwiki-rc2009-12-02/inc/plugincontroller.class.php --- dokuwiki-2009-02-14/inc/plugincontroller.class.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/plugincontroller.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,158 +11,162 @@ class Doku_Plugin_Controller { - var $list_enabled = array(); - var $list_disabled = array(); - var $list_bytype = array(); - - function Doku_Plugin_Controller() { - $this->_populateMasterList(); - } - - /** - * Returns a list of available plugins of given type - * - * @param $type string, plugin_type name; - * the type of plugin to return, - * use empty string for all types - * @param $all bool; - * false to only return enabled plugins, - * true to return both enabled and disabled plugins - * - * @return array of plugin names - * - * @author Andreas Gohr - */ - function getList($type='',$all=false){ - - // request the complete list - if (!$type) { - return $all ? array_merge($this->list_enabled,$this->list_disabled) : $this->list_enabled; - } - - if (!isset($this->list_bytype[$type]['enabled'])) { - $this->list_bytype[$type]['enabled'] = $this->_getListByType($type,true); - } - if ($all && !isset($this->list_bytype[$type]['disabled'])) { - $this->list_bytype[$type]['disabled'] = $this->_getListByType($type,false); - } - - return $all ? array_merge($this->list_bytype[$type]['enabled'],$this->list_bytype[$type]['disabled']) : $this->list_bytype[$type]['enabled']; - } - - /** - * Loads the given plugin and creates an object of it - * - * @author Andreas Gohr - * - * @param $type string type of plugin to load - * @param $name string name of the plugin to load - * @param $new bool true to return a new instance of the plugin, false to use an already loaded instance - * @return objectreference the plugin object or null on failure - */ - function &load($type,$name,$new=false){ - //we keep all loaded plugins available in global scope for reuse - global $DOKU_PLUGINS; - - //plugin already loaded? - if(!empty($DOKU_PLUGINS[$type][$name])){ - if ($new && !$DOKU_PLUGINS[$type][$name]->isSingleton()) { + var $list_enabled = array(); + var $list_disabled = array(); + var $list_bytype = array(); + + function Doku_Plugin_Controller() { + $this->_populateMasterList(); + } + + /** + * Returns a list of available plugins of given type + * + * @param $type string, plugin_type name; + * the type of plugin to return, + * use empty string for all types + * @param $all bool; + * false to only return enabled plugins, + * true to return both enabled and disabled plugins + * + * @return array of plugin names + * + * @author Andreas Gohr + */ + function getList($type='',$all=false){ + + // request the complete list + if (!$type) { + return $all ? array_merge($this->list_enabled,$this->list_disabled) : $this->list_enabled; + } + + if (!isset($this->list_bytype[$type]['enabled'])) { + $this->list_bytype[$type]['enabled'] = $this->_getListByType($type,true); + } + if ($all && !isset($this->list_bytype[$type]['disabled'])) { + $this->list_bytype[$type]['disabled'] = $this->_getListByType($type,false); + } + + return $all ? array_merge($this->list_bytype[$type]['enabled'],$this->list_bytype[$type]['disabled']) : $this->list_bytype[$type]['enabled']; + } + + /** + * Loads the given plugin and creates an object of it + * + * @author Andreas Gohr + * + * @param $type string type of plugin to load + * @param $name string name of the plugin to load + * @param $new bool true to return a new instance of the plugin, false to use an already loaded instance + * @return objectreference the plugin object or null on failure + */ + function &load($type,$name,$new=false){ + //we keep all loaded plugins available in global scope for reuse + global $DOKU_PLUGINS; + + //plugin already loaded? + if(!empty($DOKU_PLUGINS[$type][$name])){ + if ($new && !$DOKU_PLUGINS[$type][$name]->isSingleton()) { + $class = $type.'_plugin_'.$name; + return class_exists($class) ? new $class : null; + } else { + return $DOKU_PLUGINS[$type][$name]; + } + } + + //try to load the wanted plugin file + list($plugin,$component) = $this->_splitName($name); + $dir = $this->get_directory($plugin); + $file = $component ? "$type/$component.php" : "$type.php"; + + if(!is_file(DOKU_PLUGIN."$dir/$file")){ + return null; + } + + if (!include_once(DOKU_PLUGIN."$dir/$file")) { + return null; + } + + //construct class and instantiate $class = $type.'_plugin_'.$name; - return class_exists($class) ? new $class : null; - } else { + if (!class_exists($class)) return null; + + $DOKU_PLUGINS[$type][$name] = new $class; return $DOKU_PLUGINS[$type][$name]; - } } - //try to load the wanted plugin file - list($plugin,$component) = $this->_splitName($name); - $dir = $this->get_directory($plugin); - $file = $component ? "$type/$component.php" : "$type.php"; - - if (!include_once(DOKU_PLUGIN."$dir/$file")) { - return null; - } - - //construct class and instantiate - $class = $type.'_plugin_'.$name; - if (!class_exists($class)) return null; - - $DOKU_PLUGINS[$type][$name] = new $class; - return $DOKU_PLUGINS[$type][$name]; - } - - function isdisabled($plugin) { - return (array_search($plugin, $this->list_enabled) === false); - } - - function enable($plugin) { - if (array_search($plugin, $this->list_disabled) !== false) { - return @unlink(DOKU_PLUGIN.$plugin.'/disabled'); - } - return false; - } - - function disable($plugin) { - if (array_search($plugin, $this->list_enabled) !== false) { - return @touch(DOKU_PLUGIN.$plugin.'/disabled'); - } - return false; - } - - function get_directory($plugin) { - return $plugin; - } - - function _populateMasterList() { - if ($dh = opendir(DOKU_PLUGIN)) { - while (false !== ($plugin = readdir($dh))) { - if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp') continue; - if (is_file(DOKU_PLUGIN.$plugin)) continue; - - 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 - }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')){ - $this->list_disabled[] = $plugin; - } else { - $this->list_enabled[] = $plugin; - } - } - } - } - - function _getListByType($type, $enabled) { - $master_list = $enabled ? $this->list_enabled : $this->list_disabled; - - $plugins = array(); - foreach ($master_list as $plugin) { - $dir = $this->get_directory($plugin); - - if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){ - $plugins[] = $plugin; - } else { - if ($dp = @opendir(DOKU_PLUGIN."$dir/$type/")) { - while (false !== ($component = readdir($dp))) { - if (substr($component,0,1) == '.' || strtolower(substr($component, -4)) != ".php") continue; - if (is_file(DOKU_PLUGIN."$dir/$type/$component")) { - $plugins[] = $plugin.'_'.substr($component, 0, -4); + function isdisabled($plugin) { + return (array_search($plugin, $this->list_enabled) === false); + } + + function enable($plugin) { + if (array_search($plugin, $this->list_disabled) !== false) { + return @unlink(DOKU_PLUGIN.$plugin.'/disabled'); + } + return false; + } + + function disable($plugin) { + if (array_search($plugin, $this->list_enabled) !== false) { + return @touch(DOKU_PLUGIN.$plugin.'/disabled'); + } + return false; + } + + function get_directory($plugin) { + return $plugin; + } + + function _populateMasterList() { + if ($dh = opendir(DOKU_PLUGIN)) { + while (false !== ($plugin = readdir($dh))) { + if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp') continue; + if (is_file(DOKU_PLUGIN.$plugin)) continue; + + 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 + }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')){ + $this->list_disabled[] = $plugin; + } else { + $this->list_enabled[] = $plugin; + } } - } - closedir($dp); } - } } - return $plugins; - } + function _getListByType($type, $enabled) { + $master_list = $enabled ? $this->list_enabled : $this->list_disabled; + + $plugins = array(); + foreach ($master_list as $plugin) { + $dir = $this->get_directory($plugin); + + if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){ + $plugins[] = $plugin; + } else { + if ($dp = @opendir(DOKU_PLUGIN."$dir/$type/")) { + while (false !== ($component = readdir($dp))) { + if (substr($component,0,1) == '.' || strtolower(substr($component, -4)) != ".php") continue; + if (is_file(DOKU_PLUGIN."$dir/$type/$component")) { + $plugins[] = $plugin.'_'.substr($component, 0, -4); + } + } + closedir($dp); + } + } + } - function _splitName($name) { - if (array_search($name, $this->list_enabled + $this->list_disabled) === false) { - return explode('_',$name,2); + return $plugins; } - return array($name,''); - } + function _splitName($name) { + if (array_search($name, $this->list_enabled + $this->list_disabled) === false) { + return explode('_',$name,2); + } + + return array($name,''); + } } diff -Naur dokuwiki-2009-02-14/inc/plugin.php dokuwiki-rc2009-12-02/inc/plugin.php --- dokuwiki-2009-02-14/inc/plugin.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/plugin.php 2009-12-02 19:50:12.000000000 +0100 @@ -12,222 +12,237 @@ */ class DokuWiki_Plugin { - var $localised = false; // set to true by setupLocale() after loading language dependent strings - var $lang = array(); // array to hold language dependent strings, best accessed via ->getLang() - var $configloaded = false; // set to true by loadConfig() after loading plugin configuration variables - var $conf = array(); // array to hold plugin settings, best accessed via ->getConf() - - /** - * General Info - * - * Needs to return a associative array with the following values: - * - * author - Author of the plugin - * email - Email address to contact the author - * date - Last modified date of the plugin in YYYY-MM-DD format - * name - Name of the plugin - * desc - Short description of the plugin (Text only) - * url - Website with more information on the plugin (eg. syntax description) - */ - function getInfo(){ - trigger_error('getInfo() not implemented in '.get_class($this), E_USER_WARNING); - } - - // plugin introspection methods - // extract from class name, format = _plugin_[_] - function getPluginType() { list($t) = explode('_', get_class($this), 2); return $t; } - function getPluginName() { list($t, $p, $n) = explode('_', get_class($this), 4); return $n; } - function getPluginComponent() { list($t, $p, $n, $c) = explode('_', get_class($this), 4); return (isset($c)?$c:''); } - - // localisation methods - /** - * getLang($id) - * use this function to access plugin language strings - * to try to minimise unnecessary loading of the strings when the plugin doesn't require them - * e.g. when info plugin is querying plugins for information about themselves. - * - * @param $id id of the string to be retrieved - * @return string string in appropriate language or english if not available - */ - function getLang($id) { - if (!$this->localised) $this->setupLocale(); - - return (isset($this->lang[$id]) ? $this->lang[$id] : ''); - } - - /** - * locale_xhtml($id) - * - * retrieve a language dependent file and pass to xhtml renderer for display - * plugin equivalent of p_locale_xhtml() - * - * @param $id id of language dependent wiki page - * @return string parsed contents of the wiki page in xhtml format - */ - function locale_xhtml($id) { - return p_cached_output($this->localFN($id)); - } - - /** - * localFN($id) - * prepends appropriate path for a language dependent filename - * plugin equivalent of localFN() - */ - function localFN($id) { - global $conf; - $plugin = $this->getPluginName(); - $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt'; - if(!@file_exists($file)){ - //fall back to english - $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt'; - } - return $file; - } - - /** - * setupLocale() - * reads all the plugins language dependent strings into $this->lang - * this function is automatically called by getLang() - */ - function setupLocale() { - if ($this->localised) return; - - global $conf; // definitely don't invoke "global $lang" - $path = DOKU_PLUGIN.$this->getPluginName().'/lang/'; - - $lang = array(); - - // don't include once, in case several plugin components require the same language file - @include($path.'en/lang.php'); - if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); - - $this->lang = $lang; - $this->localised = true; - } - - // configuration methods - /** - * getConf($setting) - * - * use this function to access plugin configuration variables - */ - function getConf($setting){ - - if (!$this->configloaded){ $this->loadConfig(); } - - return $this->conf[$setting]; - } - - /** - * loadConfig() - * merges the plugin's default settings with any local settings - * this function is automatically called through getConf() - */ - function loadConfig(){ - global $conf; - - $defaults = $this->readDefaultSettings(); - $plugin = $this->getPluginName(); - - foreach ($defaults as $key => $value) { - if (isset($conf['plugin'][$plugin][$key])) continue; - $conf['plugin'][$plugin][$key] = $value; - } - - $this->configloaded = true; - $this->conf =& $conf['plugin'][$plugin]; - } - - /** - * read the plugin's default configuration settings from conf/default.php - * this function is automatically called through getConf() - * - * @return array setting => value - */ - function readDefaultSettings() { - - $path = DOKU_PLUGIN.$this->getPluginName().'/conf/'; - $conf = array(); - - if (@file_exists($path.'default.php')) { - include($path.'default.php'); - } - - return $conf; - } - - /** - * Loads a given helper plugin (if enabled) - * - * @author Esther Brunner - * - * @param $name name of plugin to load - * @param $msg message to display in case the plugin is not available - * - * @return object helper plugin object - */ - function loadHelper($name, $msg){ - if (!plugin_isdisabled($name)) $obj =& plugin_load('helper',$name); - else $obj = NULL; - if (is_null($obj) && $msg) msg("Helper plugin $name is not available or invalid.",-1); - return $obj; - } - - // standard functions for outputing email addresses and links - // use these to avoid having to duplicate code to produce links in line with the installation configuration - - /** - * email - * standardised function to generate an email link according to obfuscation settings - */ - function email($email, $name='', $class='', $more='') { - if (!$email) return $name; - $email = obfuscate($email); - if (!$name) $name = $email; - $class = "class='".($class ? $class : 'mail')."'"; - return "$name"; - } - - /** - * external_link - * standardised function to generate an external link according to conf settings - */ - function external_link($link, $title='', $class='', $target='', $more='') { - global $conf; - - $link = htmlentities($link); - if (!$title) $title = $link; - if (!$target) $target = $conf['target']['extern']; - if ($conf['relnofollow']) $more .= ' rel="nofollow"'; - - if ($class) $class = " class='$class'"; - if ($target) $target = " target='$target'"; - if ($more) $more = " ".trim($more); - - return "$title"; - } - - /** - * output text string through the parser, allows dokuwiki markup to be used - * very ineffecient for small pieces of data - try not to use - */ - function render($text, $format='xhtml') { - return p_render($format, p_get_instructions($text),$info); - } - - /** - * Allow the plugin to prevent DokuWiki creating a second instance of itself - * - * @return bool true if the plugin can not be instantiated more than once - */ - function isSingleton() { - return false; - } - - // deprecated functions - function plugin_localFN($id) { return $this->localFN($id); } - function plugin_locale_xhtml($id) { return $this->locale_xhtml($id); } - function plugin_email($e, $n='', $c='', $m='') { return $this->email($e, $n, $c, $m); } - function plugin_link($l, $t='', $c='', $to='', $m='') { return $this->external_link($l, $t, $c, $to, $m); } - function plugin_render($t, $f='xhtml') { return $this->render($t, $f); } + var $localised = false; // set to true by setupLocale() after loading language dependent strings + var $lang = array(); // array to hold language dependent strings, best accessed via ->getLang() + var $configloaded = false; // set to true by loadConfig() after loading plugin configuration variables + var $conf = array(); // array to hold plugin settings, best accessed via ->getConf() + + /** + * General Info + * + * Needs to return a associative array with the following values: + * + * author - Author of the plugin + * email - Email address to contact the author + * date - Last modified date of the plugin in YYYY-MM-DD format + * name - Name of the plugin + * desc - Short description of the plugin (Text only) + * url - Website with more information on the plugin (eg. syntax description) + */ + function getInfo(){ + $parts = explode('_',get_class($this)); + $info = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt'; + if(@file_exists($info)) return confToHash($info); + trigger_error('getInfo() not implemented in '.get_class($this).' and '.$info.' not found', E_USER_WARNING); + } + + // plugin introspection methods + // extract from class name, format = _plugin_[_] + function getPluginType() { + list($t) = explode('_', get_class($this), 2); + return $t; + } + function getPluginName() { + list($t, $p, $n) = explode('_', get_class($this), 4); + return $n; + } + function getPluginComponent() { + list($t, $p, $n, $c) = explode('_', get_class($this), 4); + return (isset($c)?$c:''); + } + + // localisation methods + /** + * getLang($id) + * use this function to access plugin language strings + * to try to minimise unnecessary loading of the strings when the plugin doesn't require them + * e.g. when info plugin is querying plugins for information about themselves. + * + * @param $id id of the string to be retrieved + * @return string string in appropriate language or english if not available + */ + function getLang($id) { + if (!$this->localised) $this->setupLocale(); + + return (isset($this->lang[$id]) ? $this->lang[$id] : ''); + } + + /** + * locale_xhtml($id) + * + * retrieve a language dependent file and pass to xhtml renderer for display + * plugin equivalent of p_locale_xhtml() + * + * @param $id id of language dependent wiki page + * @return string parsed contents of the wiki page in xhtml format + */ + function locale_xhtml($id) { + return p_cached_output($this->localFN($id)); + } + + /** + * localFN($id) + * prepends appropriate path for a language dependent filename + * plugin equivalent of localFN() + */ + function localFN($id) { + global $conf; + $plugin = $this->getPluginName(); + $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt'; + if(!@file_exists($file)){ + //fall back to english + $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt'; + } + return $file; + } + + /** + * setupLocale() + * reads all the plugins language dependent strings into $this->lang + * this function is automatically called by getLang() + */ + function setupLocale() { + if ($this->localised) return; + + global $conf; // definitely don't invoke "global $lang" + $path = DOKU_PLUGIN.$this->getPluginName().'/lang/'; + + $lang = array(); + + // don't include once, in case several plugin components require the same language file + @include($path.'en/lang.php'); + if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php'); + + $this->lang = $lang; + $this->localised = true; + } + + // configuration methods + /** + * getConf($setting) + * + * use this function to access plugin configuration variables + */ + function getConf($setting){ + + if (!$this->configloaded){ $this->loadConfig(); } + + return $this->conf[$setting]; + } + + /** + * loadConfig() + * merges the plugin's default settings with any local settings + * this function is automatically called through getConf() + */ + function loadConfig(){ + global $conf; + + $defaults = $this->readDefaultSettings(); + $plugin = $this->getPluginName(); + + foreach ($defaults as $key => $value) { + if (isset($conf['plugin'][$plugin][$key])) continue; + $conf['plugin'][$plugin][$key] = $value; + } + + $this->configloaded = true; + $this->conf =& $conf['plugin'][$plugin]; + } + + /** + * read the plugin's default configuration settings from conf/default.php + * this function is automatically called through getConf() + * + * @return array setting => value + */ + function readDefaultSettings() { + + $path = DOKU_PLUGIN.$this->getPluginName().'/conf/'; + $conf = array(); + + if (@file_exists($path.'default.php')) { + include($path.'default.php'); + } + + return $conf; + } + + /** + * Loads a given helper plugin (if enabled) + * + * @author Esther Brunner + * + * @param $name name of plugin to load + * @param $msg message to display in case the plugin is not available + * + * @return object helper plugin object + */ + function loadHelper($name, $msg){ + if (!plugin_isdisabled($name)){ + $obj =& plugin_load('helper',$name); + }else{ + $obj = null; + } + if (is_null($obj) && $msg) msg("Helper plugin $name is not available or invalid.",-1); + return $obj; + } + + // standard functions for outputing email addresses and links + // use these to avoid having to duplicate code to produce links in line with the installation configuration + + /** + * email + * standardised function to generate an email link according to obfuscation settings + */ + function email($email, $name='', $class='', $more='') { + if (!$email) return $name; + $email = obfuscate($email); + if (!$name) $name = $email; + $class = "class='".($class ? $class : 'mail')."'"; + return "$name"; + } + + /** + * external_link + * standardised function to generate an external link according to conf settings + */ + function external_link($link, $title='', $class='', $target='', $more='') { + global $conf; + + $link = htmlentities($link); + if (!$title) $title = $link; + if (!$target) $target = $conf['target']['extern']; + if ($conf['relnofollow']) $more .= ' rel="nofollow"'; + + if ($class) $class = " class='$class'"; + if ($target) $target = " target='$target'"; + if ($more) $more = " ".trim($more); + + return "$title"; + } + + /** + * output text string through the parser, allows dokuwiki markup to be used + * very ineffecient for small pieces of data - try not to use + */ + function render($text, $format='xhtml') { + return p_render($format, p_get_instructions($text),$info); + } + + /** + * Allow the plugin to prevent DokuWiki creating a second instance of itself + * + * @return bool true if the plugin can not be instantiated more than once + */ + function isSingleton() { + return false; + } + + // deprecated functions + function plugin_localFN($id) { return $this->localFN($id); } + function plugin_locale_xhtml($id) { return $this->locale_xhtml($id); } + function plugin_email($e, $n='', $c='', $m='') { return $this->email($e, $n, $c, $m); } + function plugin_link($l, $t='', $c='', $to='', $m='') { return $this->external_link($l, $t, $c, $to, $m); } + function plugin_render($t, $f='xhtml') { return $this->render($t, $f); } } diff -Naur dokuwiki-2009-02-14/inc/pluginutils.php dokuwiki-rc2009-12-02/inc/pluginutils.php --- dokuwiki-2009-02-14/inc/pluginutils.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/pluginutils.php 2009-12-02 19:50:12.000000000 +0100 @@ -20,10 +20,28 @@ /** * Original plugin functions, remain for backwards compatibility */ -function plugin_list($type='',$all=false) { global $plugin_controller; return $plugin_controller->getList($type,$all); } -function &plugin_load($type,$name,$new=false) { global $plugin_controller; return $plugin_controller->load($type,$name,$new); } -function plugin_isdisabled($plugin) { global $plugin_controller; return $plugin_controller->isdisabled($plugin); } -function plugin_enable($plugin) { global $plugin_controller; return $plugin_controller->enable($plugin); } -function plugin_disable($plugin) { global $plugin_controller; return $plugin_controller->disable($plugin); } -function plugin_directory($plugin) { global $plugin_controller; return $plugin_controller->get_directory($plugin); } +function plugin_list($type='',$all=false) { + global $plugin_controller; + return $plugin_controller->getList($type,$all); +} +function &plugin_load($type,$name,$new=false) { + global $plugin_controller; + return $plugin_controller->load($type,$name,$new); +} +function plugin_isdisabled($plugin) { + global $plugin_controller; + return $plugin_controller->isdisabled($plugin); +} +function plugin_enable($plugin) { + global $plugin_controller; + return $plugin_controller->enable($plugin); +} +function plugin_disable($plugin) { + global $plugin_controller; + return $plugin_controller->disable($plugin); +} +function plugin_directory($plugin) { + global $plugin_controller; + return $plugin_controller->get_directory($plugin); +} diff -Naur dokuwiki-2009-02-14/inc/search.php dokuwiki-rc2009-12-02/inc/search.php --- dokuwiki-2009-02-14/inc/search.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/search.php 2009-12-02 19:50:12.000000000 +0100 @@ -23,34 +23,34 @@ * @author Andreas Gohr */ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){ - $dirs = array(); - $files = array(); + $dirs = array(); + $files = array(); - //read in directories and files - $dh = @opendir($base.'/'.$dir); - if(!$dh) return; - while(($file = readdir($dh)) !== false){ - if(preg_match('/^[\._]/',$file)) continue; //skip hidden files and upper dirs - if(is_dir($base.'/'.$dir.'/'.$file)){ - $dirs[] = $dir.'/'.$file; - continue; - } - $files[] = $dir.'/'.$file; - } - closedir($dh); - sort($files); - sort($dirs); - - //give directories to userfunction then recurse - foreach($dirs as $dir){ - if (call_user_func_array($func, array(&$data,$base,$dir,'d',$lvl,$opts))){ - search($data,$base,$func,$opts,$dir,$lvl+1); - } - } - //now handle the files - foreach($files as $file){ - call_user_func_array($func, array(&$data,$base,$file,'f',$lvl,$opts)); - } + //read in directories and files + $dh = @opendir($base.'/'.$dir); + if(!$dh) return; + while(($file = readdir($dh)) !== false){ + if(preg_match('/^[\._]/',$file)) continue; //skip hidden files and upper dirs + if(is_dir($base.'/'.$dir.'/'.$file)){ + $dirs[] = $dir.'/'.$file; + continue; + } + $files[] = $dir.'/'.$file; + } + closedir($dh); + sort($files); + sort($dirs); + + //give directories to userfunction then recurse + foreach($dirs as $dir){ + if (call_user_func_array($func, array(&$data,$base,$dir,'d',$lvl,$opts))){ + search($data,$base,$func,$opts,$dir,$lvl+1); + } + } + //now handle the files + foreach($files as $file){ + call_user_func_array($func, array(&$data,$base,$file,'f',$lvl,$opts)); + } } /** @@ -59,7 +59,7 @@ * @deprecated */ function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){ - return call_user_func_array($func, array(&$data,$base,$file,$type,$lvl,$opts)); + return call_user_func_array($func, array(&$data,$base,$file,$type,$lvl,$opts)); } /** @@ -91,33 +91,12 @@ * @author Andreas Gohr */ function search_qsearch(&$data,$base,$file,$type,$lvl,$opts){ - $item = array(); - - if($type == 'd'){ - return false; //no handling yet - } - - //only search txt files - if(substr($file,-4) != '.txt') return false; - - //get id - $id = pathID($file); - - //check if it matches the query - if(!preg_match('/^'.preg_quote($opts['query'],'/').'/u',$id)){ - return false; - } - - //check ACL - if(auth_quickaclcheck($id) < AUTH_READ){ - return false; - } - - $data[]=array( 'id' => $id, - 'type' => $type, - 'level' => 1, - 'open' => true); - return true; + $opts = array( + 'idmatch' => '(^|:)'.preg_quote($opts['query'],'/').'/', + 'listfiles' => true, + 'pagesonly' => true, + ); + return search_universal($data,$base,$file,$type,$lvl,$opts); } /** @@ -128,40 +107,40 @@ * @author Andreas Gohr */ function search_index(&$data,$base,$file,$type,$lvl,$opts){ - global $conf; - $return = true; + global $conf; + $return = true; - $item = array(); + $item = array(); - if($type == 'd' && !preg_match('#^'.$file.'(/|$)#','/'.$opts['ns'])){ - //add but don't recurse - $return = false; - }elseif($type == 'f' && ($opts['nofiles'] || substr($file,-4) != '.txt')){ - //don't add - return false; - } + if($type == 'd' && !preg_match('#^'.$file.'(/|$)#','/'.$opts['ns'])){ + //add but don't recurse + $return = false; + }elseif($type == 'f' && ($opts['nofiles'] || substr($file,-4) != '.txt')){ + //don't add + return false; + } - $id = pathID($file); + $id = pathID($file); - if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){ - return false; - } + if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){ + return false; + } - //check hidden - if(isHiddenPage($id)){ - return false; - } + //check hidden + if(isHiddenPage($id)){ + return false; + } - //check ACL - if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){ - return false; - } + //check ACL + if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){ + return false; + } - $data[]=array( 'id' => $id, - 'type' => $type, - 'level' => $lvl, - 'open' => $return ); - return $return; + $data[]=array( 'id' => $id, + 'type' => $type, + 'level' => $lvl, + 'open' => $return ); + return $return; } /** @@ -170,13 +149,10 @@ * @author Andreas Gohr */ function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){ - if($type == 'f') return true; //nothing to do on files - - $id = pathID($file); - $data[]=array( 'id' => $id, - 'type' => $type, - 'level' => $lvl ); - return true; + $opts = array( + 'listdirs' => true, + ); + return search_universal($data,$base,$file,$type,$lvl,$opts); } /** @@ -185,38 +161,52 @@ * @author Andreas Gohr */ function search_media(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') { - return ($opts['recursive']); - } - - $info = array(); - $info['id'] = pathID($file,true); - if($info['id'] != cleanID($info['id'])){ - if($opts['showmsg']) - msg(hsc($info['id']).' is not a valid file name for DokuWiki - skipped',-1); - return false; // skip non-valid files - } - //check ACL for namespace (we have no ACL for mediafiles) - if(auth_quickaclcheck(getNS($info['id']).':*') < AUTH_READ){ - return false; - } + //we do nothing with directories + if($type == 'd') { + if(!$opts['depth']) return true; // recurse forever + $depth = substr_count($file,'/'); + if($depth >= $opts['depth']) return false; // depth reached + return true; + } - $info['file'] = basename($file); - $info['size'] = filesize($base.'/'.$file); - $info['mtime'] = filemtime($base.'/'.$file); - $info['writable'] = is_writable($base.'/'.$file); - if(preg_match("/\.(jpe?g|gif|png)$/",$file)){ - $info['isimg'] = true; - require_once(DOKU_INC.'inc/JpegMeta.php'); - $info['meta'] = new JpegMeta($base.'/'.$file); - }else{ - $info['isimg'] = false; - } - $data[] = $info; + $info = array(); + $info['id'] = pathID($file,true); + if($info['id'] != cleanID($info['id'])){ + if($opts['showmsg']) + msg(hsc($info['id']).' is not a valid file name for DokuWiki - skipped',-1); + return false; // skip non-valid files + } - return false; + //check ACL for namespace (we have no ACL for mediafiles) + $info['perm'] = auth_quickaclcheck(getNS($info['id']).':*'); + if(!$opts['skipacl'] && $info['perm'] < AUTH_READ){ + return false; + } + + //check pattern filter + if($opts['pattern'] && !@preg_match($opts['pattern'], $info['id'])){ + return false; + } + + $info['file'] = basename($file); + $info['size'] = filesize($base.'/'.$file); + $info['mtime'] = filemtime($base.'/'.$file); + $info['writable'] = is_writable($base.'/'.$file); + if(preg_match("/\.(jpe?g|gif|png)$/",$file)){ + $info['isimg'] = true; + require_once(DOKU_INC.'inc/JpegMeta.php'); + $info['meta'] = new JpegMeta($base.'/'.$file); + }else{ + $info['isimg'] = false; + } + if($opts['hash']){ + $info['hash'] = md5(io_readFile(wikiFN($info['id']),false)); + } + + $data[] = $info; + + return false; } /** @@ -225,18 +215,18 @@ * @author Andreas Gohr */ function search_list(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') return false; - //only search txt files - if(substr($file,-4) == '.txt'){ - //check ACL - $id = pathID($file); - if(auth_quickaclcheck($id) < AUTH_READ){ - return false; + //we do nothing with directories + if($type == 'd') return false; + //only search txt files + if(substr($file,-4) == '.txt'){ + //check ACL + $id = pathID($file); + if(auth_quickaclcheck($id) < AUTH_READ){ + return false; + } + $data[]['id'] = $id; } - $data[]['id'] = $id; - } - return false; + return false; } /** @@ -247,38 +237,60 @@ * @author Andreas Gohr */ function search_pagename(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') return true; - //only search txt files - if(substr($file,-4) != '.txt') return true; - - //simple stringmatching - if (!empty($opts['query'])){ - if(strpos($file,$opts['query']) !== false){ - //check ACL - $id = pathID($file); - if(auth_quickaclcheck($id) < AUTH_READ){ - return false; - } - $data[]['id'] = $id; + //we do nothing with directories + if($type == 'd') return true; + //only search txt files + if(substr($file,-4) != '.txt') return true; + + //simple stringmatching + if (!empty($opts['query'])){ + if(strpos($file,$opts['query']) !== false){ + //check ACL + $id = pathID($file); + if(auth_quickaclcheck($id) < AUTH_READ){ + return false; + } + $data[]['id'] = $id; + } } - } - return true; + return true; } /** * Just lists all documents * + * $opts['depth'] recursion level, 0 for all + * $opts['hash'] do md5 sum of content? + * $opts['skipacl'] list everything regardless of ACL + * * @author Andreas Gohr */ function search_allpages(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') return true; - //only search txt files - if(substr($file,-4) != '.txt') return true; + //we do nothing with directories + if($type == 'd'){ + if(!$opts['depth']) return true; // recurse forever + $parts = explode('/',ltrim($file,'/')); + if(count($parts) == $opts['depth']) return false; // depth reached + return true; + } + + //only search txt files + if(substr($file,-4) != '.txt') return true; + + $item['id'] = pathID($file); + if(!$opts['skipacl'] && auth_quickaclcheck($item['id']) < AUTH_READ){ + return false; + } + + $item['rev'] = filemtime($base.'/'.$file); + $item['mtime'] = $item['rev']; + $item['size'] = filesize($base.'/'.$file); + if($opts['hash']){ + $item['hash'] = md5(trim(rawWiki($item['id']))); + } - $data[]['id'] = pathID($file); - return true; + $data[] = $item; + return true; } /** @@ -291,42 +303,42 @@ * @deprecated Replaced by ft_backlinks() */ function search_backlinks(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') return true; - //only search txt files - if(substr($file,-4) != '.txt') return true; - - //absolute search id - $sid = cleanID($opts['ns'].':'.$opts['name']); - - //current id and namespace - $cid = pathID($file); - $cns = getNS($cid); + //we do nothing with directories + if($type == 'd') return true; + //only search txt files + if(substr($file,-4) != '.txt') return true; + + //absolute search id + $sid = cleanID($opts['ns'].':'.$opts['name']); + + //current id and namespace + $cid = pathID($file); + $cns = getNS($cid); - //check ACL - if(auth_quickaclcheck($cid) < AUTH_READ){ - return false; - } + //check ACL + if(auth_quickaclcheck($cid) < AUTH_READ){ + return false; + } - //fetch instructions - require_once(DOKU_INC.'inc/parserutils.php'); - $instructions = p_cached_instructions($base.$file,true); - if(is_null($instructions)) return false; - - //check all links for match - foreach($instructions as $ins){ - if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){ - $mid = $ins[1][0]; - resolve_pageid($cns,$mid,$exists); //exists is not used - if($mid == $sid){ - //we have a match - finish - $data[]['id'] = $cid; - break; - } + //fetch instructions + require_once(DOKU_INC.'inc/parserutils.php'); + $instructions = p_cached_instructions($base.$file,true); + if(is_null($instructions)) return false; + + //check all links for match + foreach($instructions as $ins){ + if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){ + $mid = $ins[1][0]; + resolve_pageid($cns,$mid,$exists); //exists is not used + if($mid == $sid){ + //we have a match - finish + $data[]['id'] = $cid; + break; + } + } } - } - return false; + return false; } /** @@ -338,86 +350,86 @@ * @deprecated - fulltext indexer is used instead */ function search_fulltext(&$data,$base,$file,$type,$lvl,$opts){ - //we do nothing with directories - if($type == 'd') return true; - //only search txt files - if(substr($file,-4) != '.txt') return true; - - //check ACL - $id = pathID($file); - if(auth_quickaclcheck($id) < AUTH_READ){ - return false; - } + //we do nothing with directories + if($type == 'd') return true; + //only search txt files + if(substr($file,-4) != '.txt') return true; - //create regexp from queries - $poswords = array(); - $negwords = array(); - $qpreg = preg_split('/\s+/',$opts['query']); - - foreach($qpreg as $word){ - switch(substr($word,0,1)){ - case '-': - if(strlen($word) > 1){ // catch single '-' - array_push($negwords,preg_quote(substr($word,1),'#')); - } - break; - case '+': - if(strlen($word) > 1){ // catch single '+' - array_push($poswords,preg_quote(substr($word,1),'#')); + //check ACL + $id = pathID($file); + if(auth_quickaclcheck($id) < AUTH_READ){ + return false; + } + + //create regexp from queries + $poswords = array(); + $negwords = array(); + $qpreg = preg_split('/\s+/',$opts['query']); + + foreach($qpreg as $word){ + switch(substr($word,0,1)){ + case '-': + if(strlen($word) > 1){ // catch single '-' + array_push($negwords,preg_quote(substr($word,1),'#')); + } + break; + case '+': + if(strlen($word) > 1){ // catch single '+' + array_push($poswords,preg_quote(substr($word,1),'#')); + } + break; + default: + array_push($poswords,preg_quote($word,'#')); + break; } - break; - default: - array_push($poswords,preg_quote($word,'#')); - break; - } - } - - // a search without any posword is useless - if (!count($poswords)) return true; - - $reg = '^(?=.*?'.join(')(?=.*?',$poswords).')'; - $reg .= count($negwords) ? '((?!'.join('|',$negwords).').)*$' : '.*$'; - search_regex($data,$base,$file,$reg,$poswords); - return true; -} + } -/** - * Reference search - * This fuction searches for existing references to a given media file - * and returns an array with the found pages. It doesn't pay any - * attention to ACL permissions to find every reference. The caller - * must check if the user has the appropriate rights to see the found - * page and eventually have to prevent the result from displaying. - * - * @param array $data Reference to the result data structure - * @param string $base Base usually $conf['datadir'] - * @param string $file current file or directory relative to $base - * @param char $type Type either 'd' for directory or 'f' for file - * @param int $lvl Current recursion depht - * @param mixed $opts option array as given to search() - * - * $opts['query'] is the demanded media file name - * - * @author Andreas Gohr - * @author Matthias Grimm - */ + // a search without any posword is useless + if (!count($poswords)) return true; + + $reg = '^(?=.*?'.join(')(?=.*?',$poswords).')'; + $reg .= count($negwords) ? '((?!'.join('|',$negwords).').)*$' : '.*$'; + search_regex($data,$base,$file,$reg,$poswords); + return true; + } + + /** + * Reference search + * This fuction searches for existing references to a given media file + * and returns an array with the found pages. It doesn't pay any + * attention to ACL permissions to find every reference. The caller + * must check if the user has the appropriate rights to see the found + * page and eventually have to prevent the result from displaying. + * + * @param array $data Reference to the result data structure + * @param string $base Base usually $conf['datadir'] + * @param string $file current file or directory relative to $base + * @param char $type Type either 'd' for directory or 'f' for file + * @param int $lvl Current recursion depht + * @param mixed $opts option array as given to search() + * + * $opts['query'] is the demanded media file name + * + * @author Andreas Gohr + * @author Matthias Grimm + */ function search_reference(&$data,$base,$file,$type,$lvl,$opts){ - global $conf; + global $conf; - //we do nothing with directories - if($type == 'd') return true; + //we do nothing with directories + if($type == 'd') return true; - //only search txt files - if(substr($file,-4) != '.txt') return true; + //only search txt files + if(substr($file,-4) != '.txt') return true; - //we finish after 'cnt' references found. The return value - //'false' will skip subdirectories to speed search up. - $cnt = $conf['refshow'] > 0 ? $conf['refshow'] : 1; - if(count($data) >= $cnt) return false; - - $reg = '\{\{ *\:?'.$opts['query'].' *(\|.*)?\}\}'; - search_regex($data,$base,$file,$reg,array($opts['query'])); - return true; + //we finish after 'cnt' references found. The return value + //'false' will skip subdirectories to speed search up. + $cnt = $conf['refshow'] > 0 ? $conf['refshow'] : 1; + if(count($data) >= $cnt) return false; + + $reg = '\{\{ *\:?'.$opts['query'].' *(\|.*)?\}\}'; + search_regex($data,$base,$file,$reg,array($opts['query'])); + return true; } /* ------------- helper functions below -------------- */ @@ -441,35 +453,35 @@ */ function search_regex(&$data,$base,$file,$reg,$words){ - //get text - $text = io_readfile($base.'/'.$file); - //lowercase text (u modifier does not help with case) - $lctext = utf8_strtolower($text); - - //do the fulltext search - $matches = array(); - if($cnt = preg_match_all('#'.$reg.'#usi',$lctext,$matches)){ - //this is not the best way for snippet generation but the fastest I could find - $q = $words[0]; //use first word for snippet creation - $p = utf8_strpos($lctext,$q); - $f = $p - 100; - $l = utf8_strlen($q) + 200; - if($f < 0) $f = 0; - $snippet = ' ... '. - htmlspecialchars(utf8_substr($text,$f,$l)). - ' ... '; - $mark = '('.join('|', $words).')'; - $snippet = preg_replace('#'.$mark.'#si','\\1',$snippet); - - $data[] = array( - 'id' => pathID($file), - 'count' => preg_match_all('#'.$mark.'#usi',$lctext,$matches), - 'poswords' => join(' ',$words), - 'snippet' => $snippet, - ); - } + //get text + $text = io_readfile($base.'/'.$file); + //lowercase text (u modifier does not help with case) + $lctext = utf8_strtolower($text); + + //do the fulltext search + $matches = array(); + if($cnt = preg_match_all('#'.$reg.'#usi',$lctext,$matches)){ + //this is not the best way for snippet generation but the fastest I could find + $q = $words[0]; //use first word for snippet creation + $p = utf8_strpos($lctext,$q); + $f = $p - 100; + $l = utf8_strlen($q) + 200; + if($f < 0) $f = 0; + $snippet = ' ... '. + htmlspecialchars(utf8_substr($text,$f,$l)). + ' ... '; + $mark = '('.join('|', $words).')'; + $snippet = preg_replace('#'.$mark.'#si','\\1',$snippet); + + $data[] = array( + 'id' => pathID($file), + 'count' => preg_match_all('#'.$mark.'#usi',$lctext,$matches), + 'poswords' => join(' ',$words), + 'snippet' => $snippet, + ); + } - return true; + return true; } @@ -482,13 +494,13 @@ * @author Andreas Gohr */ function sort_search_fulltext($a,$b){ - if($a['count'] > $b['count']){ - return -1; - }elseif($a['count'] < $b['count']){ - return 1; - }else{ - return strcmp($a['id'],$b['id']); - } + if($a['count'] > $b['count']){ + return -1; + }elseif($a['count'] < $b['count']){ + return 1; + }else{ + return strcmp($a['id'],$b['id']); + } } /** @@ -498,13 +510,121 @@ * @todo move to pageutils */ function pathID($path,$keeptxt=false){ - $id = utf8_decodeFN($path); - $id = str_replace('/',':',$id); - if(!$keeptxt) $id = preg_replace('#\.txt$#','',$id); - $id = preg_replace('#^:+#','',$id); - $id = preg_replace('#:+$#','',$id); - return $id; + $id = utf8_decodeFN($path); + $id = str_replace('/',':',$id); + if(!$keeptxt) $id = preg_replace('#\.txt$#','',$id); + $id = preg_replace('#^:+#','',$id); + $id = preg_replace('#:+$#','',$id); + return $id; } -//Setup VIM: ex: et ts=2 enc=utf-8 : +/** + * This is a very universal callback for the search() function, replacing + * many of the former individual functions at the cost of a more complex + * setup. + * + * How the function behaves, depends on the options passed in the $opts + * array, where the following settings can be used. + * + * depth int recursion depth. 0 for unlimited + * keeptxt bool keep .txt extension for IDs + * listfiles bool include files in listing + * listdirs bool include namespaces in listing + * pagesonly bool restrict files to pages + * skipacl bool do not check for READ permission + * sneakyacl bool don't recurse into nonreadable dirs + * hash bool create MD5 hash for files + * meta bool return file metadata + * filematch string match files against this regexp + * idmatch string match full ID against this regexp + * dirmatch string match directory against this regexp when adding + * nsmatch string match namespace against this regexp when adding + * recmatch string match directory against this regexp when recursing + * showmsg bool warn about non-ID files + * showhidden bool show hidden files too + * firsthead bool return first heading for pages + * + * @author Andreas Gohr + */ +function search_universal(&$data,$base,$file,$type,$lvl,$opts){ + $item = array(); + $return = true; + + // get ID and check if it is a valid one + $item['id'] = pathID($file); + if($item['id'] != cleanID($item['id'])){ + if($opts['showmsg']) + msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1); + return false; // skip non-valid files + } + $item['ns'] = getNS($item['id']); + + if($type == 'd') { + // decide if to recursion into this directory is wanted + if(!$opts['depth']){ + $return = true; // recurse forever + }else{ + $depth = substr_count($file,'/'); + if($depth >= $opts['depth']){ + $return = false; // depth reached + }else{ + $return = true; + } + } + if($return && !preg_match('/'.$opts['recmatch'].'/',$file)){ + $return = false; // doesn't match + } + } + + // check ACL + if(!$opts['skipacl']){ + if($type == 'd'){ + $item['perm'] = auth_quickaclcheck($item['id'].':*'); + }else{ + $item['perm'] = auth_quickaclcheck($item['id']); //FIXME check namespace for media files + } + }else{ + $item['perm'] = AUTH_DELETE; + } + + // are we done here maybe? + if($type == 'd'){ + if(!$opts['listdirs']) return $return; + if(!$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) return false; //neither list nor recurse + if($opts['dirmatch'] && !preg_match('/'.$opts['dirmatch'].'/',$file)) return $return; + if($opts['nsmatch'] && !preg_match('/'.$opts['nsmatch'].'/',$item['ns'])) return $return; + }else{ + if(!$opts['listfiles']) return $return; + if(!$opts['skipacl'] && $item['perm'] < AUTH_READ) return $return; + if($opts['pagesonly'] && (substr($file,-4) != '.txt')) return $return; + if(!$conf['showhidden'] && isHiddenPage($id)) return $return; + if($opts['filematch'] && !preg_match('/'.$opts['filematch'].'/',$file)) return $return; + if($opts['idmatch'] && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return; + } + + // still here? prepare the item + $item['type'] = $type; + $item['lvl'] = $lvl; + $item['open'] = $return; + + if($opts['meta']){ + $item['file'] = basename($file); + $item['size'] = filesize($base.'/'.$file); + $item['mtime'] = filemtime($base.'/'.$file); + $item['rev'] = $item['mtime']; + $item['writable'] = is_writable($base.'/'.$file); + $item['executable'] = is_executable($base.'/'.$file); + } + + if($type == 'f'){ + if($opts['hash']) $item['hash'] = md5(io_readFile($base.'/'.$file,false)); + if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],false); + } + + // finally add the item + $data[] = $item; + return $return; +} + +//Setup VIM: ex: et ts=4 enc=utf-8 : diff -Naur dokuwiki-2009-02-14/inc/SimplePie.php dokuwiki-rc2009-12-02/inc/SimplePie.php --- dokuwiki-2009-02-14/inc/SimplePie.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/SimplePie.php 2009-12-02 19:50:11.000000000 +0100 @@ -7569,7 +7569,7 @@ { return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http); } - + if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url)) { return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http); @@ -9779,7 +9779,7 @@ trigger_error('needle is not a string or an integer', E_USER_WARNING); return false; } - + return strpos(strtolower($haystack), $needle, $offset); } } diff -Naur dokuwiki-2009-02-14/inc/TarLib.class.php dokuwiki-rc2009-12-02/inc/TarLib.class.php --- dokuwiki-2009-02-14/inc/TarLib.class.php 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/TarLib.class.php 2009-12-02 19:50:11.000000000 +0100 @@ -274,7 +274,7 @@ $fp = @fopen($archive,'rb'); if(!$fp) return -4; - while(!foef($fp)) echo fread($fp,2048); + while(!feof($fp)) echo fread($fp,2048); } else { @@ -331,7 +331,7 @@ * contents are only stored in memory. This function should not be used to * add files to an existing archive, you should use Add() instead. * - * The FileList supports actually three différents modes : + * The FileList actually supports three different modes : * * - You can pass a string containing filenames separated by pipes '|'. * In this case the file are read from the webserver filesystem and the @@ -341,7 +341,7 @@ * filenames. The behaviour for the content reading is the same that a * '|'ed string. * - * - The more useful usage is to pass bidimentional arrays, where the + * - The more useful usage is to pass bidimensional arrays, where the * first element contains the filename and the second contains the file * contents. You can even add empty folders to the package if the filename * has a leading '/'. Once again, have a look at the exemples to understand @@ -824,7 +824,7 @@ function _extractList($p_to, $p_files, $p_remdir, $p_mode = 0755) { - if (!$p_to || ($p_to[0]!="/"&&substr($p_to,0,3)!="../"&&substr($p_to,1,2)!=":\\")) /*" // <- PHP Coder bug */ + if (!$p_to || ($p_to[0]!="/"&&substr($p_to,0,3)!="../"&&substr($p_to,1,3)!=":\\"&&substr($p_to,1,2)!=":/")) /*" // <- PHP Coder bug */ $p_to = "./$p_to"; if ($p_remdir && substr($p_remdir,-1)!='/') $p_remdir .= '/'; diff -Naur dokuwiki-2009-02-14/inc/template.php dokuwiki-rc2009-12-02/inc/template.php --- dokuwiki-2009-02-14/inc/template.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/inc/template.php 2009-12-02 19:50:12.000000000 +0100 @@ -80,7 +80,7 @@ html_search(); break; case 'revisions': - $first = is_numeric($_REQUEST['first']) ? intval($_REQUEST['first']) : 0; + $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0; html_revisions($first); break; case 'diff': @@ -240,6 +240,7 @@ global $ID; global $REV; global $INFO; + global $JSINFO; global $ACT; global $QUERY; global $lang; @@ -249,6 +250,13 @@ // prepare the head array $head = array(); + // prepare seed for js and css + $tseed = 0; + $depends = getConfigFiles('main'); + foreach($depends as $f) { + $time = @filemtime($f); + if($time > $tseed) $tseed = $time; + } // the usual stuff $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki '.getVersion() ); @@ -267,7 +275,7 @@ 'title'=>'Current Namespace', 'href'=>DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']); if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']){ - $head['link'][] = array( 'rel'=>'alternate', 'type'=>'application/wiki', + $head['link'][] = array( 'rel'=>'edit', 'title'=>$lang['btn_edit'], 'href'=> wl($ID,'do=edit',false,'&')); } @@ -298,6 +306,7 @@ }else{ $head['meta'][] = array( 'name'=>'robots', 'content'=>'noindex,nofollow'); } + $head['link'][] = array( 'rel'=>'canonical', 'href'=>wl($ID,'',true,'&') ); }else{ $head['meta'][] = array( 'name'=>'robots', 'content'=>'noindex,follow'); } @@ -326,30 +335,28 @@ // load stylesheets $head['link'][] = array('rel'=>'stylesheet', 'media'=>'all', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template'].'&tseed='.$tseed); $head['link'][] = array('rel'=>'stylesheet', 'media'=>'screen', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed); $head['link'][] = array('rel'=>'stylesheet', 'media'=>'print', 'type'=>'text/css', - 'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template']); + 'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template'].'&tseed='.$tseed); - // load javascript - $js_edit = ($ACT=='edit' || $ACT=='preview' || $ACT=='recover' || $ACT=='wordblock' ) ? 1 : 0; - $js_write = ($INFO['writable']) ? 1 : 0; - if(defined('DOKU_MEDIAMANAGER')){ - $js_edit = 1; - $js_write = 0; - } - if(($js_edit && $js_write) || defined('DOKU_MEDIAMANAGER')){ - $script = "NS='".$INFO['namespace']."';"; - if($conf['useacl'] && $_SERVER['REMOTE_USER']){ + // make $INFO and other vars available to JavaScripts + require_once(DOKU_INC.'inc/JSON.php'); + $json = new JSON(); + $script = "var NS='".$INFO['namespace']."';"; + if($conf['useacl'] && $_SERVER['REMOTE_USER']){ require_once(DOKU_INC.'inc/toolbar.php'); - $script .= "SIG='".toolbar_signature()."';"; - } - $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', - '_data'=> $script); + $script .= "var SIG='".toolbar_signature()."';"; } + $script .= 'var JSINFO = '.$json->encode($JSINFO).';'; + $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', + '_data'=> $script); + + // load external javascript $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', '_data'=>'', - 'src'=>DOKU_BASE.'lib/exe/js.php?edit='.$js_edit.'&write='.$js_write); + 'src'=>DOKU_BASE.'lib/exe/js.php'.'?tseed='.$tseed); + // trigger event here trigger_event('TPL_METAHEADER_OUTPUT',$head,'_tpl_metaheaders_action',true); @@ -372,7 +379,7 @@ foreach($data as $tag => $inst){ foreach($inst as $attr){ echo '<',$tag,' ',buildAttributes($attr); - if(isset($attr['_data'])){ + if(isset($attr['_data']) || $tag == 'script'){ if($tag == 'script' && $attr['_data']) $attr['_data'] = " + + diff -Naur dokuwiki-2009-02-14/lib/_fla/MultipleUpload.as dokuwiki-rc2009-12-02/lib/_fla/MultipleUpload.as --- dokuwiki-2009-02-14/lib/_fla/MultipleUpload.as 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/_fla/MultipleUpload.as 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,329 @@ +/** + * Flash Multi Upload + * + * Based on a example from Alastair Dawson + * + * @link http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ + * @author Alastair Dawson + * @author Andreas Gohr + */ + +// delegate +import mx.utils.Delegate; +// ui components +import mx.controls.DataGrid; +import mx.controls.gridclasses.DataGridColumn +import mx.controls.Button; +import mx.controls.TextInput; +import mx.controls.CheckBox; +import mx.controls.Label; +// file reference +import flash.net.FileReferenceList; +import flash.net.FileReference; + +class MultipleUpload { + + private var fileRef:FileReferenceList; + private var fileRefListener:Object; + private var list:Array; + private var dp:Array; + + private var files_dg:DataGrid; + private var browse_btn:Button; + private var upload_btn:Button; + private var ns_input:TextInput; + private var ns_label:Label; + private var overwrite_cb:CheckBox; + + private var url:String; + private var upurl:String; + private var current:Number; + private var done:Number; + private var lasterror:String; + + /** + * Constructor. + * + * Initializes the needed objects and stage objects + */ + public function MultipleUpload(fdg:DataGrid, bb:Button, ub:Button, nsi:TextInput, nsl:Label, ob:CheckBox) { + // references for objects on the stage + files_dg = fdg; + browse_btn = bb; + upload_btn = ub; + ns_input = nsi; + ns_label = nsl; + overwrite_cb = ob; + + // file list references & listener + fileRef = new FileReferenceList(); + fileRefListener = new Object(); + fileRef.addListener(fileRefListener); + + // setup + iniUI(); + inifileRefListener(); + } + + /** + * Initializes the User Interface + * + * Uses flashvars to access possibly localized names + */ + private function iniUI() { + // register button handlers + browse_btn.onRelease = Delegate.create(this, this.browse); + upload_btn.onRelease = Delegate.create(this, this.upload); + + // columns for dataGrid + var col:DataGridColumn; + col = new DataGridColumn('name'); + col.headerText = ( _root.L_gridname ? _root.L_gridname : 'Filename' ); + col.sortable = false; + files_dg.addColumn(col); + col = new DataGridColumn('size'); + col.headerText = ( _root.L_gridsize ? _root.L_gridsize : 'Size' ); + col.sortable = false; + files_dg.addColumn(col); + col = new DataGridColumn('status'); + col.headerText = ( _root.L_gridstat ? _root.L_gridstat : 'Status' ); + col.sortable = false; + files_dg.addColumn(col); + + // label translations + if(_root.L_overwrite) overwrite_cb.label = _root.L_overwrite; + if(_root.L_browse) browse_btn.label = _root.L_browse; + if(_root.L_upload) upload_btn.label = _root.L_upload; + if(_root.L_namespace) ns_label.text = _root.L_namespace; + + // prefill input field + if(_root.O_ns) ns_input.text = _root.O_ns; + + // disable buttons + upload_btn.enabled = false; + if(!_root.O_overwrite) overwrite_cb.visible = false; + + // initalize the data provider list + dp = new Array(); + list = new Array(); + files_dg.spaceColumnsEqually(); + } + + /** + * Open files selection dialog + * + * Adds the allowed file types + */ + private function browse() { + if(_root.O_extensions){ + var exts:Array = _root.O_extensions.split('|'); + var filter:Object = new Object(); + filter.description = (_root.L_filetypes ? _root.L_filetypes : 'Allowed filetypes'); + filter.extension = ''; + for(var i:Number = 0; i= this.list.length){ + return this.uploadDone(); + } + + var file = this.list[this.current]; + + if(_root.O_maxsize && (file.size > _root.O_maxsize)){ + this.lasterror = (_root.L_toobig ? _root.L_toobig : 'too big'); + _global.setTimeout(this,'uploadNext',100); + nextFrame(); + }else{ + file.addListener(fileRefListener); + file.upload(upurl); + // continues in the handlers + } + } + + /** + * Redirect to the namespace and set a success/error message + * + * Called when all files in the list where processed + */ + private function uploadDone(){ + var info = (_root.L_info ? _root.L_info : 'files uploaded'); + if(this.done == this.list.length){ + this.url += '&msg1='+escape(this.done+'/'+this.list.length+' '+info); + }else{ + var lasterr = (_root.L_lasterr ? _root.L_lasterr : 'Last error:'); + this.url += '&err='+escape(this.done+'/'+this.list.length+' '+info+' '+lasterr+' '+this.lasterror); + } + + // when done redirect + getURL(this.url,'_self'); + } + + /** + * Set the status of a given file in the data grid + */ + private function setStatus(file,msg){ + for(var i:Number = 0; i < list.length; i++) { + if (list[i].name == file.name) { + files_dg.editField(i, 'status', msg); + nextFrame(); + return; + } + } + } + + /** + * Initialize the file reference listener + */ + private function inifileRefListener() { + fileRefListener.onSelect = Delegate.create(this, this.onSelect); + fileRefListener.onCancel = Delegate.create(this, this.onCancel); + fileRefListener.onOpen = Delegate.create(this, this.onOpen); + fileRefListener.onProgress = Delegate.create(this, this.onProgress); + fileRefListener.onComplete = Delegate.create(this, this.onComplete); + fileRefListener.onHTTPError = Delegate.create(this, this.onHTTPError); + fileRefListener.onIOError = Delegate.create(this, this.onIOError); + fileRefListener.onSecurityError = Delegate.create(this, this.onSecurityError); + } + + /** + * Handle file selection + * + * Files are added as in a list of references and beautified into the data grid dataprovider array + * + * Multiple browses will add to the list + */ + private function onSelect(fileRefList:FileReferenceList) { + var sel = fileRefList.fileList; + for(var i:Number = 0; i < sel.length; i++) { + // check size + var stat:String; + if(_root.O_maxsize && sel[i].size > _root.O_maxsize){ + stat = (_root.L_toobig ? _root.L_toobig : 'too big'); + }else{ + stat = (_root.L_ready ? _root.L_ready : 'ready for upload'); + } + // add to grid + dp.push({name:sel[i].name, size:Math.round(sel[i].size / 1000) + " kb", status:stat}); + // add to reference list + list.push(sel[i]); + } + // update dataGrid + files_dg.dataProvider = dp; + files_dg.spaceColumnsEqually(); + + if(list.length > 0) upload_btn.enabled = true; + } + + /** + * Does nothing + */ + private function onCancel() { + } + + /** + * Does nothing + */ + private function onOpen(file:FileReference) { + } + + /** + * Set the upload progress + */ + private function onProgress(file:FileReference, bytesLoaded:Number, bytesTotal:Number) { + var percentDone = Math.round((bytesLoaded / bytesTotal) * 100); + var msg:String = 'uploading @PCT@%'; + if(_root.L_progress) msg = _root.L_progress; + msg = msg.split('@PCT@').join(percentDone); + this.setStatus(file,msg); + } + + /** + * Handle upload completion + */ + private function onComplete(file:FileReference) { + this.setStatus(file,(_root.L_done ? _root.L_done : 'complete')); + this.done++; + uploadNext(); + } + + /** + * Handle upload errors + */ + private function onHTTPError(file:FileReference, httpError:Number) { + var error; + if(httpError == 400){ + error = (_root.L_fail ? _root.L_fail : 'failed'); + }else if(httpError == 401){ + error = (_root.L_authfail ? _root.L_authfail : 'auth failed'); + }else{ + error = "HTTP Error " + httpError + } + this.setStatus(file,error); + this.lasterror = error; + uploadNext(); + } + + /** + * Handle IO errors + */ + private function onIOError(file:FileReference) { + this.setStatus(file,"IO Error"); + this.lasterror = "IO Error"; + uploadNext(); + } + + /** + * Handle Security errors + */ + private function onSecurityError(file:FileReference, errorString:String) { + this.setStatus(file,"SecurityError: " + errorString); + this.lasterror = "SecurityError: " + errorString; + uploadNext(); + } + + +} diff -Naur dokuwiki-2009-02-14/lib/_fla/multipleUpload.fla dokuwiki-rc2009-12-02/lib/_fla/multipleUpload.fla --- dokuwiki-2009-02-14/lib/_fla/multipleUpload.fla 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/_fla/multipleUpload.fla 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,15814 @@ +ÐÏࡱá>þÿ þÿÿÿ +    ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿRÿÿÿÿÿÿÿÿpª|YªrσRASHP ÝÑWåÉ0À Contentsÿÿÿÿÿÿÿÿù¼Y Page 1ÿÿÿÿÿÿÿÿÿÿÿÿW9Media 2ÿÿÿÿÿÿÿÿþÿÿÿVýÿÿÿÿÿÿÿÿÿÿÿþÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýÿÿÿþÿÿÿ12345/ýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿþÿÿÿÝÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿRÿÿÿÿÿÿÿÿpª|YªrσRASHÐçþá`åÉ0À ContentsÿÿÿÿÿÿÿÿB¼Y Page 1ÿÿÿÿÿÿÿÿÿÿÿÿ9Media 2ÿÿÿÿÿÿÿÿþÿÿÿÿÿÿÿÿÿÿÿýÿÿÿþÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿýÿÿÿþÿÿÿ !"#$%&'()*+,-=ÿÿÿÿþÿÿÿ12345/ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ>?@AþÿÿÿCDEFGHIJKLMNXÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜŽÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ’ÿÿÿÿ± +ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ² +³ +´ +µ +¶ +· +¸ +¹ +º +» +¼ +½ +¾ +¿ +À +Á + +à +Ä +Å +Æ +Ç +È +É +Ê +Ë +Ì +Í +Î +Ï +Ð +Ñ +Ò +Ó +Ô +Õ +Ö +× +Ø +Ù +Ú +Û +Ü +Ý +Þ +ß +à +á +â +ã +ä +å +æ +ç +è +é +ê +ë +ì +í +î +ï +ð +ñ +ò +ó +ô +õ +ö +÷ +ø +ù +ú +û +ü +ý +þ +ÿ + ‚ ƒ „ … † ‡ ˆ ‰ Š ‹ Œ Ž ‘ ’ “ ” • – — ˜ ™ š › œ ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò þÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿMedia 1ÿÿÿÿþÿÿÿM 4 1212170633ÿÿÿÿþÿÿÿM 5 1212170716ÿÿÿÿÿÿÿÿÿÿÿÿþÿÿÿM 3 1212170191ÿÿÿÿÿÿÿÿÿÿÿÿþÿÿÿÿÿCPicPageÿÿ CPicLayerÿÿ CPicFrameÿÿCPicSwf€€Ù£€h0ÈMÿþÿÿþÿfiles_dgÿþÿeditableÿþÿfalseÿþÿeditableXç»?bÛ…®QgfÿþÿÿþÿmultipleSelectionÿþÿfalseÿþÿmultipleSelectionX÷ ?bÛ…®Qgfÿþÿÿþÿ rowHeightÿþÿ20ÿþÿ rowHeightXøh?bÛ…®QgfÿþÿÿþÿÿÃ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='2'> + <dataBindingInfo> + <property name="acceptedTypes" value="{dataProvider: &quot;String&quot;}" /> + </dataBindingInfo> + <eventMap> + <property name="selectedIndex" value="change" /> + <property name="selectedItem" value="change" /> + </eventMap> + <property name="dataProvider"> +<schema name="DataProvider" base="Array" class="mx.data.types.DataProvider" required="true" readonly="false" writeonly="true" category="array" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> + <property name="selectedIndex"> +<schema name="Number" base="Number" class="mx.data.types.Num" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxValue" value="" /> + <property name="minValue" value="" /> + </properties> + </schema> + </property> + <property name="selectedItem"> +<schema name="Object" base="Object" class="mx.data.types.Obj" required="true" readonly="true" writeonly="false" category="complex" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€€ÿÿÿ?ÿÿÿþÿMÿþÿÿþÿ€€ ÿþÿdataGridÿÿÿÿÿÿOÿ€€€€€¨%ˆ»fÿþÿÿþÿ +upload_btn ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿUploadÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='5'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€€€8ˆ‹Bÿþÿÿþÿ +browse_btn ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿBrowseÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='6'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€A3h W¦&ÿþÿÿþÿns_input ÿþÿeditableÿþÿtrueÿþÿeditable +HÖžåA­3 F”ýK£ÿþÿÿþÿpasswordÿþÿfalseÿþÿpasswordܲð­&§K²CWõÈ0Nÿþÿÿþÿtextÿþÿÿþÿtext³·Ès‚ù"KToد›ÿþÿÿþÿmaxCharsÿþÿ0ÿþÿmaxChars‡Ü9^LB¨Vhä'd²åÿþÿLimitsÿþÿrestrictÿþÿÿþÿrestrict¨KºÑñDG¿R…=¨ó®ŽÿþÿLimitsÿþÿenabledÿþÿtrueÿþÿenabledÍÅßv1óC¯|2þ4zY÷ÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible»¦•¬² G AA[X}žÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight¦*ŠixÿEº¬~†J,ÊÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidthFÙ‡ +»¢AÈæaUAÅÿþÿSizeÿþÿÿØ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='7'> + <dataBindingInfo> + <property name="editEvents" value="&quot;focusIn;focusOut&quot;" /> + </dataBindingInfo> + <eventMap> + <property name="text" value="focusOut,enter" /> + </eventMap> + <property name="text"> +<schema name="String" base="String" class="mx.data.types.Str" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxLength" value="" /> + <property name="minLength" value="" /> + </properties> + </schema> + </property> +</component> +€Ûk…ë[pÿþÿÿþÿ overwrite_cbÿþÿlabelÿþÿoverwrite existing filesÿþÿlabel×!V¸AÅLµ$%ò5;˜ÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacementáöq÷ĆE´’«¢ÓéŠÿþÿÿþÿselectedÿþÿfalseÿþÿselected¿Ç˜Fz…–H—oÒhîóœ ÿþÿÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='8'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€Ï3¸oW]ÿþÿÿþÿns_labelÿþÿautoSizeÿþÿleftÿþÿcenterÿþÿrightÿþÿnoneÿþÿautoSize%µLÂOÙH——ΊSfÿþÿÿþÿhtmlÿþÿfalseÿþÿhtml¹l>z*VGE£1's¶‡kÿþÿÿþÿtextÿþÿ Namespaceÿþÿtext qf¼éO›FN"@ Sðÿþÿÿþÿvisibleÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿrowse();ÿþÿ€€ ÿþÿLayer 1ÿÿÿÿOÿOÿ€€PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPFf"}] fileRef.browse(typeList);ÿþÿ€€ ÿþÿLayer 1ÿÿÿÿOÿOÿ€€PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPÿÿCPicPageÿÿ CPicLayerÿÿ CPicFrame€€ÿÿÿ?ÿÿÿþÿKyÿþÿÿ¼import flash.net.FileReferenceList; import flash.net.FileReference; var listener:Object = new Object(); listener.onSelect = function(fileRefList:FileReferenceList) { trace("onSelect"); var list:Array = fileRefList.fileList; var item:FileReference; for(var i:Number = 0; i < list.length; i++) { item = list[i]; trace("name: " + item.name); trace(item.addListener(this)); item.upload("http://0.0.0.0:3000/upload"); } } listener.onCancel = function():Void { trace("onCancel"); } listener.onOpen = function(file:FileReference):Void { trace("onOpen: " + file.name); trace("onOpenType: " + file.type); } listener.onProgress = function(file:FileReference, bytesLoaded:Number, bytesTotal:Number):Void { trace("onProgress with bytesLoaded: " + bytesLoaded + " bytesTotal: " + bytesTotal); } listener.onComplete = function(file:FileReference):Void { trace("onComplete: " + file.name); } listener.onHTTPError = function(file:FileReference, httpError:Number):Void { trace("onHTTPError: " + file.name + " httpError: " + httpError); } listener.onIOError = function(file:FileReference):Void { trace("onIOError: " + file.name); } listener.onSecurityError = function(file:FileReference, errorString:String):Void { trace("onSecurityError: " + file.name + " errorString: " + errorString); } var fileRef:FileReferenceList = new FileReferenceList(); fileRef.addListener(listener); fileRef.bÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÞßàáâãäåæçèéêëìíîïðñòóôõö÷øþÿÿÿúûüýþÿ‚ƒ„…†‡ˆ‰Š‹Œ‘ÿÿÿÿÿÿÿÿÿÿÿÿ“ÿÿÿÿ”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿÿþÿtrueÿþÿvisibleÄŠüó9ŽD”ìz$hí±ÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeightü!«Ä%«B¶ÞÂeaþdÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth]Yœ+þkîF€Å á¨Ãp!ÿþÿSize ÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='9'> + <property name="text"> +<schema name="String" base="String" class="mx.data.types.Str" required="true" readonly="false" writeonly="true" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxLength" value="" /> + <property name="minLength" value="" /> + </properties> + </schema> + </property> +</component> +€€ÿÿÿ?ÿÿÿþÿCdÿþÿÿþÿ€€ ÿþÿbuttonsÿÿÿÿ™3Ìÿ€€€€ÿÿÿ?ÿÿÿþÿZzÿþÿÿimport MultipleUpload +System.security.allowDomain ("*"); +var MU:MultipleUpload = new MultipleUpload (this.files_dg, + this.browse_btn, + this.upload_btn, + this.ns_input, + this.ns_label, + this.overwrite_cb); +ÿþÿ€€ ÿþÿactionsÿÿÿÿOÿOÿ€€H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~  € ?ÿÿ CDocumentPagePage 1ÿþÿScene 1ÿþÿøõÿDÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÌAHÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿ ÿþÿ€€€€ÿÿCSwfPageMedia 2ÿþÿButtonÿþÿ]>ÛBwDEãÿþÿButtonÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿButtonÿþÿmx.controls.Buttonÿþÿ`/Users/Vixiom/Library/Application Support/Macromedia/Flash 8/en/Configuration/TMP1x4k159sqe..swfrCWSÓ—xœì½ xœÇq(Ø3óÏÌû$A Á›H‚—HŠ¤ BÔº¬`ÀˆÃhf@ò!Y–LÆvè› -Ë–ãøŒç8qö½¼Ë±g×N6Ùgoï¾—ÄŸ³9Ö/ÎéglWUŸÿ€²d+/Ö§ÿî®î®®¾ª«ª«eýO±†/°úˆÎÏÏžíeŒEØéÈ·ØþïÍ›7YsýïF®Ïý¿~ù ÏÿÑÆG‡¯óúÛŠ»7œnzï_\ÿÿûèýùßüä—¿ÅækšyÆ(ÏòÆD"ÂÿaÇxøhce'f«ÕRqx¢TdŸgûydŒ×ñ6¶ çkn¨úfúõû_uîÙÁ ?ó½ÂÍM_~ǯüó…ÈË]}òãï:ùïùÐíü;^Íã<¯Ãs=È¿n´2VÎ]Ì ” +¥2|ç+¬ëF KFy*»x…’ŒU.ä‹–ºÑÎæ²çxÌÉÏX¬òxŽe%WŤsÕ¹BŽ¥;¨1ÙŽe؇¥3Ù|鼪qhM\Q [³lgì‹g닼ñÿüVîùüõ7ŠÇúÇþû;~÷ê/ËMüõÃw}I´&ñ#kMÜnMÂۚݼ5›xR’e¿Äß’­¹óþÃïú¿¿Öû¹Gnïùéol‰Öô¾°%%wdÈ'%ò툼ËÎUs36î]<¥ÆÛÉ«åu¿ÚüÇWŠÿY \û#C¹Æ¦w-˜ÎM\0q>ûŸ7׺¢ÃŒ×QÍ'rÃl¶˜ÍM拹,ocf*Ǧsù©é*»œÏV§ŸBU^o…•ÆƒzÏåŸÈ±Jµ<Ì3]61)¯²µ¼þ^i!Wœâùò•s3™ :;ÎòÅ)VÌ]©pXhà &VØÃl&S®äØÌlešmg¯e‡8b¼àÑIƶ°‡Ø«)}tü±ÜD•=H¡ãårfŽ>ÏQÑüïEQâ¶ë +ÏæØd¦ÀK–íT÷a³dè4µu¬¿”;[Î]Êç.ŸÉT.°‰r.Sͼ8S;Sâ±…ü 4Ÿ 9ÞŒñÜT¾x*_(°‹¥K¹ó%Và4äÿäŠYŒ»”¯äÇyÿŒ]acsL„8½¯LL3Nñ1–)ä'x=ºŠÉB¦2]ÈUy§ä*™™+ï™Érõqf¶PͳL!?UdçG‡*ð²9V,ƒoŽG…wDËd³#‘+³±©Biþ×`SVšCË„í>ÒOpk†['Ẇ[¤ŸèDMãwŠ(išäS"³—ív°Ýv {ÛèY¬‹‡ß*ÛÒªnÞ Æ2 ïDWs†L!/ׇG ¢Vª7ÆWpEœ9cˆ@7»±Œ¹›03ÒRݹ6ëÙôSÜ#Žõã2s' ôR8+ÚÛyQ±¦(,îVÜyE¡Q±«:±QØšôÀ/uç(…zá!$ß‘n=©áV dƒ5&zS4->‘a™Aò¥˜oß”k›Éð=±#‰¶Û\Ö5¤2EÜíéQ™ÉØØvð¢4Õ)™ÙÇã;XxÝ%Qb'‡X¥C vyÊ÷´„€v§;h­¦5¬¶ÝKÂiwH›÷¤qUº{ã‘Q¢åm +JDìÓ8HË™Ërpæì b]ߟ’Luç¦ °`|¼ï³Q +;QLf‚ƒmjHÃ[)L¥DÄXÛ±£œÍ²yS~,zŒuzÆoÒ¿ÉÖýM°•r ]÷ðoà_¢Ãì"ÎtàË\HvÜ»hô·KÏí’ä+Óf™8P;ØF–tÔ$Ò®{Z”ׇŦFù2òì<ÅÚ0çaD°v’Éó°µÓV›$Ùx)]3AÍÞeÃbþ†a÷JAÖ<ƒÞ©Á°ZõÜuU-œ€ƒ˜:V;ºT;¸&ÅœçXíÍ[c?æÞ‘î¸Þ¬O5|Ö<ÆF#Þ3†`‰ÌêÐîâ¡áeU7Ž'þ’ÑО@ŠšqlÖ«-jV^,5qX81«E›U‹ Þ©œÿrDà«óViæ°¼ƒ†%?‘ñÙïÕ¡cîqXXÜ:çÀ1`3Üú,FG¹A*å$æ;sž øß¡ë.c/åáË>qDPO×ßq¤CÈŠêØ£ Cì*Â8K‰°ÉÉÉ–}o}á_ºWTýêÀ·«¿ö”ÖKé`”‹@l„ÇŸ(ͳœ£/€ l¾fœG.7û­ý—ùùßýÖBý¶Œýá·Ø(c¼ßòU “jsœwñ~~þS=%;9 üþù·Ìõ‰§ŒNnÃÊ—[<\Dé@š$bà”Æe$ŽœoÁøc¥‚D ëÿÿƒh)l“€í 0© º ñª"žâ  «ÃÂ랎,w+x’9âW°ÁÜd†ó;Щ: “Ý3L‚ƒ“Wª¹b%_*èvž¸’EyÇC·&y–7'–Cq­ßØŇ ÄxÖö®Ï½`×·RÇÇØ:µŠýÃàŸ}=´ƒºeïxïG+ïønùOq°<¡Ë 6¿w¾eßô { Á¥ogŸwÀþ³6¶ +ú.ü²läCJ-ÅrTrÚU3ã§3Ål!W†!6_=²G4Ö¸Ï×là»±G—QÖÃÄTËïØÅ ÑÈFld7;Uš˜­¤¡•ó5i·Ö •èÕ`ÊkÈÌTgË9˜1^3/™QΧ!E»ÙŠ½¾9Â?§èJÖüž²$h Öµ–ê:“)f¦x¨שN\‰@ë8ÕJgJE>»¬~<ÈÓ×ûûq%kýLŠú1ΫhÿO} 5¼¨å»ïžŽX{Ñz³x^(ðά¯”dû_‡~ñ­úiM~TÜÂZüQïrÖqöÉoc çöÿ<ÿ:x…Ëÿ~à£6!6Xžc±zÝjÚ›¨iÍå÷Ȭu˜u#ßKa•™6ù3mä„ÿˆµêlbп*#}3³A6 ,m䯨Éòe¾=·?H–Ï'®1d«6pÖ㠌үñõ°P8&¹,?Š¯¾QËUijŠ¯˜qdÕX®˜/@bƒRœA>Ù.æ‹By`0xmO*9ù;95Ú¿øôZì‹Uœí_ü8VóSÀ¤î¦ºäkO+}¯ôáØ°ûÍ7vÄ óµòé •|ãë&mùfÊ¥j©:7“S['AA0=t‚eù©›M`ÔT®Jûj©x’ã\>UÎ\íÒ¥L!'J´·à‹ù+PóñsçrÕ³åÒÌ©Bfª‚\2C¦7Bçá2ŠsèÍýFv˜°ÄWcŽ5V!/¶X>âÄ1÷wð”1uç¹8eùœÄS†3q½5Ó=,6Œ~ŒŸ^bt\[r>]ºÉcJt“+},¥æz#êéy7ß[ÊgÙvqŒ¨Õ¢¢ˆ[—6 ~‰£Ò'6* +iðÒÀH*QÏ5©Q}ãõ˜±^™aÑ Ý'Ôuòs\jª}ÜZ':J_ ›:ø·)EgÒ +Ò AjBA8ž†vÃßæQ>‹ùW“îT«¤s ˆAðh@qc¾ñ³ ǵÿ”ü_¦k¦„ÏàJµ<;Qa=§´vslŒÏž±1Ò,Ë(N(Õ¿[ÈMVQJAõQ-Í€NU„Ô-fc3™2Ìj«üñ_/JÝ6:£V¬1½xU¬xÊyш¨ØT -pcj©«˜±ª ®XaºWª‰å’ŠD›Îgs¬œ»”ã$Ïæ+3™êÄôÉKÐ,Q¤Ò.S‰:ˆ©¨¾Ÿ“?$Œ5`àtôÃ<À²¥¾˜•ÙÅ\uº”=k?#… l;“ERÙ[k È2(°å™õª+o.¤ÂB 2ç;ZøÂñBarWŒL¾Uµ: ªlZŽAéÎOÙûáÏÊ4A.9’P³]&7‡$²óÑ…P²›¶Ÿôÿ#¸Ò÷ùÜ•ê©|®•AÔÙð…8ñ1Éìx¦€”K*á«ÕÌÄ4N‘0PÈT*r_š»8^*`.ú½ Úúrn +÷e5-D¶lŽO¸’ ñ.ÌÍð¶Ïæ Yü¤^›a“ùb6ÅÑ;~)“/@$AV.gfð«Âë‚öë™ +»ß ‡«|þ© ‘#ƒ4Ø•çÄ®jn§q&Ô1§hü4G‘ÏQNJ;0š“ºH›k^r|b"Wá#=_ÈWç†k…2UΔ³±\1;  rФJ—1ï©ré"´êlÆ)² ;8©pšÃÖœ+WçÈ:rŠ˜ÁĨ S #yãK¢í¹‹ã¹ì©p~ÂL©Á< 7>%ÊEü°¹2ùT—~<€Å,_.òu)_•ÝÈcL6-WžÊyÊ%þÝÓ·«oOßî=ûq… U¾¨z~=)ð’ ±Þ%Ôb1sEFe®PÔL97™+ó…Q$¨0%‹]+“ͪ±YP]ÅÄr.Vlد°¹W—YZåã2I~ëc€zS3ó©ïâéâE½e  qœ‚7t…„º‡Õ6¯&Õ/Òj}iu*­Þ—Ö ÒHkò¥5«´–ÒZUZ¯HkÃÖµ§d r¸é¡:™yYHæå)Y's­‘¹ÃÃ=KÜV(Ü:‰Õõ°è´bWpÖX¤¯TÕ·2OEiYÈ*³ Ìbv;}½2Ý/]!ø­Vø­ÑE_Vø­Öøu‡ã×¥ð[kâÁo¿nߺëíp®ˆóŒW˜S,oö0“ë…&ö.Øz‡Æ¦Ú­=hE±Á‰ÒÁŒÐN¾6æ°0Ž›Õñi‹oD­WTÙªt…m‚†Ç¡IB)¿Îפ-ºI=¾b{U±ÛÌbW‹6õB›<Úv]Üv_q;Tq}º¸9UÜqÛuq;¯·ÁùÉ3 +hŒ³ ˆrwé#\;£Ó.½0ì>†*¯= hç‡Ñ¨‡¬»pÎÜ–ÖûP.ÇÐ~…Ž…Ÿ5î;$¬¤ÈNă÷íÒz`—Pþ!…ö S¦JrJ˜‘aS´Ã£;=„ªIj,@®eÂ=BU¹7•›˜ÏÏ‹vö̦ÕF;P¹îðäêu@YØÔ:â÷‘å5„o‡ÞŒÀôqÆ.gæ*ì}L’t-dHÑ Í|FÕËF5i¸?eéNw(ÝiÔ;ÐûSh/„½}©óÛó öWÜ£ L¾£ÏÕæØ@ÆDä12ĘÛÃ’WXbŽÅå‚ð¨Ú*”],ÌJKÏSœ¤4; ,..—¾µ:ÇÜã¼óO8Q<Ì£5 1¸ÌÓƒ²À`0eídJõñ…ÁIÀÀ¦É)É>œ†ÜÓ¼Öa>¡Âq:å+…„¦ÑC¨Ñ‘CèÎë+@íèa±+»ùⰛůìaÎÜö*273˜gº ×2—1#ãÄÄ<1Q+FT~æú* !TŽçŽxIžìþŒÝØ`êãÿpâ¼ì•뀲ØB{ŸÑaÍYEÝõ0ÈñënÇ•£Ü·Àõ[˜sÐðcÔ³,ñ-ûwHÛ£´ƒ¼••Kó¹ë=¢Îß‚dYé(ï?AœŒ` ^c×çätІ‚—|^í­÷\ß%ñ!Õ¡8/'Iå$d9ï&¡÷R3µ]„+â–uïCBÝ«­Ȭà~Þ”Zæ$8qª†I”Î¥•á +¹UÔw_JýV0,A²=\o“;oDŒ±‘IcOŸÖèW¢È«®×ÄHöð¶gÙs43DÊ¿^EÝ-[´Bõ®§‰†-gîÃŽ£ÍÏDŤµYŒ¶@—âØ1ŸYÚ£r´&É)‘¹Þ 7êjfŠ uyÉãb1• ›¸¾fNÄ°˜9râÐÍ£¼›‹‚ìYÌÓczÓÜ}é7 ôSÔ›ÀÿN¥qÛ{dG.;™4µNõ¹Ämšš"kÀm'3¨Ù$ñ¡åšð€¤„nb>hÝ̳Âuy{(Ÿ‹ì¾gŠLqO¦w ¢4EâÈô{ +»è›ÆùbŠ¾˜’äEfWYíGdûoÇ­púqÂ6.±ý=2]¥goÆe{3¾ÓÜŒMƺ’n•vNñ„4ª:Ñ!IöQñqÐûè¼âR,°®f]ª0±ËJ +qN€õ¬¨~U2H©•±Ñï[Õ )(pÏŠb±Õ½Õá¥ÞãÁD•v´—RØtkA¿l-è­+’ø­7Ò ¢¢1çocFè ï<ëðÕV‚²Ñ7RÐXÙq_ +‚ +ƒ +„ +… +† +‡ +ˆ +‰ +Š +‹ +Œ + +Ž + + +‘ +’ +“ +” +• +– +— +˜ +™ +š +› +œ + +ž +Ÿ +  +¡ +¢ +£ +¤ +¥ +¦ +§ +¨ +© +ª +« +¬ +­ +® +¯ +° +Ô ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÕ Ö × Ø þÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿMedia 1ÿÿÿÿþÿÿÿM 4 1212170633ÿÿÿÿþÿÿÿM 5 1212170716ÿÿÿÿÿÿÿÿÿÿÿÿþÿÿÿM 3 1212170191ÿÿÿÿÿÿÿÿÿÿÿÿþÿÿÿÿÿCPicPageÿÿ CPicLayerÿÿ CPicFrameÿÿCPicSwf€€Ù£€h0„gÿþÿÿþÿfiles_dgÿþÿeditableÿþÿfalseÿþÿeditableXç»?bÛ…®QgfÿþÿÿþÿmultipleSelectionÿþÿfalseÿþÿmultipleSelectionX÷ ?bÛ…®Qgfÿþÿÿþÿ rowHeightÿþÿ20ÿþÿ rowHeightXøh?bÛ…®QgfÿþÿÿþÿÿÃ<compon“R59²&Þ°·Kª½ö9dãI¨¤&Åë®·Â:Y‹Á$Krþ®Àzã„Óeœ¿O¦Èæ‘#í + ÞÍôeµ :îSø÷õv‡©§½"9‚vÙ¡™©]‚iv%Є!Õ×¹<Æ;çoHí¸0l\ +V}±X}&êÃê}Q¢ÙÓŒsN³¸î5aœ‹Q:R¼Œ×›¤Ñü3FG·ª–B<äº]ä:åÉõlH®g1WTäz£'×Cr½‘Œ#”ëª'×µ\×0× ‘ë§<¹Þ’ëM˜ëQ‘ëÍž\o1r­0r½…¨< y7Š¼?íÉ{=$ïu#ï·å}«'ïÛB°}bû‹"×Û=¹Þ’ë˜ë5"×;=¹Þ‚ç» <‰¼ïöä}wHïÆkÕ¢€• ú? ÀÀþ”XuÒ0NkpœÖˆbŠ8WkÐDôE­¦U/á8r+5îëÒ²Ô~k5ª1ÚèÍfñÂE +§;¼+ð¨Eäj5}ì"k}ÅH|.¥„y«¶)¼º„ Å‘ D[ >küèÿŒP2?ë‘=H6ÁXBõ­2}­,Úo™ÎÞ<&ù^«âo^'y‚Ëhµþ¤NEÜ÷àÎD¦Ñk€SpŸ“»ö{ÓêÌußÁÌcÃórؾÞ6ž»Os8txϧûo-ò|µ·g‰à”MpO³÷Ûη¾U¤–„-êíƨ÷Á/uV°ŽQ•^ñ¸~£I lRBÀœCDf“:‘ÏìiBRc·ÅÝÈü'; ؤ¢´±§%|!Žç$B&dŸäè†bŒæ¿D« ª:`‹zz·ÌŽ¡^@†î½j€úv*’7Åè×t5û·Û¤žì]MÃ6ACœ=fSe…Äç‰ ‹ÔhAˆçÃr#”˜€ÑÅ Ã%0ÙO|WÈ­1†`™ìÃ!ûér•{]G|Ýç9&ŠèŸs?8z£¾Îºo$*Ó¼#q¥ ü îÒ¹?‰âŽÐ‡ŒKC÷a€;_e÷#TÚGéŸÑ?§~þùýóIª0‰J; "Ô²¬Ÿ’kÖ§Óvr-&/K®Çäÿ “)z•8}¯Ääz“׊änLþXXá­˜üoîm"w&ÿ¢7¹O$oÇäφÞ„É¿äͽUäÞ‚É Ëíbr{Xr#&ÿrXr &Ψ{SŸ„6õùeê³ K;ÚVÀ +2¢³­ç~! +¹®}ŠÏ0ë¹`³9m8àÕýÛF –á€×rEiNÁ²ƒœ&(«aÔ!l:^i*ΊßN(?V²[ʼn-¨ÐŒëZZ¡q“×;iAŠDQ4Óµi…'INŒŸþ +j¤*HH¸\ÉÔЈÖ2ŠZ’σÜGv‹T±Õi[½X&AZ šœv&eÚ1±°5jà& |´¸Y· ðÒ,ÚZÕ0ß.†ùæÛ½Ã+úÎa»1ßøB2^뉬 éeçу=“Íñ`na˜'xm!LÕ=ÚMKÅœi¨§~AÑf<:£Þzðo#r (àXð‚ +±iiàâ)i©‹A‹Z úÄb°ƒ¾àÅÀš óHB¾kÏÄî +_¬,zúËëÏjØW ‹Õ¹W›ëËGÛîØ‚¥µB~)HiÏìaÙ|™·V­ so}Z0Núpb/Æ3âª|µÌ)JŸæ zÓ™ØÖŸÎeT„Ó¥Baô’Š±Œ³'ó…}yî¸W&Ê<Ûy]£¼‚8—(Æð¶×.Èx¼(q‚çœ*ÃåÏàØA oêÙr®R±Ío;³á¹³ZÊfæ8ÝÀwc©lá™™±H'ƒ“pÓX¤xýìòt¾ +ŸeSå\®Ècgsü¼6—Ø\®P(]fs™"›ÎJC_' >FË™âT.xûÁ³$ž÷Œ#¢y.GI<ŽfL‹}},4Îjã9“™A“weîæAÓs |¥íP¸S$9£Ô×{ÖÉWøß$_KIJÄuƒro +Ï rfa ×êš[A Ö‹@Ý­ Pˆ@ýõnq‰2ªV&ÁÏ{30$Ãi ¹’Ñ×12º¤0d$2¸ùJdš‚Šè^¤ž¹·m·™ïv-ü×Êmü×ÎËøo9ÿuÄ#I`eFoäºÖ]Ác;ùo%ÿ­â?ÈÝÅ«ùo ÿuóßZþ[Çëùoÿmä¿Mü·™ÿ¶ðßVþëá¿^þÛÆÛùoÿõñÚVPm¯B©™»Sä]à³¹»“àÖÁÝ“÷ÂîÞä<¤ÝÆÿá‘ûx$ÿg?‡ä‘’gæŸ_GßûÞ6æL²ß˜gÉ:*~È=Ì+½C4âHœ¹ýüw”ã¿ãüw‚ÿxÜ`\å<9O"q–‰œ­D($Ü)þâ¿Ó‚˜Ãü7È›UO¹—¶½ß©¶÷b{߀ÛûÎàË©†¿„Æ–:Èt-;~?UÃë]ÝZµo¤_IU7 õ]Mq i`Vá,¤Èë?ÆíEã†çly‘èoö8ú8‡›Þ“iH²"“f@Þk-ïâ*e¸›C÷8t-~•·_žvÏ Ý&ÅrFg«ž«¤pù‘Ê)ÏIøQÄ.3ó=jPÃ…ÂS­îî!˜¾%i\‰RÐpOüwÈœ3°SÁeN“L%G|å,µ73¼¨.´ÊK«X+°@lVdÃÛœò–Øeh¬j5.V¢Óˆ—Œ +„ÝÆô_»p®ZÎAñˆƒll‰ï´äÛB°zãà¹uˆ÷Ͳ‘ž81MY2ÔWÚîúú¤oþá!fbâœqË+é»aâ*sÍ_Z­J«£»;ÎJT[HCùV¯y²¬¿¾Ì[Á¸¬?9ßDÛ^´˜»L_ì«C >+ÌF©j¡‹ÿ͇:n˜æ ¤o›P9t}æƒ +ŸbY„Ûª)Õ&žÞÿ´vÁx’÷J=£pøÖÅc±¬¶]Q©ÝôÞ@å´«úÄM3Þþe€hÛtìZËå>eøÑA\Çâ7çM   ÛNPšûhëÌÝ){c%îómØŒ—¿îjßu5è%:®Âݪ)ku]¼ÅŠì­k¯®u²®õuÙµ }Èn¦4Ê¡¶ºÕøl$p3%°WÂ1²Éo~Âã„™ÄfÃx”,:"ý&5·h‘^‰}BôʹÞ.]0û Že<Ç߬§•y{ð 3a·¦„цŒÓäÙ˜–YV%oQÞõdÑœöZÓﺎyÉ-6:hÂMMdFÿGÞ·ØG1£zÕð?€OmÑ£6FÊ~Î6kÒSj›ÙK‡˜9—63Á4ûÜ›ðUa¡*oÛÉSŒï4쌼ڋÄË;$™²c`§ ¥ó.ÞþÝ‚6ò €ö{ä„Ø+׳=†ÅX3³f]ƒjím×›„-[”6Ùn\ººÜ}î~¡’öL)!2: ,gn¶œ9è 8œ¼Ö¦L`î€+jøµ¾šáëˆÛÜ4Í`aà±þHbò N^"/}RñÒ»°´£[P~——.VË¥B¥ÏvýÕxn=ä¼Ö›ü\ CM™laš«ö1ÜȲw—«z=—i³Û´ƒsqàUn`¶\†Év!ýP”s“Â!Å…|95|ìäOèeBxáRIÆMÛ*¡ðe ™ŒÉÙ<¢›çÜûà‡`l¬RE.„ùüãÞ ºƒB`écGŒ‚/#± €~˜4%Jà˜ÿÀëT¹>Ë]œ™Î·›e'õg53²ûÕã‰#pù…T SÄU<ÞA€d¼¦M%™ÂD°Ë(Ÿü|L—.xüªù ¦õiO4”vÄàuÚÀ 7xŒ¹\¤coÐxµ8:9 C…làÕ£UÞ{ÕrEEb»«¼Ï8åØì Â@iœ­¨š(¥Zá@˜€(s6¯€(¥šg“¼ŠI^â$”0É¿h2¯u¼Ú¡+9”9Ôyò™Šðcʈªç"š²Bd Eç^—ôÄ&}ý`”•@Îz<€*lœHKE”sš§,œ­ãÚ¹ª}*ÌÌVKéÜ Ÿy¼¹üüÁkçùBfÎô€†%S,Ì ä ÛyUPä5Ì¢èã“`2v‰N·i:ÚgA9Yá 5q<¡OÁ‰vvF¶DDˆ/€Ueñø +8TâBN-?gÑs9ú!>2dºò¨EýAV÷ˆ³˜í¹*gN›Š'æ"˜ËÁaÐçáHžç'àA:À›Çý%ŸMµyNø½Ùá"Ì,\y™ø/V¤–D''(L4ðNN<Š‘P¢UF³:ZÇ©JZ´eFÈœÒT¨úTf¡aôyÈVÓIÌSš‡¯´C÷ûW¾l‡ná¡Û¡éùêQ…¯y%?¨ wÈÛ¦Ëàe.ZíqäGGuÞk‚š'}Óxšs€Iä_:ž\ ¼§Ãl©…<ᬓ!tx¤+Bª“"z_GzocÁ0þâÖyŽÅæeƒŒ–=eÑÃÏí¼Õó½Û½ÍïDà˜ð 0cÊ—ä*õµU}Á¡Ì\Þcx@]ús¢ ¼)"ð<Î;xŸ®9â¾'€¼€ÆDàèTBÔŠ®.ðëç݉¯6«ë +•ú•úQ•: ¾>¦R?®â~A}u¨¯O¨¯Oª¯O©¯SêëÓê û¿:Ý‹¯åîω¯ûÜ__÷¸?/¾Î¹mâë¼Û!¾îw?!¾îu?,¾†ÜOŠ¯A÷#âë¬û)ñu—ûQñuÒ•?N»§Ä×÷câ+í~Z|- 5E8'‰®9/A†CA–K;CAî‘ #¡ ÷JT(H§ rŒJ ÷I»CAî— +áÈÒ_ÍœZ§9‡xœç}×Ééx’Sz÷Ê9ÞƒËQ,xbôF'@¯s?à¾à¾ß}Ÿû¼û^÷9÷=¸ÞñÔHmám\ÆI1ŒcžÇ¾b{ÝŸÓ¼ÔÏ ë92ù01iAx÷£8;ÜœîÇpF¸×y…/–Êû ÊûIÊû)Ê{Šò~šžÌän!’¼Åö´òá¯dJ$OÛÎPdrF$ÛÎPdò„HÎÙÎP>³T“”_V&)»±©G×3XDw‡™¤(c”¿\y®5Å_»1ŠÏ ŲNAÔÒ[Öô Z¦:­”÷ŒºÀ1iå¡5Ñ3iþ¡ì$”…ª Q½fò í/Ƶ‘pèóa†Å ¶ÁP뇛oH§)h  ,øÇé|õ8o‰¡~ªiÏ£p¾ÃêA>ÌdHºŽ©øb8Ì eâ¡=,eɪxz¾Ä#¢Ø}^“!ãEŒ3УÁ2'WÄ uøªœ0(¹˜¹‚d˜Öê~³aLXÒhkvi>cГ?øGÙ@)4Œ -#†Œ_T€ïó™†:†‘À A¦©³ÀVÊÿôX°ñÜT¾x*_(èWŒrÅ,FwBl´…€ßz@¼pdÞù“”ÉÒ£§kInêÿmÝ¿m›ukªmt‹vÊHèÖ¬´m‘×DÀc»ï!˜‡¬”ÕQ,ÐÊß~;-Èæß´Cx¥Y¤š_6‹ƒ@3:C® “y&e&Ä‘ªF¾'Ž¡Z¥¡ 3Z¨7ÓË™Š«1ZE¬:N7.† ¶ÜoZ ´I6“¾0¾’”ñ–òZ¹`'ÿ 1¸o.ÄÍJè×"4ÐLi ËÞúZÓÊMD›ö ¢Ôµàùs™ö$±ÜPŒt¤†¤Ú‘„ëêq ~šN’ã Ú³R<Ù OGn¶½pãµC4è7¥+U^ýŒ ïØ»½`ßx'ºã”pȇU¬f5)Fõiõ ÒŸñ¡8â(Òö-œ˳ Žß&†k†ÝäÆ@™Nð ´z˜y-)p;Ð(ëüš(lCR¶a-œãB-‹‘Êɘ»Þ+„KƒœÿÝßÅ–9¾FÀ(UèŒ7¡$,H»®hûˆhT—0‰°,Pz°yXX±‡ã6Ap tÔJþöyÏÄÜ`¼zc‰°w2) x„Æ+@èÕ„Þ¤.ÛBô b»DׂH(S|[9éï }Ç"âö)ÿj¦­vCµLó6Å.Ô­=¬EhC³´,¤õÄ⛽dÜ¢±zïIz#Þˆo„ëˆ{#¤¡@­ùpÊn­‹¹{ Ð${!ÐØ¡þ{[ªN}\E¿¿ÖÈ÷$×Yšäe•}Â?+ö ϯÍæqßR}B/ÕÇÕ­¡±Ò.ìÚ†Õ.of%.bÐWäI¡„Q[¹Üy³B£ð%èÐZÉ@ +lÒ>_Õ²ÄûQ¸´Ä—¯B€xMò“E ¡›hãäh䆩u ŠÓ~ÅÄIµo {v£ÃvIºmVÂiÐÑ6z`åfp"\Y<¬øÆ;C¶Á»T1#ª˜µŸ]£8æ~oqÃx+Áɲ?µò®·:W2E¸½Ö“/¥OY¾W7ÎÈnnç@Ä(>ÅÔ,Y7_d,(Ò ŠŒ{"Á»êÇQíKU¶|Ãb×…Gô,ØD~SÁ)Ôe›f/ªÕ`ã¸áý=÷¬dåî–ŒÞÙÀç…Ò<¹‘éûp ÇæQÝx˜P€šŠÁœ÷=tuÕ6êÞ«”÷)eÆýAÊŒ¨û€x•û ØAú U=ä>,¾qǤý]|=êfÄ׸úšP_Yõ•S_“êkJ}M«¯¼’½?¦¾.¨¯‚úº¨¾Šê«¤¾fàk;|=î–I°[¡ªB'Kÿb‡”¼}x9ôöáã Þ>|Ü{ûð +FÏáß'Ò±ÃpòE=ÑmBÃC#TˆxGPÄ[QO+ ð1‘|“/y“·ˆä^L.ÉK¿F ˆ÷`Çmä Ÿ0{<âܪôá5!ã‘ñùFÞ6|msdM€œ˜r1o.ÃÇ_ï ùFùL!?‘Ó¢cp8á-Éç/#¨<ß º{67 ‚ÁÇÇèJVIˆƒ”|v:S̨(–»2‘›v–™™)̱j¦<ŹùÓS¯³{DEøJ;:Ô¦§×K™ì_|ôŽo$/ëe±Ç‘hÔ¯,>-Z™\Þb§HŠã)ù ŒxypÅ“-yØŒ9Ã=¡§fy„¦6†"#iA9‹¥ñ=ê“óÊiS³ºØOÝúgá>—äB¾+„S·6XL末F]˜+'|¯ŠöÐPz Ò +Ò ACA•ùmãõ.´ïe ì+°bwÁ×f0eÿÀn3 +èl•pdWñ^”Æ`ÿ*=’›DÇòêø§Ê«#SLA#ƒêÔs[̃ZÌmEJ?ðŠK³½+·É뀪v4¤ÛÅ:¨€‰5kÐEb"Ú4­b$îø†À @zû¼b›Z•Á‚$ái³ ƒé\îDF}5rCòáˈ¬IK%ëàÕÍ(>ßç™Vo†ªxo9ž›$ÿ°¿å®86ʹjª?&LÕxôÂ.<É%ÈÕ?à1ÆebR8¨¼±¬·z[Gb{@`R<>^f* Ö7ÊYyà–9·>ÚÝU´CwÑ?äa„ž:]ª[«Nµ­íÛÚ6ÜÖöok÷ û7¶?¯…Ì×NG÷…olþ|zk تîÊͤŒrsrë(¡F¨T¼KÜ>õor˜vÏ ã¡Ï^§ ¥°JP¾åˆÄRüŸ{Š¸Fp®š«œ/UyËd`@oZÉTU F)ÆfìÛzÇÆ¢À#Óñv“›-’U’ͺ¬‹¾9ù¿™ÊD>¡ãøQ™ÎOVjù +ÁVËÒÝ^Pøqdãhž%êJ—GxD³‘KXˆW¹ :¡ ‰õJÓµ¹¾µóeÓÁ«${è¥7Ã߯f‘ëW×/e¶áªº{J +î|5ê‚hmÀ¼¯;á›mÚl%ÒB³aår  ÖAˆ"#þÍ*G‹ã]"G«nèë…¤º5³V‰|[(H[Ê{ÊmOûüêh:·Uo6Ë®6®R Ý*%#m‡$ä +2êeEâ¶ÿT·ÿÔÚä•êJG(ˆºÓÛ +Ò%AV‡‚¬– kBAÖuý\Ácbtwû¹‚n?W°K\7$Ÿ$õœ:ÍÛ½^¾A+½jIP””‚¢'ñqðµîzwƒ&8Õ0PÜMÞèÍéÌÝ‚ÖLæÐÞŠñ=ɼº™VÚ5R¯§8„`¼zÌxµz4AÒ™ø6€“Þ¹ð¢5Gv»Ï}µ7mÓW ÛãֲŗWL¾<(«ƒ ë)¸Câä·®oiçÂ-¿¨(2ËOJf¹‹檆%eø­êî$>6œa9ÑD0gH‚—]êAl îöß.ûDÈY Ï¸k‘çÕ/‚<'„C°8Jœ#‚4±HãG2]žoÌí^ìÜ^- i{ŸH¦áM”>ž³ÉMbZ8p‡Û"‚q‹¬t]l©|òmŠO¾ éz´¼¼Gx(ÀýkîJµOšÍ û• + +Dæ» ò_+:¹0O°`¦Õz×i(Wº˜£·É ¿°ô×4ȱ=ÄÚž_Ð ÿˆˆ+ìŠö÷3#LÐ08ÇTQd¿V6 /U«¥‹Lüã}-MxAù¯Ñ°qüVZÙùŸp =D\6€‘Õ•ÌøB–ý†…~} Í /kÙÏÑ·ì"2±£4+Æ´z³]ZyX[ßS>—=Ú•ò`¤ üÆÆr>¾#ãQŠ&m+5ÔΤq¦Q!¥r—Ã¥ºi9¨=¡)£Oˆ—þð«÷JßOô!|DY®…ÍJŠ†Ëz›žù§€‚¹É\™÷¯6·¤/3í´~9@|z\ YaÑwšºäe±|qe‚Ÿš2Yýž‚ýN à'ýu® +z „¤wdkŠ›£ßx6ÅÊFlØ#+¾Éa¤ýØTY@2/ÃYZ´cIo¨ ÞÊâ²Ù„)›M‚¤“¼ÃóÁ™ÍÃØq¥# ß&j¤ ¨–倫P‡ õþ„†”õ,™N ·8›ý ôPf«?¡Í~S',³ß+Õ ˜°ÂLÀv +‹zªt•‘.èÑE‡Øæ|äÕþ®¡¥Y-=Ó±gïv¹ëñ¯’)2ðfÛ„©è7ÖÝBÙ¶v)|È"îö8 ·‡nÍÇÝ^è•m<°M¶óÀvØÁ;d úRJÈÈ ŒK«8ðà"£{ƒ£·GoŽÞÝgG#Z»8Z»$Ž»y`· ìá=2°—öØï +®awpôžàè½v4'ùmšðI1’‹ó10iÚ¶ÏoÚ¶ŸCzèöÑ[_$Î`²ÝÛ÷vj|Ò=ÈI’t÷«BäÓ¢‡ä¹&éV>w?&j8„VÏ)Pæ¿FG‹’)ÿ#m‡Z·ŸÏß~1Å$>j;[Á¸cHšã–Ϭc+3g²÷íò6]Ù¾AñÀ)‡Ù CA’EÌ}R÷Â%•ó˜t(‘tOùh,Õ?jfòè1NÝå³ú8•Æ~2û «ÙMyâ= wÁjN#-†—øðüÇü½!ÏSP_݆•ˆ}Øt¤z@Y›(9Æ/Ö#ieÂÆúáÍHÉšöšÕŸ!ó‘Û< +[<9žÑ•5k³3ù5Ѷ”IW¿t·Ñ‹Òamog!°—’Ùî^B¶´•úNÃß9ê^7Ï’ö;çóöãcõÓìÆv²I~;fXoh3ŽÌÏÏ»çñ"™°Ý°Š‹o>’¥]Àyì¦cNRtÓ½BG‡Cò^·qÔð†ÐÕ;¤â^òŸæÖð"ÏŠkÔ1ÑL<)ubî}šöWɜݽÏ+¯£­å~’×ÅÜ`_DÈMŸCq¯²ã°’u%ëòû0–]“¥>""êE¯+›:Ü”¨1CKˆC>²¾ îì£Ä'5 C&Kî7ø'W `=Ö›€rm¯‘Ž¾ì%¿ÞŽ6Ÿ›_ ˆ'öGCäžÆ²ß%_gËx¸ =îá/Dô„gÏÑY±˜ j½]¾S‰ö!ÒG»Œû}o—Ó+üì¿> +®½µ„>[.`}¾ªÞ\ô¢?rˆräµ<º‘w´­/~ì§÷åx˜|1× á—[\eV£L¿¼Úa©ThVoX„aD?àh:¶TS³XûÅÀ¢'†ö,¸I§×âéÚ?FúB—¯˜ˆ¸•†ô]U¼º +Q,äL®ZÎOT˜0ßɲ&*•Å-I!/B$ +ˆ)iËð)l\]õ]e5 4Ò|ùQ}Æã~öÓ€˜ìy-иŽH%×Çí‡)Ýó8 M +Sœ'èÿÊ|Sg­ÿźWä›:‹Ìý:¯v&܇™~7¢Ñ£Èy‹¨·É”?4[Œb'F¹- nýÿµs«àiÿŸœ·iQ,h³zÙÛ ·yÂíFX6}Y8wݨlª—?W -ÁV(»Ë†Å(±\Q¢cI ¸¢®Pk«W­)}»«Ä*Û%@£îjwøêv׊¯uîzñµÁÝ(¾6¹›Å×w«çM ’«ôHñHo:èÉ‹maÉôäÅv¼Äµ}‡ZÛˆµž¼8¸¶Ãã™}ÆUåùÆ7uBÎk߉ì]à!“y¿Y¯òÆÒO<ÝÈ·—wc€ø4/ /k›Ë¦IÏ…I‘¦áœ.~ãæYác=«Ü¸+ùoºrŸ%WîYéÊ]b¬„Tj ¥¹À‹å°„"ÂåL6îý­—¬Ò®Ÿ–LwQ^+pA7|ßÙþÊ_Áïd¿tRÛ¯.Xë!ùÅì4±8‰àÂÃíÉ‚ù<Ï–±Ëw[Çk:R—6ÌêííµÕ±Ë,:Íþ°=ÅË“~cš¡<®ÉŠsôöÀQo"HïÍKz5´ª žK{$¾ÖCà ‡Ë °5IåøF : ð«µXB:!°²™+!°îX··Cqè½_‹ÞX+ì7o¾ à :ÇU^:u!’LÙ¬fÉ» ä¼ÈüÝü¸§E÷Àx|4¹wï^&´»õò†ë´Çí:Oá«ÒRé<ä¯V¥ðúktý¬ú‘ßüæ7=—úÚƒŠC4‡hmŠ†/q—‹Æ!qé +JbD5‰Ðjb¡ÕĨæŸþéŸT5É¥TãÜJ5| ?¹Ñ·àèÕ=:Ú0÷?þã?²ä׿þ•%Œ¶6Bô§fÁR¿ùÍ߈-:~Ú†þ¥.©ÇÚ¨\ús«ýÐFMõfæÔý릗bm Ë÷¿ÿýÝÜæíƒ[=|^½Äum|%¬| ÞÊ~ˆ5øG´6ðîh'4_Î…aOÃK´­íùaH0ôÿ=nk‚†?ÙÖ–:z«µj[ûêW¿´ÔmM¢÷Ýï~w‰»W@æo|ãÿXâ&Vó-nRðQ1YoþdŸùÉ>óNVäì^ÎÉú;‰ŸŒÞŸŒÞ“\R½ó. i-†ÄÿÜC_·ó'œØRgÈwØ¿NL¨•º…À´7ÒÏ,{*’Êk[ûL̹Tq²ÕÆ ›Ü¸øÚ(îUÚœ¸r®Ò#¬Gz½µû7º¥õȶ@oÍüc»ÒäÜŽµmÜÌ@“s{¸&gÜÑ ,ƒ|×þ*þÌÂz•EkqÀrÔ.*©âUÅØfóKÙLá|9S¬ †fbŽMæ  @û Ô¿d©Nß”ÀèËó(²ù¾òd©X=•¹˜/̱± +¯#È£3z–ÍKHY¼eL¡ÙJN=n¬µ'ƒ⪀°èYa_šÉé€í©L&Ô=ù"µ¾¹¶°‚»²KCå|v$_ÌñþП*VXx‚¹Œ2"ȃN§J˜M– +<~”#‹>zÏ—s¹S*J¤JáÃW§S¤ôf<’ËL*€T)KÞ˜yŸOp°ÙrΪ`Њ6 < zØLifvFµÊÇÐœ ?]z87J…ËÝ7%‚è{ tq¼t¢t…¥f/æÊðþznf&G}po`[lSkiêÔÂÍ1dRfƪU…1¯¦TÄG¼Ëya*%.tÀÅŠáâÌl¿Ð ù}¼#K—e°Ëà0âï“N¿ ¼Ÿ2Õ Œ‘|¼+WYÿÕÐ{8þ)r ØÙri +?‘)³ã½,§ÝiDl÷nÅ*¥B>+†—¸Hr1SžÊGÀ¨†>ÓFôùÒŒø:Af6| Wó™ÂPf† ¢“øïlÞ»b6SÉÌ•fåÅ®ûr¹ ƒ™9q÷}fƒâÊŒGé*¼ÇŒsªX•ÿÏןLµœ¿r_q/Áõ²9v™M³²TТcð!ðÎ@à>•,áèÞ¼„ñüŸ‰Ù2¥ûp†wq宲¤óée±u·f­mÀÍÿy¹G›B²‹_¿!CíÞHΕ;êælÔ­Iž™J¾S›|æég¤¾/vþzàð«Aù #S;‘£ÉÈ©ÍÈjŠ@KrƒNiMþ}DÜ涋èeÉz ³<ùëó¿'É?šÿ¯2à +UgòOþäO$ÌJ3° +Ý6Š@Wò_t;Ж£»“wì­“0k“{ÇT†uþP¶éhòòå’~÷èoþæodà8?.ü– œ0ó àQ{Ôâ¬Ñᇃ58¼p‰8J£fà˜8nN˜P“ytR2»œG?–ñäÙJz6&b -‰tñ;¦:m×­^I€gQq«_`5ê^j¢Ø;­ÜwÝRî÷Œ•;õCå½EÌÏZ¹ï¾ÅÜö OßbîsVîó·Ô¯ÝÉÏ~öã²_½D¸çÖIˆ_ËÜ{­r|7,iÐý£ö ÃÀÁä›Þù&x ¹W¯ex®\À þ{²Ì[åú¾D ¨…èØ-Ñî ˜ßØ"p5Jó]ˆX°´eÉZ¹žÇøÊ••D{‡Qîø­w‹¨¡Î¬áHx ·8†|MÏÞbÓë5bzŠÂ.+wŸÒkÙòæ\a±9–¸ÌâÓ,ZfÉ æf +3ÓÖÆOØlÙ”`DY ²ÎÓÜPÄO ßXæp.­âRÒ´ðA¼ööuƒ@-Hˆ–«—åk!2P àÄܨ`>¢íÊá?¸<‰»$ý» +7foŠ‡.ƒpµª…,‹»næóJ 9` ù«KLNþÅQ¾iOÖ_E_ô¼˜6³ÂûÐ Íx–U ÀARæF·$|Öƒ—'Ž²¦zH}ÜiKœú³·=ô|úçêAZÙ®‚Ëz…p<ËÜò°x +´ |‹·85NÒ-“ð,âVP²¶ÂJ¬Ú‰kÑ—fR_wj:%¥iÞ,͵^n…¨M¼ï…¿8ú¥ÃONÖƒó=÷ô7îþÛïßÄèúáæe; ½ï;NbÈ0û»”^æ² Ó aTH¦Õ[ùÊÅÈoäŒÖÅòìœà ý‡i9–]B{†ì<õam ÜäëPµ»N‰ÔÞM/oŽoR‡7 Ù¸ÖùêÅGd°ÅâË׎Yí‹ÁL”§z/€¢ Cž±aåñõ­l«Ì#Û´ðZhœzç‘)ùžSBß'èŒ÷î ‰/±¯Æ¿¯Á¿¯MwÀßì÷p¡¯3¸ÐÜB"Yþ7—R‚d”?¹xOHiðSö#/¼>°M"ñi¦·&;~ƒ’D6na ;>.;Æç[QÄ2ßØݯm^Xx¬óŒƒ€&_œ:Qº÷ÿ´cûq:ãYBÃ^òÊd›­Tu‰Ò·ÌØ•ÊDJš£Éæß•AäyÿMIŒ¤Çô(Ï’å^S.-ѯMI¿)Ѓ +è¹[y)aBÐò —”3ENðr… æfªÓg(Ä.€ôÌxKñx“9"ãòUCŽÅUÄÇñq@ÏçÕÓÍ«›Ö-®9vÅðî£û>ñ”L±ÄNªÝÿ.$Oêô2p… ÖÉFì+јÔ9ÑJ’Œ3%˜‚³§K_póYe2XýEo„x»®3oÔÓxô ¹ð ²ÕŒÅÑ%¾žÀùÓD†%Ë|žðáþ¿/ 7ñ_3*ïÌ3‰]h íUÄ·’鎑¯¸eÖ¦n¶O½¬Ô"X\ V'i‡ßÒ2·û2/£{WKɼ̗y¹ƒN¤—’y¹™܉$öîýƒ£{ùõTÌa'Ò:TÒ>#!øÌät&ª4ªIÉ5x”«¼çýöt‡—ô‘¥‘ |¤_4s»/³&ý¢™—ù2kÒ/šy¹™yÒ ¢*u·¤î6ˆúâIè½·@Bÿè½úGï-°nô‡x¼àÿÑ®éÁÉ‚ ^o™pïŽÄG¨ ‡Ú(ïK2“â?ÜLZ€nòµP;´¯»*ž¦[Ðbß[u·:dèÖÚïQ¢]ö”(«È'.îMÂ÷N2‹Ã[ «åÛ~ ‡œs5àÙneè\BH±ƒ®¥M×éaßê=Ò4ø ç6ˆç”zX 91ÎÊÜQ† QpÌqUz µŠç-PŸŒKuN—ìãÍÂǯÛí‹YmÄð6ý%“Žx‰wÎO·`¥[ñoîýq™“ðéMZ€mŠc «•MNtô¦öW ·\ËÔ§½Ïm÷¶mOŸÖo8¨Œ;d;T[û|mí󵵺câ7¨Nú TçîL*GWMçHäMˆ¯< ‚3TvFÅ:๪(²fsvkw@”gQ#x œ†Sò^½?SÄmF„<“ÆÜnѲ}]¢5œøÂYÊÜN”T8S§²¯Hßo²Âsè<°ø¡s­,iÿ©†Óí$Õ:@œ©äùé|És”’¡¹Bé2›Ì³)°È¸”Éà&rOÏNNŠ@EÊNÌ¡³ÓñY^ŽoäzNF•R¹zj¶ˆöDú’'ºÞ‰`Vtœ+ýÑ<ºÑ ʦ0›¸Ê¸I*AŽÂ +À]  f1€ÚÅê¨_  a1€ÆÅšB¬[Zèö?8—Í°È8<‚i3­^F 5=%ž¢,?|€^±_TÐFþAv€Sƒí>a‚ÞtÂ]¼}µ²þ›Úm«(kÙõ­øJ{/‹iç{n&3‘cQð ï3|—égÈÀÁûUásÀ_éòÔ$qØè8ÀŸÞé)8à¼Cð˜~ )Tä…=zÔ)DÄWÅ»e©Ð‚VÞZAq@ [æ("­ºÞ+‰d¾bÿo†LîKE&w2ï¥-@¦ÚV£ÇR‰„¯+it^pú]ÚóQ #AV—a¢eÏ‹&á³Ôêxט–ÇwõUù¸u2 kRòIè&Pu&ʼná#q½ÒËòÔ&ð>ËÓå»õ¢ÎZP+FݵÔôåÙ…ßgGQT#µ-ë„?ÎVǵãNÔåDÁ–¦…*ˆkÍSC:´!+RÆÛ(Ž»ž æGö‚{½Gö‚9XÒwòj®·Á* ïÞjÒÚ+饣TSÚP :öÁ³QÐÛA9ƒA|Ô1†–ˆïMyˆŒÉSݦ´ðÚ)*XO¢émý!ýRÎ +ÙR» +ÕL‘/|c*{cJž ;ù²Ù\v;) ”-¡FÌ3Fˆ×ó{ÀÁ"ÏÎNØb·95%Ä+óæÔ"¹‘hëÐb5Õ Ê óèµÔi¡y<¾7ÙoF@ôôÀïGhˆ.¥’FÔÑä[´KéÄ”î„ê`ÓÁ»IA’¶øã·¦ÄÛîæ»™öû<xÞÍŒ9q³·6´î àµj¤€ÎíÁÚ{iIà”¿9%$Äcªd•â¨¥ŒÇÞ dY¸ÓA’‡:=áïôúëÛa-OöÊiG'µXVŸ^Ù|™.¿°? Î S[=?j´;~UúŸŠ©—|”£l§_’&ªXz‰6!ÄŠ½ê%ZëqRàî– ÄÏïàŸ"=+¥°Õ±ïãTb œ£®ÌÒѲÖ$N N½&N§ÿÑÞ%§[Xÿ\{P&” ”É53ÃeR Êß ¬ƒ’oVõDþýãŒO¦Ä.6ÔzeU…[q½mm±í˜âMí6[zh¼&åxÝŽƒøçƒ Ù’’‡'ºƒ¶¢z!N~0¢íˆé£Nœ›ú¬·ª°…}Þ½s§µO Óš'yÓ_™-è[~:RÍÁÅ›±1‚%kë:¾”àJ‡¥Ž#Q´ªã´”5 Œ_]ë‚ÝMH³>œ(uŽ;5Bg>1]CìYŒm=ª¶u§ÖÓôø<ÿÓ!BÓŒ\ñl/…¾»^$}?Å‚hæ£ï®¥Ò·îô‘£Ã¦0VÖi¸Î&ðÒ¨u`^©Ú»á¨^×Ëj5Ã1V“?wüÚž3è=Í•)|´¹‹…Bì&&âfįbÄhæQŸ¹ô&´5[×GäluÅonJ¯WæóÑ{“nù|ôÞáZ.0\rv5¯¿dw\ -0!üdøF…¬'ÑX_@þ©ekÛ¾´\×_… NRªã¼9-"H‹›¾¥S÷-¨®üÚˆOCj³J¶"1ˆ›ŽŸ–ËYR¾×¬tÿ ë9q‚ùæï•_b/C¯¼êV{%„NQ°¡ýóšNªõÿÌÂZ/N ÿåßtë÷ùZŸÕ£$”ë§Ñ²Ø¡áEp‰€ ®YŠAÌšÔUý Ã,…#ZœðõwBó¹QàØ5×PDñYMä±9!=6ÿóóq¹D9-¸ªZ \™rVRW³äᵆæø|¨pXlM`¿®( 9#TÊ^@ö1Þ†·=9?ßÄD`sò:°%ù\ÞÀÀÖä“&S–'sL:’“:°2ùeX“üŠ¬Hþ®ìN~•‰ÛÁõ¶Ã.êî§;€É·§…ñ`ˆñÜ‚:ÀDÐ뇱©ý;¦ýCKI­ý{m/ä¼ö;‰w/¤ý³2ùªÐ¦˜Â7³¸7}v¶2Mž©Yp\%  ×ÒÆHçuœÉ\áûöp1›»¢ô`UÁ?P“Æctˆ +x²TVïÍ„r®PšÈTsìÜ\¥š»(+@+å/ ,7Ñ&j¶¡ËÚ1ŽÕ£›&“&ñ¦óÙ“ÑrîRŽSžÇ[”††dfª³eõÒãÀt¦8Åë“?^†WÿØ9é#µWo¯g*Õ3¥ÙŠO ªì3<Ó%h3¼ú.YÌHµã©\ŽPbù +–…Å—s•*ïzJÈ–F2¨ÑÌ©âÈìV!V°CÊOÐOTg3Yöèl™>¡nL Ž +ƒTG…•Š¼%ª ú˜®à5{&þÑ^@Ÿ¬K=YÌROCà˜'S°b`ÇË¿GÚ!C¬ÞÀ~Ôv»Y‰“¿pü)ð|gáN?ÿ7ÍËÊTrúkt¶ZN/Ë™)’_à ƒCI¿âS¸!/Vr™òÄ4tÏ }žÌ¢¡y3ä 1Gvl2_®TÁC„ˆ…a C|¸3€¾1‹‚yÇEy7ó\â…áÐÃÃX*@ 'cvüÀzð ÊPþÂP-féÙÑr颚€„µx T +úB.±îð#*ëî|ÑaœâŒ5¢TädBˆ<ÏyªŒàøØ{€HUÌú€´YúD!?qiàûš”ëÌ…¬Zø¬Oç«çs¨%ç0ÇåœkÄÙhçX©¨'•6c‡ÇUôøä!5tÇ®`¡|q¡aÉ*œ/ ÑÂ-J»gƲ®§¥Â 4Zùë7ta¬ƒç{p<’©x,=,ƒ¿a‹xŸeA¯ +!Îü[„ùBŠµŒÃöøc5!ؾÁÇ ¾¬ÏyŸ=©QoÔšO&Ž‘ù¨‡ÍëXÜó||!­Á¯zøâÊn­Îg¸è¦û;”¯N¼Š/±oxm,•(ˆ¸â¸ÅS~Hñ”$–; SúÛˆ\a¹ÂYÁ)6Üã:‚å)aá&â´ž…œî‹‡N·Û"ùíœßEhaq 8ì3ÈqÆ$[CFbÑ=˜6@WN{» áÄ`Šþ=‰>ªgè©´Uñ.]1_‡Ž;ñQ3|L=¼EáŽ#›8ä™9›ÙV˜Ójè ˜7É&°«"Qi¬ï²¨¹¨  Ö¡_T0 5{Ì·¬oëPc¶Æì™1¨"H˜ˆ ̇EuÃÆ0}0 nˆDŠj{Šx 3tÚVæçõ¾ã ÅÄ*¹…›év +]žmdKm;H7šQ²æÞ©W`"ÍÑôЇw¹wvuÝwuÉŒG=ûñf/ý‚—™}äú~°£oèaî Kä‘]uôQ®&›/³úB©tav†Õâ!‹ì?XwCHÊã†& AXìÓgk%ûDz6שó³Oî°R·`,^Š€Çíè>+úË2Z’}ÂV¤„}^FËW‹GLi_*(r4(òlPäÝA‘é ÈsFd­Œ<ßuPüZ’‚÷ˆôž”Ö}òt댕<ó½‚gÞ¥¬÷ŃbbGZQ(îCŠ;ºð³?PxØ÷KJÈÍ?@^Š4Š³M5d,6â\9îKyÄ«¯2xÝnœ'µæöíô¸5ÖŠ‰ù ‘å£l)u?´pÝЊQÖ¡`¡¤:ØMÁ%>¨¹Í>ššÔCŽ<5°ò;±Ÿ ÓÃß…Úô°Õ¦e}Š6©Šý%1y˜ÄÒëÄkì`±ñ©ÍðAÁ×Úç—¿wÌóKB>šÕ>š¢´LJ/‹ÛEÚXÊìÑqµÑêú&?Wc÷¨ˆ4­ÂZpBpR¶y‚̆R2鳇:¯ÝÎb¤tzé+!h=˜Ñê#MD]³ÜNV]3B…€±¸"´aæ š ®ÜºØšÖ@Ò¡&¿]n<€tãžN/NºñEI7LºñH7¾0éÆo™t¾†™¤WüPÖG“¨È„iXÄh’]”&Ù`šd Ivašdo‘& 3i’U4É-@“œÈº„)–[”&¹`šä Inašä^4MTÃLšäԺ݌kØV²O!¦Žœï€Ýn x¯á•¸8;™Vfh ðË‘GMU)í ap ¶1÷yñ²páÍÿ`sðˆ^–Kj“¡s†6ø€s–XëwJëQi¡kšB´R"ñ¯(túMd{“‚ChÝ]ÌÖ$ôƒt‚{Ús¦4·6q"DŒšw/@‡7|ϦË鹣ߣ–L‰–€ß#(â3X¯ Ȩíñyl‹+¼óff߬¼FU[¿ù9¤·©%ÅL÷â ²ŒÞ¨ç}$Zä +!‹h×´:7M_ï—5=Ì)I?®y|xü¤ÁÛ?+o”D•9LLð-êdß©$QE¾˜¶0säa߸ÙÛ˜Ü&ù¨sA´*ÜÿójFö“„=˜M63á¨@HÅ +i±|ƒ÷Ü6ªçŠ1 ⸒ÅÄÇòcJ~<$?‘Yù‘“òc<&Š¾0–È ðóÁçUŒc}_Ê¢ÙóR~1ð&¥M «j=ÍyäÄ€v·3‹§m5;jBÉǘܵeÌ^f1tV¾q_¾œyÈöv߉%t_ÔÛ}QÑ}ÈžõŒ™%Ž‰ +5–‰7ÑN#ö•ÛíÒj÷C¾v? b=ëðóÐU¸ˆÅqJX3dÊWÐ#¾ÕK +‚p°\$õ“¨ ¤±‹ž‡z#n›Š£)­µY€š[ŒKŸÓEÚ ¦=eàÑ&çg½Ø õ™UºK¥Ó_]Vœ*6±†•<ÂÁ§}ÖgôjýŒWÅð8²KçluÍî2ꚣ>ÝéþÚêÜæV‚¤ë¨kÌ=·êÎb[ åV="zIå¼ Î?bp—%Á·¾9Ø·áʱ¤U­ÊÆ5)Vá¤9‘úR¦Ñ4È©l®®QÈÌ>²ù!¾°x”&XiøÞ'ïö^Aiµd‹”X` aŸß÷`&Fu‘àX‘–UƒÙóeãCÛ[~ßú¹¿Íyö·1qÊÜ›²îÿ¨Õ[l?ôïvì“+´Bk…–¶9¤P.§Î›Å›óî ÃIŠBuk®êÙÛ ³QÈFI¬oh¥èè'V'Rj#¶¦¾áKcIá;¡"|YÉá¿å¸“Óþ˜_'ø†$èþj¡VÊ ºI¾"H‘µÜÖ¡“¢á5iŸ¡¨šˆ&Ô@xåЯ%Á˜;èMy]zTu,_ìWp¬ŸLYQ<ê)#J[ο^ÍÓ§=‹ÏZ±žõ¥ôÒ0´4¼ÁôM”]WÅfn6×Ýu;Q±$uÈå€è¡5Œ}3ÄP÷Yš¿”ìðä…£ƒæ™ââXÞ(U¼ëô®;í+ò*þ½æ³þ½ŠU] „½Zâ®ó# gæOAcqĽÉuÄ×›=à"ú-îO‹ñ{]€F•Æ-J¿WFìVÜݳJ8øVkþ¿ ÿ¾=%MHïàâø}‡\7ß™–Pr&¿K'/âÀF¯îPÆ«w`iGùhäcëŽ0ãUÛ6s¾ñ/]Èz­#zûBÖ«v.m¾ŠFœc¦%T,¦* §…ÍW®lK12¨4Í,ÏUy±lìÊq¯Q§ÏÊslÌu%à¢4ÈméØXP¬×bÍ[-ƒSQ¦mšŸY¶h`¼ˆ~XɬUXµÂËIôn|‰'‰2øxÓyÎꎰ49ÏÎó¿'XúSV³ð2¯EÊ /¯¶Ymjkñ™¦§ÐÀŠpV# M[°Wš'ÔS ßrðfŽqË5â&ž«…9€‹òc‘àe.i(ŒNÁ çÓÀµÎ^g]Œ&Æ´Ö¿oðu]¿ LÃ08`ñ·¤)Ð3—ÎXüÀÍaÀ-À­aÀ­Àm©QÑíZ`1 ÎW‹Xæø¤ ˉçR{ÕŠç’PΤæÚ;ÅŽÛ+vÜ}!{Ø2¡*¥*•V÷˜*_A—|Ô]âr§ŠXmrVkÄÅ tCÀ5@×jS¹'Y'µ5([ ×IX±â.±»nXpD¶ÉÞ¿Þ!˜õÆYÊ‘é1‘¾!¸ ”¨ü™‹n4Ê eúçEú&yHöâT¨8»›1Ó†€LžZ¶È fK‚jØ*2lÖ¬®Î`–<z4 ²1hÀð©Ç„ÃÇm/I^BÓ·§ŒÒ»œä‚髹·ÛÑ +Þ˜È vÏ‘œ¡â»h©|*ÜìQ\‡ \plÚ­_¬Uá…ÈçJ“Êìq·ÁÉ“}$¡Tf¯®ä¶c£&ŸÄ„|Ò>Éëí_*Ÿt@ñIGŸ´ù¤#a|\((dffrYzÉÞ ýJ#d¿–Œn_ˆWòç4®ûLç&. ó}ÙÃQ[5ñUâÝÛ}¬O^¾/ZÉé·Fب`Æ'˜qBwôª0“£1y¯=2Mønªx÷‘˜ áOÝ–‘výÊb­,†ËÃHá÷¸3¤Íó«2^ð°j•™B~B^òw’ÉÄZó +ö°þÖy#Ïú¬oEDÎؾCÁI¨pÜ…Ò«·vÅ')…s¤Xñ뀼 ªÎJÖ¡žD_gr`7+ç^—.¦?‚nƒ^§Žpäðk@Þ„–{4%ÏMàÆçë‹À›ÔêÚìÇöí¶clÑÒZÒæ–²I©6J²·"o\JñÙ6êøÚÇDÇFják«k‹Xü]Ø.\9YætR ²L0Cm\Š‰òcÖ!ej²ß^çã |«­Ô®ÀQ¯ºðUÃs–«Z+²>ù­rw’€Ô”©®BÉÎìIñ´îB!hIaÙó¾ûQwuZ*³…¿®›(ù” †8­]4;âvVr}ó¤5 "³r²S#r`kü{·ÌO¬®}i¼ÓÖªÁµÎ8q­ ¢§=°D®õF®Ã! F{ÃE…q«x¾ñÑ8qí£‘µGbtnA’ƒrëc±9ŽßY~Ówø•ÓË€òb`¿/fùŒ«ïúnx©xW¾ Ü#˜ž78À‡+ð2Y… œƒs!=SF éÙâùüÅO°ß$÷’ZüL™Y˜íÃì|f}é^6ûo>FF$œ-¯ãIuuøBVSz"Â5¶Vu90 ·b‘­1Ôµª®vs{$]@­x¯ÃÌP½Uj•Ká9ä„8U6 BLùú±yÉFtýÔ”"3]Ën¦9 ¢–€Š6UÔl«è}eù–úÖ”®E,ø&pc(0؈úeŒm˜ÖŽ—^A^®·e|(¬ Á-(±«dŽ«‰$)_"éòà/¢W{ªÑk<­¸µ‡/»ÕB}T,Ô›p¡>ê}øW¢>s%šo¼¯²];Ýôì¥íÒ 2¸¢8ü+—/X’EÄ _Ýá}Æ|%•I‘/D#×±BîR®°‹M §•g¸¨ü{ä+M5=NÈ2è=Îp¥>†PK _£e(S¸gáåSØ–…+ qˆ¡¢+5pÑÎn(S±TÍOÎ!¹ +2`Õ{!ʧ V1‘™˜æí˜dùâ¥L]³:òñJ"Ë„@ªœ/Néw-+‚tÆ“ ÒS‘ ðpq:WÎWy®-Æó¼§~:² òr3ø”µ]CƒPƒµ§þ|ž'Kl_®Ç|¤EŒ‚ÀvÎd‚9Ι<Û9“9 +žX£Ÿ.×üŽ2ëÔ'Ö]ïºiqB盌B(îLšKœ[sIO­s8©¸ÃÑn/G›š£ä觊£³(k+žÁF?ecÂÓâPåÙTyU°œqiŠœ(²ÆÊÃ~Éšæ¢9VŽVèË‹®E3ч¼¸<,O–‡ÉdyXÉÈÃBÈËZ†<Ñò0ä•|y`$Sy ÀTF0•‡¡˜ïƒß|wád¢Z7üð£àó±ŒÈ®ºÙU~SyXµå!™«ÒŽ¾î–êñïÒ ¾ÿfò×-E¸]°+Ëø÷çªø¨xe(_™¥ ÀÞ#ÒlýE=—”£æÀùŽ!#x\D?W(Ñ‘ºŽ5¤ +l`ÏQG¤]üB¶ §µOËtúñ7F‡qMHœd0¢ø´ø +Τj#½çÕžžÒ+¨O .xpÿ… úƒôÓFî¡Z};µ^¾ NÜ¡´FôAé w]ª"QU‰†H4T¢)ÍvÝÚgEâ¤2ÝÔ¡—¤­–Ênäg7ó³gílAàEÝ@›DNqµ×1¡¨5ãª^:J›±¢ô—vU¿˜ê$n’N&ßtuïnïî]’§öKqZ_ ·Àäü3òñ’'O-!à¨Ï Çâ|rÁ:um >?!ÿ[=qÄîî±ÁýûâpM…õ9<=yoô{CiWµiAõ{÷÷Ù¾JC0ÎÞÄø¢R}L´âDûãDx­ÿp4 +NÞíiì¾;ØGÿw6¶?Ô…¤«Ð¾¬Õ€gFëÚx ³‹™EvàäQdö]J!XÝÛG­ 8¬•­\Ý¢vÞÛ—o õŒ|Ý‘m=Æ[Û¢ëöÅ¿!Ûÿú¢Ààz˜ÝÞ•Õìôvß#lÝÁÎæ =ؽµ%ûOúf}c»ßG”[ow 2]†ñ !ãÓÔx¦C=°ÊQÔŸ¬Ãw±j3×a¬Ó;f¯›½dv*Ûô·s+G:pýÿÕ×LYŸ?wW\’aþZ˜>^#º‹9G¶OJÍËE-N`Ysí,¢ô¸[FèXAÿ‘ +Úv颾øj:-E¹÷Z+XHÉõÜ°W1ã¢ä–¨A}«l´,ó¦ã¸& ÅÇILÍÀˆ¥õ:U6Ý~Õi`Ùõ’:»B¶8'´Yo+;.ÒÑYbƒgXZDI§0Ÿh}Ú—‡ç úôˆ':Ï ¡ Ž­äѽK,°Øk´iReœ Sq7"3tôLs 0×\ÌgsjeÀªæNWƒµÚ´;V›NlÊÜ7k°gÚz‡íÉ]ªV°Š 6ߦs'Ë"¬lª§4ØB›%Î8 Ô8­ä˜€yñÙœøD:–§ûœØÊ€ƒE=íˆ_’”„˜µ¤|r‹âÿ² `VPÌk¼*ŽSâBÞ1ÎÁû÷y~b.iÌëNa»¨õªLM‡6Z|š:<<$¯Èœ A¨mòm`©àØx†;ðF«Ûâ€Gñ‹øç¢^îõ.W:ŒtõõЊ¬˜cÅüèÉ…lO~ðÁoYôäÉGVí¸Ù¦{ž“j?Vo¯ý%**aE¥B£_ç}ì×ËЯŸ°Ñ¿}*jÅê>|È¢ƒƒƒžk*L‚ŸH (øñäü¦@œ–ÒDo°TZtf8ëY ö2 ¾XÂ_ÿ4Y)0øN˜ñŠ€ ÜÅV6 t&‚¼hö¼x)ú';j}9ib.Ìÿ9µ¼6¨jg6ˉ¾jVIQjwÌÏÈ ÎU-vÙQW¡ù’ªb((é5Qƈ¦7nH¥m1ør§®ET½½®61’¦M3š!’ãJV)”“JF §Ù<ѱœs+§íÞ9éÆ<Ä@äWXܽʢî* »×XÐ}™ñîuv·T\Ø£³ÞÄáci(Cì3תÉ,tù4EÛœÏÍa:`²²âœˆ,tH+™¤'¦÷¬Uw¥ì¸ƒÜÒ±èã¬yËC)J·t‰efÝÄáçÅ×é¸wÁÛÈ»Qøe8Q|~¿ +¿7”2Î#ñ×r‚–ûð ±@!ª®W„^ /¿ß$?óñkô´¯­îȧåøuM¬áSÄp<ò†~|M?®éñ(ŸÄ‘츄ˆ›ºÌ›x€Ãˆ ñyºŽ„’ê2¦®àŸ«Èé1¾ï­ÉÖKוÖïv.Ÿg•ôM©¬}_<αÑYÆlKÑŒ¢¦5z–å)p !Jñ×Mqâètd-o‰"M&äNZ‹Â$@êo1lQä"…Ù +J Šó¶È â o¤ áý¶(²À$¤Ìê:Ù`L' a½+ŠœUÔæÇŸk ñiÛ˜Â|_y–‰C›låÛ-±1&¼…êj‹"ÏI?‡Fj³Û–lž™Q˜3‹Š3ÝÁîþpÐß»ôöö΃~g¬œB˜o‰"K2Œ¹îIRa¶dè¹ðÐ=ÏF§l"SòfÕ0+ÎÆ“£Èb{k§Cš*„óo¢È2{ü I<êÞ µ{6F•œ·úh¶¬ð©´«,éûŠþ+9/KÊó,kæKZp`ïÇÆ~I€‰j¤ µx^Ð3ÏXY¶8?<#¡°¡¿7 öí{Êljó•ÓþDübÛ}xÁñƒO Le•r±Ÿ6ŒÑÜ|¸c›Wý&…9=K:ÖšÝÉÿ’¡·ÿþÿÿþÿÿþÿ ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿButtonÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ *<?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="Button" class="mx.controls.Button" implementation="Button.swf" iconFile="Button.png" tooltip="Button" src="mx.controls.Button.asi" modified="1059073889"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +<class id="mx.controls.Button" > + <Event param1="click" /> + <TagName param1="Button" /> + <IconFile param1="Button.png" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <method id="icon" > + <param id="linkage" /> + <Inspectable defaultValue="" /> + </method> + <method id="label" > + <param id="lbl" type="String" /> + <Inspectable defaultValue="Button" /> + </method> + <method id="labelPlacement" > + <param id="val" type="String" /> + <Inspectable enumeration="left,right,top,bottom" defaultValue="right" /> + </method> +</class> +<class id="mx.controls.SimpleButton" > + <Event param1="click" /> + <TagName param1="SimpleButton" /> + <method id="selected" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="toggle" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1121281616"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1121281613"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1121281609"> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1121661005"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1121281616"> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1121281616"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +</component> +</componentPackage> +Media 1ÿþÿBitmap 1ÿþÿ +Button.png÷´EwDEàÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hhhxií’Ñ @!E›éíäNw(w*¯ øQa}Æ$K=™ÙÚÛÒEäFsW<_µ ,)œCQj>˜QYŧœïZqªuDÜŠSyK0þzöÏÏú ÀÏÃ_Y?AžŽ÷7šÆðIsŽ›$ÿþÿButtonиÿþÿButtonÿþÿ +Button.swf]>ÛB+ÿþÿBorderÿþÿBorderÿþÿ +Button.swføQP?ÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ +Button.swf‡àÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ +Button.swfqÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ +Button.swfÁ°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ +Button.swflÀ>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ +Button.swfQ?ÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ +Button.swf RP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ +Button.swfÏSí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ +Button.swf=i„@ÿþÿ FocusRectÿþÿ +Button.swfÿþÿÿþÿÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ +Button.swfCqí>ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ +Button.swfRP?ÿþÿBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ +Button.swfqí>ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ +Button.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ +Button.swf‹RP?ÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ +Button.swfŒRP?ÿþÿBrdrBlkÿþÿ +Button.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ +Button.swf’RP?ÿþÿBrdrBlkÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ +Button.swfüH?ÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ +Button.swfÚH?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ +Button.swfI?ÿþÿDefaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ +Button.swfþH?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ +Button.swfYtÕBÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swf]tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swf_tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ +Button.swf_tÕBÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ +Button.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swf_tÕBÿþÿ&__Packages.mx.skins.ColoredSýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€kinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swf]>ÛBÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ +Button.swf`tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swf`tÕBÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ +Button.swf`tÕBÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfatÕBÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ +Button.swf`tÕBÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ +Button.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ +Button.swf`tÕBÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ +Button.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfatÕBÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfatÕBÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +€M 4 1212170633ÿþÿCheckBoxÿþÿ‚ŽdE¢?@HêÿþÿCheckBoxÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿCheckBoxÿþÿmx.controls.CheckBoxÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPcvc5e1p0uh..swføvCWS&«xœì½ xœÉuXÝýw÷“<Àû !9Ãá fÀ§É¹4¦n=lvCÝ :GÒH¤Fcê¦EI#Ù:,9²9×Fr+¶"oì$òÆ^ËV6‰­ÏÙØZ'Jb'¶ÞQ×ÿÿ €£‘<ùvç›ÿªzUõÞ«ëÕ«W¯žÇžm_­11Ÿ››ûªØ/„ˆ‰³±ïˆkòß;wÖ»5÷»ÿî·¾öòïm~vø·WÞú@y靈K>ù'·þïÿ<úxñ׿ð[ßsM2c\fyO*“ÿˆ2|¼} §fëõJyx¢R_edBÖñ± ç„èhk}çì;¾á»7ýä÷Kw¶üÖ‡~õ¯.ž^}êÆÛ?÷‘ÓÿêãŸ>ôÙ{¾'«y£ÌëÉ\ÇOʯÛ]BÔ§ — •R¥ +ßÅšè½Ý$Òq™*._“´µKÅrMdnw €…üsº$3–ë2^bY+Ô1éBýz© ²=DGBѱ éðD6—/V.ê÷15IÍ1¤fÙ=‰¯Ÿo-ÿìíÿëþï^þÁúýòÓ‰ccÿùCOtÍ×O&þfãðÃ?+~“©IýبIºÔ¤‚Ôì•Ôl‘Iiq^üŠH}GQóàã|äßþÎŽ¯øe¥ÐøA™!×cä[_f¸ ¹TpgMpÂŽ ‹ŸŽ©°Ê ¤S ,—oʵӖäšØ†‘ÄÛ¾èÒ™bþ®ì¨Êd-l»eQm†ë”,‹ì—ñ=" 2‡i’¸ q„Xm@í ” „€öf{æ¡6 ÓÕ¨¶½‹Âioš÷eqVûû“±Qâ彊#˜ì$ƒÕÜUÕI¤pö.ž×f”FÍyIèÎ"˜ìïû“bTÁªFäÁLÜÙf† ¼“"tJŒûÚAŒ•b–+›ÊÍÑsbe ÿ¦­þ›Î`Ý "–R t¨÷ù òK|X‚]Æ‘r™Éžÿõþnkê¹O±|UÖ.;j¸Ý.ÒžäqZõ⼦Åe}XlfTN#X@Æ<ôHèÖ^:±öþ¬C“b›,¥7f'èÑûã$,& ›ÿp²´N†õôøÀQ˜Ï}_×! xˆ©çÐÑ«éH᜔ðRRRHaµ¿7çôý„$Ûs«Ãìjä¨yNŒÆ‚{ ‰ìêÒêàáU]7ö/ùšñÐ@š›I$ëÍ7k¯–›Ø-¼„CÑVM‘ç"!UÊ_ž‡|sÎ)Íî–G¨[Ê™ìÇüã£&tÂ? ‹Êä8b†ÊìÅh+7H¥œÆ|g`Ì”ü;tËâµÜbÙg1Žhú#G{XcÔ"žMâ±çcBŠt±˜˜œœì<ðþWþzÝàŠú¯Ýøný?Ï:ÂV¥#lQzˆÉøS•Ùr^J”§*×X™Ó¦ÕjW¯^µšHÏþÛ¿ßñí›å#²´¢]¦}0Õ“ â»ÐQÄ7÷·~M|,Õ—Q¿ñ¹Ï}ë‘•§9eîø¿øWÙƒU¶“*æ h$‹µÜx©ŸWOóê’ü2i‰"¥ë ÿèW?´v­ˆ§žŸ«V«m@YúFuÃ?ìøÃkå$)û¤ÌТì¿ý3š²o=úgŸ×”M®|ϳâ¥T{BÖ/ç €KFsàéö”„ûçÅ×ÄšSÏx "}ˆ|äÑÏ}ž#Å7ed³DÜŽL0—"µ6+W˯’CsMï“Ió7¥CðþÖ_ßã?éüï%Ü᱿øoÿ=Š^1ý1 ·M“ê D_§Eßè•BU¶eŸLèRmÙñÂçÖ_ëøÞ÷°-OÌíÞ½û¼èXú÷¾÷íkåÁCãBö6 ¾ô.»ºæŸa'¢ÛN¦x!´±_|Èï +4 ÑÒ‰´,µhydF°m2º[R2-Þ “wî?":ÚvžH_HýÍ©ýÏüæÇoüȾç¶ÿQþ “ ¨~P/»Û±öa £[´#?»ãÁ0—#N˸/Tg5þæšÞ"“–ß;q`4fç‡Á~3•JÖ/QÏ4Dñ.Dn¹…øÓï?*“z^ý^’ÝDdÛ„öBiÌGÍ;¨_‹ÖÁ.ý´ŽfÿÇ€œÈ®/1OÛ˜Óz²Â`.»û\(*V¢êVSZ‚Ú…x1•òä<¶êמÅï%r̯úôׄxo*µBŽ™åßÆϵ²«v!6ÊÆ_õâzŒî“üYAûe…+dF{úXI(Èõìd­V¨×¬uVÀ2v•ØÓ ‡/¼ð‚èèþZßï~ùä¹e÷î’ô€¾v5Òó”üº-k¬Mçò•«?¢ã—UjµnC\W‹SÕ|õÂtþ*#ÚˈþÅü ‰è7ú~çËg~;‰g.€èÑq< ü!Úë"º=Šk’ÖÊȯ¦dË‹­@ÆïC7’(É8h´­ ™ã[_·„';ã$d£Ò¨Û¯Š—gJ:ÎÄ¡Oä¯còá?I~ìw/œúíÕ÷v3ùë]ò+Õ|¡ú#""¿^äŸ*]’xÊ>+68‚š<ÞÿŠXû“¿óÝwµlÏwß ++¨–7"¾c€¯œ¨§‹SÓ%8yíQ~PÞ ¾0ô5xéÀx#¢}¶X‚S ˆ>ÙºrÁ›ìÖ]/þÍÜÜ?åÖí¤ÖÝ(¾õ1*§‚Ó¢X—Ñ0ô¶&eÙßúêÜ1zJu…4t…Ÿš{iîÊùÆê +4¸79]a¸Áò,#i™‡f‡@hšÍHàE wßʸŠÄþûß•’"éûLw@¶æF¸ñ +ÌÔ]Rt7AÏËéHDѽ١§VØvl1gÜmƒ…ÉÜlIÎz°Uð½U<2L +üÓ×ê…r­X)è.GŒqÙý s¥e–÷¥–Cq]¿¿GvZHȬݽ_yÅ­o›.Nöô 2j»û¯ƒüû |@7œwîÿ÷ŸüLíCYý£l³Lè ‚ÍíŸë<0=#ÞBp™ÁûÄWý£2mˆ¨‰íèµöá?e³ìØzK¤Æ†ä]=7~6WΗä¢);ú\´ÈN³þØK•;ñÏ5m’±»°—Q;·Â¤¡!Æ.Opöv̾Kœ©LÌÖ²@{;æš²2j·ÅSnþ$ÑÈÍÔg«˜?EY6h…ãé±~—XñÙwÈøE`ý6Ñññªâ< –»©ús¹rnJK­Ý¯[{õK|*—g*e98 ~¿L¿'ÜàÛD×—2ÔàIYE÷ß<ÿ 4É¢–ï}x:æpð»xY((»ö8¯Rœü߆~ùýφ٠$¿¯Oþ5×»Iôœûw1Ð&{K÷?š{=²Âåÿeà3.#ö8##º)Öʨ½µ/µÕ«ÒZ0Û^Ù)`GP)ûÂ¥ì•óObÎDºO@·Ð¡iö d?çÀl-Aþ£Œ¼7šu¿%÷ÛÝÏG²î«©›u%{$±‡ÇéW‚øV˜ûK)à'ÅšÛRª«W¦¦ä"Dý‹(”IúOÆ0¨Îè!(Gîåb™-,­ÍRŒ'»e­”Üèþú;×c{­–|èþúç(°FRL›Ý÷2$Z%úîšØkWŠ•ÛrŸvü:}@»²ú‡o±ùñó Û¡¶P@‡l…Rn¼ ùĬ¹ÝÃQçKröÅåST‘ü5?nNÚSì-ÎJ&]’QqŽzZ~ý<¤¢-Š!ô$Ú©‰Óyï†<ƒ^ò +cû2×ØB ãí;ÉCblì|nâ’œ‹jý—¯õ£TÒ!̵÷$ óÍŸ•Óº²À² U’f"òÍT+õJýúLAK3ÁìÐ)‘¯æ®Š± Œš*ÔIÔ©”OKœ«gª¹Ë`òr%W*‚š•]©èrñÔ|òÂ…Bý|µ2s¦”›ª¡êN &.FJú*ªMF•\üÄh KÊ>̱Ö)ò%ÊGêAÌýg¨:YÚCïIÊ ‡†|ˆ‘ÌX'¯©[-h4×' }L/‘ òF<|¤óT?}BÛ$”¶×í#–Òt«Mû„x´RÌË刪j6çW1¿%kRÙžÛI´DIŒr!mBÚ•´Ê_Sf”±o¿Õ=7±CÄfD|´ÉÏš:c‚ŒšÚ¢øÍ^|”¾R.wðï’ )T¤­!H›ij"ñ´L.Â4Ê™D~-1ê”tN‡<QE•Àx”Òq´‡GÖ}<²ÖãȺ/0²&äÈè7K[û—7AŽ›ÿ ý÷"†›uPŽàZ½:;Qç°SÆäjlLŽž±12wSÿP[Âé)¶T˜¬£QõG½2†^Ò4ãŒÍäª0ªòÇ+r¾¬ îdÔ9=kŽ™ ´æÄSÎËVDÍ bh’ÓÓmÍŽÕe¨pÍ ËУÊvMMëÈ´éb¾ ª…+Éò|±6“«OLŸ¾dq‘ÚäJ4ALESµÇ%ëðC©X æ ÉÇ0Ì"_‘“YU\.Ô§+ù‹°þ²R‚a²Lv„ÎÈY[™ÙÌŠ0ãIrp"e³ÅÚtQ6N–Jƒ”»fe +ͪõI°¯£é,åv(ÿ8üyBÛKêÞ¥zšÛUÉêNBÛå7!”…R¶kYHF‰#¸ÌÑ÷ŵú™b¡”W Alìà q’}R†E ðÌ7(—² ¬×sÓ88a ”«ÕÔºtýòx¥„¹èsô*˜V S`MXEPÛL’³å rÀUTH6é`aFÒ6>[,åñ“ZmvFLËùŒDïä•\±‘Y»š›Á¯š¬ è7#V9¹@"VÅ<üSC&ƒD i±«^çUÕ^Nâ*L¨cN&~Z¢(Ǩd¥žàŒ–¬.ÓâZT…œœ˜(ÔdO/–Šõëà ™C ¹ºÜxˆ±B9?  ªÓd*W1ï™jå2Pu>ý;Ù„œÎÕ$Ïai.Të×ÉdrrLQÒ>‘“#$DìŠ5jé Ùª`¶¦ &J²`Ähb‰ƒSe9[FCÕ¨À±1œ2ÇÆŒ‚;^¥z9W—ý_`nµ/3I ØÊr$Ô¤§ðÏ™Üåbé:~âð ® Óê¹\uJ6ÈeügæYœ=è,‘b]òs‚ÊÀa({hƒÑ"Yèÿ'ñ ìŠeý1LŸ`÷\…¡…‘’ø +Ó^¸<^ÈŸ©€äǶËÈ  ÜúT²pž\©L} ×U`@ +÷0™kÃe9/ëªeŒ-¦ªS…@G¹"ÿ¢ûú÷ôïëß»ïÎ4‹ÀU/wܧ/5›UBOö—s×TTîEÍT “…ªœ9A‡)™W­\>¯ûfI7•àéœglX¯‰ë¯;)³²:$eÒ¡vb%X(¶Úæ:‰MQ2ÛC²h° Ä#e𠉓eCŸÍûD‹yM™cœÖJkÑi­¡´6Ö>OÚ’PZ‡Nëœ'­K§íà´¥H]wFÕ`‡ŸjQ™—5ȼ<£ª dn¶2÷¤g…Û +ÛJõ}">­EãR4æôUºú.¨¨'« +Ym²I8ÂîÊPc¯ÊS[„Þø­Ñø­5E_Õø­1ø­kŒ_¯Æo½]H¿µ!üÖü6Üê†}ERf¼&¼r…d³§…2;ÝÈæa1b=ê›^’Mnö¡iç&/N°„DãUøÚæP€Å€µت·OÛB=j£æÊvCÐ5±OIl)¸!DÒ6CR_¨ØºØv±k˜¦@SÀз+TÜn]\¿)îº.nw¸¸]¦¸{nuÃåÎ3hBŠ Op¹{Ì®[ÐŽi™öž@;œ}`ý'7£ñ[÷à˜¹7Ë&žÐ0Oõ¡ƒÔ =Õ ‰khÍ oüdéjîzM|J(–Ž Ù.Y¿™/èzŨa Ë8]»µAW<ØÑeЈ[û8rç7æ 2ŒÂ7ùÇç|Ç?Ñ ˜#Bpä Ð2$„ß'Ò×DêºHª áY½Thce˜˜µé LñÒ¬&èðRX\RM›@×&Ñ9។Ê‹ãf>­ƒÁU‘š6TƒÁŒÅ¶Ó}Ó@¦h N.OÎPOá4䟕µËÕ§3þ°Š54Mˆw¡DGu¡o­€3˜TŸH\Û+'‡½"ymŸð®ïo hÁ2ÓC8—ɘ¤Š¡/"&ˆ‰;1\ù¹[«‡P9î;’yÜ&y¸³ûcq{o„ýqøÃKʲSTv†çmFŽFȣʚó¤,Šû¡“ã×Þ7ªzyh‚;æH`ÌCkÔÑÀ´p44íQÑYe+/®¦æ ·ú¸<)ß‚fEé¸l?æGvF0/‡¾ ëKJvzhØ)K¾¨×ÖGnmƒ’d—Œ›PR–“¦rRªœOñ=•G‰Lc¬ÉjE\RãþcȨGi#Ù:>.Ii^Jb´¡š„BéBV[Ób‘Û¹¾Ç2úßFäèyâÖRµI"DÄf¡,€mÚDª7Yý#š#o¸Õ +"Ý'iÏ‹OÐÈôR™ð|÷Ÿt hñjÜhp>}Š [.ü§=ÏØÄsÅÏd­®¹§Ô±c![ùgUoMVC"w«M-ÔõÜÝ’%ódª›¸µ‰FNÌ°„Ýs’ÐÌ£²™ËÌö½Oé¾€ü›þñ &È¿SY\¶à’”§¦\–¨Óm®p›&@e ¸Ý#,.@6Å|hD5'<¡8aH,FÍûÏf¸Þ` ³<É^’k&gJ2}”™Z2I¢p,PØåÐ0~.SÅT”,2ƒ²Ê2 ?Sô߇Ká<+õ Û¤Âö·é> uÃ4©£ ÖpùJ h¢mtͤŸ½juÄÖbŽØZyšm-œät ¥ÓNðÄÖn€—à«p¨€;4p'/΢­KwóÃÜÍ·a7?ìæh\Ñ?páØ°íÆ\û+iÈx³/¶>ª§”›Çtö\>oŃ¹…ež´…°îÑn¢\)lã Ú< 6Â&!+Œ»3â@û'm²{Œ×Û ûOÉPžßZ5槌ƶ"ãd«ñæ¤}–yˆ…–tXÅž6ÈùJÅN®'šdGÕ§›KL hÑ ò·ß¬æí–l]Ýá»®.%üVjæÆÓN­¦¨&|ï ÒÜÐgÌmúŒ¹ñl·ð¼­ôãñCshIc-!-iÀ¡WU]Gãê:¨ºÎײº®ÆÕuQuK_Ëöï–åt7lÿîÛ¿;ªý»Ïe¯%[–7fËrbKÏkYÝŠÆÕ­ êV¾–Õ­j\Ý*ªnõkÙè½`Ó°Ñ{lôÞ¨FïE<×¼–lYÛ˜-k‰-k­ê»¼¯ÓËû¼¼ïÆåý†Ë{Ȭr®ý7ýæw¥04ß"Êi–ú æØ¢,0mcD\sÈ $¶e%.\™Â-ä]àÁÂLd‚‰×Ÿ­ß£ñ»\£áF ž¤ûœ¤ð´à/ôS²Çí’PɯYö1Ú|^ƒúKöÙ¨\BJy73êœP9rŽ +âf@¶{¸L)Y”RžO˜ŒÂ4 Š‹É¹@Ümt¿¨¥î¥Ê*ƨªÎiýÓ v[¨<ü…‘oq4GΆ ɺ4nƒVjTm&c c/¦ª…BYÆÎä~m +.3ˆë…R©rUL\Ï•Åt®TBø:`ð1ZÍ•§ +ÑËî%q¿gmí}!o%q;š³-öͶÐÚê…ç\nMÞµ »ÞtÚÍÀ†òõ¶B}8ñêv‘ä!Û\ïY¥_‘Ód|­4)1ßʽ¥qnÐ3³y€š«›îæ -wƒ@s$­·Öñ%ʸž™D ?ÍA—l„L镼˜¹Ž©‘1%5B¦M!ƒ‹¯BfITë(BfîÃeÛï«]§üuÉßRùë–¿eò·\þz’±4ˆ²£·‹Ý쯱+åo•ü­–?ÈÝ+käo­ü­“¿õò·Aþ6Êß&ùÛ,[äo«üm“¿íò×';äo§üí’¿Ýò×/k[Aµ½µfþ=¦#ïGÊÂß›þ¾4¼|àïOÏAÚ½òy@FÊJHy(}nîypÀøýïïþýiñOæDº…Š?Åö•a"Ž&…LþŽËïòwRþNÉ߀ŒLêœ÷CÎÓÈœeœ³‹…Œ;#Còw–™9,ƒ’¬Vʽ¸åýA½¼åå}.ïG£/§Z>!Ú;[ ÓÍTâLãû©Þ,ìúÖª{#5úJª¾Ihîjò%¤i˜…ó¢®ÿX·­bR²•E¢O Xãèã.vxL¥) %ŠLÚu¯µR~H.¨”áRá:z,¢û{hñ«Ÿ iÌÐmR,gt¶¸J +—©œJù‚ÂAnEÜr0ó°\£58\(ñVû1NÙ­¼H{hÂM$ +«ýãÀï»l£„ÕF;t÷?OmÑã.FÚ~Î5k2Cj§ÝJ‡…=–¶ +šCoØ ðM¶PU·íÔ.†Ã»™‡+co"±û²D³?M¦ì¸‡hé¼GÒ¿—y£öh°O ˆýj>ÛgYŒugÔµijï½µ„mÙâ´È®Ã©«×?àä#éÀb•Ñ!m9s_´åÌýþa&àôÍ¥Úæ\Qï­ðÕ_Gýc(MÓfã™ãÆ)>—xÂ]p”´*ÿÏDo2tj”ÂŒ +8™ ˜Ô4!;O)Õø@Àú#Ƀ&y‘²ôi-KÃÒŽ·oÀùc!Yº\¯VJµ~ǽÙ\û…óæŽôW"jÊäúD3RuHàF‘ ¤»B=è͘}¸¦RŠ{³ÕL®{凢Z˜d‡—Še”Ô&•;gô2ÁF@¹TQq“ ¶*(|´P%c`r¶ˆè¥ôþ&ðC06V«£Ê|ùñhÝA!°òƒ1‚#FÁ—vlà„&Mq Ž9ñ< Få‘냱±Âå™éH»yqÚ|ÖsS {qŸ³^_·cÈÚ@\-àX&ÛaÚvP’+MD»LòÉÏÇt媅ãW/NƒhèôÄ@G A§ rƒÇ˜«eÚVI‚ÆëåÑÉIè*dûSgÿĈI]¶^½ZÓ‘Hw]¶™äœ˜A(€ó5]¥ÔkóeÎ5¥Ô‹bRV1)Kœ„&å7Mu'p¶wÀ;tE£º²„ºH~ÛÀC~LYQ5ò\Ä¡)'D–P´ÿu)wiÊ×&L9 ä¬'¨ÃÖŽ´RF=§½ËÂÑ:nüݺ»ÂÜl½’-ÌÈ‘'É•ûY»ì>,”r×mhX2ÅÂØPÐøjß°›W9×0‹oSœœ“±+´»ÍÒÐÝ ªÁ +{¨‰Kô<Ëìhgg%Á_«Ë’ñ5p¨$#XO­>gÑs9ú!>*d» +r}^Ö÷ñ^Ìõ\U°‡M-sÌå`3òp¤öóðÊ màííþ¢÷¦Æ< üþüpFÖ${ŠŸÔÞýõ”Èqj€ÖÉÇv]yCWb—GSšëBVWJ.»uјÅúô§ÎhWGó8UI“¶ªÃ +ÙCš +ÕŸÒ.#¬¶±7Ùz8ñ8¥qøzÛtÿÔªÙ¦›Ÿ ±7Ý>ú¯dCÿç‚â¥mT¨¶g{žð[ôIÍlßcâ6]à¢å¶P–„2“mIhÝ58s+„/ú¡NÍX÷îAJ7 ¸ýàŠºôeí‹%ø’r5¸Lþ–« = A¯€-¦’[WÑëEïfƬ¶6[š½x™ð© ˜×'fìš[«”½\èïjTÀYè[öóckõUÛu”?ÉWm ä—¸Æõž'bü6 ç© n²Z'î±ÜO ˆ/wb½ª©ÜÝÜ&Ûob¯µ¹nŒÏã"ŒÂ–yPP@‹®|+©tÒ}±Ô•RìÅŽš"Rù§sÿ/лuÿ'Ü[6´ÉÞË;á÷ E´î”¹7´× &1¢/X{„ÂÊv ­ÉŒÕÎkã‚RNèçêøšG·ðw™‹èœˆ8^ÉÀ:v›Ù€ÀS´=r¿V üç%3*7­îŠã5ù·pŸãSjSã镪.w°‡Õv÷dõÜ°!CÙ ”îžðwÝzÒO!þ4=_z^]L©}ŠìÕýa-Ý‘÷W +¼#ŸÝ‘WY¡n±ú  ×ÐT0 8’°uM›;dkµZÞ¬²wèæNKÜßßÀǽ¸¹·º´Yîopü€SÕ…õmþÕØ—Ó4fL3Ú«/ÿÙž˜NèËñûrœúr\_Ë_ //†‰ª$«¿;~Öf­Ù ¡W…®@¯í +¥è^{È(y +àå˜0Bד˜÷ÑþtƒãËû­m·×aTºpåû"3)•‰ÄDÒ»E躬™e õâº7°¸~.¨†ÞdÔm1ÿKû³ï Q£i+ê`Mø ®cÊÕïQ{àT"ƒ»ÕŠ•d¶ÒŽ«´Ý(A<€¨(ŽßêP*´£üí*¤ñ„!"ƒÎ´rä-ÊrÂ6 ÚN¨Éè˜8XX·Àœ#¯ [yhÔÎp +F–“¡-œA;>[¢ú ) ¾CÀù_1Nº—% âM4[,8­–Ý3 å±`ÈÉ1gÕ,1ìY|”¿‡T`DþΩ@†J¡À¨üW‡=¸F åÿï É5]®\ é‚’N—+éHºh“´Ü&雤Gm’VÚ$=f“ô¸O«Íµ—'‚íy¯ö·:£=gÛ‡G½!eõô"òäB.¶ÌzóTôAæôª Ï&Zµg¯§“1g ~šLµ«xRW±©“¾Õú¨íã?öþý\똞3Ç«ŸÐõ<Û ž1]Oέ'àÉï™GÇc¹ñÆ~ŸÍ7ó•Ÿ•_0å—?©ËŸºËò§MùÓ‹)?ï–^3Po8LmOàD½[w½CÃKRk66-5:v5}¡ÈŽxVŠà ¬Í ÙÚ +ÚGQqž¡ð\`¡zSúKÊ÷ÎQÿX°ï¥ó¼’9tžWVKK™³‰-àgü7*ˆ*¸òkR¤@{ý¨ëµJÏŠEV¢x1cÞ4=Ú£*¾âV|5\ñÕ@Å;ç­Øöpí¨âçõ@_ òóM†ŸoÕøÚWò£h ¸ÃÁv|6Ë"CP¸èrûU”Ýxo‰"Où¦ sH(äßÖ°3¼}žòžÌAçŒ #ž·Y~ ‚š@̸ƒióôF®åáZ6ÂÛ–w†ÝV™†m„Ú»fŠb(gz!I]Y‰\{·žÞCsìÔanøC fí"¤èØ¥ôêjOÌ¿¡FÒJ\¯¤X;JOÖ[‘‹"!p“¨™9ÇóßkË·+õ¼ñj8¤S²¥µÉ´÷Ùi( ìf9A)wÉ•i~)4Wn×üø ã´ ø‹¯·!îöWmp¡,Üྠ\­…ÚálP!Tt´+¬ÕÉ¿o!¿wŠh˜pq‡ÛâKsŠ ‹òCª¥~„¥÷‡b^2«Ýì-•rhõAäÿzaD¾Ð(äìz5Ù¯ëìfë‘•–¥Ê@Púawßb¦†y‡ &~Dw4ú¸û¶ÿ“|®ý1EgwÐçN°g„Ó¾$Wë¯íú 6}dæòq˃ž¥‚KÁÀ'q›Â—qÜqàS¦æ˜ÿS88ð +^ãÀO£S ®]]à×ÏùŸæ¯¥ W!×:õtêgtê€þú¬NýœŽû¼þêÑ_¿¨¿¾ ¿¾¨¿Îè¯_Ò_Ø>øµÒÿ-÷†¿ó?Ï_ø?Ç_ü¥üuÑïá¯Çý_ä¯GýŸç¯!ÿ ü5èÿ÷¿È_ùŸá¯Ó¾røqÖ?Ã_çüÏòWÖÿ%þZÖÐá‚r&º¢!ÈE2Üd¹y°!È# +d¤!È£ +$Ód¥‰rŒJ )‡‚<®@VÁ–¥¾:$·ÎJÉö¸(Ûn¥äãiÉéAÙ*d .Gµà©ÑÛ+zƒÿÓþ+þOùŸò_ö?éÂÿ8Îw2µR;%Ë$+†±ÏËØw@ìÿgŒ,õsl=GF ?OBÚ/ ¼ÿþŽ ÿ³8"üÏ™¼ì‹¥‡òþ"åýåý"å=Cy ó"æjµ`‡$/¹žV¾ÄþJ¦8yÚu†¢’sœ<î:CQÉœ\p¡|i±&)W›¤GR·o0‰od’¢Qþtä¹¹$ùÖùŒQBf(Žu +š à)½cÝAo•åêÓúð’ñ,pLYy˜“耊2ÿÐvÚ ñx±‘Ƀ±¿7F Ÿ³,^ëX¿±ù†rš‚ +ÚrA~œ-ÖOJJ¬ãg>š¼ÜŠ°¬ÔÃL.€:B71µPŒ„9¥M<Œ±‡c¢-Yà(žžÀ€/¾qD{,h2d½ˆqZô2XæÊx¡_•cƒ’˹køH†M´9î· lIc¬Ù•ùŒc@OþàmC¥P7ZF,?W€oÚ†:–c† ÓÔX`+~ú ,ÄxaªX>S,•Ì+F…r#¬» + lŒ…@Øz€_8²ïü)ÎäéØõtnŸÿ[/Nºgÿ®mÖÝý »´ÐFBwg`l‹‚&ÛýàÁ¡id´Ðjm¦— ×dµr¬ÞN·/„ ±Ü_²è ÚAç…ÉUtï^kìäŸ!÷ÍÕ†¸C+ý:ùz¥Ð'ÐÕ`}]Yí&b©ñ ¢kÁóç2ãIb¹u0Ò“RÇŽ¤\×kÈÝtŠN!%šžUütäJx:r«ë…¯¢A¿­ý[¥óšgddÃ><mïAwœÊ‚6™¼YÅjÖÐÁ¨Ù­~Mù3^ËGEZ¾ÙY°ê8Ë`ûmc¸Vc¸ŽÜhÓ ¹`À©f^O} +Ü´«ƒ¿ á“(¤!­hXûÅ$ŸE«bÔádÂßTÂ'•Aο7±cŽo°Jå3ã-¨ ‹:]×¼}†‰êe“Ç’µ[‡ÙŠ½1þèa|F­ÏÏ?8˜›¬Woö=B©D"¡ *vÂŽy´.;œ3ˆ].½ó"¡Mñ]Mäd¸Ì‹˜ß¯Mü鑼ºg8ª3b8Ø·)öP§îê|š÷ s¾SO,¾#ÈÆ k v‘t0"Œh +FøÁˆd0B +4Û§ì5g± –p`?Ú{tGÃïÍ´èè÷×éùäçB“º¬r€ý³bà {~•Vÿh¶€iõïÃæùpÌör‘f9ÿ€·„´ƒÚì¥[ôMûqÑÃw}šhjñzí Ü$¼–˜?j×7Œg1iËJèuýŸ6{M-aŽ›‡½Þ‘ é–QísÙ€‡J”K¨œèe•¶@MC|›â¨Ó„£vþ]‚àz-^Ê`ƒ0-žob¬Æ€ÄûuÖ8èÔd’oq»Ãô›]DzC@Ù¦šDr¹yh¦"[ŽšygaÔl³Ÿ›ï86߀Ðäƒcš—vÍuÏæ ³Âó|$o\‡r®c?4¦p§Ø¥ZFÕ@ÈHoÃô6oiµÌ Kþ0ƒŽâ¢(ž~N˜³4:Ù<šªO™©ú¤¾5” Qú?°]ÛÀ°^åí¬$E †Š<͇0z)W+ožO~´Y PgøI:àá«ZŽz?—–ä”< Y“üdÆÑBèÚ8y¹¡Ãz^âlø`â´^7†«ÑnI†Œ¥NÂY8£mÀªÅàTãÃâa-7>Ø`|H3¢‹YïÈÙMZb>ÌÂ7\A¶bIVü‘“w£Ó¸J(Â嵕|)}ѽºqN5s· +Ø Æñ)¦%º…"Q‘^Td2‰>4_;Ž_ªŠòM ]1£` ùM§PWEbZ¼Â\;o:À2!qÃû{þy%Ê=¬½ó‘Ï eer»0÷á@-£ÖáfB.zs1ôhÐ#ÎUÛ¸ÿ¨>ÌxLf<u˜÷ŸÐoðŸä¤ß:Š@ §ü§ùëLaø÷ñ׳~Ž¿ÆõׄþÊ믂þšÔ_SúkZµîý9ýuI•ô×eýUÖ_ý5_»àë~•»5ú§Îg²ôìc—R·¯6¼}øÆyo¾1xûðF_Ç¿oÊ2bÀÎωîåꡬâAoM?­Ààœ| +“¯“·qòL®ZÉ‹S¿E+ˆO`Ã+Õ')ˆ¦ —NU®‰¹öúëæ{™ùTÄ:ƒQ³zØèxQQ\#…jðèZÏ^ê \ 2 +e¥´o±¦R«7o‘€)¤ËÌ][Ìͱ"i‚ñU\šï‰jënž]³¾|F˳­ ü±ë±Ïï7’Ü+OÄð-¨`n÷r”I½è^–rœëSnRèBU §ª/J÷Ô@êÖx•úFWc®Tí .FÙêÎ×›ròÞW9©Ê^X-äk ¦Æ@M¨™®‰»/œ´PÎTXÓº9[³ÖFŽ}7mfÒ_‚n:ìMv'Bu±b'¤Z@¶ÖÅ°~9ˆ"— óî£Å¼»é/GöõhW|AÅóب¿„¡v¡öo +Ü8iQév¦pžÎ•ó%*J®Mf@¼¨‰ÜÌL麨çä²Tg¦*NV«¹ÐÙ×Ìlmš^ÁñR%—ÿÛ_rþ$¼ä,ìTr¾˜ºC$ÞˆL£vÉi¦þ¦°ÕVoâ­oš§er€ ÎÏ1¥‰GUýižec–¿e/9ÌêÍu&@;Æž©+1±óXšœª¿0§´¤GFOEÔ¬Ü؉¤Ú™î‰‘ÜmŽ^Z½ […stènŽpŽ.Cè;ø轫!f] +ù¥ A–f‚jûîlÈQ ¹àw™Åf¹ÆµÇÅUÐw©£ž¥‡ä +2~6Ná¶üÔ²€ü´²!É«ôÕ† ÚIIoC^Ü5f«Üd­åy$,<ǽ{]X*X– +Öc‰†Ôë§í®$(7+žf:ùJ«“/)Tu +¹Ãßèo2 §¾º:Š¿%½5{»]øÛÐ<ÛîÚÛ1¾/ÝŽçSDûÚY“2TÒB4^;þ–ñê +˜¶¨×Qvœr7Šžc$²»ÒÁÛukÔùÙNã3ai H•{wTn­æY¡Þ!*¥(¼Ä(…qícu6ôî õÈ~Ë ‹#—×l¹<*«‡J çmÛüóJ:÷ÑÍ.ìg7\T…å·+a¹—ó5aiE˜î7ü{HŽM¡d˜FI4-’òe +zܾ.ÿ‹ öý–g‡=o~ì9ÅN“x„cÖ$æaMÙtuŽÍÝÇnyýætw€Óös¿ã¤Òðjm¿Ì¹ÄOclZ$pßÉÁ¤†EQº%±X9ù^-' _·÷ èÒQþì ×êýJ/§E5TˆÌµÿÆȳ칶‡s¦ˆ¬ÎC•C…Êå=¶j9º§¿¶BßuyﺲÃ3)üÃ×Ä5s 5Ã6õ¼.tQtˆUµ ¯Ôë•Ë‚ÿ >ÿÊ®9¨þµÇo¥õAFøMÚ†›KÊF‹v:BRÙ"Ÿütå2oÜ¢SÇ”e ô­šˆîŒÀqšc›ñ»>:¢mèí±Bã_S»d47ÆÆ +¡' FÅ£M]1@P»P·M¬ +e(S¸jEXoÄØW!ŒkW}‹âÕ‚ýÿÿÿƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ?õG•3Kú`§—Î[ v%eë —O Mù ÖÜ¡/;í¬y +‰?'¶cN˜ÛÎp—žÍA¬#Ÿ›»¦\Þ<å>| 8ÂÉ|]¨ƒa„Õ3?÷à q»÷[ïÀY]ÙŠmôj\hpXiëªÍ""Y–á-® š‹±¤w5G/eÉÝlÊÖͦAÓIÏÝÈΛ-Šï‚K±8mYä2Ѥt@Ír=¥„Lh '´eœwVM=.ÞN —¿»Â KÝÅMÂ2÷v“Ѓ +ì¤p%›ÀÒÛë«­tæG/mb;Š±7‡7¸ÖIÍ%è½ly*o/–5Éðöw- ($ÈèÄu½Þ$6¡-å5…lÛ(¥É½yÊ–#𲺿ÿnʆ*Ùœ!‹Ç`¶-˜ŠŽðým”m{¯Æ‡ <“~Ÿ—òûÈ PÒß!;T`§ ìT]2°KvËÀnè—þŒV2Ê“ÊÌ\Ò©èÑÑ;££wEGîw£­=­= +ǽ2°WöÉÀ>Ø/û-ì÷D×°7:z_tô~7Z²ü^Ãø4w„ô‚Á~ÝTÙêÛê”Á[èñÒC„FÇÙþ}^“Ÿöï—ûI’öêBÔ[é‡Õ¾&í? ø,×pÍ?¡AEØ/MJ¶ÿHÖ %´bþ19~ñhäA|Üõ‡q'5'' 'Ve:Ì{²S÷ãÊ]Eß ¿Ø.aöCWPlQ]sŸ6­pEç<¡ A,¤ ®T÷hUÀ "­^® ¾\ ûØ~xس.Xƒ +àË ßÍÿ˜|!êåZÜúB¡³˜­?lÝàÝ1D[ë-2wßt¹’ÏÁC¬åî:äFm…‡ðÍUõ/mUìwXÍÛ®7ÿö‹ÖÓ´c5Y‡y ¶¦ÞÀã2œWdgkúYY1ÞèMWU@£èYÞ‘UäG\ß `×:¡7ªê³uu߶ÅNÊ® U‹ù‘bYîó¦Í§Žå§oAëý\z}5ǯø–dü¨DmA/V …3:ŠSJ•ÛŠštŠT÷óG +¹I ©äÉ¿€ló 6[-8 :ÑT ¢Á@‚˜©ÌÌÎh¦â³¸ê¥^zVß÷%†Âé^äVy<ð†¯ýêð@åòx ·3³— UxQ¤03S¨ZO“ÙªçôêžãµÀ~=8øöð¼ö†ž² =ëwßNž™­ãúÕxL6dåªjqƒ n½¿ŒïîæsõôN>Y*Të"‡‰kèÿ”%â|µ2ÏfœÊUÅÉ ‰^^òŽa{÷š(Q«”Šyî^ó¿ÔKß+3üuŠôr²£×‹¹ÒPnFà;ÌÓÙز-$vå|®:’»^™Uš½Ç +…Kƒ¹ë¬|‚@Ÿ„Ù ëLÈ?41:©`ó¡qx YÔåÿrþÉÕ«Åkñ]’ +诋«bZÈ!—/ÊÙ]] A@6z¸€—ˆè°£‚ñòŸ‰Ù*•C ´s¨”åÜ5 ¶ѺSëSëÝœ²×GtbG¹,5"ÑŠz½h¿vú—ãK^µþ…$õ±‚¯NŠõÑI\JðÒ-ßciN¿ðΔ¨9eÑVmkÛ¦o¾´óÍ̱ÄÊ©øî.:Ó›LJWú¿Ä„1ØíæèeøØ-–§mî·U 'ý{sÿNeX¡ë_™þö·¿­`VÙÕx‘½é¿6t¬ñ×rôºô‘ý- +f}zÿ˜Î°A¦ìTLF”Å1lIONNªÀV;°-ýgög*°µõñms¼K[÷GÛcöýéÛ†¢{¹µA’ê`PœÃ}“è‚c± þ>»mîOãßpøc•{x±åFæ~à®rñ:¹ÝM÷Ëð-EÓñôÕ«ãÉïÏÿüÏUàdú›ßü§*pÊÎ3¾sçƒbÔÙª¢ÅïKÑû~¼ä7Jãvà„8iNÙèÁl[c§pGu¶FdÚ¨®3†Å :ùKèÆÍ‹Ó*)¸+ËÛjô)nÕ1¼Ø:¸ØÜÝUîÿœ“;óCå½KÌÏ;¹¾ËÜn'ÏÞeî Nî‹wÕ®ëÒ_þòçT»™ðÈݳ¿–ù:å„¶Ø ôø¨Ûé0púÅ¿¨O¤—ãìµ ÷à°ç†M¶ü= YæœrC_\Æ3ê :vW¼»ŸÇ7¶1®Vi¡ñ¼¥-K7«ù"=—¤·ÄL7µ§öû„hËû„wM$®‹ÔU‘œñªHO?Wš™Î‰¥r‡-–M± *:Qü«I™æ¶~òdr˜}V`™S ¹t±Vjš½ª` hü—Äýç Ð ª—åú­”fH‡ T¸å°*ØÏBø*†oÄ7o Ÿ,ðÈä»nò|:AI¯“´F½âöR‘ž¶6Måë$ƒåÔä䟗‹ödë ô®"‹YjWøš!]GãFØÞmSöÚý +·‚ÏŒ—De`+¤¾Ñ[š:óÇ<~øåìÏ´‚þ ­%n€ðR {–ùÕavn½¼etzM^Ú¯¢u’ì 54Yá$ÖÝÄõx™"°žå•|J+£ YrCÔuƒ/Ê{q/žúÔ+rü7xûdk qôõwþÁñ½ñ?ï`t+¿:œÂFk!»ý”ý:Ö•ìÂ0W]˜6£C*­ÕÉïQþkV~+g¼%*V–àæ—? åXv|ô´ ¹yZÑ@¸§ÈØ]Ó  +x/yÕxK|[”cã¶!×Ö¡P½)v¸6¤¾BtHÌš_ f\žn½Ž¶ ú†“'Ô¶ŠV•GÑ4š¯ŸÇ‘­û¿®ÏßD{¼ +G.µÅÇ7ãß·àß·%˜ïh7 …¾Í’B ó©dåߪÁQ­ŒÊä·/\ã›”2ùyw‰QêáwDÒĉï `zwºãwiÝñiÄñxû6ºãÓuÇèU,síëÚ!ãÍíñæW›<‹|¡Ùr´kP¡ÁP.ÿÜl­nJTÆEc×j9(é:ýKîK]5P4A¦Zc¤´8öõAD¯T è¹ï4 aS@áRèAäÀ]ÚLB(º“p9W– ¯ÖÄ`a¦>}ŽBâhÏ,ïÀ'ë˜,W~z%BWã“ã€^èZ‡¥š×Ö\ÌqâÿuqÍ2ïÒŠýzJ¥8j'M÷ÿ'4O›ZÌ4á$k÷ #îÕŒxBZÒL’Ö¯"¥pïéÓ}Ù×-•¨£Á­Ö¯;¶ØžZù®:\O­mÚعýÖpà+@R>MåDº*ljì>â/“äÓ‰üuàÑ©½'q íÌZOõÑ5¿JÐañRøé£Í©(_,â°vÕ ¿Åeîe^¿Åe^ʼœn.&ór;3Ø“¤öïÿWÇ÷ËÿZ!¨…Ãɤ °^G;Fb9sYÅÙmT ¹m£Ï¥T ý±àƒn z‚¬-Žõ6bý‚™»C™ ë̼,”Ù°~ÁÌËíÌ °ž™7L+¦j_ 6S_= ý÷.Xî½wÁÂpï½ ¶ŒþðOübæn2˜¸X×ØÅÞïEæ#T”ëQÊûšŒ¤ä7’@#‚Â-! +Íæ–ì¸dcÅ!)wÛehj]o'ô¸ÍóÜQV“QNîKØø*Mƒ>퀬Q{l׿Yg¶Ywª ë†YJhWÐõúéÞÿ7k¤m‘I÷í7±ƒÀ>‘@ILŠ2±¡ÖfØb® $ºØ¿jàÓÚH¯jã­|ÉË_ŠYcÅHšþT(Ë/YâÃÖí—mXévüÛ‡kRå$|v˜÷aãþN-1lF b‹½c.¬ÇÛ¢Ö#½]Á›‡»²gÍ%~q·¢CÓÚ¢µ?Dk?4Ç<ÌoÓô%|ÅõcáæXÇ‘9™œyàÎ:²³Z(Ñã(z8֌ƌòì³"š¸ƒ'àÖ(%ï7ë3EÜkE¨=iÂ_Ç”èej$ó75îd™p[c¦d u:{Ô;­BV6‡Þt®W›Îû"ËæÄûïÞ2©Ùì.ëÝåDæxûvÃïL`w©ö=ýξg®ý¯†œ7ß?±½ŒÞ,™ 4f iÝ’q6P{*µºX l¥TèT¡T¹*&‹å|,2®äŠ%Ø‚qîéÙÉIÔô¦ìÔu¼í2>+ë¡ÂÑë{`gT«TëgfËhOdösõB­ÏBõJ!ï`mîü(Ü/ ÌVe)°_¬”ê’°q¼\‘L£ñŽ½‘tsŽMäNÌ\ð±”Kl¨1;#òƒ\Š¸o—³°ç^’ÚíÖ®æf˜`#‰¡ +%õwyöòx¡::yr¶>-yP¼\É]‡vÕï¬tÊ\RW÷g$5è(@\ÊTÆ ïüƒ7œÀÙ¡b¨«V*Î)Ó}ÆÆòv¿ú[߸þòŠÐ4¡Œ½cÿïx'•é«ÜK¦a¦™ÅŽöÑÌ!ÝäÅО3ÝìÅðr~ ºÅ‹¡ƒœ@t«cP'ºÍ‹©9ÎŽn—ÑíáhØP.ÉŒª ¸~Ú¤*·þq¸Á¯ü…šh^ e!€Ö…Úh_`I€FÖ-äÏnåDlÜ:»‚@WPèÊN±seùÁœ+ã +–’>èphˆ}låÔWñ¼¬#àaRuo‡ËZvk;¾;²C$ŒsP‹½0“›(ˆ8\¥„ ú)Œ*¸á Š†èsyfòeõ}Tz¦g`ƒó!–1Ã@+2x×ÈëÍJVß`ÇU™†­º»‚’€Ræi&­¾µC1É~—å6ù¯›üyØÞ1·›šûD“éKid.¼¾âÑE–ô{U{§ EV¯e¢|+ç?@#w”z{מUÛÍ õ\C:‚€µåSBÖ¨ÞÓÁ‰e$¿QŸË&ñaæ¤+—ñ­\g3+ÆýõD ^æèÅïó£xŽÔ¤N[6ð})V'ÍÍ <ˉƒ-M'U4'OmÙ†„¬ÈXÎ1<#ݱó<Õ +þ­>Õ +vgýÿÛÞ›þ1¶CÓ­¥üȱgXÿKAM/m¥–d­DÏÝx¶3¿=Ô3X¼A¯~ T°Ä,|ï¨M¤~oiK–¯4$B© +6’ª@ÝÌÚxظJY¡ˆ¡c—ár­ž+ˉo,FeoΨ½!a§\úÛäz°Ú)] ¢¸7Þ0B²^0GW;ˆÚ;t8&»­™)VDÎÌ[3 äF¦m@{ˆ5Øytl¶(ƒ"Ü¡×S£5̸ü¶Åurƒƒ€t þeŒºèbZ mµ@ ¾[ µ˜HM™HéNE; amK8~{†_+±'ºZž8NLxI»µ6[¼î‹µš”‚ÎïÃÚwД 9_±N±7M²JñôT&ã­F_l™¿ÑSQÞ 5z*Üè­·vÁ\žÞ¡†íÔy³{Må‹Uºü"¾Ý ;ÏÏmíÒ¢;yCÝKhW.ú¦¤wL±&®ErEšbµâíŠÔñN ²ÂÃJ€øÃ9’ÂC„ ̓m7O‹\mR¢®ÍÒÖ²ÙfNÊbN«aÎÊ°×ÖE0§ )lºXÙ25o§LQ§L÷è‘Ù¨S¦¹S6…:ewJ¹XµûFôg0>™â)œÔVmU…Kq«km±ó„–M]N,žê¯iÕ_wa'þå¹hFvÚï)îÎòZ¤N~2fìˆé£…÷MýŽ³"¤°?¸vÞã¬üŒ’Mu®aAß ó‘jŽ.ÞŽM,Y[·È©g:,uœœ kسJ×€:~„ÓŒˆÃ¿ƒ$yø"ÔÔH—qò*×IKì[YœçÕ²î5HOÎÉ?}1b4ÈÕ±€Áöbø»çUò÷‹"Šg!þîY,[ÎŽ;z\ce+-·¸ ^·Íé£öu°UoÙ!šÀ³f“ÿà…OdÎ(‡Š«2èµ·W4„ØKBÄXøˆ £‘Gmæ“S`g´nŒ©Ñ곓/?cæ+Ûð>Ädò¼x„¦ 7ž]ëßt®‰&˜òdøIA…l$ÕXDþ&uÊÆsÛý,Àè5;uÌ©yC^Ü MªødhêÄãÊßùIƒÝB ›X2ƒ¤éäY5¥•Ã^}ö÷ßbZŽw0ßáVùñ#h•7Üm«4àS<Ä'$ô؜ᓦþ¯D#êyÇðoþ—¦þ@ˆú¼é% ¥~ê- m^…”‘ŠàF¤hbf6™×W½ùD +)N…Ú;eäÜ8HìFàKé¢å,~¼8¥\3þc–#’jŠò"(¸¡)0OÆšjÝâNwØ-´œó°ì×5”d„‡²—P|LCɘߞ›["8°5ýØ–Ž} .o``{úí1¡R–§ BzÒ“&°*ý[&°6ý X‘þç&°7ýM¡_‰òÖÚ «¨Zì&ß—å3Äûœ!^˜÷ в-íЧCXŒ:ýjtú‡–’æôï­; çÍ–úè|§N&ëÌ/hŠÉ®ÿøÞôùÙÚ4¿ÎWk\ <Û%a¬tYǹÜ5¹n—ó…kú¬®"䞤ÉX€…3D ¦kxÍ^ð?Æ œ'›RO—óÔÒ8æɬYØðD‚ÓØŽÆn÷²¨Hö—.?™ï<Üé·^¡Ó_£³õ4z¥³ãÖƒ_P|Àá/tÕržüNV+—õD  »¡·¡t2!Ï;’ åÈ~|P[w³›zâÃ8ÅYs„y# (sžçÐj"4¹XÆÜĪr~0dÌÒ'JʼnK÷û0ÿÀXÈë‰Ï¡xºX¿XÀSr sR °f@œ-:Ç*e3¨Œ;<7`ú§ é®;v •“ ý SVébeˆ&n.í‘ÀãóÆÈ| ´gkóÚ«rÞ’ ½)Ð +_RÛ­µ„ }óüZUšîÉŠøý ¥V‘TœtdÊOk™’Ô²I/ekÛQ*¤GfYR\bIL(–§ØÂãÌ9 ½:Þ.wŸï5b8a”Å °Ï¡Ä©ìë <°¼Î)ì‡ooï ôò7 ‹¤=š¤fÜA¨×Ñm®lDõP}€+ÚáC–˜|oÆÜKô˜jrqoU8}0ŒÓ}.Nó\Ÿ¹?Â?çaVaÚ§­d«nFÿˆž#÷…_ ?ª1}ÀÌÃRbäiƒµÇÕîv-Ç•ÃN³-Å–>z>ä±á‰J òÙ9ÊÄÈ#›%`[E$Êð&8iŒ+“q,roÆœ~S+ÝAŒ\ +G0´VçšAŠUG$«—-Ä7¸ú#ØN„½ynuNfn˜Q)ê«Q\D÷aÚ]9ÝÑk)'3ôïióL%Ð3Y§â=¦b9ô’£vø„vJáSž§H +Œœ­b3ÌYÝuì›dØT±¸2Ö÷EÜžTðÔáW0`NöVŠÐD°¡¥g@W|˜û,}¹Y‰OtÎæ{-añÉÖÇ-‹—"À»­ÝïDÿ–ŠVlA…°©`_VÑÊm­õ°pÜÏDEŽFEžŠ|8*2yÁŠlV‘{/Š¿“¦à#<>’1§F_øÝßzãG•Ìü(ËÌÛâ”õ1«x8Øã—!]ÕæcÈqÏ~þòqÅB¹õ(ëBñƒVq®©†ŠE"žÀ™ã±L@½úKÖ]‡ã¤Ù^Áž •—Æf˜OZY>#S÷Só× TŒª§¥Ÿ¢’Fhâ’6‚S|¹!žÚ ÔSžÚYµ‰ò;±Ÿç‰éiÆw>šžvhZ¦Ð§h›«Ø^ +“§I-½Ýq?ƒ9xáÓ‹á“,׺û—ÿâÙû—”òšŒÕ>Ëïwæ¬÷;wqÚXÆnÑq½Ðšú&XžkrÛ‡+¢“V¶œ0 œT4OÙPFå¢ó졈Æëv³X)+ƒüU4†Þ™Ñi+ ¢¦Yî&릡…ˆ¾¸¢!av§š ¦<ˆg±M]‘¬Ã“ünfÝxëÆ5œ]˜uã ²n<šuãó°n|~Öß5ëB„Ù¬×òP>Ä“8gÂ4,b<É/È“|4Oòóð$??OòwÉ“Âlžä5O +óð¤ÀY1Ä + ò¤Í“Â<<)Ìϓ«æ‰&ÌæIAÏÛ8‡m'û´êÈùØí6÷)QñÅÙɬ6£@c€¿‹pôPUÚžÄÖcö:/#þÑXBxßu%xÆL˽ÈÐ>Ã|X€ß£¬G•…®m +ÑÅ/„·g”Òé×QìM³„ÐÖpu±WX›ÑOÒî=¥½´ñŽ”™'4ž‡ïú¾Ë‡WÓrÇ¿O”L1%à÷ŠøÖë2zy|iñyà 1ïóíÊ›˜­Ì¤~§K iîrK©™Å.Al½Ý*Ûˆ)òYÉÂtMë}Óô­~péÑÔ'¼Š’ñ“FÆ÷AÆO[²ý»Õ’¸6‡I°Ü¢wö+µ2®Ù—0fžÚì[7{»#³€ûôìu>¨Ve«¤ûý$aŸî‰Šðû¸ÁÌQEÒÂ~•€"“I0(ŒƒÆ4\dÑÞÁžöÞñn[ÅѤãxh6q¿îlâž ¼£ùyïR2©ÜI:w“rG)z“Öµ„.fYWP¾à+úªÁËqóRlFuí0&éHx3FšÓ»‡•jn}ÖZQ!o8Dèµ~7sàe¾$^æ³äĤ”q§Ë´@LÊÀb©Ÿ­¼ZÇgNé>•So¶pæàÌ:bã9¬P¾3d}FÏÁÍÞˆâÒ÷8ˆFwÏšÚ?{OPEågÆm~-J»^ ¨º6àÛ½ui±ßîmED¯èœWÁùGäÒwÖÁ¸‡òmU—¶qMó,œ¶RÆ6š=•+Õµ³Àn#WNaõ…#£,™F®}ênï5ÔV+±h^vöðù}¾·€O´›"Á±"M«–°Ê&»v°Ùý¾ó{}»XßÆx—¹?ãÜÿѳ7/?ôï.l“'´Âœ +1–®9$.g.ÚÅÛãîM–“”êÎX5£·'âÌF#'µ¾Ë UÜ'3úì7NªüdOhè+¾2–$¾×P…¯*YËþ[Nz)ö'¼’ óýÍ|¬Td¾ÿŽPrEÔAÖr÷ Þ~˜:<Ž­“|êtPýÖ,?5Ly[vT7¬œìWH¬ßžq¢zdÔóV”±œ‡§ï L>ëy>ëϘ©ázÔÔð.Û7Q›®Ždn¶çÝyÏ8îÁˆE‡Òˆ^àSóçÄ40Ô}7 •ìÉäˆGÍ3ùâXÞ£Žx7˜Uw:Tä ü{3dý{«º û0Pâo# Fæ{Xìq/ú½/ÎÑ/ù?Áý÷ƒÆõ‰[œ:,~½Q?±WKwïÖÊÁ÷;ãÿø÷ƒeB²=–ú!5o~8«þ dzÎô#&y‘ïkïÖÆ«g±´ãí²7ʾu¶‘ñªk›9×þ§>d½Ù¿o>ëU7—1_E#Î1ÛŠßœžçÅi2¨´Í,é¹ß±k'ƒF!+ϱ±pÔµl„‹Ò(·¥ccQ±A‹Q4ou NF™´m~æØ¢ñ"úa%³V¶ju;æ'‰èýä‹RÔY1rQ\”O‰ì)¡­fá m^‹œg/¯®YkjkñÙ¦§@`Õ0¤m özó„z&šn"Þ̱n¹ÆüÔ'ša à¤ü\,zšK[Fg¢`Ðóiä\çγ>F“`Ú^·,øŒn¦m°„)Yé™Ëg,aàŽFÀÀ]€»"€—fF¹-ºÂbœ¯D±Ì i–“̥תŸHC9“Fj_É+î^q4XÖñÉxTù«tù«©´–縫|]òQ ôòåN±Æ–¬ÖòÅ ¬ƒ€o®7¦rM^ºE9jkÓ¶¾—rbù.±¿a˜%"×äï_oŠÌFk/å¨ô§oŠ.5*ÌjÑÍV€¡Jÿ*§oQ›ä Q…òØߪs e +Ôògئ2Ø”DÕ°3l6¢®É`—ÝúŒ²9ªÃÈ ©ÏU4*ÆǧçMß ž2æIï…÷VçI_ÂuT¿Ý…VpðÆo £Ä=OI†ÜÅ÷ÐTù|c³G¾9Ḽ۸P!«¢/Mk³Ç½–$OöMú]Óý¦’{OŒÚr’$å¤JÖ;¸X9é–“†YNÚrÒp#9 .”r33…<½do~£²ßLÇwÍ'+…sZ×}¦ —†åº¨¬¥šä* ®í!ѧ¨Þ­Ì[£bT´à-8¡;z]˜-ÑØ2DЊ…&|7•ß}$!ƒ=àéÛ2Ê®_{#Т•#p)ü>w†Œy¾uU&(À¡¾Q­6S*N¨k@áF²…X§q^Ç^âïo½{Ù(°„¾;4#¢db\¡à$õ£Fãk?¸û¦3o³½Õ?c[É7j×-ÎežÈ‰ˆËÞJe{8šÿj>ÊÂe¾>òÅ…™ÊVEõ…¦=¯Æ‘½¼]nŒÑˆˆmêÇiŸAõ^æv’ìþG}VI„Ø@•Õ¡Ê¢þ–ŠôŽÐ¸5¸µpÇâôO¼4Z¥ ÒþÇÁõ{àÀ¯ôhÓxSð¦FÀ›#€77ÞéAe”·Ê}úèaG ïB~ïÕvx§Þ?ˆƒäxû^ƒíÁÀvÜSô®Õû-Ö­â¹ög“PÄÍÏÄÖGl‰Ñ¹]HŽÊm¶ÅVä8~çå&ÌÜá×Nl/Ú‹û¾˜³å³®¾›»á•òCÅ»G°=o̳o´g¬ÁËd51pö…ôLfgË‹— 2Áuü}“<È >ú™2»0+:„ÙëxÏúÚ½löïC‚ 'Gì¯ãi}uø¿6˜Mé‰ßZZõåÀFð°¹åI¶É:lÖuuÛË#4ó{v†Ö[]êT¹RbÏ!§xWÙ† íëÇ•%ÛÑõÓ’ ™é:v3uFT´%ª¢÷ˆ>TVhªïʘZx·ÛƒhXǸÓºñï²È+ÈËͲŒ5*ƒ¥}@ìkãêù›êÁMÎÕÀŸ£×ªâèµ*îîáËuz¢~ˆ'ê-8Q?|øg¢~{&šk¬²Ý¼ßõìexî22¸¢8ü«¦/˜’9bFÎîð>c±–ÉeȈ ¢‘ëX©p¥PÚ#&ÐÓŽÎ3\Öþ=Š5„¦¬Ç'Tôç)¸R CxJ _£U(“ݳȅ€òil«ì +†£!Q"TL¥.ÆÙ e*WêÅÉëE®‚,Xý^ˆö)ƒULä&¦%“¢X¾’+¡kBG=^Il™`¤ªÅò”yײƬ³žQžŠ˜ÁÃåéBµX—¹,1ç=Íã иeP–›Ãç¹ËÁõÀ¬²¡Ç3#r[ëÊßúBr½-4ϯüŒû)x.2.ZúDØ`ÝÞ_—À! µ(¹L­Ž›ñ7ñáTÓ0šÝ@óQˆ:1ÿ¡ÅØ„qÅa+Î&uÞoÅümj§`·£RêŸÇ~!ÅK0j¨ÁŽ»ƒÖ˜ù4€<Þˆò„mƒ,e¥¢µ«Pz=0{LÿõÿøûäKÎóRé_›ûmðÓ•oÍaÀɘägæÒé¿ù›M°`ø{sÿNüô—ÿ|ŽNÿßöŽ¥7®«|fæÎÜ;3;‰ßã‰íÄÎÃyÇN-4¤iÓmÆà–jñcBMO°ÕeÕJ F€H`)‹.úX ± êU¢Š²)/©Ù²«`ÓE¡ˆp¾ÇyÞ;žëÔ©”Œï9÷<¾sÎwÏwÎ÷ ‚¬‘öæ)QB½¸¢6a®…”/ùÙ%ô¦QŒz”&X/ù×(E}vèY‚Wh cjû§õ@–ú[ŒiƒÄ¡éý÷ci[CQ1jºÙë€õ} N½sNîº<|×ó¡œq“ÑÁù!ëEÕ0­U¿Ë™»­ïoØäI‡ë·’Aî1×Ëíˆçõ¶2ÃëjAL—o+g·%¢8!ò«¯6k¸çæ ÑŠô¦ñ—Ì)›Ù&Œû·ž¦nÆÕÔµÇýfÆwÆøšïFfÍ)ò¨( eF¡L©‘L¢„îL|ƺ„?E/aä[Ò/xËñ±¡Õ÷ì¹3öj÷;ͧG^ ü-ººžîûb:ÓUžÛŸaï·6V#䈛Âôî{Nùuç‡c2Æ£= +tþ@.È+m»ƒ@ƒsÿÑþ|²&vΠA`p>4¤± ï:gr±àŽçœ)ã:g²±à†ƒýl\ó{Îìç5ql½ûmû&—§ÉBP<ßî[ +ç[2ŸÖ~ú¨oFC´^â­šÍÃŒ~¦f´—(pçDƚƜžÆb 1ă*ãB•± Âí,U䢫%=\ÊZDÓÞ4[ÒÑ2K^L/f-z¤§‡¥öô°Øž–cô°€¡” =,EC A9™†X1”5= eEMCYQÓÂüßF¿ùÚÂA¢Òoùá'—£22»âgWúuÄèaÅ¥‡¬>líJ—Œ¹›æã¿Ä|ŸgÊM;.Šh:ävóï¨â#Èâ…P9¥–B{•As övãžÊfßÀ‹FQ?6ôe@IŽÔM¬!U`–VŽB/eþŒ‰>ëoÓZø‘ø¼MHÞ QÔ'ÿ÷ íšv&åM QÒ;¨Îôœž ~JþPí_X¡?¯E‰—j%;u^V7îh#æé¶.™¨¨Ä€L ¨DU&ªuÝ:õÊÄ.¥ºiB/®–ÊHή&g÷ºÙÀ£f€Ž«=M ­WõØfÜŒ ÅÇ8îMGZæñÍ“xy#È“xÁçI¼¶¸¼zì\se5Í÷f¡ÂÕ_ŠIÜ(+¸lÌ=2Bmó3{̵Ùïs;‹ ÄK˜Ãä+—æYëùAc‰Fq.ä}uxI@UV‰ù°Š4¬¨ (|_÷lQ†]¹ÃRÁŒJÔI(Ýu6-bOܱƱ.$"ÖŒD \ïæ¡ÒÕ[™c-‘Ë*oŒ3Xqž]P뿘©R«ÄB'ÔÀW³ØÈ…ÆÚÊâüªh^¼¸Ú€òsNöRãâšX“§leŽâÖrnQhœÓÜ¡{ðK”•ægó³ÒbõÕÙ…æëæ•Fo¶K0óÚÍsè^ÖjÙ¤}^½÷øoîTØ– <ÿ´8Ú7<š»oß0½,ØßpsZÕMd=ÿ]I¿+·ûöim‡gÝ+ZÑE;=KËŸs¿]¶Ðe‡Ñôƒ˜픵wù“üß#IDÿz. g…®Æ Úõ ¥wyén/Ýc¥Ïè›GK±ÚÁ\Ÿ¥‘ÄG`w´™‰>=ý©ŠâŽ: ÷V?âgW£!ÞekÚ8mw4ÌO#Ñ(?í‰öòÓX4ÎOû¢ýüt :8íšš‘%儺ªò,ÑŠøúp«×¤{uļ޲¡Z÷vŠ²POÜÛÕŒU¿(3äÿÓA¨yõ“ÌÑ–.R¢(QbKJ B¢ºƒUHï–¨§/¹°zïg7Fj‡×®ýŠ}emÅÝL4äÏS ç)¤Än9‚Ý"nÜcý ëáwàçîÝ»"œšš¢õ8¾j0~&Es*ƒ†cŽÝƇŒ?õx·úì¿húsúÇÙ¸yó¦©l` Ú€ 0 AK²-aÈ&ÀЭçp›û°æ¹‡“KÞ蔉»)´ì&ײ›Ü&Ýܾ}[w¦é&ØJ7`o—Ù8¶)öšl‰mXûÖ­["üè£ë)°­›Pˆ~Š›¶zó柰¶øÓMeèÇj5ÕŠuS»ô³Õu覡ú•åìþ«k;ö†„y¹sçÎ÷mËñM +ü®¶¹kŒÂþ!÷àƒâsìÁ_ÐÞ —£‡À¼ŸÃde›ÈÚäç™ÒÔÿ2’5žÃ‡d--ö®•4Y»qãôdM÷駟¦¤^ •?þø¯)‰T«ž·H¤äpR´>ÖkéÌC:³+žìîçÇú§ÂCì}ˆ½ÿ“§¤Žàá) çšQâÿõÍ8žÄÒ~!Ÿˆ/ÏIŒÅJ#Ì0=”9“äg™™ä~/þŽ)…¦qPåÉR56Pس/ÊóS’é_¾®¥9y~:M°²Ç!¿÷¸AɈRù8œàÖLRŒúÇ4öª$9Ó­%9Ž¨þÝPóêxîùÍ%9‰òzßDýèéȦ-åð¾\‹pf—+iÅô¶Džìf|1{K¶—÷Ü%ðu¸Ü\nÄäì ²õ˜0úš½“ÎÛYž6ƒ-æ"É›¢È©n¬‘Ñ Æ+†QN-ð8›WÖà­%èJ”2­É+bNþ[’š—)Àðâ2ts©±|…[›o^škÖ›Ëç`ý 4ïÓ‹KKÔ$´ÖX^ÀŒ{Z­hT¡¼i„XqÍ wr½‰©9X +¶ÄËV–Xm.-&ØÕ|Ie`×»¾@XÞÕ– W܃,•ß§u&ä¦q[óÝl„Z²U¢Ú‘ªý!×.…†£Æï¹³–ÔÑ­y™ºC%ÉéÄÂuµk–Ãt¿D'ö7%6öA^W´ƒöä¤jµ‹RÝDµH™B©bœñXòƒäöN°âÃß‹ZQ€Ýø°‰NNp·Ñ%Ȳrb!hcì:êÞ +éR›;µ€ëÆV‚ÝnÛÕ"¬ùÕê¬Z–‹åTØÁFUÒCífOàC±–;±åN¿å!l¹“ªÅªUlEgS­Vgåh¥sìUë°Õ¦MµÝu£`%e¯Z«•ýjÃuV §J¬ZɶN2ÕFꬓîái^ái9ÁP&eìvs÷°H×ÍÝ+?¿b,7­âŽ‚s»@Yã*$Â1g" A¯„8è *òÞÑ”Up”ýxî|Ÿkh]³"ëv þºSóÇ\³SÙÜ`¸a{²ºð˜îÏ—_~™Ï´ty+ƒòRcÛ ºª™#™Õþ¸W5Õ {âEI“-9› Ë‘ÕjÛËQ`Ÿ¥é8Üï¶[Wœ®ôµ­Ç/4}×jSέ Æ!­©ð_ÏlLYÓÆ9ŠŽÐŸ£f»7JδÓAgÛ¶BÐq@[è8ÅJŽÄWò½÷~w§œÞé°ÍÚSízßÒjOYë%;ÊRGÙTma]‡s´®Çq]ÿ!6†Dt"üLöJݯ¯¯‹ðúõë sn °¢ù$`о3Ç|„!3Xtëç6ëÃÎØÌfD«;) øh–|ü³äm%òí°vObD$"Và²j5g74Ó€û]œÿ-6Û_vÙ-§žÿAµ½¤®lAUµÏ–…‰9Ñê¾O ók‚4iÈÎ[hĪՙÂáT ÀTæ”,*ëšÖ(a•vÉà#3ý†DõקÕ!`šCp"Ÿ²Q.ú›Q“ƒâ¦óqo?D±/ˆÒ„(ΟÑü¤ç§Daþ”ÈÏ?"‚ùÓâ¥lzbO±š‹Þ<&s,àŠX†§ÏÞ«ÚO¡?O|̹çÖ$p S—•¯¶<в6héñÄž6Ex—ã]h˜fiá b­&mÙ$(ýÒYûêÚ¢_&:­Yg³I¬³¯àâ«øû(þ>¦Xgx‰¾Ö‚?†E¾žÌ]{\s×δæ®e¢oDg™»6=¡õ¬ÏMocþÔ6öˆ$¦Pª^ TÊ!i™îE›˜!Ì:•ºµSb£‡[[^[i.­²òº¬Ô+X'=]kß’EŽ€}„7«èŸi†jÊ)7ÉT­¾$‹’” +Ûǹ㚬& ±ë¬,UËe‘cB^OD{wqµqÑÂ\ª¾ãŽCÀLkÝŒÿ¶ ÏÎH=3'ÔÌèÕ{qñÒ奆^C93NNª–ÏË"'ÅÆNk%™JHAÏ©šš‘E¦É5@+ª]°ß|DÈû›3ø'ÁIý¹æ:} :•ªÅ_ÈMdN[ÀÓ¯mÈó¨jVÔ!¥[3‹¯_‡yš]øÁ•Õ5ƒÚD)ŠâQ8JmjM¡Ëx0êdÓØ(±(»CV/›í6›iŸ‘¸¡æÞÁŠy^¸û&Ç{-ÉZ0'½®…cŠÍî¼Ì÷KL—έ† +‚[â# Ã*°Aa7 â•uÁ,/J¾!˜¥l!S¨ÿþŒ’(–)z¥Y ©_ÀÁ´?-åŸ2gR\}J„°*1kH%z1|rÀ óKäœP-²JûœÞ¬ñJž{<áeVÅ·Aêe¿dº‚G|ÑR`„ˆm¥S¡á°„ç°¸Ú%±öìèloÜ„[û••fsÍF€‘ +T¤UŽ^0¿Ò˜]k`En,aüEùKcÏዀ̺óÊzÒO*KÑÑ + +„”›z-Ê9:+“ÿ ¤ÿþÿÿþÿÿþÿÿþÿlabelÿþÿCheckBoxÿþÿlabel×!V¸AÅLµ$%ò5;˜ÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacementáöq÷ĆE´’«¢ÓéŠÿþÿÿþÿselectedÿþÿfalseÿþÿselected¿Ç˜Fz…–H—oÒhîóœ ÿþÿÿþÿÿ¹2<?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="CheckBox" class="mx.controls.CheckBox" implementation="CheckBox.swf" iconFile="CheckBox.png" tooltip="CheckBox" src="mx.controls.CheckBox.asi" modified="1055744780"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="BoundingBox"/> + <include id="CheckBoxAssets"/> + <include id="Button"/> + <exportAfter id="__Packages.mx.controls.CheckBox"/> +<class id="mx.controls.CheckBox" > + <Event param1="click" /> + <TagName param1="CheckBox" /> + <IconFile param1="CheckBox.png" /> + <InspectableList param1="labelPlacement" param2="label" param3="selected" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <property id="label" type="String" > + <Inspectable defaultValue="CheckBox" /> + </property> +</class> +<class id="mx.controls.Button" > + <Event param1="click" /> + <TagName param1="Button" /> + <IconFile param1="Button.png" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <method id="icon" > + <param id="linkage" /> + <Inspectable defaultValue="" /> + </method> + <method id="label" > + <param id="lbl" type="String" /> + <Inspectable defaultValue="Button" /> + </method> + <method id="labelPlacement" > + <param id="val" type="String" /> + <Inspectable enumeration="left,right,top,bottom" defaultValue="right" /> + </method> +</class> +<class id="mx.controls.SimpleButton" > + <Event param1="click" /> + <TagName param1="SimpleButton" /> + <method id="selected" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="toggle" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="CheckTrueUp" modified="1062224695"> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueOver" modified="1062224688"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueDown" modified="1062224684"> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueDisabled" modified="1062224679"> +</asset> +<asset id="CheckFalseUp" modified="1062224678"> +</asset> +<asset id="CheckFalseOver" modified="1062224676"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckThemeColor1" modified="1056417032"> +</asset> +<asset id="CheckFalseDown" modified="1062224665"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckFalseDisabled" modified="1062224663"> +</asset> +<asset id="CheckBoxAssets" modified="1062224897"> + <include id="CheckFalseDisabled"/> + <include id="CheckFalseDown"/> + <include id="CheckFalseOver"/> + <include id="CheckFalseUp"/> + <include id="CheckTrueDisabled"/> + <include id="CheckTrueDown"/> + <include id="CheckTrueOver"/> + <include id="CheckTrueUp"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Button" modified="1059073889"> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1164217982"> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.CheckBox" src="mx.controls.CheckBox.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.controls.Button" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1164217986"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +</component> +</componentPackage> +M 1 1212170146ÿþÿBitmap 1ÿþÿ CheckBox.png¢?@H¢?@Héÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2HxÑ­” à ™);±Cy'ê£ýêƒTDš¼D Æ>Þ¡m)Ϩ×Zïœ FO©«s9jo­ µ­ÅXïÎ1Ît>`uPƒœ#?pÒÖW#'×Õ‚<G¤:‡˜ü¨–R Ïbpžä¸¼öé{fQã ù[ù!?¢|À­¾ÅQ|¾/ùñ<¸Ò{?ïø\ùQµÞ‹³<ç×ûQ¾3Ô“öð…V~¨Ñ Ÿ³Ši“µ¿îéªf?úŽÃmwv?òúïœ}ß<ýÝÏü‹•ò¥è;ÁÿþÿCheckBoxиÿþÿCheckBoxÿþÿ CheckBox.swf‚ŽdE7ÿþÿBorderÿþÿBorderÿþÿ CheckBox.swfèCP?ÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ CheckBox.swfwÒÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ CheckBox.swfaÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ CheckBox.swfõ²°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ CheckBox.swf\À>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ CheckBox.swfA?ÿþÿÿþÿÿþÿButtonÿþÿButtonÿþÿ CheckBox.swfa/ ?ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ CheckBox.swfýCP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckBoxAssetsÿþÿCheckBoxAssetsÿþÿ CheckBox.swfDP?ÿþÿCheckFalseDisabledÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckFalseDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckFalseOverÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckFalseUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckTrueDisabledÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueOverÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckFalseDisabledÿþÿCheckFalseDisabledÿþÿ CheckBox.swfCP?ÿþÿÿþÿÿþÿCheckFalseDownÿþÿCheckFalseDownÿþÿ CheckBox.swfCP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckFalseOverÿþÿCheckFalseOverÿþÿ CheckBox.swf$CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckFalseUpÿþÿ CheckFalseUpÿþÿ CheckBox.swf&CP?ÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿCheckThemeColor1ÿþÿ CheckBox.swf¥÷>ÿþÿÿþÿÿþÿCheckTrueDisabledÿþÿCheckTrueDisabledÿþÿ CheckBox.swf'CP?ÿþÿÿþÿÿþÿ CheckTrueDownÿþÿ CheckTrueDownÿþÿ CheckBox.swf,CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckTrueOverÿþÿ CheckTrueOverÿþÿ CheckBox.swf0CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckTrueUpÿþÿ CheckTrueUpÿþÿ CheckBox.swf7CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ CheckBox.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ CheckBox.swf-[„@ÿþÿ FocusRectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ CheckBox.swf3cí>ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ CheckBox.swf÷CP?ÿþÿBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ CheckBox.swf cí>ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ CheckBox.swf{DP?ÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ CheckBox.swf|DP?ÿþÿBrdrBlkÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ CheckBox.swf‚DP?ÿþÿBrdrBlkÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ CheckBox.swfì:?ÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ CheckBox.swfÊ:?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ CheckBox.swf ;?ÿþÿDefaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ CheckBox.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swf~ŽdEÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ__Packages.mx.controls.CheckBoxÿþÿ__Packages.mx.controls.CheckBoxÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.CheckBoxÿþÿÿ>import mx.core.UIObject; +import mx.controls.Button; + +[Event("click")] +[TagName("CheckBox")] +[IconFile("CheckBox.png")] +[InspectableList("labelPlacement","label","selected")] +intrinsic class mx.controls.CheckBox extends mx.controls.Button +{ + public function CheckBox(); + public var __label:String; + public var __labelPlacement:String; + public var __selected:Boolean; + public var __toggle:Boolean; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public var borderW:Number; + public var btnOffset; + public function calcPreferredHeight(); + public var centerContent:Boolean; + public var className:String; + public var clipParameters; + function get emphasized(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + function set icon(v); + function get icon(); + public var ignoreClassStyleDeclaration; + public function init(); + [Inspectable(defaultValue="CheckBox")] public var label:String; + public var labelPlacement:String; + static var mergedClipParameters:Boolean; + public function onRelease(); + public var selected:Boolean; + public function size(); + static var symbolName:String; + static var symbolOwner:Object; + function set toggle(v); + function get toggle(); + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:ýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ CheckBox.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ CheckBox.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ CheckBox.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ CheckBox.swf‚ŽdEÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ CheckBox.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ CheckBox.swf‚ŽdEÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ CheckBox.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles‚ýÿÿÿƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckBoxAssetsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.CheckBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.CheckBoxÿþÿÿ>import mx.core.UIObject; +import mx.controls.Button; + +[Event("click")] +[TagName("CheckBox")] +[IconFile("CheckBox.png")] +[InspectableList("labelPlacement","label","selected")] +intrinsic class mx.controls.CheckBox extends mx.controls.Button +{ + public function CheckBox(); + public var __label:String; + public var __labelPlacement:String; + public var __selected:Boolean; + public var __toggle:Boolean; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public var borderW:Number; + public var btnOffset; + public function calcPreferredHeight(); + public var centerContent:Boolean; + public var className:String; + public var clipParameters; + function get emphasized(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + function set icon(v); + function get icon(); + public var ignoreClassStyleDeclaration; + public function init(); + [Inspectable(defaultValue="CheckBox")] public var label:String; + public var labelPlacement:String; + static var mergedClipParameters:Boolean; + public function onRelease(); + public var selected:Boolean; + public function size(); + static var symbolName:String; + static var symbolOwner:Object; + function set toggle(v); + function get toggle(); + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; +}; +€Media 1ÿþÿDataGridÿþÿ¿úBwDEøÿþÿDataGridÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿDataGridÿþÿmx.controls.DataGridÿþÿ`/Users/Vixiom/Library/Application Support/Macromedia/Flash 8/en/Configuration/TMP1uru759snc..swfRñCWS¹Axœì½ xœÕu0|gG›%YÖfy_%/x·1^dK¶$lÄÈ 1–FÒàÑŒ˜y  l('†LHK k“|éMJRÒ’tù›6mé×6åKº|¾³Ü{ßû¾ïŒlSBèÿü<ŒõÞýÜsϽ÷ÜsÏ9÷&±ãþ_áþ©©©—Äz!„OtûÞ'àï¹sçDuÅoú&§¾ûçßzùñß_|SÏwš&ʬ]Ô=ãã?œüÛê½6õk/|ë 1­†‚~(ro8ìƒ?¢Â;«fPu~±{¢PÈfz³ñ’Ø‘hã!±sN Q]Yq×¹ø›®ë¿§sÑGÿ%}nÉ·>ôÕ?ê{%÷žÓw<÷á=¿óè§7?{Ù ™[ lJí \_gk…(Œ&Ç’Ùt6‡ß©¼h9?¤Š±ˆ‘?šÊäEìl”19Ô1{ÒP0S€x€2Ÿ,PRád:)â Ü€êÇ,êGPÄC©ìAÝâ:Ù›ÆõfÖeWú*2Oýß—¿‘|ü§÷ýÌ ÿô¡>2ç•öäà-ì¹ê)ñªìMøëMÈÙ›°»7k¡7K )"úÄ—Eø Õ›+¯½âÃözÛWnÜÒúà÷—ù£mç—Å$ðÖ;|D_GÀ[¢¿wÂÞ)Q÷HDNçübõNd~I‚\öŽuâ»LtŒ&š0ï |æÍ™€6 +‰Ì`²§SLd†’éLrú˜IŠÑdjd´ Ž§† +£¦PÚÍ‹ì‘›±ÝþÔ{“"_Èõ@¡ø!G¹]1Ú¯„FÓÉÌ”KåûǃuâdJeFD&y¢Ðy±ƒã”˜7ˆñD.ŸãùQ±R¼OlÀ âÞa!–‰÷ˆ[9½÷ÈÍÉÁ‚¸žC»r¹ÄIþìçªáß1Yã"±æ„'’b8‘†šU?õÇ5Ô-ê澤SÇ’}¹ä±TòøDþ¨Ì%…äž±ñÂÉYˆíH§Æ±ûœ˜NB7Ž$GR™½©tZŒe%fEp’™!Š8–ʧŽÀø œ'… ¾O Ž +Àø€šO§¡»‰át"?šN`P’ùÁÄxRd3‡Æ‡ þ80‘.¤D"ɈƒûäJCCI‘Éöã7À‘‡!i‰¡¡ý‘̉‘töH" ƒ³ßî/TOæqXrÙlALVAÌþlbWØ›Åq6(‚>KÄ:Ïú…åë©}Ü/Öüö·à¿˜ýŒ9[!ŠSb$ÞðX¥MB4Ry é=âÃÜQÊ]ß19S“,ämÂÈÚ$A(ïÙmGE+œÁJg°ªgÇä,“2`=mþ¼øž8 +íiØ5äG &aXÈÿ8% uýÖŒX7ö (‡‚bËâðêíµ˜!$ÎùE5ö*èë£ ü¿¦¬„*º™,¶A@EÁUUŽ+Áô Ð?_:[ e?g®¬Õš³J â¶Ý,·{gÕn7«†šg v-ø¯¥oTÿÝ)¨Ì˜gÑö/ÂÄÐnÕ»Ö™Û=­ÀxÖ±T ‚;ÎbW åcbÚJfm‡†ü„7?c&`ÕÇ/Ô0w™h€Ûwup‘¤¦†±®,7N1œ@Œæú›g›HùLTt@k¡‹€z€^ 0ÑIhSGcQ$…4’~ìEϨ°šx®ñìiŽs×#H©À]Mõèþ½(ûÌ3Î(Sƒe‚Hÿ–%é»kŽw4!BÁ`0Ð{Q5zVýþéÐœb (ôËU¸¸6ñ´rÌæV4k„´xr6$$6°½Ûã‡gœ{ùÁçÔW"Åý:§^®Èë2zÛ"Tž3gî5SˆEñq(VÑàß1Y)wIšŠßó]<ýÏ¥®4›¤eæ·}ç›?}¾*_ËôùnßÁxâ®HúaL:Í@”ðœËv£3Xç 6ô¸[µáÊŶjõ0/’´Œàýs€!ÓÀ«õ…i`qÏ~l¨–Û À +ŽTÌ™ 扳³„µ„"¨ /Å9ŒYj©=ÛC¾·Ìˆ;h™¹ =›AΊ÷v¨êf1ÃÄb-§WVê—»j0c [ˆ“VüÅ®ìåPþ0DÈ€ý˜ðÖë©EDÎ’X2¡-ÆÓâIŸ +«Š/…Ì°}s©&{b%E2nWX¢¥KòY+㽪±±­‚ª*m¬s2T¹âDy{HüfŽË Çl;±D®5®ú]=áLkã ÓôÖ›§¶Tkk/ +¦µ%ú¼.N«ªßZòõ2.7è\2b£ADÒ™KWDÌÙû庾)¦˜4ΣB ²`@ïëC¢WåUƒ('3ç”Ķ)Öeçw¤â“´¶‰b{Írò¦p,ºY4¹è7bÐo$Fmÿ¡(²•B¦Í-‡àùd£™Ž|™…ÉAkS±ôlQ(oŽ›u¡6ˆ³U"Ô“ÜÏ»ž_îi~hªõÂ2rÏÇ"Ø8ç‘"‘¬ƒ‘H@¸ØÚËãŽ>)´A-->3AÏÞw²coÇhø·Æ°hJàèD)¬—Ç+¶ãznYº•"œ@ :úÑ¢û¦5) §¦fÊAûk[¼a²Ú>ÕÀ¬¹YôúÜg É™ÍoçÝÅ…Ããºm¢`èmásil†¨[·:°™«Ø$²=Zª{tƒ +üW0H¼6å¨Í$ËmL–p"‚ÜaíìµCíÖ.\X¬ÝvÉŽvd3¬ÝöYŒr\Ë*·ç<ç‚»&-!ÞÎÃ!ÕÝMqŒP×ÐoÛÞ eEåâ&–!ú°t>Ÿ®ÙøÁóÿ1¯³±ð«§;Þ,üÊ))¬PÒÁr%ÁXÄïÎNd†€£Ü=!^ +íƒØJÑ'®§üâ×_{­úî/ü¯Ûvõ¾*üâÛßþ6²Žb~ÝËKßü£¯}ù»û÷Ýó¾<=þzâŠt}*ƒì¢zÖž§üàéÑïCzŸl¼Š÷CͲñzj¼Jt& +‰îdb(™Û<Ú•‚žÍ´$+o÷‰xêÜ×îû³ë¶´N6Þ9*+­V=šá¬´Ú¨´÷X2—†cÛNk+¤ÕˆkZ(ÊÎ ?ajÊ'^{íµ)ÿâß?zîî³ç¿vˆ:=„w/|öîþ³çÿuÞ–CÕ²ÅZÕÕb#µXk´ØŸOæ…l:‚©3E{àe? ЊõÛDõÌÏÿãWk:2KÔ¨Ô©>ÌT5ÖRuTc6W€cgö8Ôµâg‰n«8H?Áx÷ÝwÃH|;øçk›Î¼röoÍ=ü£–ûéÒÚ—üê_ýÆ?þÝ/nyå+GÖÍ+»û_üìÇëdƒõªÁYªÁ™Ô`=7XÈ% ƒ£»ý ¡A¸ç‘ûöž +ˆõë×W?÷»¿n=\I­OaøÙömѾ{Úu„˜?+ò…Õß¾÷“^ß\6úìù§ïÔþóäðýÖ^xpßì¶æúñ?}´ÌÿÙsBÞ¼üûŸ½ÿžàë_þµø+Ï=X¾!ýú—ö~ÇøÓ¿÷;!ý§â7ýaý›ß7êÕ}ÿ™ºzi2¸æëGãGº:ÖÆÞ\öɧïztÓhëSÃøçðSÃ÷àŸO>ý©ל{ úWÿyίî.,’HjTHjpŽJ£œÈåQÐHh‚ÜWA|‰4q­÷a¡*Q7U†ŸA ÅÆÄù3áph¤ú/ÎßGal›Ÿl_ŽÊíõôSðY •7Nù&Í1i¢1éÊ¥†våóÉB^B×LíáÂq a³ÎÞ‘MOŒe ;.L³!‰³UR¶Ù¢39œÎ$/3´è ”¡Eêá#þž…d&ŸÊf0ëJ\³ôì¦?®Çêj¿¿È(Z×ò•óÎöæèꀦ@Ô\1ð¯úý™‚Pæ«CYqÍú¿èøø3ùý8÷'ím1$Ìsg›Z?U³qt\ÜÆùb[ÄKN‹ù8³s1c°býÁ"‹ÏΰM%^®€¯Ä‘îDf(Ì¡¬x*Š·$ ì1Dا¢‹àß…ùRÅÇKqGì…r`lPv²Š:¹PìÍNäãØË©hâ¨z)\Õ̧Ö;ã…‰\I,€ixôGE](Ÿ½³Ú'îGŒÎÕæBk¨­EÜÖD&1}àA\¬±™2-¬wdÇƳ™dÆ9Ž—Cúï8ε_ˆñ8† ‰ºÿ:õ¢PUýÚ«F}Ž]c‰Y½$Ž¥ÞJ—ˆºS“ç©žrÀ`ý½‡}ŽµTô'Ó€´Ä‘t2ëÜTtž@Y·§¦¥Px׫N –i‚碻Ü39iË)o_.{,5DHÃÌ­%2·òbHé…¼M¬)Ð\v«ë^nýî—v˜µa%T…"ÜTÕ{àë,ÌÆühb({ügt±Ñ&ók…ØÊõ—€®”€þÃßüúíV\ÏÛ#‡ ÚÒ”ø½—Ť6íÃXŒkãûœÕ¢?56žNòÝfgöxFvÿ2Ù}üºïûnÿîïÌÞP'»¿ÆÙýl¨ágÔýËT÷+à5ÔýÝé£'¬b­ƒw†ãƒçÅܾþæû«>¶æÍ÷á„Òæuï ÜÍhjd4W4o?È÷#ÈkÅ ]ÏüÈq{¼ŽÀîN¥ñbh*z"×›ã¶FüÁÔÔ¯Ëq«áq['~ï Ñ ;ã‘‚U?Œsmi†ø÷^šz‘¢GÔ GpŸ˜z`êÿÌÙ}ÊdÞÒÖ;¹'#‘²˜¡„“=¢"‰rÞ@¾PdÓ +,jÿeØ , m¡=Œ)F§\Q¬â®úÅàÚà€ëÐ8À…çüŽ5¿Ym¿ÜõÅÞäÝ=pÑ¿׶բæúÿ+ïzÑÐwÇ›¨„fê~iŠ—ÏXKëÿ¹ãçV°Ñ@1¢79VÏûyq¯Î=ªŠ–SÑMÀ÷çx)ÄB›½…6ÁÖó Ÿƒ6 ÜátAÜx¶g–-RÛ)²ü D^^-ß‚sAÝ©¢hy)|FÐp#À°æ²ŸiŒ¯@úÅÅ99$Bp,ƒ™BѱR$3¸¡@¢‚êêƒ0'ÆRyÑiFgR<_‡ÚÑô/ ¿ °Q÷Ê]ói,fê^yŽs Ç0±{¹ÐC‚hÙêd/ÔðmùBvL"”O>WÀÉç«¢|œ'xò÷ýÙõ_k]ݼïÎ œcÖ@–mtÍ^&|ÕÏíþ[ëvhCüy\F¦V­ZµoÞÅÈÆÙWÎÞ<·é³^l‡φ«|ÐÂ7_zzó?‹7Nœ¿¿bò Œ÷cüSŸÕñ¯­¯xY|,\ÀøÓ_ÜüÏMí2ejçoÿH<® + ¯_ùÜë€o‘íÕ~Çî¼]ôæ²éôÁì o­»úvžt¨oå߸«»|ùS ­/Wýù½wìý÷š_jú·ìo +wZW`U*{õ íËýËøàÓŽ}ìÕ•Wú£öÒ–•Uuµí‡÷4Uï9¼©výl~õÁ7~ Ú[IÈîëeŸøÉO~%º_ö½ñõÍ7ÖŠûîyõð™;¿öêÃÕåßëØèÿ¯?8M"/¹K•¨~¡q‘ÿª3/{q[þõ=Ü¿z÷k•¯tž9u㇚žiøû_ß²ú4ŠÄ½Ûqâ«œQ6çkggßR·i.¤¯‚ôhâ§|–DBåe§^ì¼sÃ×þ³í·þÉü|¼«úðÚß»¡pïÍOüçƒÁЂ"ê@ NâibΞ—5uŽ¦~“Â}¶ ãœª}ùÃáª(tK‡y¤ W@J±Ñuëp Ë²oþ´íßvÀBh 4i i§SÜné`Ú™ÊóLãñݣǗô?J/+ƒì}Ç”Aö8E{m:4X°]šb¸%Çš{ÐýŽõ ËÙƒnOÖH_€´žihh!×a¤…抺(¨ÌEAå@Aœ¾)(ð1ˆ­0)ˆë‚ØJÎAmⵆaw°©ë/pSxâ~òo)J‡¸©›Šž…Ô+/±Sþ‹í”wZT¸¦EåtÓ‚!¿Ò 9ŠäÔÝ÷sŸºL0ûÜ0×ÂíýDòùjÃéîž÷ПßyÍ¡†¾û¥Ë¿öÇûb[`qDÕÄ*gõ³¿².º÷SŽõxV÷Ëßzãë›F6·|¯-úÝ·¼üüs¯Bx’ŽAÁ»„_±º•Ýó·ðŸ^YôËoV¾úûß>í>Gy'¿^ÚÙð(O ö̯ýðÁeùOþÊÑÍ ›¿`¬ƒL}*lÿÛº}®w‰v—›Š"}Tû Å~FžU7ô Jóèà#¸ÝÅT° ýA”äôrddù O@PAsã›K˜¾JO͉±#»³ÀŒË$¢#®1Îjr¢âñsßù ÷ßuË÷ZÆÛþú‹o|]./ýïØòwjËõ ‚Þ¹>.„¤ƒz€¤†Ÿï¯r žŸyËwšw×ýð¥=·ý¾„üÐ;ùA'ä‡Ü¯ˆîƒ¤«½£ÿr=ý:È+ ·ƒ$BÅH"ì$‰4l’„x휼Åé„E4W¡^ñP·æš‹×ÿ–Á²k¼É §Ñµ?ëiÄ‹êµ^ hÉÚ©‡a‹y•Ø‡ç¾ô% ÂŠ»¿ï;³75m8ª8ýØÌG7¥×>³U4­º÷ÀìMË6œSñÁªû9:7'×AÙ3؉âÂêaÄìaQŠí¹Î¥+—×óy*z r\ÿNûX©õ[mχµ›½›â±[ é=ø–º^ünùØ«ó ô7àõ¸O"O8 ¸Û÷xºÍä‰W)7("¸^¼^ÿGMýÅMÕ“\¹ªJ<ÌU—Ú4op×.I GçÆ‹ÞÙntWd²Ójƒ´ZgÅyܯš¾µ÷§/;ö+’áÝÙøÝþ»Þ„fñfû&Õ):ñTþœxÎ eˆŠóâ£Ø½ëÅ«÷Õvî3x˜!%CÂe(¡üÉößGäF€^¡0/ æ.q“ õÔÐP:iP.X /4“ˆ‰ëU…„.¨¡ •‚.‚5ýÕ`@3Ð2àf¡…2dç²(2Sâác•àRQfªéX€ãðB»ÿ®ƒâ¼ÿ8^¼‘}ì+EëŸß~£D”xvR,Ó ’Æ£Ð'y!tøÝè8R +CâÕ—7¸‹ÖëmâÕ©§5:œÝOz»/IïL‡§£uŒv Âìøàyž|ó ö6H¢¦½:¢fÈ~,{†×ß +ª—ÞŠOžâU÷ ¯ºUWµOò‚ _fK³©¥³¥ƒYs}† £ŽÆ&yr¡j<äj<¬ÇR6NdõÃ÷O£n`˜Æ®†ÄÔ4€ø/ §\ ËÑEtßü6¡›Wì›] Ѩ¢ˆæ襉h~xùäM—&¢ñ9ì¨)¢1Æe™iH¿Ï-µâÎG<ºG–v8²DY“|X‘¨ ÑÀcJõ«?¢Ê xõ ȾªÝ³ŒóôJK`;% SÑGqç,œ¨îÅKTë<Œîö¶Êä NTÕ|”…”}¾v5½†AUå«jÃ]¡ãkÑ÷ñ•·¡1üLµÈdŠ£ò>·zΫæ2†ù£NôÙ­Ob§¯än˜peœpI¢Æ!ξsCÌfCY'(Dö¸Ž“<Ÿn ˜×ÛmÃy‡´t\ì.dôñU½åEY(} •­BÁ5pzÉ©ÎwŠÆµ÷ÕÒ|¨lx>çÀ‘¾î•5óásœœë¾-ÎÃçf8Ú5>4t-|nî½ñ¡# Ÿ]À.7>”¸>{im|è¦fø<Lcã—ŽÂçµÀH5þxñrø¼¸žÆ/Ä G€oiüñü2øL3Ðø«˜a 6ÙÆ—wÿ|ž€)Ûøò®|Þ[AãËíXì4¬Õõ¿Qs|>+eý·Ê±‰Õû›ÏÀç°ºÔÿ¦‡ÏOïÿ>ŸÏÁôjšz¶>¿”Ú0um7|þ&GÿóoÀ8~§ì{¨‰ð—€èÆGºÿ>ÿ +×84ú¦9†99†»9­•ð à3_RÈ_¶½”ÿ‚„ü—‹Šç›Bþ§1Þ‚™‹(œ‡QL'Ž$ÓB‰ÕçœmQ}éÄ ³Í"G2ý9ïôõÀKaäÖÎÎEÓ±ß{ÜVl[Ŭà}§ý¯¿†löCßôrÞÓäE·H9„…âCøêòm/¢üàšßY÷ÿ‰!lºý™wÉ6<×ÿ†=„“{æ¹®Ú +âjs‘ p á4ª+8zRE£^T¿!U46‹ºW…n%J­Lˆ«Ñ,n*ŠSôØ¥ÔÿRø(SG^4ì5±ÄŸÁ0RƒWfÞ™i€ Y¯½zÞ94Çä*)Q‡ +AÇ ÔÑé¦B˜ã°\Ô?ñ¾Q©GÕ*ê?µïUy%¼TÔ¿xm7j âÆß½¼Y5ÆìäqÙ+¬ y#4‰—Y'.e´èÎ÷¸¨)ëvŽÿ A5î¬ÀžA_x ŸÈY¸#Šxx¯ùÛí][q*4ÿ$i ¢hþ[Ž‡·Nø¸Õ‰Tx¯¨z²›a«»"'—ÞYKĺV·ŠƒÉ…žÌøöó8Œòm—ÒÏ°‘&Ñü;µÍ¼@ÎÍ¢ùc¯ï%i  x™h~´¦øŠ+鉜U?è3©i5ÆC;c¨à?žN2æS°ªázð’"uy¾ÂånÍßø‡>eÖø ü9Ó+ÊDr(EÚPb<‘ÏÏæ†Dz M%N µh^ä’hA–H§Ð€ò¿±Ô lyW²Ð—ËŽïM'Fò¤X.HOÜÇ&$*ª¢l…q{oƒ™—UÑ©Ä\G%X.p¡r¬¼N¥ÿš ;|†n{ð±F“6ibŠváÉrræÐ*ƒ¨Á@€-’i[ûY‘vmíP¶êÆS-ÑÉ*rmÑ*ÄÕY »•Ró¾Ì¶®òYåq#Ž7œ ‘t WVR骤R°!Oü¢±^ }Õd’m MøƅГ§ì6}‚MYËYJ[eA/…Ø¡gÄXÝ_f©,™¥Re‰–ÌpÁÞ>÷ã_3ìAuÔÔ¶K”Ý_¤‰™(¡Oõö9³î3k>ͬ;\3kfÆj­ð;Uõ¥EXâÌ×#_+20³­ 3V¶‰Á‚ ÛsÊv00³g`€1¨?'ý4è¿›NÈåõG!;ŽndH0ÿ90žÈá¬vÔ„® ”;ˆ: ×Û{éÍ;â¹ä˜‘wFp5¼Xèe;oÆê:T8ïCèjåYAí„´ÑÔP6‹cI@ùP*?ž( Žî9†Ý’Uj‡ \£¤Tr¤p- Ž>T&kä9 xôæ9,†²ûa1ˉ±da4;tVz¶¡Çí`8Ã^.k ,Ò)¡…Âöªˆ+t‡RéT#?š‚ÁDÇé]x³M¥óF!ϪZ&f†jA?"›ºÿ9¬½yhêR”DÎ rìr2ÚáC!ÖEzßN¿ì2c?q7ü\ËÞT2=¤6ÜØi'˜€&q£Ï#œ1Ä—R~+ +…Äà(M™Ð‘AíK'ÇŽdÓTŠ?{£ƒ‹\r}]ä(«éÄCBV"«B0¤ÉqèÛ‘‰Tzˆ>yÔ&ÆÅp*3ðvK¤ÒÉ9óÇãô…l ößž©¸ËÁÙÓIP¥†ðOžŒŠ¸‘Æ ºÜI¹«šÛ©\…t*);? + ÂT:Ãò£ƒ¢ÕÞ\Sª’]ƒƒÉ+ûž;’Ú›EÎOzÖ!lWÇOÅ7I s‡“+S„u耓.f©|OÖ¥TA #ĘlZ27’tÊ1ø]·zÍêu«×®ÛD+¯"øÅÍ'¼çÂü<TTâGç’ÃÉ,Œ2A‡9YîZ‰¡!M›i=TB.çrÅÆ=ññÞm\fv¶‡Ëd“Ë@úϨ0É‹÷P¼yQwG؆ƒ9NÉZÒ¨³UD%›íiež´rVáI«ÔiUÓ¤Íð¤Uë´šiÒjuZ›L›I½«‹©\è°â]åªð¬…ëcªWá2£pƒ‹{V°5jØš˜Õ´ +ÿ¨f5–éͺùZáj¨!®*™mV²H8˜Ý&Ï`7Çw¨#BK øæhøæÚU×ðͱá›W¾ ß|³|s=ðͳá[0Y‡çŠœ>Á#»ÒÇ'óâB¡t?9•aß ØÍ»u»¢×F eÞs¸X¥Ý øÝ„¾#F.vh´wv¾9åÊÑè²h‘µsšÉ·ó±2Rÿà +!#ÛQÊV«ˆœá“"¤„›ôV¡]éà¬[@J0"ÅÕÁ0URK¬G5N»µ wÐO‡ùâ`uØáQ‚œ„ 3f mOLûÁ‚ Á„À‰“½Lɘº¬nhµ&Ti˜öºè¡YJh¢Ž$¡rG‘Е“x÷nkaqX+B'Ö‰àÉuâ:öÐ#g0ÚGkÄ„TÌ~Ž ‰ ¸büŽÙøÉÙˆClœÎ¡!:&éd÷§âìÚ"Þq¼ÁÔæºcrÐNŽÈENoaM ‹üÖB$rúº*ìUTîYàv880-H¾Rz]ËÂvϲ¿M¹ë‰‰· +úÕÒÜ?Ù*G ü-J†ˆ•öÃøI|ðd„kp=Ò´tÉíÔ|Pï­‡&—aM@’~û ‚z"\OXÕó éEíjî¦íJDŠiKõ[×¢®¶o°'Žk¡+e"Bf®¨P õǵ¯ªr¹lþ[ªb\‚TOÎT;t"ÀX,”טFYôÍÒ¹n²'D¤ú>$ã™ Ǽë•ßºÞáÞ…7öº×Ó÷ÈŽÕ ë†`P§¨†oŒÛždl§J;àñät“¢ÖðV5%“•j£.$FØ·Ô|D.¦ªcƒ“‹xæø‚˜-`RN‡¹†9#Ñ>D…6M¯6wŸ$ü #þäu'À¿#qڶЅ_P-;‰8÷N¹‚m”»€"k„í2a`‹)äã ª5á°Â„ÝÅT±uÿf× +×â¡T\.²GaÏ”…B®B‘HMÛ  °ÃUÙ˜gßì‰Éxb²Š'^eö?äSýßB[á4;õ- mHAûööÆ„çÜŒsÎÍøJs36ë|¼V¹ +ù¸"ÂQ!èïRhï•[¼g¦4/EÛÚl¶¥+“»œqI!Ï ¸þ£ã¡_T Ò÷2Ð*Gøv¹UuòeöÐYQ.¶öh5¸±wKq¤N(×sÇbÔuÇ‚~ܱ K°N(äK°îe§¬Œ3㤷 ‰¢÷ºçY«œ€·:´[K#…üû­Ûbº¥ j :ö°ÂÚû#6ž…JzRÜ>Y‹ëd9.Ã"ü]Z´…¦ã4›0Ú’|D1½ì\Œçà*õ€QªÑ(õc¹Ë.–et•,QvÒ(û¦à²t•}¨´´_”¥v•úP‰R¢R·ÉR¸J}¸œ6àl—e?â*û‘-~„Z,Ó‹vWÿa…aÌ{Ÿ\uâH§Q¢Ó¨¬&Cs5J^ÕÎrÔ^õB>ØÀ‰[‰Z·ÇU­;«QÔh±»˜‘ *—Uh˜¶¹Wà˜¡Œ€+³ñ㬲ÌS‚çXLz„SÂ6 W‹´1³(à–®Ä æ¿"­ nºÈõD|?m™ Óæ:O ÝÇ5zv*–7…Šà5dãÕßy&öÔèÚ8œ)qH³Çìªjù<éã›;-ñx©Ò”KNƒ'‘šýäc?‹Š#›˜ï*á(TÒ.“’}ø}b|;¤\åj+(¿®qeô'­§zÏ6àWŸu/c™ç‹+¥@€ä_è~Úú%J·ºŸÖ!ó=ù¶âWÎú ×ö ÿy–ÿ<Çžç?Ÿå?/pƒjPé1¢fÅp%xQ­YŸ‹;“Ë(¹¾Tr%ÞNæèÙòôÝLÉϸ“çËäy”ül©Êk)ù îÒ+déVJþ¢;yµL^IÉ_*Uù Jþ²»ôrYz%¦Ti‹’ëJ%WQò/”J®¡ä¯mO£ê¶U}¾ªU}NQm;«ÐK€BÅ”èœÚsÏû±Ô™a†”Òž+®6g+¸ïþJ ŷ抾9EÍ~gDkuH¥©Óñn»âÌ{éäåG³¨q^qúÓ^h†ìVÃö…¦ÏŠL6ñ‚äó“h2`KÔö+-<»6¼*-ŒKSâ ý'­r1úï¶Iöw!EO¯­ê³Â¶Ä6+GXWãÖy—¹Y2-¯ˆ=bg);;F¡êÛÍv ¤Ñ‰ü·U¦ÖíòxƒÙÜÖKn.,¬ +œj=v‹{-VØUE‰ñ=GBsG}Ç\©ï˜+Î*γJ>žÿm Í(¡Œ¡%0ô–š«.Ý\57Wóv6W[º¹ZnnæÛ9þuPO]Éñ¯»àø×ÿ:‚sÖÛ‰–úÒh©g´4¼Í5–n®‘›kz;›k.Ý\377ûíôT‚)9è-ô–bƒÞBpÎy;Ñ2·4Zæ2ZæÍ]ìö>OoïwÉí}mïw•ÜÞ=j•SU¯°ø™7šn“÷”´·z·æÀEi`šÊˆ´ç°B0rlJKÞÅ]8y +gÖä3sgr<‰<Áà»O×ïjÿ%îÑhQB·‘V·aº-ø}Çjp’$6ò«†~Œ«5KîÁŽƒúæÝŠ\÷ÚêŶñQÞ©wìÈËk…úÒ9•>³+J夹]1uoû´`œ8ìÉq¼8’Ž´ èM„?MÿÚ¦«qÔ­çç2ìp<›N£s +ãPÎN¥Óüåò€·ý—({;6ÓîD£Ž1|±£¹ÃQO†øêÈHíD‹Çv:àp§öå’ù¼3Ñüv6ü‚²C‰“€7|î4›sÀ™w N‡Ñå¿LI£CÝ㣩üÉ%“ˆHÂymÄÉd:=.O&2b4‘ÎvQüÚÙð£7—ÈŒ$‹o?t–¤óžqD4Ï…ò(IÇÑ„©±o s Þx$ÆIå]ë°ëC§yÐt(ßm;Ô#·vŠä÷[móžùÅä+ðo„•¯•$ÅgYÅJ/)]åÌR=@­ÕÑK Ì @ù¥PV€ŠÉyÒˆÒ¯W&á£Ï«H’¥€©d¹RÐg›cj`ìšJS©€¡ÍW3£Xó.Pn¥mÛª†Ý®~µð› ¿:øÍ‚_=üB¾²²½gS˜»Ìj„Ø&ø5Ão6ü°t üæÀo.üæÁo>üÀo!üÁo1ü–Ào)ü–Áo9üZá׿ð[ ¿Uð[ ­5rkבÔ̺Ì&ä5ø̧°ÖFÐßZA£|k}Mó­ ð"7B$üÙÁ¬Í‘S§ðy°ù—º<"¾1%"å\ýF¬~«u4ºMvb{HX;à·¾Ûá· ~»á×q!]òr,¹‡3K–¬eDâö¯ ~Ý™=ðë„nUpé‹ÛÞ¯ÔÛûÝr{_DÛûÝÅS‡KªjʱЙp`oiûT;¿½±k«U§Ejq“TmIhÛjJ#¤ŽQ\…‡0E™ÿÖ‹†…p¶P%=ü‚{Ø–òy•¦2)VdØ (»Ölfl¨\àhò$¹ªbû=ÒøÕdCÚ¡q¶&¥zz' +.SR4~äz²™~EœõPáØ£:uv4(ÜËÑÚv²ÙV’†I”ΆxñøŽ*9Žû0Wœœ$òI¤ò}ÜcÚÌÈ +P´*£UjY 1!‹‘5§²;ŽÕ½¦ÅJcà˜ÃRÖ˜^C°£ê!)‚Au6 ;-¿ Y=ƒqpY’½ÙPG‘HWœ$@S–Ì”únÛ]ïŒx–áÿþEˆ™î7¬¼" K«kF=ie:­œmw‚Ítm¡åkÝ +æåZ²br>ª·¢rjßÄÛž?“<Î_›¦C•-Ì*uÕ†ÿÕ[Κê•|ß‚:¡Št=êƒUžfY.ÇV­©™òàmø§¶ÀÃ0*‚Ã-ø5‹U³uKu¦÷®§N·'-Í ÿûµ¢S§ã2ykYï¹à÷“ì>˜«(~mÊÔÐhDëŽByî“®3tºIF3+îÃ6lÆà+ÙÖ¹Æ\zX=¤ÃótWæÛmÁ0ÊÙÝÖO[ T[ ‹¶å¨Yôìò"¥J£ß€´µnmx³¹™,ê+,ñªŸ@œT“Xj(²F‡o‡‰Íe¶H/+>+Ç@ÂR«W˽ +Ç*à7Û©î< ̼ËcRiCÅÙèYWEš‹%/Ó”Ú“A¢[ÅûhZù™nt«7Nƒ¤ÂÍ]ìÆøûß—8FcŒÚ4ùï*ŸtÑýNˆ´þœS­ÉžR+ÌQÚ*̹´TH¦Ùóâ¶9¯I Uem§N12¼Jâ°Éw«ˆUDËæꫲSà2 Mç5Ðÿµ7ê @úëÔ„X¯Ö³u†ÆXµp̺JÝÛ “3¤.›Ÿ7Ùy´tµX­MòJÚ5¥¤Èh³ÖœÙR\særk«ìÀ‘33µ +Ì64Q£¯¥øU_Û­ÄMó –Ê3;5f:díÎ Gq«ðïÎXñC†N-&0ã +vÅ]*5QBçn%ïpiD(¹ÓN¾H^zæ¥ï¡Ú”ô{ŠñÒìÞ¬êÿ”aî3¿ëßUŠ‰¦Œ&÷lóÔÄ•™ÌœÁ÷¹xÙšNmâîX`‚ÙXýÃÅ‚\ºÒ Aw#'³ÒˆÌ’™s:“@>n7p”ÚsLâJ¼Ð“Œþ¾Š«R}¶R¶ò‘¾ >=¼~<ÒÙľ֘Ë$Ò¬ðbÆ ãôXGm?¤¡(Y ¦vi*èòð¨–]Mäw'“%‡­w¹Ñ°Ïùc|vÈ òó¡NGÙ!¿’~æô«`¦«ú– °¿åf0›n¸p0«QIõD¥ÐÝg‡^’›qÇ^4m«¹ ΄9À&?¬óÝÆâçÁšÐ +ĹìG”)’%×FŸ ‰^Åã]^¹&ÅŸTî«Ô5áÍ +©T +¥Øc;FȈ³³‹XDª=C²¾ž½¸&«7t©™žRö´˜¥¿Í3×k¦b¬„¬¨A^æfwŠ7 É•Òv(€–EšsÒ:ÊøoŸÚ¿=…&üø°Íä* çi—æí­%c›ô1¥ù1²ÌòÓ;ûìÉ•ÊJÕžÁT&_@WJ¶É ƒ÷Ê×è ãJfõ­©Dj\¦¤Â<‡ò­—:´T˜Ø‚úîëU6µAµ]«n¯¾Ø"óâŽ#Äãè½dQºOó¡F(Yî…„dÉU«û%êŠ ©‹êã]4PÚØÖçtÀ¶(î4UkŽ;YÓÅxtd¶Ö#^sNïÒƒº„+ˆ´ŠQÁ]>lÕžàݵûÙVí=è®59ö¤ŒÍ†ºØ|ËV_7Ì­\šÍ]¦f3qÕÁÉßã¹€+5(—‘½[HÀ?_™¢Z0û¿Õ^èJûÚ2¦ådÍzí‘6MzDQWW¬×9õ><5}9 C×Ö“Ì®R«Ùr=OH[cŘys²ÑJI²ÕV¥lS ïf¡Ej.î‘GÏÖ +y¬è°Gt%A½ŠþUË—Qhi_¼6N.–CrÉ\§![ÿXT®!ö²È¶éÅøj§èb½,ë³60KºP8 JL´n¤7]"·N3ï +µÁÚ&ãZµéû|+ìâ—ëiÚ®â.~¹‘’wÚÉÉ/·k~ù^ªmg¾cæƒP1miõtjÕB?8óÐ4nFe^›kvºK$¾¹d/ë…„”%jl6ŸÌÞøÞmìŽõ³P…æD>IELvÇ’¦ÔÍ¥<ŽXš6£šàʊѦß*Ç t&¬0 *(¢ÒªbÁØŒöK÷¸yZ_jœ.JX滼UO†°Ð™ŸøV—$.#¿M`2âR®4ˆ +éüD‡0ÈÕH¢“â¼ÈÃqK ûL3š|¡¿1öC&½”iO›fV¬\¦ÝÚ½îÿˆ-Qw‡M5#Í£>ÀíêNeJvé'J\³¡qÄ©zÀé.u'*ÌãŠÄÿ»SŠ?ß{Gþ®”â_`î›òû 8&²%UUœ5¢²> ÷lC# ÚÞÀ‰³M¬ÛTƒÖH𛉠ì§ÈévØ–¶T +ÎX5ÚÖ²Zë›á™®pöz~+ràQ™ê‹9¬p;Mö”¯×˜p{ˆ+ž•½Âéµµ©ø¾ßlÍ–«l‹Ìê·æXså×ÂÅ9ÏÒ©ªy–N2\ý§Ì âž]z³Šj߸åÙ\KÈà¡øO|¥FNž`þ¸ˆ‡½/‹ŸÁ¨\w©£RO~ž¨£;¦l<éÞÿ»(Õ{ybøƒÿѽßèéýM%%¹þnårÚCÃ[à2ÂE&¸ÍRD%2£¦oëiXŠ ìqØ3Þa›Ïõ#Çn3|a=A4Ÿ5ƒoÓÂê6íW„—©%*X¤§u¤ëoí‚œ©^,9øä°Jh>ì‘[€SçLqF~<Ìe¥®Ré¾.255C™,üÔ,‹ø^žš’å‘;|ÚÒ >’:ж͑oÙ¹‘oÛÆÈoÚµ‘ׄÔô÷Þ8â¿u¸‹Z›xÄ6Sò–¸tUqy WÓ¿¥.¦ÙqU£<ÏÝWLÅÞ­ø˜ÿ5Õ8œj5EÞ®ålÕ뵎÷ké [õ€­ë ÛœY‘T¯ÑZ6ÅÞ{UA‡MÒéI£wµõ¶³¦ +©DšòUÒw9,ò8%Bš{û"úŒåÙ$.싨C·XÖ*Â8I¬ñtb0É·ÌZp¨ZGùÎ(bÏ£ ÷D5è‰9Šï +(AEÄ6VsÞ0iïCRÍEé)S°Üë‘«Ü +­—|tX [U!¼zŒHU‡(¬Ú¥Ø\íT +]ì>ÔÕþ½Uk+™ÎÔr•Z­Zÿá:•;]1ý?.ÍbY=này§‚sÇC8„ƒ“R¢:Ë‹–YEÐ2Ë~‰e1ãdÃÔÇðl¥Þ68z«žôp!¢gOiÂD´Ulö«ƒ‡ÕàÂÉ,×›>7Nf9pRCú­^¼4Å{9­¹Δ ÷<ù˶[æ °f£ÎmYÑ¢+7Œ £DŽTjÃäõ+ ñcJ¦‘Þ|õšI£väÜcêu/ð΂"ƒ³À18ºó< ݘþ²Ðý’׸ÔÀã2z‘ÁÛœìÙ}Å÷õê!ÞÈ 1Á¯zk7ÁÅáFùÎZ2î|ä¹Ë¢7~Š%,­Rî¢2 çBMIU>›+”sÐÏß»CD©òk®V65ؾ^3¼Ã&q¢ËkGåË]V∼š!É´—í]Tª¤%ô2×»²'vƒjª-• NÂõ¤¼|[fSݤGy¹ÔäbÄ„¾*ÆÂÛÔ-ØŠ¸J`ßૼ «)á2oÂJXëMXG ë½ (a£7a%lö&l¡„ËÍBÇV9 ¯ ômf:±ÉÛ‹"ÿÝ®”ô–•Ì²LeÙQ2ËŽX¯á@€s±½l;ý»K›ìvX*û¬©ïÓ&&=gAË0_‰³ Mº¨ ã&®žkªÆmMP3³Vp©V…8ÛT`)RVŒ'¬rn×9s»åÜn ð‹Uß«÷ËãD+'îw'˜[íæ⦪ yÈ|f©on‘…äþÜ¥ —Å<ÇHM´üx:5˜4ÅawMo1Åêsy‘¡«&’ÈÀÞ2Àì¾Ôl³UÝF™¡4W%’'ÑJû)ããé“êLÐMyrÅ­!H·ŽXaÒq§“ËÏ/ý¡÷êäÂÈæ‘É_›ÜBHãq¡QÙû3ÂtAù^ù´O$f^ÿùÜ–>%Gè––Hò–ÉÞ6‚¡}5.×fÞ©ä:^ÚŸ}}êê…)í²¬Z»µàaýÓÒÇÔ‚½¦XÀnYé#;{¤/åÈŒôù(KEÉ,*KeÉ,•*KUÉ,U1Û¶åÞV›ÓX¡fˆŸ† ¿–úXW¦.}ª¡‚Q ÊQüOÅKóYб/ÿ‰ëz)´É Ï”Õ4(ª¤Aµ„é;Š¼aäº+Ÿ)wÕȶ³Ä8ÖÉ Hg~œZ©´«¤Dæ— Õ‚Ý|Y+ Y”^7¥o'•·…Ý.W3Zk¢ð1Sw‹\C—zöÕg«Ø8tüôx¥kZ}›‚Ñ +vÙܹùB›äkƒÆôo¾¶VNÔ$‘:Mü¾4>HC5¨Õ¿ˆ¤‰oZBª œÖl\b7ʇÇ mPA»YBèÒ;"=Ý…×ÁÓ¶× ¼ž9½gç’PÏšÍÛ8[Kÿ:üÐïÅnkMz[û€ÜÖVжöâÛšW<1Uõ—eXøL·céÍ[ÎÞÚŠlUû’'÷pÁ£É“jëÈ’õQ6³OúRónr”vh\À¿ä,¹×Ù•rX'cV”Øqb6ƒø#EhNÑ™K¦äk²F»c3öl½E¢ÐÙ®ÿî&-7[B«B›r=7˜’žiáo"?˜Jah};b-•ç¼…\ƒìšEY,­³%yR截ôûaŒÓ²ÛÄ%LÇ«Õƒ¶‘õnIÍôŠ¤~f†UøfŒ:!‘Hç ûY"µ~åhý‚(³§µƒÞPØzRšÌ{­'y›åpšÍ¶\o¶ +ˆˆÒ"§¼Uú|0ƒÁ–¬ƒôåó–¨Ö%jœ%>,KÔÚ½SjäÕ–„¬V?³d–™1·òf[Û|V¼Ç>×b¢z kƒÖZëVÉêÍܪr6:sú½†µ +¶ ñOåàŸŠ]¡”Ë‹w™evÉ,M*KKÉ,-*Ëœ’Yæ¨,sKf™«Y¬9E¸‚›%uÏóró¼\Á|ªqAW¼Èý$Û"È›ëáæÆm-N§©à¤Ì6ßZhˆ~$­.FB±–¸£—ÆÏVÁé:RÛ«AÚË)¾5Rã òaJKøíË9nkG\m?g¸j]OD*Wú+0ŸòM7“°+#n?{s”(c…í[a¦«JUzU±ÒJ$Ê >8À TX1P_!v5l« ÏŽ—:¬6Þ tðåy“//V4’Â9›£Þ*O^!‡¬Ööö縉Uù‰Y¾C1Ë-Ü1Kw,¢:Dá˜uó±aâ #ĉ†‹s†li¿F?OÁµ1þ³%Ϋ›izn} èÙ­ÔKbJÕVûé)wvBÓñ)ùÂâ:éÃÑjc¶V¾°Hië%ÝIRi$Z %gX¬¢¿›äyVƒU#ƒ!—XéòÀÅòÉ4ŸüáugÕB$ý@±Ûä~ò—/ݶ}|6–9S¾¯ÔE²‘ÝæŠ) Z7§öeÓ©A¼}u„óî …ìþìqôhO®ÔŒûÐ>à9Ñ7_~ªP.{¼ÿéÀg +&Æ2×PeÙ‘Mç鮕[àÛÔ>¦&ïS]°å½‘ïjW®cî¸3ðMi±ºÝ‘ E_6ŸRv«Ý: ÀÑygª !&6œÊäe+:/Cd¶sµ»cf;fªpÌh‡jKœ°sB¾¤n³½fX6éÈ“÷äqW¥|ŒãhœQÐ+6Aµ+—L(ËiýB[Á&Si8‰ÄD!+òãÉA8ÙH²#Bíß-dxw"ç²ÅeXñAÎA÷ܦ:¢ä}8)Ž”xËÝAôH®-ä1È4Ž•Wøx7/ïÛ WÛ0¨jâÙãyô Ï ÁIFû"Ä›x|²LS’Ó!žÃg¸íÓ¥¨ ±”œ>{ \@dwçˆN…„T昄K)60t,‘?J­9ý0ò“›¦óCv¹=ÐõìD>yÍh2™V†ÃÙŒ‡§L3HŸŽƒ²2œvVâHž —™ÄjPn*ÃGNGã­TÛH Š7®ò:O¯.ˆvõïèÜÓw°[ì¶}RÚÚ&†ÓvÛJ6êïkòŽÂÁú½0¦¨‰cè”ÐtÉ}+>Nì…Ãá)ı49æžsÕz·vÿOÝ;wØEkI§·Šb¾DªÕ©aœ1–FÆó˜èeq¯Î…áÙÇW§(/–«äßòoµüËšúa!Íz4ËZÒwG$nûåvúÈ)zÜ!ÎŒï°ý!ÇE½ÆECI\Ô¿“¸h,‹YMÂEƒ6.šK71[7Ñb+¿À‚⮎§þf»þÙ%p=WãzŽ³òùÎÊç)ÏWg›¹ö{¹ JC¾PC¾hZÈ{ _`C¾°äKb¶³Ãé _ê„|‰ ù2í/{“¬s©¼/>m8}ÔÚ²þsä¢Þ8\¸CA›FÁŠiQ°Òƒ‚Vm®ãc¿wUÿë«”ÿõyo­/+`*G«l´Õ¢öYXT¡Á7¾D5gSøâÍ¿,wœ£"¹ãrç/×Ìwåqõµ/ìêîjûI¸rm”ì¼,§ÔÊ©•r€/ ©»É5[Ô;ÏåJä¬$ý²°ó€X©Ý.ðÁ휦ɱ•°è²jm¬œ?Öñ.8åˆæp¥®§aCü´ýX k l4Õ CÁh·©­2m" ÖùôÐâ¸f>k3¹¶?&©`3t½ž²Fþ_8¿Y[lUŒ­°XV RüwNî+”6ËFs¬îÅš˜}Ç †ÊÏÖDR]`j;‚!ý2wT½á £¾Ï͉Åý^Ôîìq"|ž1©V¸§3·Ü®1µÕƒƒJ¯U½í”XæÙ%éf·¢›E7•L7‘¢t£ô¦ŠÇR;’ÓÚ$/!5©- 쪶,hu¹¨­Þ ¶Õ>½(ª%SÕÒÈ_#UuZ{LªR¹ÝijÄ$ž¥Eˆ‡°TåÆëm•¹è¦Šb#Û¢b÷R¬Õ¥|ðvźŠRÖ!¶p Ëe~“¾‚ª3Kôµ7¨Ü†Í–éã#ò«+h™”V_ŒÒê‹RÚÒé(m©“Ò–:(­±›½ümweݪšS]ãJ‡ /ä ÿÎWbÎ +ÅùÅùm‚-—)kUŠ^gh^«ÂÍdU/ƒõ«͇UXûðûcÆûš h6m5o“AµM.õ9;íÄIŒÜ+·RÁ\Kky/ÖÑzÞ몡2ÆœÁ8ôźdáÝ4={Ë5^,Š,þÎI¾e²D¸Vð«Ì¹Æ~l‘¨½Zœí9€í A39ƒ8kªVw3ú*úNù\ëG\•¹ñx0n¬3‡¶60ÞãÙÛíË:¥ò±Ö&FDõieô„¨ÓÛ$öë´m!›Œ’7ÇÏV»Þ1Ðu"·gµÒÖ˜•±²\³T-7/žÆõ¸Ü"OMöiÃI,·Ø® c®`¯…_Ž¤!×Zysp-©sBúM†‰ 9GÐ`»ŸÏã:ëñ ÕjgÝnŸÚ‡²ƒxC[ï<˜ ÑŸÐNpt´$ Ü#Í¡OÆŒµí½’(HݧœÇ4‘¤*sZšNZKNK³å:J¸U'ÌåõÛB¸&ÔÈ1"ÎJ_HÅGï€ý`Ó141˜²ý¼öñËoOZ5·ñÉ/Ø$x‘¿T8,éo3]µ°Þ§}«Þ®}«ÞQÜ·ê)ëNéõ.í[µÞÚ$¿,k§tb½Äà)b®;¢Æ1Ȉ’rÁ'S«ÜÙ+Ýîò¹Hõ2틶EÛàmÚû•ªÜÝqŽV +…3)ùwò +™Ìúû÷ÚÉN¯Ë(9å.½H–^@É£îä&™ÌnåOÉw«wFßê=H°ì¬Z/ôÜêe +°4çWó +MFfø‚¹óOU형œ¹Ëz±è5—ŽòÂ.ïq?o¿Ü$¯ +ÜwRž;ªb7W©<7y¿¤ÝšÂÃ(×7Þ÷ÆûõÞÇŽNŒ¡[ãÎÅ|ûidܤq÷’y ”+G‰¡±|©r#ErhÊ\a"‘î.æ"Ý|ÌÔ|ìó/\¹Ÿe²ÑÁGS™žN +Ó µ§º&·QaÓîO¡ýênò?.†é|R½N®-xå*ޥœãа˜ß•Ëe#dÜÔ!ŽP üŒ<Á(kf稪§•#3ªÐ`:5xÔŽ–×tòfoÀ¸Ò÷UŒô»ë‚£SEÙ‰ 7Í)ÔÉCã„ ï¡qÊÅ݇Œf†íT|‰ÞLÅ0¥êöd]:¬Ëë]Æqí8‘O"¤ObN"Rê +)ÀãE'µ_À¤ƒYnl,5ȳãP˜’èRÔNa/Å”2’KÛ ]2i‡Zî·'TWÆÅîÙiæ¨GuIgr6ÓGæÖ0 ¹Äö_ä ‰\(Tß1g3q~¤W=Ök/² Þ7Âl6ãeHʧ†’æLÐh–Šœ’¨ñ‚JW‘P1ÇÁ‡yê°ˆVWΫPˆ#©š÷®ö]ßÀI}ÈPó5¢ãò1YH¤Ò®{FµÂR‹j­ÓÔ‚…µþrÑž‚Ø+ŽOOä99•‘_ê^ÔxÙ@¦IWœ=‘tãEQ^£¾F +׃Îd:AŠül‚}cé"^ô÷ VN‡¸´œ£û]'¯*çkƒãMg×È»ºÂ4Wô)”~» » zYâøCj…p†©>G ! ŠÛ 'wÚ ƒ;ƨ¤Ó\.ÌyS\èÊ,J´Ì‹ê韴¨TϤâÑòŽ¨LGW˜ª’/ +-·=òTQ»3Ìoµ7]=™&ÕVÈ!e‹µRÑ™Cuš+¯Ð É +Ë+Íüõ1y”®†)ŒR¢äZ¼—´Qû®Ñƒã<~Ï]Š›#ñÒ„x)yó;Û.˜wlñœcœã¦EC3ד6O§Íwïsîóý|õ¬t™q."€„Ô×Býã"i¢m„ᬹ„¿àT2Ë„¸ŽœK]Ûoøôx)Á )_J!yÍi(C·ª£j-Ö† ™NŒHbà³¹µBv)`­tÔ®ž3£#bÀºÌ‰Š€–Ã)Ú•5¼Ö†›4r,ù:B×Z(´žú ýolˆkã(¿µ"6)¹ôflQvÀ—ÓÁS¶Ñ®Zö‹a»¾²Ù1-;K€?}îRC»ar1Ô‚êËa‡÷tåï¤ø¢ô× ´Ð4Ø¡¬”Rìvº‹Ð2vɼ)Ð =dâ¿ÌÈ»×ÌÛeæ펱W +2u «.÷ؾÑo•¦#|eˆiX¿c¾Ïu9ÿ)á%6¹„YûõsÏD4ͺ‹^ô©ÀUˆ«@?ŠÚ•YJ)tâ§xŠ¤_mŽì5ZZtí䥲V§mÙ£SqtŒËa<²]~jmÑ–Ï:Œ÷`^åÂÊ]°ôÙhÈSõS„0Ò…p/ßoTÛKå\ûe[\£ü¥Ú,Þwäð¼‰(¡ê4¹*ݹf( ¥±w8<’˜ž:у_ð«Ñ¸Ô¿.¦œÿª•Fd…¾Þf‡+p®‡ß{Pj3VGñ!z &óÝ„s©{ò‘ùˆ®®Ôëp½xäŸúJ­Î–Yú¬A¢”!¯+–f9¥’iX䉒ec‡c^ôÉ„®Jµ6T0ÑmÀJźm9~¹™ëèYæ%_Àº™tã»…ÊsZ¾íò9T¢çȇn'Ôþ°ŽReË…§¼¼’êcD}Ùj·Õ—€H¶‘™œ¥DÒRÐDîYw8EÓÕƒ&jê´¿kuíY×°0AÛ+™°ë4;Aoñ*ÊQƒxs¼Á»MÇ:‡Ü–ÔËK9Õü*ÉüÌÒ!^EƵ^ÇâuÚãdצK^¾§{{­æ…í_Î\ë–`€¶Î ÁÙñ,À]‘®3ýån¶•Sýågk½ms6v‰ƒ˜ãû<‹HÑÇ<²jÌ[kBž&Ì›’cÆ-‘¾)9Š¿ÈÔ±Bû î53êòï%ýRš²'ƒ|ÂT|ÉÅÙ¯->Ç3([[¤Z‹iMb¡[2@ö:àiçdÑvèâSq)ïÅw)Èš,œÊ ŠÐŠušôK z[·r×6莣Û|/*S u‘ÃæFÂÛl(¨èrœß*ù†ZÝ™ÓÒë\añºk6ª‹ªnD™šЃÎûºré—@çï6ª»Íù}¶gÕp0ØåD¡¾zw.ÿé§Û‰xïP#ÁÁS¥6ÒŒ0³ÝiOæ2áÔ´§œ»ÌS×ÑJ {½»^µNöý°uº›®¸­{¬{U÷OÇñ¨avUýŒ%ÙH'õ?ä¥þÁi©ÿá‹£þ‡4õKhG]ÐÏ®ñ¶É•}¶=Ä·:[·zgÑ24L%Ëlq•i,>>êö9…uŠãÄ +Éklû$Uê¢û°;¢É}óÝbÞœ»ä?ø²é‡å× õùuJ­·Îʯ]ÖGå×ëcò«Ã:'¿vXʯ½Öcò«Ûú¸üê²—_1ëò«ÏzB~Å­óòë õ¤Ô]îì„ÏzXv‚wÑÈÀ:º÷–íÄMÈÀ!ZVzÏκ?im³ÖZwZYµ¼Ú<ÕÞ{v¦|JêX•üç0ÿù4ÿyšÿ|&bîZ+èOrr(Ÿq %þËÖËŸšv +è<êôjVó,ýû\\âç:íDq¶”ÎÌ!yÜÓJKày©DÐìP"øŒ;Yixò#µŸ¶“ + s)ù³FééUügÕ/hE„IªsgÕ³c²è3äùBvL?DþÇ,væþ5%"w”øï?Eîº0g¯mxGd_¨&FöëËrÃϸ”êkhÙîÖc^Á&Fº€2._#q¾$M.(ë;¡oO¾ë>ç ÏÞõ}©ä`r?ÄÊo¾1R¡8µi^ͼÛ.c^ +yfÔÿðW§y0[³ÍR6Ueï²ë'‹/1ÕæþZcÞÌÔƤŠ: Òf¥>°DR¶6KGÕ“ véEfåêlŸ06–€±É £¾ F£ ÞFgÅtkÔxz™Qf¦#CÔåæ Nˆ›½Ï.qËEBÜ\âæ AÜ\âf ±ûɾ?r2 ù¦• ð Íuö೨¤î-D#Q¶y±r ͺ*×£ð2¯‘µÁÙ*ç;ú½À1n -qÜBb?_Ö¨Öù1§˜"à:hà +‘h¸€æ’‹`.RÒ†R}^¨¿ÅZµrIqÕÊ¥Ö2¹é/ǬÄU»™¢&“)j‘L9ænµš­«Šwâ¶vYÕ k…üj´VʯÙÖ*ùU ÜE±Gìç+`uÑGìçÙÉ©¢x™æ >Hµí¬Ú(l?x)*Š¬s4UÕba5g¶}Ñ~Z%E®Á抰.¦À©¥õzN¢îáIÔ:J ¿Î%F¸à)J-¦põ”*Ž©ÚH:9Ôñsë`°Ò)£SšGM°]Ã…dNjIJãú·Ïíº ˆ"t«@+í,CWÈ£ŠåŠVêVÄG¡"r;Z¡LqQy¯¶Ôh×’‹¢‡%Šjè)dz‡‡Q[ÑàËÛCŒ±`ÄÏu×ûsgiÞ>ý’r/sÄÉï€~‰S ¡Å­…UæweöÙ¼ŸäâëDþšHÁšJ5™Bj:-ÊäW¹¬Ôv|U(Ö}Ú̦ÚÅBÍ÷ñnZ”¢ÚqË{íØ­€Òe[ÀÒß +–*Õ +;sqFJ#¿FK¹•­‰ÎX©¸ Úÿ­ziäÍP9Û:RîCåZ>%›vëÁT Œ5Ѐ4ÆUé.ƒÏãI]Öêf%œ¢·Èɘy±Ý²½#Ñ%œð“ú…5×[Ë•ï„jל¯Ÿ!^à"•NµaÚ¬‘ö¡>÷BUj.h‘«òmÅ+÷º(p»[€ªt¥KÞ¾Jíga—JwMøh§3ÓR…4ãYÙr–ÇÐÜ÷RC?F;PUžpWÙæmE\·°¯º“ÞÄ*]W92®63ÚL'^¦™œ5ED"k”Œk­–q­s‹¤Ö#yÍį Ö2k£µÉÚLbkKû…|›9E—kFã!ªgÕrƒøP)Fáë>UÕ¿Kži‹|e:ÞÂQh«3H¥ú hï«Í°˜Ê·æFôþ–æd`Š(¢KífÜá³*nöj«º¢“)0<‘rêg ä è£7nü¸:AüeV›ù ±…êAû¥'ÌÎðQÒˆ¬Af§’Òü yœë+ä¸ÉäØøhY„!±ÇþDáIb˜¥ý©cIàK°œ`ìSñüÊíäb ãòb( µfOÊ¡C”Á8 p'¥ü`"=(u·•¬HŽÖÏÌÊhö¸‡„¯6 ¤ßÜ™Î$—F,*W¿nKX ); +,Íêÿäi ;ds4ì«›°G´£WÈåu$õ»c˜ò )+…ÂP^·Ä)…CýÞIËþ Ò²ŸiYÊxpئ§å‹A¢ªÉ ÷ ‘C@­kÆj`¿™Yë¢ÚZOŠ¦ÚͶrfR|‚‘°Ÿ=UIç–ú,2/U¯ }K(_Oô¢ò‘F¢6;¼‰ö1¥ºÝœx›Ëàˆ]jÄB·vôi;UÚ*â ® PTvjmÚ@–O”Ÿtùš4(§ˆÇÛ¡`Ùn:ãÖvᬉé¿ O‰Z<„£ÜÕk@ÃŽ•ÞÚ=ê mIGGί !?Âü;¦ŽRä_k0$ª5Ù‚=jÛÝ{¡òÈt9ÊcL·Z%z¸z\ ¿}*€ÞY¨@,¨í•|¦QOAý¿u!¾¦ÖÉ׸ºÔAN§ÖÉ鸺tÐìR½Ù¥Cf—®6»Ôdvé³K×ê\lG£‡Ýã¹A« ÏŽñÌ^èTþmñ-¯Ó›Èõòdï7ïqe½R¨‹\¹šh>Ô\½nÐF>«ì°³‰ëÝbgWÛÙ1Ûg—vÄŠgÿÕ²Õ½f ˆË'ÞaÝÎM%ÚÐí$œí¸üÒÞèÁèÛõHi¿·7iÎvpÚú‡<õ'íú“¥ëÖõ\bý£vý£Sÿ³þ>@}à°[;L õ*M.†êùì˜Þ?ýÆj|ØPªukÙ´²]3! ›…±…(wh F1©i¦ÂÍ®ê½îÞµŸãÝá¦a˜&Ȥ­1³6ÄÉrÉç´Ç­[lÍzÜØòòÁA« •¸ó.nوŸ­=±½A5|ÌÙðqoÃÇ] ¯˜¶aó섾;éªã+n|¾×Æç­½^ÍŸÌ)ÞŽÛêÇ›â’ep3µNº:WÄðOÞmź'»ó>Ww6 üí%‰áŽiê;åZƒØŒ l<·kG•Îªo–/·ž£´i¨Q¶r§·•’ƒpû¥‚lå.W+6h·–Ím¡Ð2-Be¡»]…fØ9€µ{ôÚp/¯ xRǵá:›qŠX‰vJR`5).ý´Ãä +ÙZÜã«…y, 2gâÊS­9Aë>“¿m’*¿uL=»¥x;N«Dó3¸U’OPÂç*ûü€g­\®ññ vNAøðù×˱#¯Œú¤JÜ»…Sj¡N8 Tˆ.銔êÄß“=RU²hou »\Çâ£SªCFÏ7«‘ràÃËíx9°w»‡Ì#U«<>LøŸ/l–Ï3 eñ½•â'uñGäcxMBd’ÇY&ßá€>â<·ØKôӅ?¬•ä>R\IIøf%k‡s¶€ßj— +r”g ¤¾fë¯åú }¬f÷¨[Íî1SÍîã¦íÁã¦íÁ'LÛƒ'¤íΓßcx2±aú¤õ”üú”õiù5å*ôõ´NýŒN}F§vè¯guês:îyýÕ ¿>«¿^Ð_/꯽úësú‹Æ‡¾š¬ç´‡ÇOʯk¬çå×!ëSò«ßš©­9ä×µÖgå×ÕÖÓÚ&äùÕi}FÛ„¼(¿öYÏhk“mO²W~°žÕ¶#Ÿ“_³J*ô+•ƒÆ’Yª,=%³Ôksüi\5È,ûKf¹Ze‰•ÌÒ¤²ô–ÌrÊrUÉ,ת,ÍxdiůjÀV7ภÆã Œ]àq`ºF¥F°žÄ‚»{Ï6aîÖ“Öyë ëÖãÖǭǬGi½Û-õKk ³=Dó{'ƶYŸ´y©Oñ†;“­ZØDÅú +r<Ã&84/¬giFXÏÙeŸ—ŠM\ö³Ò „˾Èe÷rÙÏQY‚¼CíÒºåºDù¼’ ~A¿ŒÈäQJþ¢;9!“Pò—ÜɃ29IÉ_6’/N÷õ´JÊÃÔÕU.¢—RII§ò…A©ùÚ™($øÒ;‹F2W4`-g|Á¦SO1*Ž +lU•ûeç±Ô‰T¦QK½ŠÉ“J+ÄKÙz±˜M¨kúÿKÞ›ÀÇ••w¢·ªn©n©´Xò¾ËûÒÞÚûnË’-É-—Üey馻EI*-¸¤RW•,»›¦›¥±ÄÐ1h $!“È&¼Lf&ó²LÖ™ÉK&’L† ~ç[ÎzoÉË„_^ÿÚª{öýœï|ßwþÉ{&‡ 7M×ø(¦Hwµ0a»¼)Ð)·çå©)¶òW™¬TËš¾*T!dµÓ¬IM+u(u74¬úGYs†7¯ +8.dÍZx ^š·DÞ/Ëê‹h@Ûª“ˆ mk××Hç´D##¢s0kºQª”I¥î +E#”T.LóCÒ¿R*cN•3·P™X´¶§S~Q»¹,á­"£„Ÿ†vd¼\AOL„d¾r€&™§_Q/4;Çõ…šb¡J¦èt]+Ü)èMŸösÜážÎ +VTžeÐÈx±Z(6a.còšÅ¦¦ ˜ýs5@°ê¦›§aÈ\‘q–NMWÆDA} à¤Åð‰ébu|ªX ˜cÓVú€ÝC0C‰–s&AU¢f)+Þ8”ª2б wt±\)”Ë…azFv®\š€ùd‡áƒ2ôí&uÿæ©/´F3ÿ¿iêË„ÞÄ—6TždCå_©aé:ÉŒJ¸“Òj Ô)“¹æe$&ešx9Ü΄Om¯U +!-@¬,Þ#b1+xíâ´d,È0ZølYoI,¨Ï+~ã¼âƒêõüâ7ϳ> æ™ËÜã#ª†|„ww-ˆ$SÛ¼$Ì…˜cÀ¾Nlbkò>åÝ[í­ï©phaÙî`ªš³ÿâ\×q°CŒ“$üt½Ùºÿ, ZWuåNÞfÜx¿&Ï6ÏfY.Bˆm‡Ó,¥IØ ³ÌWx¤M’Á2ua[~·A«\Tb Ž˜€‘"PP +Þ«šC©g¬Æž]#Ù2«I?À“'q¢”Ú¬¨¶ ì¦õÁ†»i­¡ºÍò^­X›î®BƒÛ¼Ä8îõ>ªIož2{¬Ž¶â“”Íš†zÒ ÊÚp®ªÂ¾½ÊÚÕ IX3$aŸÉ­¤¨‰àóïPDÉ?ù€ ìu÷»Ð¨hB€Öj«§Íä°wÛð ›³zaàLARSïÈd‡ïSª³Ñ] ƒdEˆ¿®u&³Nw½Ë†¡ÝrÚZCV>R³ Õéú°6Ÿ{àpì/æøVco0£Ø0ÒZê-öñ»‹X`EÇ7ñ;~™{+‡Z nQYÐ!©÷` þ3dL þ\‡Oõ­;J–†â»Ô«KjúTÇr‡,Ë*‡¡Ññ#6ºÊ*î#åT[õr›Ö¡õa”ìMàp_õ><¾žóy4?– š¸@FÝ’š´–ìDîü½UKm²EL*Ÿ±nÿ†\ÑÚ-*ÛPDó{i…/µŠÝ•µ4ŒRt(œ+©Ù‡S\I{ÏÒ–à«ÖœñæT1Üò’ÞI+Wn²6æË@\B’Õr~’9‘^,<Ç£Öìo©5ë¹V]³¼¼AEFÉ{±^+X2y9Û…-Ozžm¹ÇZÂ@èÛfAˆ{ÅM.Q†% +ÆÕ ü„»´6x,è ž ^¬ ¶ƒÁ£Áž`W°;Øì 6ËSË<AÌçeèSŠ ÿÝX!Ɇÿî¹²á³÷AÓ —;?oŸ^e0?6¼ÃøCª¼â!¯º“ß­‰<ÇuN!NvïÛ~ò&]O¦ ^/X¿ªT{:‘™Ü):¨§s`À`rW¦ŠãC¯#?9Yª¶ ÿ¶üd09Û¦ò•j[u¬ÐV˜n+àg§\2‹Ã®xÌ*P¡,|MOVÆÆGª^~jªxËä<‹HtèhŽ7òs±c-Ö¾æà›ŒëV¸äUc¸Á¸žoÞä~k†?KLÆ=ËÀ«oÒ’‚tž½Ô¡ùÑÀ-×<üÂðxõÜR¹ úÖ÷VQäYEäÜÉb–^ˆY"'ɽ=Lã•é{5˜Æ‚ XzßÎqj[ ¹…â53‘œc©<·ÕU7Iœãd„TAnÝx?H"4[)õYI*¡‘V& QFYZ#š®µQ¿ûÇôÆŒÆ^lBümʃŠB›íl¤÷‚hï–hïV·.A\>¯ËxÁBCû Æ*Cl‹5…¤9.ò%j±•„©•/|œð‹}}ªf‹Y—kÆEœTi&–g!E•ÕŠ`2š—Ü]¢ÑvIõºÒ…fâ° íE' â\ž¿K‘t_e$Àç!\QË6 Å·}ÄŽk5±Š¶]©oHT‰eFžÆs§%*Å*0]lÕ~²0C»Ò»Í´Ïr5vˆ|>bgK@þµ9~®³ñ²€º”²q^Q%\\‘Ò]’a ÔpC×m&n¨ŠÃ˜++1‰öõlF&ú¶Ÿ4(vq77á¥Wo ı(ö_†+,`Õ¼m­ž b6[‚­Á6±3lÙ&­¶øuÁA©A}LÞx‹ÁÛuÚ­´8Ôi¬˜,}]Î6%½Ë¹´G²š{:«kh g°5Üé»ï.ã«Ïèà"–Ü‹x/²–š+À¼˜¼” æ:|˜ˆíEÞXÃz¾ï ×èQ—#À¢‘ZvÇ·C/8ª¸!{™.Á”ÈÐcÅ“amÝx°(§_ I~sBŸÛqbß4XÝûq{ë´o)B 2Qöt(š§pØÀåŽë‰p€%‘¹ên: +üø(~õ\iˆö\ïÂ|©™Ý1zí—V½žÔM$ÿ˜gŒ£X-h"ñú8.ÖG\¬xpBœÉš‹á¤fâóæ¤ jÖù#'D›ùZÅ•«#퇃^” ˆs-ÄRÜæ§D-ÔD +Õ` ]_Ž'ƒuâ³"8ì 6ˆëÊnqQÙ, V§RbnÁeϪÓÎq;×{Ò|n:uÓy7fyªé°ÓûÝs¹é°q?¼îÃeAÜv>´ rºóÁgçzÛ eâ`äP8Ò§Åü­Òt*0çF¯å +Œµ‹W‚¡Âx‘Pò.O™êe­—rÐ%Àì XùÍ•fž”Ê8ˆ¡`DRªƒff—7—BYD_Y Ë*+Á³0RŸ²ÿ©•’$ÞM{ÕUBÒש Bˆ€Õ«Ü×øWxuCìœj|Åtˆn²RQ†±7t—1ôFÙɆºlÔø6 ’e2 b¹ `•ÊŽë(‹ª†L'_k9Ç!;æh„YX‘ ]v$4 ¹¤}eÓÇrÉÅN&õÅz-+íéº1+€RéQÎbÜð0¿uR£=¦ÛÌ@û¹I®˜ó‹µ¹òƒG#iP\#qÊWfòS…©êX瘩1§Mó¶WÍË3+ÜõÃè‚¿O»ûF˜3 í»Â_±ðáçB~Rl1e±Ô‹¥2á@J_¬e õÀ¬úÂÒgò•Ç +·TŽBÞcX% láŽW5ÆÒ4t¿, 9ÔÆ¢Íóuy!åü(›pÔŸpa·Q}$¦'ð(ë¶ÂëRm{·ÒÄïx™p:uH„LÉA + 08'Xo­ ~"I?ØöDûÎÜ +«ÄŠ¢DÕ'dÏäÔ4¢÷ÆŽˆß^C‡\‰‘ri¢c,_î€@ˆÏþ×.ôfÁ+_îÁé*èx2U7áËde¼Ð /S¶W7"‡#š†YËßcb*Â^ÄC¥èx× §«:qD€‚>“õ¬Y°„G‚1Õ;˜mn]|*¬µÙ•C`¶Ž¾lÿÙlçÙ‹ýÝx$Š¸€òFÑÎNLUoéS 1³‘ìƒ8.ÒxEÔ–>'ÆoöTµuxm–aOu¯çhÇŽ©µ~I-(:jÕI#¨ +R`O±X¨¼\D:r–¹Û@ DÞ:Û¤ô—œÚ'ge>vú<(†Næ›…G”ðÔ‘¼XýXd¦¶°Þz­ Ô8ì½Ý$ þÕ"þµ˜fßz Xq÷½&Aq‹«À-/5ã5ŽyOÐý²þ(^íÅg&«QN0·F– ×CÌ&Žd‹0Zû¤|½9›±P€Ô` Eã§HTdH!:poOÞ†{gÏ£3í§*O«Ï&ŠýÔæx6fWÙ5OÅT^®èLc} O+|Xƒ5HJ¥+t õx²ˆ À +nÅÇyKé˨ßÅ>6™´Ì´ÄF¯Wä\å6z;V>ë‘„–É6 `©Ë¨ÕÒüfÙ)©”¦ Ô×Rš\”¶\Í |`¬Ï)–b³’ÙÊPR–Õñ»_ƒú¦DÒM ,ðÏ‚W¥Sß@¸ÀNÎÔbÈf°×¥!5«iö Û¨òfÈ¿¶øI Xæaùýe£|r½­†‚fFݲ·ë·†7@% sÈ(e‰GÂø‹«æ£~-¦Þ¥ ˜q!ÂÈ·;õ#ÊÝfͤ.N³Æ¬ØãhÉôk£5Ìè5ƒúËzÓèfí½,nóâöÖnêƒuT»©»CMÝ«›ºŸ"è¼ 6ÑöK –³ ÅA¥BœÊÊ&9ù—Yy8#ƒÃÊê¡ ç¦åŠ]¶é/>˜C…ŽP… /D…œÎ8ꌣº3Ž†^R³õ˜f"ÉÍøx(ã:ããnb9ÝOªé>k“N„*vRU씚ŒñàÈ9õ:ªW»®×i'­¬Ö™¹U«=T­3ªZé¯ÎP½ÎêzuÖê¯ss«ØÙPÅΩŠuÍÞ_Ý¡zõèzu×è¯ós«VO¨Zç M8”6-÷Å=Ï›N@­mÅ`}ë²Z½ÅC5ÿF³àÞœÜ|=¾)Û5jæÃ4ÕZ$Š$Š[}Ôˆ)â‰ÝÝŽ3*U!ýÀÜÆ.ä(?P«e*J)­ÛZR°¨§â–ÄeáiCßÍùA†ÔU9¿ ™n@wZ¹3¸WÔÓ¦›$c~tŠ³l‚,ÑÊeŠÔ{1Fk@Ú~uåÚ‹t=ºiV2Kq 6î³î\§­M¬b]ÕLCèà%À„L£=Õ¤E%Á+…Äï'\ûHò”$~Ô“@€hú)c8Mš !˜TxmÀ‘(Ï£ á6dT‚† µa¶Ž©¯ÑT[àûîñªÃ\Û¾0mhVø¢Kw}’‘Çy:7Êóî1µPs$4Ü@¢ÿƒ¶Ä…:óRM…5¬\˜ï·uàd4(ú¶N _"jø4…ɽ²–Õ®´‚Ë®ØêØ××<å>uE#o@Ÿ²×t"¸:¿ì®Y1UVx>òññeÞep=¯)ªˆ/O`ÅŸÄ¿¯Ñêö +{³µUò‰0A•u¨··»Äµ&Tx¦½VI±×fÛI¤ô8)²fƒKÖ|ß(Ä6W(¹Ñ>¥žÊÉOKíÎàÙ»{@~Õ¸ÍË(!F¡XŸ/K3ļ"âçù¦ýÚˆ‡O´eÇ2j>Ònolýú!°'ð©Kô¨ñIÆhWÞõ ‰¼‹åYÍ—ê B]ÊÒÞ ›qƒ—jñX ãÌ(äðuˆBD„ΞB¯aW×ÉFŽð#B-$•tñáæÀëûš ƵºG’w×Cñè:ÙjåCxÅ·ø1½}È{ȘBã÷³yˆÞ£AãFäe{Lã6Æ%ºØ;]íèÑÜR=ûC¥k³ò”&Ò“ðj))&¢Ú˜âÆÆ4nª‹†ƒ7°’¹ïwÉu‘Ñó ?ÝÅÿÉ«1®¢rŸ²7¿§r·åšUæ ä³ +oÏžÖdâ …}×çÑ·ñގꋾQ«•hhŽ bÂÍ1F‰ŒWãlZúuÁõ”û0²(ë–W[Èms)¹ÍM²±ÈI }URÐWÖÅÇòKžZýJ·C—'ŽÊ{‹DC%œX0 jà›"LÏ5˜•Ô"ÚáYÞáñ|,×ýÁ?ýÙ©×þù¿_ïÇ‘O!þʧ=T§Š2‚8 ñQKlÂ@}»×½4Üf‚›ª ‰pŸ‰Á芩.àË9’ÈKc²ùŠÛböE—Óê VX´u@‡!«ºipÓtá@趡ëñíØ[ËÁrB­;“ˆ¿¥`óžsNÛ7xµ§áäQ÷ãyùñzùuB fç¸:ÕêxA½àðÇ'‡Êb§´²_§g?pÝáÆ¢CÞúw«µ'› ;†in5UÌÁ}Qnܹ̩‰=äNn_ÛhZ¢2ÕϘ¨Æέ÷º„3§M^ÍànÜ.<ëtxÕgë6ÜÑòdê,©v{9(8ÁŒ|˜^ð6ÇÕà¼"øÆœ3#âÁ›pƒm'ùÄÓz€ ^Àéü…˜}³FÎŽþA+úzýEϬ^ÈpYxf´D°sÝÞ—×ßÈÝêU`Õj¬Õ뿵Òe›L…P•¦=³Je•q+±ŽáFí³rØ sL&´ÓÙ ‘j˵U:‰(x3¯îƒNcò¦Ñc¿7x “!Þ +bÇÑfõLý²ù<ê­Ž6ï[¥"¸—Т_‹…êÍd‰ ȯ1@¡ÇduXwº8u™»KKbµÈwÞ>‚Û«úy+Eç¬ä6f%M¶ÑPDüõä’·ï1•[Ú2œÞ¦ Lúq„<ØèÙÇ`2x{ÎÑf|{N*2R‹2ØÜûø6´ÙR‰¶öJÚÝÜ­ØâüÁ×Ìsð.âOÏ®w0Æ¡Ø™ÔåjŒ§åwÚ‡îwÏÃ~WóÐÄsùõâßs Ó9àÌ[ŸÞﾧ¸ª€2þ]T;@½Pï‹®ÍêAý6?¨ Þ©ïÞQú¬mÐç‚ЗÖ?73굎âïÞÍÇM—„swÎe®ö+Tí¤Ù©÷£«m×Bº=ó<‰š·o÷b]˱Öß#jŸK­ïEL…ïÒµ¶äyÏË'¯ÐH5óž,yÝG„ &–ÿÚi—÷êÀšEæŒy‡ªë{#êzh–‰q_×bÍ{xEåù>ÇÖÑK®nóûä¡ÿ~Xøõ¨¾Nßmw0kl-ãFì”W•’:ŽÒsŒ©èò­©zϲ…ÄûS±ónÅ>$͈.ÿ>Œ$ñ÷Êr¾/ÇU­Ÿ—ÿýŽ|óîK²ô"­¨!þýŒø÷IñïSâßÏŠ?—Œ¥<ĵÄ:4¹ux-/³x0””'ÂƧ<Š“êçå¤_`øÊ>‹Á¿èwqpÿ’|ŒƒO`ð/»Á§8¸ƒÅ ÞÇÁ{1øÓnð.Þ‰Á¿jÏGÝý3JÝýìªSMm,†Wj©»³Zûï.€wÖúó©µ;êë³j¹ºÑZ½ÏQ³sTïj©Ó‘;¬ÚÊkÏø¨Þ.T¦¥6ìè¢+ml[ß[ªÖ«÷· ?*òé6ò^ÚÉ–ä!ÎÓ_ÔBèM3dÁîRq|è–W-õ–fXY,nâŽÒ:À¥‘ëS©«W²ù,âBŽf.ªåñ¡ŠõV ZšcP­–&”yW©ªo¿8ãš/"Ò"}rzP ¯JðVÕK“µÞ«×Ía„Lx0l^–XGØ«ÂkëªÇ½£Æe©þÖ曄›¤¿J"EÕ‰|å:LH¨ÊuÔÖzÿöc5ð¹Zz+bd|tº\Ð +Ñň˜0Ô_ Óê>K°Ÿr@ÿ« Azä^©8|…úØ4çiXùÔêªQ6>ǧ.æË"PtjÅPà” +ÇÒ.­\X:*ÅÃIJ†ÔT!ývÓÿÜÝ %cßdû– ¹™ÆCV. µ¡^[mÈ4pé{A=Ú"îwFq¿\ú"M/žÉÒÒ•hVBÃZ £8(Fn§¡¢e‘ª-!ʨI+s´j{+ qQö$%£l-9æÜsÌñX’íR,¸¥ØO˘™Òj^DÍËŒî§VÕÖvMž´ ¡J+³¡¨VälŽZ­Á#¡D©Ç²R鱬 S€zlÖ²1¬/®O¹bà6||¸®Ç6ç¶>t·Uu]›cÕ x#|qºBN­Ì˜øz†Ê¸Êé!ؤµØÊÞ0ó$úqó‰ÚLš-¦1Œ­Dë6PŽÛˆ_¶KÆé#æóiS—q Jê—{é›^pËKV¯zuÕn/1|ÕK wí +‡d—R¸Ü­”0÷(aà£Ø{‘Ò,û›<×õhqø}iÎ(Á‘æôñ—–{Ê÷ýÀO“žªè>}‹PØeÏ"á÷åÒ`¿‰Œ{ Ç®%‚ƒ¶óí<Œã¿Â3æ¡ þÖÈ!k4ôüÂÕ §Ø +IWô1‚U[Év?gí9pxãAŒeªZwÄxòn­ŸÒx…Âk;‰ê)ãΙ‘—SVºKÉËéß¹—Ó°Ê^SŽ§¹kýñ£6k³ýôíh%'—C&3ìf „fÏ€f’á¬Ôá³E=p‡ø!u¨Ég]ëÞùÀbµÈûJ}]Qzzö=ý¦Ûgå‚?gŽËIœÖ]"le„¨Q®0:Qºe=ÙˆUHqôZ<ï°ŽËî]ÛZðÕÔ÷} ô}¥RxOVî¹#d䎡5€iö [M¼ÉRU>êöÍ…Ð4 3¶ä ñ%Õ#!ë‘Ðõx„CúdÈE²;kÆ€ƒ¨Kf"“@wÖQqz¯xÜ©½|–C>ïÆ)#>dÄ1Ý%¥²FŠþÂ=AáRnx #¾1r<ÿvP¸½¶^’•»³Ï8câ‰ãÏ•ž7¼^ *7g¼¹å:8kfko§³u1HtƯõjwî}´,Ç=*£u…ã)I¼†ŒÄ8œ[eèˇ-ýrž\&.˜RÓÓ ¿.û~^‰¶²a†ãâteìÌ´ '%Í«ë/&PC£GÙV#–h1l*EÿáRRn//âÜ( Í@Œ±k$†MŠEô Ö¬gR;Fí*T¨ýØÕZÂ6¦¾ ð ¤@ô&+:î,ö`B郾Tš¼$û¤4‰FpXÒuvr8zYUöÇ2­ÊFº“7¤xÉÜbÀ 4{L1–‘òê™T‚¿1cÿš,UÇGná7™F¼"¸(Á›ʹ2[AMR…pßc"™´)~3ÉSs¥ØG¸A|»Éë~¬ë[-¯3%u)†È]îíqˆ)ÉN €Ï +Xicýiɥ͘Š:P¤ªÝ^0|Õ󇻽1£¦Á|+јeEÁ:xà‚jÂÄ›f$–&É»Y졼!å'á! 1Ê!!ŽAîG\™ÞÓɼi îô(kc›ZÂ,-íYhI{n˜ÒžE³H{›Ìß%–´g©”ö,Ójò²#Øg¹Éy6w¤4­Ü X­Xÿ%J²³ÊxŒ¤Äe+ Qž+Œs`VËaŽéµ2=C¢û% mËö´2öœ‚h“®“¤3×kˆ!}OAØïðäþž6TD—güÀ(þÚƒ¨Ù.ŸÓÌäŒ xƦ'~:ãLk2°¤1í'!q +‡ e [¥º4B™³|3ƒ"Òåa_l 4#ÕåniçrŽGW.þÆè†B]ðrH:Ü­Yß+ë¸JÔQ`¬p â›ê•+ð-ƒ¨êüÊ„Í+j*\­ éuMÉÿŸ˜ÒëÉPO_ÕzmOÄmubŠkݵ0.¢‹poŽ2;ö©â7¤½kŽ%ºë^x÷‰2› ­Aàèt󉥌Φ9Oec‡¿‚ý²‡ž¾»PZ´…ßädä-^{LoV9ëÀxFðŒ¡¦&ˆ¢ Pk“ŠÜñ­kÕkño>Û/Q7Ó’T‹ŠvÉ šÒlÀ›äÂ~0´}Jñ]µ{æ gLfè±Á :½4˜½ètÓÇië †üï_Íj9ùÁp¶‹w•\$µ] »ø5t¹€IÈ}»Æskj,¬§Õì-€‰^%¿h5%ÁæoB–(ôHDTãŒ5f1.†áâocƸ…æIÄ´°ÔÛ³b(bK$&ïaÅø´˜QLÐ 2,CƒÙý˜žµF3Ñ5!"ŽÆåNÌaü®C™ ±Oâ+†‡(íÔòy·–øÆ>ÉVÔõ¤¼e°ùıZõþÆUâN}h–3>aîu 0F·ù„½–ŽÏ-383X„¡êÊ‹G)+±°˜-e£"gº¢òá:”˜ò}\vðç¿6‡³§—Ξòìù’Ï—›£|ÀN‰Ï¢Úà”¤·ÊXŠì-¯ü_:¥'FKºwª†[ÁÍ 0-÷Ž9ÚÌÜ•Õäæ2“s· BçJùMءلÙW)“—Ñ–U/ŒnªF·D„Æ¥ÀcÕ%ø¡uz.K*”¹¿~ðœ¨Ëj£vzfØÌày¬­Ÿ6 ×çh÷’ÙÕËì^ ý3u-íVÖ{E¯½A÷Ë™–{ø8¹F BãqJ}x#¢²HšY„:ç›ïç¥û¢fº/q¢®>b%¿7Ú—¦Ô|-ô¦œbĆŽ!XÍ°¸D‡Vßãò9f,VΛUDÏô™aoÁÜñ:”^ö%Ï7¼…p¶ …ÜÿßŠÕ¼í§º€ÀõMÊ%s‡‹$°ÍÙ@›ÁMÏf'öð ÒybolßßF „fÑÙÐôDà'ý”Ô`6½Ý¥ÁfðÂœV,ÕÔE\V"ä#ÿ óíö|û$T3øNí†oA€2QL½%¤ÔüæOð溃'$y9 ¨J~(«çä|r"K¢?íÄ!ç´åMòŽrÉy½q±öÕˆë¹k¶1¸ëvç§eAŒ²Ò¸ÜkP` dÏ!Å\ûïÊ©Í) ®a샫ñ ³rÎÉÖÀ÷‡oÒIž&ï¤Ã/x—Ár}IÊo@²d»¸ï0„—ï'Åëæ+Ú"€[‚WÄêøQÎ=¿Á ‚¡¸fîÞ#É?‹yÛ';ê½µ9]÷¯à}³pºÞÚ¢Þ«9]ï× A¼Gd£zÃèðOk›÷C/MÕöµëÿªªÿg©ÿ‡Bõÿ€®ÿ‡tÂ1Uÿ¦ùÖÿÕ–šT+ú(FZÆèb 8jíäË|bf¼5ø°Oxül,ä{qC|+³¹¾§Õ÷›öAhKüHŽ™/ÚÌ9]Èßbïq^¢s­.øh–öq)NÑ¥XRà/*8Q‚3‰ƒ3øA6ÉÊÛÇ[±¼ +Ñ:È,ûX’=ê‚˃î‡ñRü³D€"àÕ¿ÁB¯èBa¨EoÕ™½ª"pûf~Ä­ƒ(çño8ׄZfN™ºàGõÎ~Œh’ºàÇ¥¹Ôà'Œ"ÞHE?)Y¤TÄOiC«¾ˆ“ ÄïàãG=øý´pý´_§+ÂþŸþŸHz!ÿŸþ?ãÇL0!|Ò`¨á9ýÓXþ§²¸m5ÉÇ¢?«yK$ˆJ?—ôø˜ÿyQí_gþ/ +Ç/IÇÏ +Ç/Kǯǧ¥ãW…ã3Òñv¸ O .&Êýy·Ï½w›{ïßFô¡¢'E‚3{2k£ÿ.HÂNR“ðës¼9$¡Óú(#hæ¯gÙ-û,J´’¢eIlÐç]‰V»ãß¹üõÂ?‡åY÷QAÊö¦Öü¦Ú¾à0½>êpoÏ"E$~@EO~y¦I†Õÿeˆ§›=å'2þ­£åßu%¤¿’™^p_©¾(Ϩεig\’T ;Ÿ·‘IÛÿ`Ýo¤øû?šPçŽj—¢e\&ÚÜ`àÚ'ŠâÐF½à?¿üg½©þßúówÅú="gêë/øýº¯®û§SËvvö“hÚ7 Ôdádoý •Ë„·p¥Ž{æ+Z! H¿x 1þÈ@±E/Â/  ÿÁ¦D<ø/Xm•WøC¾Z{>§[š/ÜnuÇ0ÛåFh£Ê<4w;—p'¿0ŸÚÚ³á kâ ({Ãû!2"Svƒ»xÔõ–˜‰Ïñäÿ#T껣÷ܲÞ5âlÙJ^8Ð!·Nùǧåõ+¸iñÚùŸÐ½5|‡[ +5gœü—+ý§²¾TÕ?Óû®KØr¸ä‰ØÙ¼h‡ÿ×^¾yjSf†ìŠ?ÿþöÉŸnï¤?"!Ñþ‚W\-ãϲ”ñÅŽ s³™ÿ«Ìpü"ÆùRÏm-ÉûS¤„þßU‚J T˜ëË«OÅ àî˜P÷fºiA™Ñ‘Ä%R_GeTóR*Õ dHC—´_pd°ïåyô3æöÙF8„Ì.+m†0|Ù+”‡­5&bÚÄB³ì/å}'j–ÅÄ,Ûk̲_r(Õ–ž‡=Çüe§iŸ 7ͨeT[”;êþõqì÷—è ïHjè3c¼¬b¼lƈ쉿zXO íûŒÓï÷"š¤†ãgÐ×$òušçöçÃÚ›yh{nŧ©Î¬ó#±È1Ñgû|‡ÆÞ*>#eÀŸ€ÙV®è'4¯ïÿU¼¾/Ý–RÄxðg¢à§´d*Œæø õJµ÷ïyþüu–UÁqµÉø€ø›œâRüiq!ŽãÅØ)!Œ˜Ç«1–ûßµòÈßjë) Ûú¨²ׄ:Ì?'>Žs忧 NÌ ö>ÇÔ*²¯‹g•œ>$-b3Çz#GÜå5ò×öÊ⨠ð9³cþ6ðÈÍÈV1ÖÔÍß!™ô?Ø2Dð}ê¬`Jðïñ|øJðòŒþ)#2ÎùxðÎlŸéõ²øúGÃKlèX)üOuá—òò¯¨µóN ÑûµXþ1kãÞÿÓ‰¥r¨Ãé­ïþzz«Öòˆÿ+pS©/Šf_ þ9Ôü¯2Û3üoÙÖ¯Z=‚këkä[À›1äqþ¹,ˇ2¡nú¹¹vz}UÅz Ä%L¿3Ls"SËñ˜çft^e”QA´Å¹¬äšCõyÇTÆ¢N›Ï…ÔÉ:b²×q†…€_Ñ*ª0–ó5Cß:n­xÏù]†‰‘8ê²ÁÞ”öb°19è<¸ q+ÿsæW­„Ì¿¢«iøþÏ£KÝ™ðÒ±d +HÄéxL#!=¨Mð€E±¿Ò‰VÏhvÚ! Sû15ê€ÁÉ°­04»»4nóRC¥RyØk,—òÃùJÕû"ëð–’ñ–Rúº˜=Ä+êm5UÌm'd”n£¡ +îé) +^ÑffQ{¡É¡–š4›^{*K—, ØIÄ) +(ۜēxWxJ©_í”ó½!k(ÂK"…8Ë"}Æ–zJ}*(c‚e+uxY»ÛZxGÖ(–e>èZ¿KÇ•§>b$R1¥ÀÙ5 +c´Ð ÇÀÛ¿ßzÉT(!µgq³Tp×Û²0ù‚X¿Íî)©ƒ²¬9ãA.éù‹z$ÒõøJK*Ð/ŽÛ³Dxõ€î xöëÓ™˜ ÿha3bОtcL늚bÑR™wÊ náu\{'¾APÚ Â£ÞVä§W5 +o=o‡‰Òn=Ö®9ÔÏb¨ï“Bd£¸âç¿ìy",ݳ+ýS¹>j炘9>뱕­±ÜRʱõ¼]õY!oQ!ÿÛ yYµàe1¥ ÒÓd[™ ^RYÉ©´ &ïX`ÏFx,Œ¥î™]%·×ZɈ¨‡†Ã(Š–-ŠaÇ.µîÌ_<ÏÈɦ¹² í}KpîÖéA«—(jé¥Ð‘ð€ ½,–¤æºó)ýz¤ÁK/T¾½…ÑЬˆÙO°)ØâˆóÒ+©­«¸pØ~Á˜3öÍê˜^k<´¯.üD×IJȽ…/á‡N¬ùÚ0%1q[ +¹.ft‰(h}ŒØpR…¶N® c²:²:ôuÐlŒ1=5ÎÇןxfã6u³<‰ÿ‘)˜w:‹FÔaSŒì¼-ôœÑÙË…S×ËÔé-1™¼·FI:îV+î¦YkõVU+ã5Ý°åm1çàþ$Y©•rñ¦·Ñ nI¥»YšãñüxÓ6F¤Åþ[–ñTjüH o8îIëû£ +7‡Ï{Ù¡i†51‡ÛôvÓ<nʆ­œNkc|cɘq€oõ´§h潬ÚØ•ß+|<™‹Ëºš‰©ôN]É1‡ñãØs "zNñ‚À_ñ‚œ¨ê!=Çš[ <ëM[zW,Gú -^¤šT‹&’à°¸Ò€XÈ#/=ÿº!;cw—XHf½,nÛÿÑÕŽK¾XR©üÌ¿í¤‘šÄªÿ(Y)R°B2@ÉÛpš-|xŽgˆ´º"!ƒxQ}OÚÜJ`o'ÜÞ6‹MØÅÞqç¸Ø½¡Õkc{0§V0nšÔe¼Ó.U›ò¤õÒf³.hMÌz§§—"¨\Qú%Å?H.u6íš•k ÄÌIˆý6ÎTŒ=oÀ(Þ×xòì–KÕ+µWÑnEˆ:)]&j¡yxý„1uå©". mäÜÓwŒWì3ªCkeš 镬ìˆ{êañZ¯öj­Úé99¸+S§Øi÷Åãªr1.ˆ±ZS\îØ:1O‡cŠ²””=á˜:Ñ‚¶|Q•gàûb³ž¶{!Ë8b÷Á›MÔç+NWD¾êˆ¹ÙÄÈÏ&[½¾HZ'5/—#5‘ òau,«Ž£H…$€’ ™È#³S®Ý–Yb}l·Î!¶>¸[YÕ]/f»}û­•L}q”/kcjÖlæ+ný6ïј3á aaÄì–wC”ãS2êd=Ân³Ÿà›÷ ßde¨ñ|­R~ͱl”À—Ä´¬3î'i,Ïãs·$ÖE4WPkP̺ƒr£1'Z½—>&f£4‰B»O‚ßæ'mðŒZÚ¯YO–Úƒÿ`ÃG8úiýÉè}‡ý;mçlç´›·å¼%MÒͦ—÷‰Ã4³ŽÐÏјdì¨UØŠ·”>ËYÅÖ{<¹Ž×@Qø‚ónü· p"vw+¼Y –{ÉÊX¡@¨‘uÚàvj²0C82qœ£u³ ÿ¥“tæs`©ÝsÏyíMêú&p‰qÛÔÚo‡5÷3ÓGqê¥ü:¾8ÈpŸ.à'b®ÈÿS¨é_¼Í*7—M`dÇD}t: !½¢ÿ©¼û4}:–n¡w<}&¦`?¦ÌðüšújT__NÊ$1õY‡—>”Ì–PafسéÎXúlŒc6qLÌvU’tjâés1’íR¤ïM}ÇBåx6uG;þ[êõ‹=™¨!–z›ú£ÔÛµãR¯´(ÇO¤>ܬŸ5³ûûÔ—D'ö½?Iõ¥•;üùtWLöowŒû<Á»ïUŒÐcE`ÎbV2 1Êùpä<>€ GxGx/Fèµ"ÌŽ–Ðq˜¾Sp¹÷°YÒ|Ð=.—ѱv:Öƒ¦ÇÒâÎ[c[#ÌÙPZ„êåá¥.A/„‚„O±.ß ~†§ËyÂËĺþq±ˆEeÒ>Ìt·§ÓkG¸, P¨­SÓ•1OÂ,õ—®‹4Œ½ LüÉiS¥PUß9D­ÂíU‰÷‰¸‘*ÊpI}†ðÕIkº|E›žr ²èÕr!_ŸìSl5 ÜQ?KÔ +¿¬B€±"Õ·êÓ±:àî&1Á€/ m’“\'ë%Ä€{¿mCBÅ9“›)ÙÜpÏBŤJR§tHS¾„¥”!‰4’à ™ª^eöóG}øébˆuÞ€dv›gÈË«qVH«&³KoK«XÐHÏcãÛ½X§ùßJ›/E Ñ¹ %Û7kE(–>£à…úžò²eÒ¾‹#Bg£Ú'"/Œˆ¼¤f6‹4l÷Ò}ÜËøiõvyŸoŠEWoAV]µblÉÖºí‚oà™Må´rÞgǃå’EÖ’U|PÑiÉê|Ûi÷÷‰[ÛL_¢Œf~{»ˆIÄdùõ¶^:–~¢F/Ô&Wœ¨5llâ;,fÎv¾,½±F® Lu™–H}"ÙºD7sœ,Y,7n%‘ºmŸ`ÉÎV)›è+éJàoó^ñöó:Ëã$%´ZkÛÆq vG‹¬hÝu3%¿Æ )×Ø7‚TVF‘FOœPÑŒµ²X‹Tiš.ãqó‡\F²>hƒ>´=ô!àe‰xÕ}¨w_È¡+`WÆv£%ërŽ +ëw3DÄ}$åÎ%sçŒtŽv^RÑ¡AI%ŸÓ·#Õ§5§Iß^RJ¼€=»ªFœ8™™Å°æÙ Z.3îü‹}*#t\zq8I¬„ ¢‰¸h¯»»Ž±EÄ«ž?è%†¼Ø0ØéJÉ¥ÜSè«ëÒ§AG¡‘†íOðÉ_¦AUmVm³zâ×…¯Cý®“¬ë¿ÀÚpƒ%h–•#,²I"ëSŸÊE[“kÒ[ßE‚½‡I°ƒH‚½§–Åz|—=þ éCõÏß‹™Í®ãìèåúÜBFfM}1"gÇ¥K§ÙYÙ1ùƨ¯ έ~+ÚÓ€F‚†W4ª9cª[àï²f&´ÂˆÃGKüwMat:NÞ5?é$5:Çðu<ƒVµÜ¼ÐRЀܶ[ätÙBÂ7bªX£S[Âzã—[ꂲc>ÐEçJå‰|ÕQ@Ž1 ‘ºn¯BÌŽÂ8¶úË9ušo ’Ýš-ßn´îF/"XäáÏ-º‚aNW}f'éh†D_z$‚N&˜E¶úœ«MÒåOT5ÐU¥(ÄΨ7¡U3¡‡c êÉU#ÃiŠ]{F`o""H² ›¤*®¥œÒÄD xvrÂMÉ£‰®üÀi5¹¢”r¡kçÁ}MÓ7@7ØtCF?EK™OÑöq’E®=ÅÅD¯†8uKuFKU§låÊ/¢f¾ª­c-Ê’¤ˆI ÙgËê0”óÎr%–+›j¨#¬óÙšýeû¯ÒÕZ«åªÜպܱKªÜ5N¹kç^n›.·-TîUî:Ýç#ªØõN±æ^ìF]ìÆP±ëU±›¤ô5†ÆÀáú@¤;“¾úðלv³Aý i¿¸³6²ý,„1 €S¼M9ɃÛ` ”DÙæ¬ëЋHuÙ¬Cô_§ýeÔ/[³*Z«ÖÍóƒmTÿvõš¬bMt±íwWÏ4½<–¬Žxuƒ` 75¦Tz&+UïZÌzœ(s"[V©`GÖè³ +|Æ`§,~ÚáÛ®ßùI–°?R3¬rTÊW%Ž“2ÊM0x£lߘ&†´£9Ê´yÈæüÚ° iCo¨Á"‘ˆl7 ­pŒ‰lŠ)'ZSš…¸¦º!‰MÕêPm1â¯2*¯ÈV6pe›1Óh£T'e +.;Tˆi«G›é!ú뇌JÇŠ¸hâôÔ™.àPWÙ~ |H³bעܯ]èÍã[úcöùª¨ýàt {I‹7hÒiG›deW¦¹‰½}WÏ^ê [ƒ]z28Æ›ªå<ΔQñ;L= MÙ võMº†hÀÏ0C#­Ù wØ´òߥIqCU±•ƒý9¶ü¶ÍèˆJ]o¯\(LNSÏár-*Û/–ÍiJŽæ„úÝj[šR&åj™¢Y [þdÌœÈ"Êx…ÍЉe.XÊ)h…ÀL"ÓXYcÅ vE™q¬ÃئcÀ^‰,Mûä¢ÍËœEá+C¨i‰ÃÚ‡úFBwÀ|±Z(OæÁè +Z©~•MÃrŒa˲áþ攚±&ÒŒž?ÂaÌéAÿz¯{_l­uÝû: d¨»\{—#F\`ÞåÒ„%›ÙæÕW'@SO[Øʸä"Þ–ˆTÀ­5´)øU€)ÃnÌIÂÉ|³CV•¢Æ¡ôºNKR!m°}x¥¿ «ô“A ’|­!öœ)?OŠ  áQ£KŠ›W(õ"ýY,S/É4íR}%ðåE5M‚‚:&*Ÿ%^”CKYÍrøe +‹S“Ë‘ÚC9s"X!(ÄD°ÒB]BI÷râÃ&íÖ÷Öµ®IùÕòé²Ì. Šˆ…”÷Ò&Œ˜gÃx é§èqÐZœm @µïi 2Ö‹bABŽ5Û5çɳÁy?t‚Ÿzm45|¬9SŸ5zy†ð.—·å…žò5Œn[]tÛüpÛ’~]Vùn«T±‡Á² +¡ACk¨' úÆ*–-Š!V¸"›²Æ‹%q«³| _3¶šLŒÍŠñ½ ßØ«u#¥òPͲýUL.;¼:pÛw±Œqëéð”_Ü# -ß½9SØêКüÉÉüãæí¸Ì¯—3Á—³È‡ì”‹a—Ë"ŸòïÀF¨ÛŽ§n;žºãȯ½âK ÿÛñ†”ÀÛÛ>¬Ã©ˆ:,1ë ºÝ7–¤Y ‘áѹ'ßjÖ¬aHâÁn: +ÇAé8$‡²}rÑ‚f±”a’æd¤²Ñ5:ÊØû½{-⮤kzDÍ €ùh]Êf½¼Ù +ASÜ£ŠEṟKïÀ싒ɣʼnŽ;júGacMj¤ÞÐì:™€ÚØ7×Kà”jöé»k>ΧR‚N%èX¾AIà¨vàÙš‚§Pß|ü¸Â:W¹7¸7btSî»cÆüÆûxpæ¤Å;¥>î©þ oÁ«úéA3()þÙ,ì^K9ι¬¹‚ÏfCÆd¾J¾-_ ÓŒï°×Ó°PŽ)”c‰ÛÞ­M}ÔÇ’z6Þ%gÿÏ? ~Ð8±™0à]wÁ^4ìã>X{`Ç%áè—ŽËÂqE:® +Ç5éxB8ž”Ž×ÇSr7{Zí\Ï$eq"€|¼Ø‹;q3-QдàÍË µ—Þk5Ç|N©ê 7ôê1mbqÄ•·sÌñn¼ +Sr]Wbv²b§Àâƒ8|·¡ºÐfŒxÞ—2†n£~%é÷†™´D0Ä„¯Gß°m}ÇtX¢Ž¡™ÛìäVyÝPyÍXyQWÊÎù.ì ¥´ÐÐW›¢mµ{D?«…ˆµ»ÂÀQâ:¤ñœJ'ìGÏâ|¾å§¡óVz³,9‚ís—Má“‚væ-ç9ûÉ^Om›¢œ•JDDÛè +Úüà@ +ßMž·sÚn?•VØ«”ÓˆZ\bB˦èp«“‡[ƒ”|$Ì M߆!9okËqAŒÊ­z‰’ýªeã'dšqj¶ž¡W» ”ñz¼¿•¹‘L')ƒ[Ì`ƒ ¹àËquÓÕWaªî áê.De%ž9jáT6,-z1â…Âf[½ŠFûEçøzQ‘c¹0ýhÓ‹1ƒ—rVO7›Fã*Ëþ¹eù¦‡fùf•å'ËõÞC’¾E%½6ߤ/«¤OÎ7é[UÒ§æ›ô6$E=¦Þ”÷+è…«÷d0ɧñÔ—¾ô%©õ¾‰ßð?TÆS§eÄ©¦}Ôñþ|šHÂ3Ù +™Üéð¯ÏW›É–ïÔ–Õ`ð•Šâ¯Åv^³pÞIZP(Šêv7ŠS˜‘Ob£!i¢ŠÄ¸Èö¦OCô¢9ô¨ +VÚpv$*,Ђ”Œe‰‰Â‘’–©(>z„è +ï +{ki‹)S©-yA»ÜÏŒL!÷œ“–ÃD +Ó Õ4W˜ä +¾XkßãE‹d )LV‡úù¦–û)y™”“ Ü’ÖÑGŠ¥RÙÊ” Ñر'†9|‰ )ËPò"D $”ØÏHÔ’p-6P" -ó`… )›óû^éu¡$kà&™“7$…¦u÷™|%…a%db ä—qhGÉä5Šè¬×Z-Q˜ÕL7øåÑnúˆìAj­+®ø×+H¸ÚøD@Q"Å ö¡sÁ=xë%Ñ—‰Ê +ÿ6XЧA£Ò™ÈIʬÙaSmvïÊÍÄÿ±´t[”]ïV'y–OÆRÙ]‹Ðµ˜ýj<,wUÂâ>ù7Ћ‡´Ç˜üX¦  ¬Œ»tºDJ8~,”ŽÀÄ“|S[i @ Íâ 2™VIJQöbq¯fâ²CbŠ1ÎóâV:äkm>NÂÔËŸwfm™ÝÔ™¥ÕÊH¯¹ˆëÜÔÄ–_­ôë¥a°L}mP_Œö&¸³IHì-Ø·g+£Q'‚EÌUJÛ€Õ)coŽí.Êtß×ÃG>ƒèãV=’U5Ž`‡«ù¶SΔ]YiŒ@ÃIˆÒ€›¤Ê·9lcTlÕ–÷Ýj¦ìɪ»j˜†¹ÆÛ×xgÆ]¬¤èÜ«˜È¬ )n^ïªm‡B®5œ¼½¡WËòÍ0üCüc3t¿k«âÕQæ⨸_ÌõÛ<ŸYÀib0{ëo<{M)JŠ–dP Û;èfä½­¶7! ¥”ñ +­‘— …xËûÙÜúaä-/`ŒÎ¤èj­´æGXfº7ÌO&ÎÂQònL1_òÃ낃î+á3üØÝuðŠ"½MÜgÅqêõÉ›‚ÖòR3^Ýà(XÃüјٶ@«éƃã¼Ðâb)…Lñnbyã RxS`ˆe“¦¼î´äS¶S*¬à‹Çae—ÄÈèå"ŸrP 9c„R]Q¡þRS¥Å tƒíÌÙ²nò=;7mý\Î.÷Ëè’ ý„‰ ^#4ãu«YßC Ýôr|øNg`Lø߉…&<ÍØ:šð>Ïþó=6"/ÅŒH˜d“$£BQKV\0¹)ìá+ˆ9xÙ£²=:r_­È[9òE‰Œ*"?yV þÇL.Š^®<';\yŠÍó’Ѧ>{ ý ’|ÁÝõìâžÁzöSqu\ГsüÔà0ï¼’`ÌÕè¯P€_àq¾l®Û+áÕzU>z¼"-;åKÕ‘»#˜ñ¨ì¼1DoÕŒÑq÷¨{÷ƒù1®^§WïÃúžjÚäA_¿¯ã +ø=“SÓUïAÓÇ–@²;¿—¼;«J§˜Eù8?<ŒP½(¡7gôž”0òì›|¬p«³43é‰_`´W†ÆÇ=Ì—¸NÃŒx@à˜Hå[R©‘}U$žb'UóƒêÞm(âŽÀ}]³^ˆ·p¹‡Û +ü¼C1¢ˆKÌ5ðèÙ”:^,’°\äýŸU.Åò‰¤Sr˜q‡Œ z¡ÇàŸ$›‰³““R“ñ¹€ÇOË"Ó3è‰\²ŽYe&?ÕY˜ªŽU¼ütµ„\ I1Tê5_u¢}ß ¿ò] |WØOF0ß!b­+ìÝ?ž/’ +8Ð’áÅEæ“|?HZßæKKÅŸ"Ojç…Bµ<>à#U¯Œ‰ªb–ªÕÒ„W¹)þÝÿfÄ¿1deA>r¤ChøÖd~b|HT&¯Á7´™WC6 Kq¢Ô¤`Nš‚ƒã“à ”à EoRó”ðªcã˜÷zƇ)¬2=U ½tÏy¾X˜,ˆH°D*V€pe 3†ÇÄt±:<:oFtÖÕr~ÊP7Fî¶;t"SÌ«rÅS<’†›dÓ—س\níðÛøƒS+·[Åï« MM) kÔ­ü„CÇÇà‚n@Åqcø”˜áÐpO}pDÃM ,?HÌXõ!ç°ãÈ Á9!ºBQÚ£rkb5Ò'1$oÊhÇÞ]{víÝõèރƋաâøÔÅ|Y|Vá­jÈD¡,–y‡ŠžŽtÕU\%×/U˱OØïQÍ^Ô]úíÆ@<· ľûz~¢Ô¤Ëê«#þœÉä î.ƒkDr¹—(àFê ËkA:D«>gCº‰¬‘Q\ƒ³6ºBV£â~+f½hì )H3GI.ÍDª|ëûâ¼zTª¤¬‡X·¤Å~«/£ù€áÓnAz·âµJr:œÄ æv  °N|‰J³DáÓ,e†S,X¦yL±`¹Õÿ+ðïJ›;¨ßv†€ëVS„ÜR+Áýðr’A04æÅpR¬5-MF¦Xk¦Ôæ£rwÐzUÅš,”„ílàzÔ”­MvŽychWËAvš½)Š¤õj·HHÏeÿ²Ë5Þb(Ȳë°Xi‰îá + ±MÈóGŒ1×µÙŠwØóag°KöÔîÚ7÷(€ŽG ‡•±íXÝÜê‘Ýúmìžú'ñ>ŹÛëf¿U¡î˨¶þµbŸàØT»ûU+èIUu[p0bLU ö«Ü%ãôP–®£ä:œ=i7ìž‚Hµ›|ÄŽ¨`êçëUoÔ*D*\ö}¤BÌ9w§D¼W¡øRµè¨û*_OÐcŽ:ý×Ùñ\H“Ö`|Ó ;ê@ò?•3êyš¯µíòZËl5úíÈjíW]½!Êm‰u :žÖYÐðAu¯sNõ@Ç9Ãa]N[ØÄy±˜*LÀnòÃa:„_¯íS ùˆ8gª“}##"ÈT_à ‚]mÑ™ˆvDâÇÂÍ*íù†Š8õØU x$ÛkÈ·”Âö +;-„xIbïE˜ÙhUO«a^„ŽùH¹P³èYŽ‡FU6£<{ØIœ60¿Q @(ÊâUX Ii¨feŒËyt '¿ƒ˜£ t uó+<±kqê n,ÖÄ%$ÕÉ©g¤ª¸‡8ß/Oá" ‡Ÿè ²eíåu#ŒúÀrá<àS¥‡J†!f*.ûM•§]Ðã”èCå©O•N–§CÌTŽÊ]!˜¦4:Š‹—µó©Ç"ULaðpF‰­¾iì·NÅ´€I¤øŒ_Á'xˆïœR¼†€EL˘c:kr³ñ!u ëAÆ;1ÅKZ¢ßSiX£ŠyT–Úô° +6© +6?,j³Šº€Vxñj~,)è½$§%&¨„Öú{@š2A(ÙÔr¯îF¾LogÜòZsŠï²Pñ]i­j )´]ú%ºéRÉCÃr­åJ]*#÷"‘¢•Ó4ä> ¬§;¥ÃâZ¡Ò®TWx1°GpRÁÒL +Æu‹vC+“1Î]ä¿Šõ‰±˜Õ®Bñ¯HµØ5ÌP^®ÊmÖÄYlsöMöçZ`ÆÒ­„80¼§9qÍ)à¥5I^Ú:-€’ ° )Ù†6à”Å7gÄlÒ¬kš0dj;v¿bcúnÌé +¹2¡¹)Ê@Ò§ªoŸáF­Òz[¾´@è››±U›g«Œq+Ö»j[ïzà,Ì †pÏâÆìfNâÖ0&ŒG²]sf¶‡Hù­Š”¤ÆmBÇØaWbÕ¬•à4;¡çHx€X–Ž…íÊÊyyÈ‚IÚÝ+ÊP·ùR`MêÖm^K‰I."´¼ak20³_àvã#À¸nˆÀA7…pªl^}HWrÕëM )Óöe°ÍìØŽ¦¥j¢áï~ia?*ˆÖ;3ß Î(!ŽšÇå¶|jUdžà)Sjãð¼;f²ðûi— øÍÈ‹#s×~*£XjGðÐ;Šïïik úMY\D3¡hAŸY^r•S†.ö±,3ýq¢¿ †V§ççèÈê?.¢¤2 8éQÝdôPŽ <­xßèd‘îb¨†Öö™éwxÿ„Ÿ¼. ’+ãÚÇücÌzPIãü@ 0³÷eÙ†»ëdÑÖ6êèQ§¼¥|¤qØþg-c³õúä„?q¸ý: h½$ Î±H—±¿âb§®Ãi @ÀPƦ} ZS +Ô2„lfØj•ë:ªö5 (ºÃÈõg ñ¶}³sÒÍXhtg ›Á2®< ÎÔÖÞèQtãùÇàc*›^•M›EgÖÜ$Ú®S²ÞYi×[ƒ+‰"ð/õcVŒ­  r˜™& $!šÍ‘™d’Œ¸ž‰(O?Ê3éxb›mû¨å¸¸åÎ*h MÙ^½ +Ô>Ž¶Šf¼Ä˜÷az,Fžá0Ìâ‹’”{\z#D×q|uÒä jóÂu€µx™ˆxâÄ0Sý¡‡ ¤T¹\vc§\U\ÉkQ®xð„Šðdð>Av¹Ð2OOKÀ­`€¿¶‡ùëµAž¿Õ×úV_õ5¢¾FÕטú:øëuêëºú*ª¯ õ5©¾Jêk +¾PL÷lP&^n…~ªô3M?7Âbº™ž8 âžUL÷¬+¦»‰Þ·H*ÅtǶü~,ZÎP+t[E²xŸg©“Ô%:ƒÁ7Üà-¼ƒËFðÜįW âWqà¥PêÕZ â+¦Pêm HwçkÞêÙ˜ÄWæ#”Bžñ¬r£‹°ˆ¿¹Â£ËSZt„Ï2´ä¨¿4eŽÎþþ·O(þ/(ªÉMÑÊÇiSJó[,tyæJiêÕ“KCJs—lµà"ŽLð4'XQBCT)Zï…å@á"­ä@jCmâ®c]i)j Zy'X¨ä@‹‚Åüµ$XÊ_¦¼håÃRÉu¼J­ãò:Þ…ëøƒ¡u\.ì*ܬî’üϳ7«…IX"±žÿm3¤¿3é"׳X[ÀoHª×u~x¸«Pš(TË·ìg2ô×ä¬Úojì§5(WÀ?ìqÓ»©žEˆ%I²tÞòTV$ˆ(›ñ‹þa&¿”;)á59å¯Ñ°Aü. k†qåú¸>øÙ"1  ô0ìr>|2¬Þ*±WÁCN>±Ïe2mÊ d—È%:ÈpY%ÄVÔ+Š²m6Ì tÈ_ û—’t9;™k’ÌqÊ÷E¸}ªÇFÆ“4…{ã +Õ¤¿|é„B2 J÷¤”m¶§CÆ##S¤á“"^>)0"e2„(6¤YȤ d‘p&¤ ™´ÜŒ¾"Ðœ ¡çs¬ºWõ6¹yìte žHûCùÊP~x|r”'LÔ\at¼‚k±$–ÕI]ªÂY +n©¸ÁO­%nÎþÎÂxLÝ2W€ákÍfÃ?´8Œ°ñóó›‡ôæú„¢”çÓÙ‹—ƒ:à0œÂ¸—Ûš#^lzÜûh0³SAÛ¥%mÏ|(€L5„1 )@z Â-ÐXˆ‹Â‹1`I8€Ì-3°…Ë™õ·ÃWáÜüàfÁxìù`6r{µ¡`‹hÒp(׊/.ú«“ajg “5ÄSTkÑ»M¦ ”ÂO›ä}¸J)Òc!ð +ŽµŽ¸ìøwC.T"ù6†“m¢w5øw %ÛºJÕ‡[É`›_'ñp’ÁváØ.Ç#Ò±C8vHÇNáØ)»„cW L©ðmÒ¼V"Ø-J•ÞÛ£½‰öÞí½3Ú{—íÕÚ#ªµGÖñQáxT:ö +Ç^éØ'ûŒÚï‰.áÑhï½ÑÞûloÑåûuǧx"¤:´ÆëM%£8–QÌ- ICdOF¾R¸vø8짃ÃÔøTpD8ŽÐ[µTpPe"-2Ó©WãŽ"»çý*ªçVëÑ\øyÄñœí>AÕhÙ8»¢þ<pÊánçBOc×´ã‚mô(éiŒ+e^Î]÷ýZŠ]Ù¾N|…=±¦‚ì9u0õY= +7TÊÓòýF*8êûÓÙ“}f¢6›è¬1\¡«Î¹Ž[—9nXÌ£”öù1C7öE &¤v2?~Òzyþtx4öÈ µw·¥Í€Ÿ@nO(¶¡bTmpkÝ›S¼hà¢ùÁ…,BgeIû Cáø(ç¾DMÒóý +ïyta,6¸€QMø¬TЧ:2„ÝqL3ΗLöø’å¬d¢£ÏšÑ—hxƒq/Uñ>Çuîáùv{÷vC/õ¥D$äÐ×à&ÙŸªóÎÊ +¡ËΨ÷ ý8L§ýÓó‘ו  ¥1y¡ìǪ—ÌÍ+>^ƒ´Èò">jh_¹¬ƒ#–®ê¾¿Mz ÁU÷.OG˵KŒ®öœ‹s“Eçß“¡G»‰à5ºõd‹X„l¬“s}†=xÔokó Æœiõ¤F3ë÷ÀÓ ¢“‘ “9Ÿ4èWdÄŠØ`F”{{Z²·üÛI ¾®¯VÐõ¯æ‰˜Ûþª§Ê;T{:ô{9g>{;ÄüÐTv+VÀ‡°Ò’¥÷!‡€÷Ø]cùbiW')– àk‹!Ý¿L¾%‚@W_Hâ©$KOÜ^ÆÄ}@ÑU¥ +~÷¦‰Òp¾ØøXxë‘ñ"‚@ˆ êuõKWú¦„M‚ZL‰;’8%gg¡˜y‰Kâ¹üÄxQÜ}*¢ ô ÝÌÙŒÁMW +Ú_ “v5Lá… Õ•ÄG9lSК³ù9ð± »`ËÀã¡?•/›Ösœd¯A[ÅÝ‹uøGJEáß'*‹ÚvýåBáœòâÐŽb©ÂÚx:œ<¥^bo!?¢"Ê/:ʉhÓå‚U@§åmÄr +êt¼©ÒÔô”êÔª˜C·¸ûéÖKœcêPD‰º*»føhl軣41X:Sºée§' +åñ¡KÕÂ`žÀ´ãœ\½œ°±´5+cùa6åçÚìä ü”Uªt†˜×p1?£g‰b_¨O|U diF7ƒNŽ3þªTß#§ŒÑÍÁíÅB¹êåñ/õêã„Ù¹X.00ðåÛ‡Dõ†Eß‘©yïÑGµ—W)LJyz1'a"_Ÿäwð™3¼‰©_ÌP¿‡òÅ®ü ‰:ÆJb°ÅXˆÚMç˽ù[¥iÉÙ»Z(\ïÌßbæLú¤šu2Ï„ƒŠ!Få\¶õ9(z½èUÅÿbÿÉWËã7ûaë,ñ–7ãybGÈ\2¨øvC †B˜¶tƒšñ¦‡¦Ë7LÜi5t”&ÅÞ5 úÁѼSãSñí”bÖGLb‹¹âæhx}»É/¾yü—SÍ_7ÿ…(õí±B@>vEvéÔ…/IpþúÔ[Þô…¦WhÚ ^Ü5*‰_Kü0E³‘C0Ø?:ZRtHkê+1•ñÂ`{/N5è8KRŸ~ðéXšúÏþ«L°L•¿<õ‡ø‡2Î +Ó±0ر*õ¿t;ðe +z¯Mß—‘qÚRûT‚u"äéXÏÍÀÔT/ ä/5‘ŽÍ¦cKêË_þ²tlMµèZl ¶ó÷âàzÐ×î`´jìåäûR÷t‹ös)ò‚$&ÕA—œ#3m‡@¸eÙÊ ›cs$õùÏÞê#ߣsÍ72õ±y¥>œ°RŸœW›Žˆ ð;²M§R33%é8úë¿þkéhOýæo~V:Θi:R÷ï¿ ­3™ ô6ãj.*7ô‘ã”é8m:ÚMÇÓÑÁµ˜;±Ag%±+nTçàjd›Œ¡ÎèšSgH3¢‡õ¬MØ£R:BÒŠ_WÖêðž¹–ÁÙž·R?6¯Ô½Á+uöJÝ7Ïš_´R?>ÏÔö$ÏÍ3õ%+uÿ¼Æumêãÿa9®n'\žâ×âàŠ•OèŠý]ë³':Ž¤Þöî·IÇ©%¸{-Æ;8ܹá’-þ=l+ßÐçñ Fµ*:0¯¾;Âë[¸®Fn¡ñ¬¹-FÃ܃ÇA݇ˆÎ#ßÁù —1K8Q»„¡yΡPÓ‡çÙô]1= Š +¡ã°çÕ{K¶yþM/qË«›ñ’c^¼ì¥†¼ _œË{ Å Û[<Ê„¨×‚ä_EÐ4È_Aµÿ‘ÖÕÅ>__@¡ÖÃY»)StKÙ¼Á B ³±dÅß²Á‘­ŒÌä^âs’™ü’}Ähpš¨6qà›œšÎwüfÅ;þ0ÖñT`#Ä„«&ïÇÅò im$¼³5~lvæ±N3 šñÉÑ3¥›ðÚZkfÙÏÌ €C +†òï›®TuŽ +ŽYB•Ü¢_z¶m³ÊÀ r^r+Ž‘äâú*aZc¦'‹¥<« Ѧ/zfñãž®!Ùþ#Hémxö'eJªÏöœ!xDQ ‘‚ØäÇMTYèqK·¨!ô€p‡ y½#×ÍOŸÍ„;e;T[w…Úº+ÔÖ]0³t~£¤ŸD£]»µ†›¥§ÐœAgˆìŒJ€Ù7±n†ÍÅ ÚŒZŒÒì5<Ò<Á€CÁûôùLû y'M*?\ÌVqkDço¨=ɲ¡Èµ;%[›¨SÉ—E„42Yæ\:=üÒÙ&/‡#óæÀ#ó×Lª×·Ë£êvù½X™SMð¦+&\öíRÞ{èn)ï=š^Ø)ï|®î{"®—ê²d%šÅÚ?þa͉‹Ó•1†­‹ö«ÔŠL6^&bNÜQÆ4ÍüÍ~e°…ï}¦i…m7 +¯]nVUä‘RyBVsÒ (Š¥!@„»tKÜä&dc9jE\EnpwÃ[)>©4n‡Îݚڈ׊âBÜòá.eh“Ѧ,&AÚuZcø*í÷uÚn£L㲟Òh‰“…N~ë¶Ã.¹­Të9 bú·ÐíÂÌ]CÚÐ2kyZmˆEÅ&‘éÖ~øÒ¢pk9@kW¢¤04cÐæl°Ä´˜³TsÈc™á¡eA浓L°KkS¿æš[!'ÇJ¾¨Å‚U ÕyÚÜIá½Fü[ë(XpP›¡­‡ÝÕ„$ø:e¹ŒÜ ’¶{¥²;ÖŠ~œÛzÙ”&ºÐ¥IÜeÂþ³wß +yeiÕ†V±6ÉX›ñ2Ùì¶e zo•…oc8nÊn;fö¶ð±Ã~’áB×Q¥5:âN¬;.˜-peD ÂlüM˜MbpÁ° =ÜŽ+;¸ ˜­° V¼ ¹·Û™åÏ{F“ö¨&Õãõ2HÆÌ1—·DµTqAû"^‘R'ïÏjÉdp@ŽyP5çÏVY§w…ëtØ®Ó, ô#/ôŽòK-×ó".âêW{äÞ0^Ò ÃH–Ú‡ÅÈ;Þö|çÁ­ñt­GÇSÝFñ¼“j?äµagÂ’Óõ±”ˆ+s’З ÛJ^bÒ« Û$ÿÿÚ{ÚظŽãöîÞݽã·ER©©o‰ú¶hˉ-‰”-3RŽ2-ÛuìˆæÇQ¢Mñh’Š¥$mã$®•¸uš4%`þÑ$N-$EQ$H‹&hSÕ?’6i£@ ´@ -Š qÜıº;3»;ûÞ¾ã£#§n"À¦n÷íÎîÎ~ÌìÌìŒxÅ·Ž¿p–ž‡¹#<ìA"¨×ÔAUo—¨¢¾ÜŒSXÐSx…š/lÅË}Ï·Ý)pÔ†ùÒY:Ø—Ûуðm•Î»Ê†ä”Fþ½ËzÂz÷¨ÓðÛ°<‡Žª(b,}Ä<Äô`è!ìœí"Å sY:C\—4 S•Éjq](²üP1ØÔÀ}VÖ-b–‘ž!Óðí´fw©5û—‚-ª &Cˆù57Ì–éÞ¼ã@E3LÒÆ\¤9•Ù+NÙã¯â×õš„;¯<Lweµ“W2í6´i至åöFÔÆ€^'ÂwP@¯e]ñp„oâÏŒX's‡”$­¹_„ó¢0ìj`¯r¥©™Ñ4[«=~a^4À% ®â30X\ìÈ>5û:ìÓ—4û„ÖVaÐgŸÂá“(‹¤\‹ª÷­nö>'û¯u¶F»rúe7S—}Ag뇫,âV6¬ø2G|™§|™÷ú2G}™÷±Ìyº|Zuñ[ELÞOèýZ~r¥üÁë¨Á¹òG4ÏüñÌ;²XõA^yL•‹8ÈLŒø©×M?Ü’¿¢Q¨Knx]þ‡mâö·¹0ˆ‡àäx°2ìB~ãuû`Ÿ4p +öRz ÚììÊDš¶©ß¶ňöýùŽÆˆ;´“pÄû†ÛÃ)'Pú:Ä5‹.´L|­{ùï€ß_ +úÝ44û(¹¤¯Øcq}«ð0„Ö¶7Iü\Éjn9ݤ¡™´œÖcž„1·Vt­³'ñDO^‡[…}éŽâW—À=ô´·¢35ì©Yë~6S÷úÖâºÄñE5‰SyÌsKk¼¨½N¡nƒº‰H ÷¬Œº‰Q7áGÝDÔMÔGÝĪQG݄ᇦb8ÉR%Š¾˜'S+âdÊ“©:8™ª“©UâÄ30Ž“)ƒ“jœT©jŠ-V]'U?NªupR­“êƉÇIÕœÛmp†a¤ÙüIdêÐüVÅá-)ûUÉQ‘ê|½ +m½ðLJc¶ª–ö$08*w)Ãé¼Ìø‘Ì!<ûŠË!@3öX®"ƒ÷ êi±‹{íÞžƒ¬VçƒW$¶< jE ¾lo‘8„æDêÂ),GôÃxƒû`äNÉIÝH ‰Yìæ½uðð¡ºxx#3wø‡8’³4eù¬@|Ú Ug y|ÆÒ…Wå<+äóÆKÜJb G¿[Ä9¢.îbK‹™€%hYnRápD! Yh\ç̽éÜsû”Q_©_5Íãç-*¿Èxû§qôÙ.½rÄ·˜›}·‘@f ú`Yì#-îM¹Oõª(W]¨D«rV +‚|ÖèÞOcï‹ý"Wö>k{_P½Ï³Þ÷2ŸWNœ²Jb9Ão°ƒ‚ß÷Ó„pGÉäÑ=Ð^â¾î\â‹Dÿý'ïñh,º•¡ESÞîhAoÞ°“„´Há™Q’Õ¨R!Œ!Ÿî¢INàµ^/íCNÞáðæ-7gnÝúl}”QTU."æ/…<Ç@‚¬¥mTGY¹Z³Å6!´G/¸àÎŽÒñmä rß4b÷ +Ûy8Érôã!ýã¬þñˆþqFÿ˜Ò?ªúǤþ1‘Ñxòx^ ¨?Tû*'{ý`ÅÁÙ Z~¯rbÇ1*Ý€|9…»[…ÃÓ®á5iäcÍBSm3 †Î©7«Wå—ìèô ¦˜¾ltú²4}ÀžŠ¬™”k¢PvL|) Ñ•[ÝÒ÷#±q?drŽEÎáÔTÁ!–‡-áì³1@gb§—ã+ÿ<ªŸ¬@eHû†šcýÔ}àá®v›<ÜÒV›¥ºΙ8ãsH ÎE`…h×û³‰h SŸ9ÐC„žÑ^›¨«8c*6:Ãjáà™Õš‘6Šp>ªbxØ¥û\uîîÐ55 òº‹)Ž:“Û,ÂEŸt}1"êÚ¤ö^¸DŽÞ‡˜r« :úSóIeþ—SfíIú.):¸îP#­Z“ÑÒª"ÂE¾‘öUN®yÁD£Qr*—«k!9Ÿ#—O!ñ…ã´ª“FÒ>í'ó"H«5[TWb¥ +Þ€½W?x•dŽ­Šq4 ÕÓªg¸ï3o5¹´£päòûç×9}»¡octË@ň#+U§7‘üwÌI—“ZÇ¢Ua/5®ÝHק9x¾ïÞËÌ$%TwöªÝ½]élÅú.‚tl¢£6QEùù®ØÖ×"|í EøA¢_7ÒKœGƒmû#AŽ~ J‚Dx©•fïßš¯ð)²Öº:tT4¼Ÿ¿nKÚÇL®áîŠÊ¡u”œÆ‹~ùµÑ3±«.þzÅÉê’Y`Yz·fçÌ>ý`äðÑOöUìÑpÉw4|ˆ['Wiê–`˜[‡ù¹[WDZ4©Ô!·ä“Öü1ñrì¨Dûȧq{|Å÷9Ÿ= +Ç@á'DÛî0 ~ƒ•ÓT÷\ ä3ð÷rÅ“/›ºì-{¯I¸)Þ½3?bÂ|Ô8¿Ön$þfø[´~Ÿ3Îï Q{Üüz¸¹ÑpwOáàÇœýÿÛð÷ãmBB¼ºKþ„>7':Ò~Néa¯1^ý4@;Ü"W£\[ŸN2^um3¯¶ü[¨ª^îÊÞZÏzÕ­eÍW1ü:·„"¯óu|ΣA%7³D‡ßcF:cVžccñ¬‹£žGŠ¾‡‹cc¾Ü¨Å(˜·:§£L§47?slÑ”ñ"¼ÄD³V²juÝëïà¾í´duOŠQqò´8-ÿŠÑAa¬f•0c^ ˜§wž®YkjËŒø¸é©à¢8º°0~IPÉ·rdÙ» ±ãÆã5+Ͻf>Õ öÊeüÇ\‘)Œîö•·Þ³Î=gCÈFÆ´!N·XùFôZ·Ls2²G-ž‘´zmóeáVOᶤÂ7x +¯I*¼ÆS¸½2BsÑaÓâ`é bRŠPohÕºOœi˵wÅÝE÷æÖIšqü=Bk|Œ–Êx”ƒ3P&ïÚ&cç¬zÉ ;$úT"dE7ZS¹ógl-œX…†Ë…›†‰#Š¾Ä˜…Pf3» †:> üž£ï[ü0@¢òO$ÝÊ`”tdGùýÏèû6}IŽàô¥0ÅxÝâ©iå!ª°CWà#ñµ°“*춬nÈC#èþÕÐoY­¾#¤~W&×óu¿ïVþ¿ê|/+Ëu¾oP̵oÝî+8åeŽ.>v/Ðœ!-ñxT~ Ùìk¼Ž‹»Í+YŸ D»/.³Ç]…’ó7žl#7á|’ðI7k^ïPZ>éÃ'}†ø¤½À'}&‰OR +fÇççUðå¼Ty!¾Ò¢ª_.f÷Ôã•â5ÙsŸsÕÉLJ%]ŽpTŒT#_¥ŠDi{Œõ™Ñ†«ÖÛ°‡ò3>~Æ R`œ£áóà¯>¾L åwŽÏSœ°™ÅÊx}È$¹ŽÍªxàÄ$xÚ1u†çŒ™E(}_4Û¤†yÕ“jõã8h)Õ¯‘3,ÍôÖš¶h¢‚cWl£¬/Ñ [sµ¥™iŒÝ„®‚XYí'Éú”q£uGã‹;‘ÉÇ&©S 3sg­g[ü¼Šª>©¢ª;‘¾g‡çÎUf–tí8‰‰8øµáÙ}AÆ"ôÀRÙUFwú?'$—šcgq}ág6,(‡±YÑØ/r0q + ìõ~_¶¬’¨ùø2M‚»M¿—”S¥a2(´·†;TÖ‘ú„FkF Ç­8Kúý|Øõ›õMÁ~ˆn¡ÔßdÞŒÁˆ[!ëx» iL= `ŸÏ¸Ñ®ãEÚI¨ÈnuCϘ°>A±øãŸü)…è +6îT„ÅÚw1 ‰S1OŽ&‹ÅŸþô;XVÙbŒ*H„Å/ý'…Ø‚¬Õöæ1Ñvq%óD„¤rT¢!šÝÞ4Ja‡¶ëDÿ áZž£ì,%Â!T¹>þq¾×Hý)ZiÝ(¡i]oÆÔ&÷¢gÔz¨i'¯l}CÜ„sb|§ª{¬c±ú{Æ= ùò®tuÙ8tx‚ì¢ÊG¯U¡Ì lÿõÚ<ÙÇÞÛ»X2ÈÝÎOd•‡D'Ý+ËA „.÷^¥®{®_IöKý"¿x®Z]‚<7i‰Vh¿ËÜÄ…ÍEϸÿ(b©›q-uù¸?áã.ຑÙÏ)ò`( +ýŒB?¥I0ªÚ3qŒµŠ(Š|¼¾¯Ñ¾à)Çdž1ßã¸ÛbßèÓïq4ð·äÚzºß;‚q%îVXìïr;À€Á}݆Y1O­ä• µ‰ØhUö9W= ,#-ƒ‚Zƒ¯>;É;g—A`×|Ñ’Xy×9“» +^‹8gʸΙø*xÉYýô¸æO(³‹æÄyëÝÅ-îÛl.¡‰-RPœXi/³—ìÖÚŽ›*ˆ`´¯—£=£y…ÑW4F;‘·ôgs¥À¬H¯2n¯2¬WpœÊ¹¤»•Hg³ŒhòC3‘Ž6ÚpãÔŠE"£‡AzzØ°2=,­Lcô°¡4XzXJ–‚F?=,BÅ¢¬hèaQV4ô°(+zX»ñ=¦ˆ‰fXYMœðå°ŒÌnŽfcÔ—¦=lvé!™³Sé¼}îfäø§éßýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€ÏråFExírc@ðD tñ>ñ*OÞ9m–‚{‘ºæìk½ö¢]©·vŒ2„]èwõÊ°KÏPÞ)0Ž3Ga¦2ÿ¼nëÓFù¢Ã¸¼yâG7„õi­ü¿Þ®gRZ#½š§§t¿‰ˆ +ï_È ?oTÞKµÖ:wëwAY#æ@è o]še¢Y'ÖÉÄ:葉žŠñoŸ ;eBGmo–Œu æ¾ÎŸÝãÏît³e÷ÚÀ$äYº·Ü³ò¾zÒŒ~-ÇØAGZáñ#“øÉ$Ðaòç’Ãñ ÏI%G\mùh·ªyùû™½õãñ°JV2ÁÂ[ƒñ9XA“ݳvŒ)4¼Vrß{$4Šëcƒ› 8“?èû=ó‰Šz¦Çg«æñß)°¢V¿”¸¡¦<Ïb>…Bò­ +« ¬úaŠB®.I]½¤\ŒDû¡˜Ï¾>+ÇmV¨Ǥ —’üŒZ¯¢9æ±â1ñ@]7¤¿¸Rç—Ö&œ2oÄGiV‡Å)øw¬×SiOÜíXhîf%#o>-Ôu«ß8ʼX6MèàN½aRdωïv(s‹fMdZF‘×Pž¼€h6cuòQ{‡5g§Œ±be¦Ñ¨KVa‡J¼7ÀD§Jì,bb­J|¯„‰.•øJ&Ö©Äl3&ºU¢§ =*±¿]R©Ž Wjö¾–]Þ(À ‚‰âëç,·ÁÉ„ë£x*žŠ˜Ø G°AO¨Tðë÷IÞÃFû¸_ýQ!=‹yR=;‡ptY`ãå—_ŽF¿T}@~Þäб9|}È&ö!ëéC»Áá5nƒáy- ‹ÆZà_š)$6“Kl&W§™W_}Õ4SLÓL°šf”é|fy_ÝÕkg0qµAíýèG¢øío_I±ÚœP-¥ºP_~ùo©c+®'  ƒšjÆÚ.þYí<´ãP£•%vÿ£õZœ ¼¼öÚk?¿½-ÇwP¨óÚµÁÆøV8?ä¼Sü gðÏélÓÑÝ|3†ƒÍ׈¬üYPêYú¿Œdpx¬¥]½K †¬½ôÒ7Ó’5ݽüà)©—§ò÷¾÷”D*©åU)9ܧKl³>Î\§3×p³g÷fnÖ¿*\_½×WïÿK.©)¸Î%®iIüb/};ÎëœXÚò}ñËÉ‘B©¦»2wú¸oa&ˆ¹Eë&1¼i~Aùj•maž~ù¬øóä?ÜAŲáΰŸô6»¢­ÇmCû´öf··ƒ«³.µšœÏC«Z“óùdMÓ¿\mù‹vUóòÖ܉úšV)â;52àÇ)ƒèmÿÎêÒÂÌ䢨MO/Võ ¨'Œ +g|¶º ô>N­Ùêô’XªÍ‹P MÔ––jçAÁB}!X¦|¦ÿðéDLÞðyå¶h®6W‹çƧjOÚB*èÛ¬jÕ«KámÏÛ,‚³]–«æBÍY•JTW—Ð~BªQLÑ8k–ÔW¦èòj™–ä bBþ7+ Ôæ1VàÌœjæ|uîA›¬Ÿ¨UjswM©ùSQöîž™E +Zun +2Þ˜ÒjÁ,Œ¥—F‰–ç"7‚ØÈìðYw4^lRÅbmvÆc"ûKª»ÒúsÔ幬H^5»é»~°ªC-,Á±}1[4š­¬êÚߤÚöú^딇ŸC ðPڈͽÈ·0X€ÍU™ù>–höÄò6•×¶á™|¬ÁT;R-E‡¨±ÖÊ‘6DãÝuöÓ«ê¿/‘ÙUE¿È'kÛœ +8àvaŠh;ƒ‚¿ÓÖnS™›E¾ wö"ÂÄ0h(X±fäA“W ¡Z­¶®B¦$r²œ +mdß؃&%íäÔs} r @n‰B^[¨CåXµfn³d«•+dç¤Í‡"Õš¸”­¶¡bm¥2ÊÞ(R­ª5F«õVÈ 9”Xµnhl«õUȼ,²Nóz6zóg´ºÝÜM¤Òus7Kæ\Qoɘ‰xÚ¿ZÀ¬­:º +ôc‹â‰d:eƒ– YÞ;š‚FíçCÏjîH®Ù,ë6)šSóÃT³E›ÏBä@Ž¬V`•'“â™3gˆ§ÅË[ãr·bÕÏcÛW5Ë’1ðǽªi€.Ç š&®9ëÇ˃ºâå(à¼4²Ã]‘º–l´¦¯ÍF¿Ðœ7 5Œ)çVVvžÎZã]É,0´…»Gáüg¯=î­½žtª±k6CýªáVÑpŠ™ì‹ÏäW¿úeuwú†Ó:2Ûä±s¥ÖW5Ûl¾dCYl(›ª¡UÌkoçu?Ì뿈åõ"~V­ŒÂ(žšˆÍyÃÐœEàt¬¨ßE5j++Dº–å]K¿Nx”\wÙøº+Z¡YÚþ1¨¾ã!ëëe´tVÄvÝŠË/2¢³qŸèì¸QÜ +oƒ¿·kÑÜG·%ÈÇ ÈÛýÒµ;ŒtíÎdéZ&<!éZox”~õ…ƒ#Ë'Ô¯máí,óÏ\Èßmµ?ízT¿ä•ì.°Ì {l™ãxÃØÙár,‡”j?¦nÄ"¦C„À{V–ÒÀa/žW'|‡’¶¨C¹G,ï|~Ì--Ôf÷]˜™‰Guqß±ñ¥ñã2=T›½p~N”—7ɃÁhá_YG,€ÜFKrFUKYd½X^-1±â1ý-ÊŠ]²N¥‚ù¨,RË©÷ÆcILÌT^Þ$|â§T­Ü#‹l’jšV4$ì³I¥ÆÃû„ªÇ1®cÏÍ_Põ$Šl2ÌS²Èf!)t·àÚakJ¨6™ +êiYd‹¤[p÷¨ŽW“²$ü®Ÿ“T§e‘­B^‡ÄÊžfÊË[E‚™ÔøÞ¦bm±Ù³®_Êjx<#Ì Yd»XÞáÎá¬,¦w ú«×úµ'%œ²nVªvÎÈ";”˜hÅ݉­ôØ­™º µ‡vŠåíÉcQ O-ÔÞ33¥gÜÉIÝJÿŠ­ Šj¬““zÅÞ¬W¬iå¾™óó³U|S‚œTï’E‰åØ#¡xY--ú +Ô1Yä¢=N¨“ »/KB,àW*H£²È­z¸þ77eu(°têï6±ÜáöÐ °SCLíœ,ò¤XÞUg³Lª728Õ„‡>9IÑÜÔK`>Å\šSZŽ£ i7ŠÂö+AîÈ÷ϯ®:¼5a4pïÁáŽ/ T–N u)õÔV õˆ,rAH>Õ¦ÌTŸÄu ¿RA9)‹¼Ç®/ »A°ºõܯâûÅòZw´ú,$ÖB§RA|BéV7N¥×,/Ë;¹+**e )¤L·YQ8W7¯ÍŒ~´,Ù3­x¬,· 1E Ùì¿Ëfo—‰¢j©L‡ª¬V¦võ]³èMLC§£úœ¬u#œ»Ãó1«RÊ?÷y‘¨†©céTˆþ¢,r»¸<&4€‡.,.ÕÎ'AÀ\8S)Q’CÂña¸¢¾µ Êv˜™ ++Å?P˜/èv¯Dã&q¹&TóƃœÃ y;;¶P«-¹^ÏÁ#ºN(eu‘¼¤O.TÇ—ªP‘€y¦Mv¯ta>8¤¼v¼¥\³±Ê̵M4 +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="DataGrid" class="mx.controls.DataGrid" implementation="DataGrid.swf" iconFile="DataGrid.png" tooltip="DataGrid" src="mx.controls.DataGrid.asi" modified="1061846969"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="2000" /> + <include id="BoundingBox"/> + <include id="DataGridAssets"/> + <include id="DataGridColumn"/> + <include id="DataGridRow"/> + <include id="List"/> + <include id="TextInput"/> + <exportAfter id="__Packages.mx.controls.DataGrid"/> +<class id="mx.controls.DataGrid" > + <RequiresDataBinding param1="true" /> + <IconFile param1="DataGrid.png" /> + <InspectableList param1="multipleSelection" param2="editable" param3="rowHeight" /> + <DataBindingInfo param1="acceptedTypes" param2="{dataProvider: &quot;String&quot;}" /> + <Event param1="cellPress" /> + <Event param1="cellEdit" /> + <Event param1="cellFocusIn" /> + <Event param1="cellFocusOut" /> + <Event param1="columnStretch" /> + <Event param1="headerRelease" /> + <property id="_inherited_dataProvider" type="Array" > + <Bindable param1="writeonly" type="DataProvider" /> + </property> + <property id="_inherited_selectedIndex" type="Number" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItem" type="Object" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="editable" type="Boolean" defaultValue="false"> + <Inspectable defaultValue="false" /> + </property> +</class> +<class id="mx.controls.List" > + <TagName param1="List" /> + <IconFile param1="List.png" /> + <InspectableList param1="labels" param2="data" param3="multipleSelection" param4="rowHeight" /> + <DataBindingInfo param1="acceptedTypes" param2="{dataProvider: {label: &quot;String&quot;}}" /> + <property id="_inherited_dataProvider" type="Array" > + <Bindable param1="writeonly" type="DataProvider" /> + </property> + <property id="_inherited_selectedIndex" type="Number" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedIndices" type="Array" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItem" type="Object" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItems" type="Array" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="data" type="Array" > + <Inspectable defaultValue="" /> + </property> + <method id="labels" returnType="Array"> + <Inspectable defaultValue="" /> + </method> +</class> +<class id="mx.controls.listclasses.ScrollSelectList" > + <Event param1="change" /> + <Event param1="itemRollOver" /> + <Event param1="itemRollOut" /> + <property id="multipleSelection" type="Boolean" defaultValue="false"> + <Inspectable defaultValue="false" /> + </property> + <method id="rowHeight" returnType="Number"> + <Inspectable defaultValue="20" /> + </method> +</class> +<class id="mx.core.ScrollView" > + <Event param1="scroll" /> +</class> +<class id="mx.core.View" > +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="cursorStretch" modified="1058931097"> +</asset> +<asset id="DataStretchBar" modified="1058931528"> +</asset> +<asset id="DataSortArrow" modified="1058931153"> +</asset> +<asset id="DataHeaderSeperator" modified="1058931563"> +</asset> +<asset id="DataHeaderOverlay" modified="1052424823"> +</asset> +<asset id="DataHeaderBackGnd" modified="1058931126"> +</asset> +<asset id="DataGridAssets" modified="1062224905"> + <include id="DataHeaderBackGnd"/> + <include id="DataHeaderOverlay"/> + <include id="DataHeaderSeperator"/> + <include id="DataSortArrow"/> + <include id="DataStretchBar"/> + <include id="cursorStretch"/> +</asset> +<asset id="DataGridColumn" modified="1055796802"> + <exportAfter id="__Packages.mx.controls.gridclasses.DataGridColumn"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SelectableRow" modified="1055744780"> + <include id="UIComponent"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.listclasses.SelectableRow"/> +</asset> +<asset id="DataGridRow" modified="1055796830"> + <include id="SelectableRow"/> + <exportAfter id="__Packages.mx.controls.gridclasses.DataGridRow"/> +</asset> +<asset id="View" modified="1056146210"> + <include id="UIComponent"/> + <include id="RectBorder"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.core.View"/> +</asset> +<asset id="VScrollBar" modified="1055744780"> + <include id="Button"/> + <include id="SimpleButton"/> + <include id="CustomBorder"/> + <include id="ScrollBarAssets"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.VScrollBar"/> +</asset> +<asset id="BtnUpArrow" modified="1062224271"> + <include id="ScrollTrack"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="BtnDownArrow" modified="1062224269"> + <include id="ScrollTrack"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="ScrollUpArrowUp" modified="1062224268"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowOver" modified="1062224230"> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowDown" modified="1062224224"> + <include id="ScrollThemeColor2"/> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowDisabled" modified="1062224217"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollTrackDisabled" modified="1062224213"> +</asset> +<asset id="ScrollThumbTopUp" modified="1062224206"> +</asset> +<asset id="ScrollThumbTopOver" modified="1062224202"> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbTopDown" modified="1062224190"> + <include id="ThumbThemeColor3"/> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbTopDisabled" modified="1062224182"> +</asset> +<asset id="ScrollThumbMiddleUp" modified="1062224173"> +</asset> +<asset id="ScrollThumbMiddleOver" modified="1062224169"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbMiddleDown" modified="1062224163"> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbMiddleDisabled" modified="1062224154"> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbGripUp" modified="1062224150"> +</asset> +<asset id="ScrollThumbGripOver" modified="1062224149"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ThumbThemeColor2" modified="1056571376"> +</asset> +<asset id="ScrollThumbGripDown" modified="1062224144"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbGripDisabled" modified="1062224139"> +</asset> +<asset id="ScrollThumbBottomUp" modified="1062224137"> +</asset> +<asset id="ScrollThumbBottomOver" modified="1062224133"> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ThumbThemeColor1" modified="1055381159"> +</asset> +<asset id="ThumbThemeColor3" modified="1056571332"> +</asset> +<asset id="ScrollThumbBottomDown" modified="1062224128"> + <include id="ThumbThemeColor3"/> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbBottomDisabled" modified="1062224121"> +</asset> +<asset id="ScrollDownArrowUp" modified="1062224119"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollDownArrowOver" modified="1062224115"> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollThemeColor1" modified="1062224277"> +</asset> +<asset id="ScrollThemeColor2" modified="1062224279"> +</asset> +<asset id="ScrollDownArrowDown" modified="1062224104"> + <include id="ScrollThemeColor2"/> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollTrack" modified="1062224208"> +</asset> +<asset id="ScrollDownArrowDisabled" modified="1062224108"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollBarAssets" modified="1062225008"> + <include id="ScrollDownArrowDisabled"/> + <include id="ScrollDownArrowDown"/> + <include id="ScrollDownArrowOver"/> + <include id="ScrollDownArrowUp"/> + <include id="ScrollThumbBottomDisabled"/> + <include id="ScrollThumbBottomDown"/> + <include id="ScrollThumbBottomOver"/> + <include id="ScrollThumbBottomUp"/> + <include id="ScrollThumbGripDisabled"/> + <include id="ScrollThumbGripDown"/> + <include id="ScrollThumbGripOver"/> + <include id="ScrollThumbGripUp"/> + <include id="ScrollThumbMiddleDisabled"/> + <include id="ScrollThumbMiddleDown"/> + <include id="ScrollThumbMiddleOver"/> + <include id="ScrollThumbMiddleUp"/> + <include id="ScrollThumbTopDisabled"/> + <include id="ScrollThumbTopDown"/> + <include id="ScrollThumbTopOver"/> + <include id="ScrollThumbTopUp"/> + <include id="ScrollTrackDisabled"/> + <include id="ScrollUpArrowDisabled"/> + <include id="ScrollUpArrowDown"/> + <include id="ScrollUpArrowOver"/> + <include id="ScrollUpArrowUp"/> + <include id="BtnDownArrow"/> + <include id="BtnUpArrow"/> +</asset> +<asset id="CustomBorder" modified="1062224879"> + <exportAfter id="__Packages.mx.skins.CustomBorder"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Button" modified="1059073889"> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +</asset> +<asset id="HScrollBar" modified="1055744780"> + <include id="Button"/> + <include id="SimpleButton"/> + <include id="CustomBorder"/> + <include id="ScrollBarAssets"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.HScrollBar"/> +</asset> +<asset id="ScrollView" modified="1055744780"> + <include id="HScrollBar"/> + <include id="VScrollBar"/> + <include id="View"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.core.ScrollView"/> +</asset> +<asset id="DataSelector" modified="1051766780"> + <exportAfter id="__Packages.mx.controls.listclasses.DataSelector"/> +</asset> +<asset id="DataProvider" modified="1052176331"> + <exportAfter id="__Packages.mx.controls.listclasses.DataProvider"/> +</asset> +<asset id="ScrollSelectList" modified="1055744780"> + <include id="BoundingBox"/> + <include id="DataProvider"/> + <include id="DataSelector"/> + <include id="SelectableRow"/> + <include id="ScrollView"/> + <exportAfter id="__Packages.mx.controls.listclasses.ScrollSelectList"/> +</asset> +<asset id="List" modified="1055744780"> + <include id="BoundingBox"/> + <include id="ScrollSelectList"/> + <exportAfter id="__Packages.mx.controls.List"/> +</asset> +<asset id="TextInput" modified="1059523437"> + <include id="RectBorder"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.TextInput"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1121281616"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.core.View" src="mx.core.View.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.skins.RectBorder" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.core.ExternalContent" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.core.ExternalContent" src="mx.core.ExternalContent.asi" modified="1121760655"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.events.UIEventDispatcher" /> + <exportAfter id="__Packages.mx.core.View" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1121661005"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ScrollView" src="mx.core.ScrollView.asi" modified="1121281615"> + <include id="__Packages.mx.controls.scrollClasses.ScrollBar" /> + <exportAfter id="__Packages.mx.core.View" /> +</asset> +<asset id="__Packages.mx.controls.scrollClasses.ScrollBar" src="mx.controls.scrollClasses.ScrollBar.asi" modified="1121281612"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.controls.scrollClasses.ScrollThumb" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.CustomBorder" src="mx.skins.CustomBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.controls.scrollClasses.ScrollThumb" src="mx.controls.scrollClasses.ScrollThumb.asi" modified="1121281613"> + <exportAfter id="__Packages.mx.skins.CustomBorder" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1121281613"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.DataSelector" src="mx.controls.listclasses.DataSelector.asi" modified="1121281612"> +</asset> +<asset id="__Packages.mx.controls.listclasses.DataProvider" src="mx.controls.listclasses.DataProvider.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.ScrollSelectList" src="mx.controls.listclasses.ScrollSelectList.asi" modified="1121281612"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.core.ScrollView" /> + <exportAfter id="__Packages.mx.controls.listclasses.DataSelector" /> + <exportAfter id="__Packages.mx.controls.listclasses.DataProvider" /> +</asset> +<asset id="__Packages.mx.controls.List" src="mx.controls.List.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.controls.listclasses.ScrollSelectList" /> +</asset> +<asset id="__Packages.mx.controls.DataGrid" src="mx.controls.DataGrid.asi" modified="1123725573"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.styles.StyleManager" /> + <include id="__Packages.mx.effects.Tween" /> + <include id="__Packages.mx.controls.gridclasses.DataGridColumn" /> + <include id="__Packages.mx.controls.gridclasses.DataGridRow" /> + <include id="__Packages.mx.controls.TextInput" /> + <exportAfter id="__Packages.mx.controls.List" /> +</asset> +<asset id="__Packages.mx.effects.Tween" src="mx.effects.Tween.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.controls.gridclasses.DataGridColumn" src="mx.controls.gridclasses.DataGridColumn.asi" modified="1121281612"> + <include id="__Packages.mx.controls.DataGrid" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.SelectableRow" src="mx.controls.listclasses.SelectableRow.asi" modified="1121281612"> + <include id="__Packages.mx.effects.Tween" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.gridclasses.DataGridRow" src="mx.controls.gridclasses.DataGridRow.asi" modified="1121988443"> + <include id="__Packages.mx.controls.gridclasses.DataGridColumn" /> + <exportAfter id="__Packages.mx.controls.listclasses.SelectableRow" /> +</asset> +<asset id="__Packages.mx.controls.TextInput" src="mx.controls.TextInput.asi" modified="1121281615"> + <include id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.HScrollBar" src="mx.controls.HScrollBar.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.controls.scrollClasses.ScrollBar" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1121281609"> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> +</asset> +<asset id="__Packages.mx.controls.VScrollBar" src="mx.controls.VScrollBar.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.controls.scrollClasses.ScrollBar" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1121281616"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +</component> +</componentPackage> +Media 1ÿþÿBitmap 1ÿþÿ DataGrid.png÷´EwDEõÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hhhxǽ“Ñ Ã Dû™-š²sd ÖȬÀƒ¸zH®®T1©"ÕÒ'˜ãbK)Ù]¬ÏµsØ…h­õªmÛ¾ª•gߦ(¥|¼3G8rÎÿÈs‡9j­ïÜ¿)ϲ,Fž¾Ù…zX«õ\õźø$àpýŒ3_*]õè÷(÷sf‡ò¨'òÙ}9ãÈù¢ž˜é‰¼èÜŒç_¾ø_ôŒý¨ç£Ú£Ü}iòüêë¬/à‰îK}¡å¬OUg”ãK{‹Ü}1ÞÄ ™£²ÿþÿDataGridÐÐÿþÿDataGridÿþÿ DataGrid.swf¿úBtÿþÿBorderÿþÿBorderÿþÿ DataGrid.swføQP?ÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ DataGrid.swf‡àÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ DataGrid.swfqÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ DataGrid.swfÁ°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ DataGrid.swflÀ>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ DataGrid.swfQ?ÿþÿÿþÿÿþÿ BtnDownArrowÿþÿ BtnDownArrowÿþÿ DataGrid.swfOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +BtnUpArrowÿþÿ +BtnUpArrowÿþÿ DataGrid.swfŸOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿButtonÿþÿButtonÿþÿ DataGrid.swfq= ?ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ DataGrid.swf RP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CustomBorderÿþÿ CustomBorderÿþÿ DataGrid.swfÿQP?ÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataGridAssetsÿþÿDataGridAssetsÿþÿ DataGrid.swfRP?ÿþÿDataHeaderBackGndÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataHeaderOverlayÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataHeaderSeperatorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataSortArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataStretchBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ cursorStretchÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataGridColumnÿþÿDataGridColumnÿþÿ DataGrid.swfR<î>ÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataGridRowÿþÿ DataGridRowÿþÿ DataGrid.swfn<î>ÿþÿ SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataHeaderBackGndÿþÿDataHeaderBackGndÿþÿ DataGrid.swfÆ?ÿþÿÿþÿÿþÿDataHeaderOverlayÿþÿDataHeaderOverlayÿþÿ DataGrid.swf‡Èº>ÿþÿÿþÿÿþÿDataHeaderSeperatorÿþÿDataHeaderSeperatorÿþÿ DataGrid.swf{?ÿþÿÿþÿÿþÿ DataProviderÿþÿ DataProviderÿþÿ DataGrid.swfÛý¶>ÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataSelectorÿþÿ DataSelectorÿþÿ DataGrid.swf ¾°>ÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataSortArrowÿþÿ DataSortArrowÿþÿ DataGrid.swfá?ÿþÿÿþÿÿþÿDataStretchBarÿþÿDataStretchBarÿþÿ DataGrid.swfX?ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ DataGrid.swfÏSí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ DataGrid.swf=i„@ÿþÿ FocusRectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ DataGrid.swfCqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +HScrollBarÿþÿ +HScrollBarÿþÿ DataGrid.swfqí>ÿþÿButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollBarAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿListÿþÿListÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ DataGrid.swfRP?ÿþÿBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollBarAssetsÿþÿScrollBarAssetsÿþÿ DataGrid.swf€RP?ÿþÿScrollDownArrowDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollTrackDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BtnDownArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BtnUpArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowDisabledÿþÿScrollDownArrowDisabledÿþÿ DataGrid.swfüNP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowDownÿþÿScrollDownArrowDownÿþÿ DataGrid.swføNP?ÿþÿScrollThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowOverÿþÿScrollDownArrowOverÿþÿ DataGrid.swfOP?ÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowUpÿþÿScrollDownArrowUpÿþÿ DataGrid.swfOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollSelectListÿþÿScrollSelectListÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿScrollThemeColor1ÿþÿ DataGrid.swf¥OP?ÿþÿÿþÿÿþÿScrollThemeColor2ÿþÿScrollThemeColor2ÿþÿ DataGrid.swf§OP?ÿþÿÿþÿÿþÿScrollThumbBottomDisabledÿþÿScrollThumbBottomDisabledÿþÿ DataGrid.swf OP?ÿþÿÿþÿÿþÿScrollThumbBottomDownÿþÿScrollThumbBottomDownÿþÿ DataGrid.swfOP?ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbBottomOverÿþÿScrollThumbBottomOverÿþÿ DataGrid.swfOP?ÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbBottomUpÿþÿScrollThumbBottomUpÿþÿ DataGrid.swfOP?ÿþÿÿþÿÿþÿScrollThumbGripDisabledÿþÿScrollThumbGripDisabledÿþÿ DataGrid.swfOP?ÿþÿÿþÿÿþÿScrollThumbGripDownÿþÿScrollThumbGripDownÿþÿ DataGrid.swf OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbGripOverÿþÿScrollThumbGripOverÿþÿ DataGrid.swf%OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbGripUpÿþÿScrollThumbGripUpÿþÿ DataGrid.swf&OP?ÿþÿÿþÿÿþÿScrollThumbMiddleDisabledÿþÿScrollThumbMiddleDisabledÿþÿ DataGrid.swf*OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleDownÿþÿScrollThumbMiddleDownÿþÿ DataGrid.swf3OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleOverÿþÿScrollThumbMiddleOverÿþÿ DataGrid.swf9OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleUpÿþÿScrollThumbMiddleUpÿþÿ DataGrid.swf=OP?ÿþÿÿþÿÿþÿScrollThumbTopDisabledÿþÿScrollThumbTopDisabledÿþÿ DataGrid.swfFOP?ÿþÿÿþÿÿþÿScrollThumbTopDownÿþÿScrollThumbTopDownÿþÿ DataGrid.swfNOP?ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbTopOverÿþÿScrollThumbTopOverÿþÿ DataGrid.swfZOP?ÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbTopUpÿþÿScrollThumbTopUpÿþÿ DataGrid.swf^OP?ÿþÿÿþÿÿþÿ ScrollTrackÿþÿ ScrollTrackÿþÿ DataGrid.swf`OP?ÿþÿÿþÿÿþÿScrollTrackDisabledÿþÿScrollTrackDisabledÿþÿ DataGrid.swfeOP?ÿþÿÿþÿÿþÿScrollUpArrowDisabledÿþÿScrollUpArrowDisabledÿþÿ DataGrid.swfiOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowDownÿþÿScrollUpArrowDownÿþÿ DataGrid.swfpOP?ÿþÿScrollThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowOverÿþÿScrollUpArrowOverÿþÿ DataGrid.swfvOP?ÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowUpÿþÿScrollUpArrowUpÿþÿ DataGrid.swfœOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ScrollViewÿþÿ +ScrollViewÿþÿ DataGrid.swfqí>ÿþÿ +HScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +VScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SelectableRowÿþÿ SelectableRowÿþÿ DataGrid.swfqí>ÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ DataGrid.swf‹RP?ÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ DataGrid.swfŒRP?ÿþÿBrdrBlkÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ DataGrid.swf’RP?ÿþÿBrdrBlkÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ TextInputÿþÿ TextInputÿþÿ DataGrid.swf}'?ÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿThumbThemeColor1ÿþÿ DataGrid.swf·äç>ÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfú>ÿþÿÿþÿÿþÿThumbThemeColor3ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÔ ú>ÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ DataGrid.swfüH?ÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ DataGrid.swfÚH?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ DataGrid.swfI?ÿþÿDefaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ DataGrid.swfþH?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +VScrollBarÿþÿ +VScrollBarÿþÿ DataGrid.swfqí>ÿþÿButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollBarAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿViewÿþÿViewÿþÿ DataGrid.swf2‘ó>ÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ DataGrid.swfYtÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ__Packages.mx.controls.DataGridÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swf¿úBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.DataGridÿþÿÿ~import mx.controls.gridclasses.DataGridRow; +import mx.controls.List; +import mx.effects.Tween; +import mx.controls.gridclasses.DataGridColumn; + +[RequiresDataBinding(true)] +[IconFile("DataGrid.png")] +[InspectableList("multipleSelection","editable", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: &quot;String&quot;}")] +[Event("cellPress")] +[Event("cellEdit")] +[Event("cellFocusIn")] +[Event("cellFocusOut")] +[Event("columnStretch")] +[Event("headerRelease")] +intrinsic class mx.controls.DataGrid extends mx.controls.List +{ + public var DISABLEDHEADERDEPTH:Number; + public function DataGrid(); + public var EDITORDEPTH:Number; + public var HEADERCELLDEPTH:Number; + public var HEADERDEPTH:Number; + public var HEADEROVERLAYDEPTH:Number; + public var LINEDEPTH:Number; + public var SEPARATORDEPTH:Number; + public var SORTARROWDEPTH:Number; + public var STRETCHERDEPTH:Number; + public var __focusedCell:Object; + public var __headerHeight:Number; + public var __rowRenderer:String; + public var __showHeaders:Boolean; + public var __tabHandlerCache:Function; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + public var activeGrid:Object; + public function addColumn(newCol):mx.controls.gridclasses.DataGridColumn; + public function addColumnAt(index:Number, newCol):mx.controls.gridclasses.DataGridColumn; + public var asc:Boolean; + public var autoHScrollAble:Boolean; + public var cell:Object; + public var cellEditor:MovieClip; + public var className:String; + public var col:Object; + public var colX:Number; + public var column:mx.controls.gridclasses.DataGridColumn; + function get columnCount():Number; + function get columnNames():Array; + function set columnNames(w:Array); + public var columns:Array; + public function configureScrolling(Void):Void; + public function disposeEditor(Void):Void; + public var dontEdit:Boolean; + public function draw(); + public function drawColumns(Void):Void; + public function drawHeaderBG(Void):Void; + public function editCell(); + public function editField(index:Number, colName:String, data):Void; + public var editTween:mx.effects.Tween; + [Inspectable(defaultValue=false)] public var editable:Boolean; + public function editorKeyDown(Void):Void; + public var editorMask:MovieClip; + public function enableHeader(v:Boolean):Void; + public function findNextCell(index:Number, colIndex:Number):Void; + public function findNextEnterCell(Void):Void; + function set focusedCell(obj:Object); + function get focusedCell():Object; + public function generateCols(Void):Void; + public function getColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public function getColumnIndex(name:String):Number; + public function getColumnNames(Void):Array; + public function getHeaderHeight(Void):Number; + public function getShowHeaders():Boolean; + public var hasDrawn:Boolean; + public var headerCells:Array; + function get headerHeight():Number; + function set headerHeight(w:Number); + public function headerPress(Void):Void; + public function headerRelease(Void):Void; + public function headerRollOut(Void):Void; + public function headerRollOver(Void):Void; + public function headerUp(Void):Void; + public var header_mc:MovieClip; + public function hideStretcher(Void):Void; + public function init(); + public function initHeaders(Void):Void; + public function initRows(Void):Void; + public var invCheckCols:Boolean; + public var invColChange:Boolean; + public var invDrawCols:Boolean; + public var invInitHeaders:Boolean; + public var invSpaceColsEqually:Boolean; + public function invalidateHeaderStyle(Void):Void; + public function invalidateStyle(propName:String):Void; + public function isStretchable(col:Number):Boolean; + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public var lines_mc:MovieClip; + public var listOwner:Object; + public var minColWidth:Number; + public var minScrollInterval; + public function modelChanged(eventObj:Object):Void; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var oldWidth:Number; + public var oldX:Number; + public function onMouseDown(Void):Void; + public function onRowPress(rowIndex:Number):Void; + public function onSetFocus(Void):Void; + public function onTweenEnd(val); + public function onTweenUpdate(val); + public function placeSortArrow(Void):Void; + public function removeAllColumns(Void):Void; + public function removeColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public var resizableColumns:Boolean; + public function resizeColumn(col:Number, w:Number):Void; + public var selectable:Boolean; + public function setColumnNames(tmpArray:Array):Void; + public function setEnabled(v:Boolean):Void; + public function setFocusedCell(coord:Object, broadCast):Void; + public function setHScrollPolicy(policy:String):Void; + public function setHeaderHeight(h:Number):Void; + public function setRowCount(rC:Number):Void; + public function setRowHeight(rH:Number):Void; + public function setShowHeaders(b:Boolean):Void; + public function setVPosition(pos:Number):Void; + function get showHeaders():Boolean; + function set showHeaders(w:Boolean); + public function showStretcher(Void):Void; + public function size(Void):Void; + public var sortArrow:MovieClip; + public var sortDirection:String; + public var sortIndex:Number; + public var sortableColumns:Boolean; + public function spaceColumnsEqually(Void):Void; + public function startSizing(Void):Void; + public function stopSizing(Void):Void; + public var stretchBar:MovieClip; + public var stretcher:MovieClip; + static var symbolName:String; + static var symbolOwner:Object; + public function tabHandler(Void):Void; + public var totColW:Number; + static var version:String; +}; +ÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.HScrollBarÿþÿÿ!import mx.controls.scrollClasses.ScrollBar; +import mx.core.UIComponent; + +[IconFile("HScrollBar.png")] +intrinsic class mx.controls.HScrollBar extends mx.controls.scrollClasses.ScrollBar +{ + public function HScrollBar(); + [Bindable] [ChangeEvent("scroll")] public var _inherited_scrollPosition:Number; + public var className:String; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function init(Void):Void; + public function isScrollBarKey(k:Number):Boolean; + public var maxMode:String; + public var minMode:String; + public var minusMode:String; + public var plusMode:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get virtualHeight():Number; +}; +ÿþÿ__Packages.mx.controls.Listÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swf\tÕBÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.ListÿþÿÿÙ import mx.controls.listclasses.ScrollSelectList; + +[TagName("List")] +[IconFile("List.png")] +[InspectableList("labels", "data", "multipleSelection", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: {label: &quot;String&quot;}}")] +intrinsic class mx.controls.List extends mx.controls.listclasses.ScrollSelectList +{ + public function List(); + public var __labels:Array; + public var __selectedIndex:Number; + public var __vScrollPolicy:String; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndices:Array; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItems:Array; + public var autoHScrollAble:Boolean; + public var boundingBox_mc:MovieClip; + public var calcPreferredHeightFromData:Function; + public var calcPreferredWidthFromData:Function; + public var className:String; + public var clipParameters:Object; + public function configureScrolling(Void):Void; + public function createChildren(Void):Void; + [Inspectable(defaultValue="")] public var data:Array; + public var displayWidth:Number; + public function draw(Void):Void; + public function getRowCount(Void):Number; + public function hScroll(pos:Number):Void; + public function init(Void):Void; + public var invScrollProps:Boolean; + public var invScrollSize:Boolean; + [Inspectable(defaultValue="")] function get labels():Array; + function set labels(lbls:Array); + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public function modelChanged(eventObj:Object):Void; + public var oldVWidth:Number; + public function onScroll(eventObj:Object):Void; + public var scrollDepth:Number; + public function setEnabled(v:Boolean):Void; + public function setHPosition(pos:Number):Void; + public function setHScrollPolicy(policy:String):Void; + public function setMaxHPosition(pos:Number):Void; + public function setRowCount(rC:Number):Void; + public function setVPosition(pos:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var totalHeight:Number; + public var totalWidth:Number; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swf]tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Voient metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='2'> + <dataBindingInfo> + <property name="acceptedTypes" value="{dataProvider: &quot;String&quot;}" /> + </dataBindingInfo> + <eventMap> + <property name="selectedIndex" value="change" /> + <property name="selectedItem" value="change" /> + </eventMap> + <property name="dataProvider"> +<schema name="DataProvider" base="Array" class="mx.data.types.DataProvider" required="true" readonly="false" writeonly="true" category="array" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> + <property name="selectedIndex"> +<schema name="Number" base="Number" class="mx.data.types.Num" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxValue" value="" /> + <property name="minValue" value="" /> + </properties> + </schema> + </property> + <property name="selectedItem"> +<schema name="Object" base="Object" class="mx.data.types.Obj" required="true" readonly="true" writeonly="false" category="complex" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€€ÿÿÿ?ÿÿÿþÿ¾ÿþÿÿþÿ€€ ÿþÿdataGridÿÿÿÿÿÿOÿ€€€€€¨%ˆl=ÿþÿÿþÿ +upload_btn ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿUploadÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='5'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€€€8ˆÖ,ÿþÿÿþÿ +browse_btn ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿBrowseÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='6'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€A3h W®rÿþÿÿþÿns_input ÿþÿeditableÿþÿtrueÿþÿeditable +HÖžåA­3 F”ýK£ÿþÿÿþÿpasswordÿþÿfalseÿþÿpasswordܲð­&§K²CWõÈ0Nÿþÿÿþÿtextÿþÿÿþÿtext³·Ès‚ù"KToد›ÿþÿÿþÿmaxCharsÿþÿ0ÿþÿmaxChars‡Ü9^LB¨Vhä'd²åÿþÿLimitsÿþÿrestrictÿþÿÿþÿrestrict¨KºÑñDG¿R…=¨ó®ŽÿþÿLimitsÿþÿenabledÿþÿtrueÿþÿenabledÍÅßv1óC¯|2þ4zY÷ÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible»¦•¬² G AA[X}žÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight¦*ŠixÿEº¬~†J,ÊÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidthFÙ‡ +»¢AÈæaUAÅÿþÿSizeÿþÿÿØ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='7'> + <dataBindingInfo> + <property name="editEvents" value="&quot;focusIn;focusOut&quot;" /> + </dataBindingInfo> + <eventMap> + <property name="text" value="focusOut,enter" /> + </eventMap> + <property name="text"> +<schema name="String" base="String" class="mx.data.types.Str" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxLength" value="" /> + <property name="minLength" value="" /> + </properties> + </schema> + </property> +</component> +€Ûk…ë[Riÿþÿÿþÿ overwrite_cbÿþÿlabelÿþÿoverwrite existing filesÿþÿlabel×!V¸AÅLµ$%ò5;˜ÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacementáöq÷ĆE´’«¢ÓéŠÿþÿÿþÿselectedÿþÿfalseÿþÿselected¿Ç˜Fz…–H—oÒhîóœ ÿþÿÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='8'> + <eventMap> + <property name="selected" value="click" /> + </eventMap> + <property name="selected"> +<schema name="Boolean" base="Boolean" class="mx.data.types.Bool" required="true" readonly="false" writeonly="false" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + </properties> + </schema> + </property> +</component> +€Ï3¸oW_ÿþÿÿþÿns_labelÿþÿautoSizeÿþÿleftÿþÿcenterÿþÿrightÿþÿnoneÿþÿautoSize%µLÂOÙH——ΊSfÿþÿÿþÿhtmlÿþÿfalseÿþÿhtml¹l>z*VGE£1's¶‡kÿþÿÿþÿtextÿþÿ Namespaceÿþÿtext qf¼éO›FN"@ SðÿþÿÿþÿvisibleÿþÿtrueÿþÿvisibleÄŠüó9ŽD”ìz$hí±ÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeightü!«Ä%«B¶ÞÂeaþdÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth]Yœ+þkîF€Å á¨Ãp!ÿþÿSize ÿþÿÿ<component metaDataFetched='true' schemaUrl='' schemaOperation='' sceneRootLabel='Scene 1' oldCopiedComponentPath='9'> + <property name="text"> +<schema name="String" base="String" class="mx.data.types.Str" required="true" readonly="false" writeonly="true" category="simple" original="true"> + <properties> + <property name="defaultLabel" value="" /> + <property name="defaultUIControl" value="" /> + <property name="maxLength" value="" /> + <property name="minLength" value="" /> + </properties> + </schema> + </property> +</component> +€€ÿÿÿ?ÿÿÿþÿáJÿþÿÿþÿ€€ ÿþÿbuttonsÿÿÿÿ™3Ìÿ€€€€ÿÿÿ?ÿÿÿþÿIÿþÿÿimport MultipleUpload +System.security.allowDomain ("*"); +var MU:MultipleUpload = new MultipleUpload (this.files_dg, + this.browse_btn, + this.upload_btn, + this.ns_input, + this.ns_label, + this.overwrite_cb); +ÿþÿ€€ ÿþÿactionsÿÿÿÿOÿOÿ€€actionsÿÿÿÿOÿOÿ€€ÿþÿÿþÿ ÿþÿ€€€€ÿÿCSwfPageMedia 2ÿþÿButtonÿþÿ]>ÛBwDEãÿþÿButtonÿþÿÿþÿ?ÿÿ CDocumentPagePage 1ÿþÿScene 1ÿþÿøõÿDÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÌAHÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿÿþÿ ÿþÿ€€€€ÿÿCSwfPageMedia 2ÿþÿButtonÿþÿ]>ÛBwDEãÿþÿButtonÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿButtonÿþÿmx.controls.Buttonÿþÿ`/Users/Vixiom/Library/Application Support/Macromedia/Flash 8/en/Configuration/TMP1x4k159sqe..swfrCWSÓ—xœì½ xœÇq(Ø3óÏÌû$A Á›H‚—HŠ¤ BÔº¬`ÀˆÃhf@ò!Y–LÆvè› -Ë–ãøŒç8qö½¼Ë±g×N6Ùgoï¾—ÄŸ³9Ö/ÎéglWUŸÿ€²d+/Ö§ÿî®î®®¾ª«ª«eýO±†/°úˆÎÏÏžíeŒEØéÈ·ØþïÍ›7YsýïF®Ïý¿~ù ÏÿÑÆG‡¯óúÛŠ»7œnzï_\ÿÿûèýùßüä—¿ÅækšyÆ(ÏòÆD"ÂÿaÇxøhce'f«ÕRqx¢TdŸgûydŒ×ñ6¶ çkn¨úfúõû_uîÙÁ ?ó½ÂÍM_~ǯüó…ÈË]}òãï:ùïùÐíü;^Íã<¯Ãs=È¿n´2VÎ]Ì ” +¥2|ç+¬ëF KFy*»x…’ŒU.ä‹–ºÑÎæ²çxÌÉÏX¬òxŽe%WŤsÕ¹BŽ¥;¨1ÙŽe؇¥3Ù|鼪qhM\Q [³lgì‹g닼ñÿüVîùüõ7ŠÇúÇþû;~÷ê/ËMüõÃw}I´&ñ#kMÜnMÂۚݼ5›xR’e¿Äß’­¹óþÃïú¿¿Öû¹Gnïùéol‰Öô¾°%%wdÈ'%ò툼ËÎUs36î]<¥ÆÛÉ«åu¿ÚüÇWŠÿY \û#C¹Æ¦w-˜ÎM\0q>ûŸ7׺¢ÃŒ×QÍ'rÃl¶˜ÍM拹,ocf*Ǧsù©é*»œÏV§ŸBU^o…•ÆƒzÏåŸÈ±Jµ<Ì3]61)¯²µ¼þ^i!Wœâùò•s3™ :;ÎòÅ)VÌ]©pXhà &VØÃl&S®äØÌlešmg¯e‡8b¼àÑIƶ°‡Ø«)}tü±ÜD•=H¡ãårfŽ>ÏQÑüïEQâ¶ë +ÏæØd¦ÀK–íT÷a³dè4µu¬¿”;[Î]Êç.ŸÉT.°‰r.Sͼ8S;Sâ±…ü 4Ÿ 9ÞŒñÜT¾x*_(°‹¥K¹ó%Và4äÿäŠYŒ»”¯äÇyÿŒ]acsL„8½¯LL3Nñ1–)ä'x=ºŠÉB¦2]ÈUy§ä*™™+ï™Érõqf¶PͳL!?UdçG‡*ð²9V,ƒoŽG…wDËd³#‘+³±©Biþ×`SVšCË„í>ÒOpk†['Ẇ[¤ŸèDMãwŠ(išäS"³—ív°Ýv {ÛèY¬‹‡ß*ÛÒªnÞ Æ2 ïDWs†L!/ׇG ¢Vª7ÆWpEœ9cˆ@7»±Œ¹›03ÒRݹ6ëÙôSÜ#Žõã2s' ôR8+ÚÛyQ±¦(,îVÜyE¡Q±«:±QØšôÀ/uç(…zá!$ß‘n=©áV dƒ5&zS4->‘a™Aò¥˜oß”k›Éð=±#‰¶Û\Ö5¤2EÜíéQ™ÉØØvð¢4Õ)™ÙÇã;XxÝ%Qb'‡X¥C vyÊ÷´„€v§;h­¦5¬¶ÝKÂiwH›÷¤qUº{ã‘Q¢åm +JDìÓ8HË™Ërpæì b]ߟ’Luç¦ °`|¼ï³Q +;QLf‚ƒmjHÃ[)L¥DÄXÛ±£œÍ²yS~,zŒuzÆoÒ¿ÉÖýM°•r ]÷ðoà_¢Ãì"ÎtàË\HvÜ»hô·KÏí’ä+Óf™8P;ØF–tÔ$Ò®{Z”ׇŦFù2òì<ÅÚ0çaD°v’Éó°µÓV›$Ùx)]3AÍÞeÃbþ†a÷JAÖ<ƒÞ©Á°ZõÜuU-œ€ƒ˜:V;ºT;¸&ÅœçXíÍ[c?æÞ‘î¸Þ¬O5|Ö<ÆF#Þ3†`‰ÌêÐîâ¡áeU7Ž'þ’ÑО@ŠšqlÖ«-jV^,5qX81«E›U‹ Þ©œÿrDà«óViæ°¼ƒ†%?‘ñÙïÕ¡cîqXXÜ:çÀ1`3Üú,FG¹A*å$æ;sž øß¡ë.c/åáË>qDPO×ßq¤CÈŠêØ£ Cì*Â8K‰°ÉÉÉ–}o}á_ºWTýêÀ·«¿ö”ÖKé`”‹@l„ÇŸ(ͳœ£/€ l¾fœG.7û­ý—ùùßýÖBý¶Œýá·Ø(c¼ßòU “jsœwñ~~þS=%;9 üþù·Ìõ‰§ŒNnÃÊ—[<\Dé@š$bà”Æe$ŽœoÁøc¥‚D ëÿÿƒh)l“€í 0© º ñª"žâ  «ÃÂ랎,w+x’9âW°ÁÜd†ó;Щ: “Ý3L‚ƒ“Wª¹b%_*èvž¸’EyÇC·&y–7'–Cq­ßØŇ ÄxÖö®Ï½`×·RÇÇØ:µŠýÃàŸ}=´ƒºeïxïG+ïønùOq°<¡Ë 6¿w¾eßô { Á¥ogŸwÀþ³6¶ +ú.ü²läCJ-ÅrTrÚU3ã§3Ål!W†!6_=²G4Ö¸Ï×là»±G—QÖÃÄTËïØÅ ÑÈFld7;Uš˜­¤¡•ó5i·Ö •èÕ`ÊkÈÌTgË9˜1^3/™QΧ!E»ÙŠ½¾9Â?§èJÖüž²$h Öµ–ê:“)f¦x¨שN\‰@ë8ÕJgJE>»¬~<ÈÓ×ûûq%kýLŠú1ΫhÿO} 5¼¨å»ïžŽX{Ñz³x^(ðά¯”dû_‡~ñ­úiM~TÜÂZüQïrÖqöÉoc çöÿ<ÿ:x…Ëÿ~à£6!6Xžc±zÝjÚ›¨iÍå÷Ȭu˜u#ßKa•™6ù3mä„ÿˆµêlbп*#}3³A6 ,m䯨Éòe¾=·?H–Ï'®1d«6pÖ㠌үñõ°P8&¹,?Š¯¾QËUijŠ¯˜qdÕX®˜/@bƒRœA>Ù.æ‹By`0xmO*9ù;95Ú¿øôZì‹Uœí_ü8VóSÀ¤î¦ºäk?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€5Ùƒ@G·!zØØØÙÌÄ>O+}¯ôáØ°ûÍ7vÄ óµòé •|ãë&mùfÊ¥j©:7“S['AA0=t‚eù©›M`ÔT®Jûj©x’ã\>UÎ\íÒ¥L!'J´·à‹ù+PóñsçrÕ³åÒÌ©Bfª‚\2C¦7Bçá2ŠsèÍýFv˜°ÄWcŽ5V!/¶X>âÄ1÷wð”1uç¹8eùœÄS†3q½5Ó=,6Œ~ŒŸ^bt\[r>]ºÉcJt“+},¥æz#êéy7ß[ÊgÙvqŒ¨Õ¢¢ˆ[—6 ~‰£Ò'6* +iðÒÀH*QÏ5©Q}ãõ˜±^™aÑ Ý'Ôuòs\jª}ÜZ':J_ ›:ø·)EgÒ +Ò AjBA8ž†vÃßæQ>‹ùW“îT«¤s ˆAðh@qc¾ñ³ ǵÿ”ü_¦k¦„ÏàJµ<;Qa=§´vslŒÏž±1Ò,Ë(N(Õ¿[ÈMVQJAõQ-Í€NU„Ô-fc3™2Ìj«üñ_/JÝ6:£V¬1½xU¬xÊyш¨ØT -pcj©«˜±ª ®XaºWª‰å’ŠD›Îgs¬œ»”ã$Ïæ+3™êÄôÉKÐ,Q¤Ò.S‰:ˆ©¨¾Ÿ“?$Œ5`àtôÃ<À²¥¾˜•ÙÅ\uº”=k?#… l;“ERÙ[k È2(°å™õª+o.¤ÂB 2ç;ZøÂñBarWŒL¾Uµ: ªlZŽAéÎOÙûáÏÊ4A.9’P³]&7‡$²óÑ…P²›¶Ÿôÿ#¸Ò÷ùÜ•ê©|®•AÔÙð…8ñ1Éìx¦€”K*á«ÕÌÄ4N‘0PÈT*r_š»8^*`.ú½ Úúrn +÷e5-D¶lŽO¸’ ñ.ÌÍð¶Ïæ Yü¤^›a“ùb6ÅÑ;~)“/@$AV.gfð«Âë‚öë™ +»ß ‡«|þ© ‘#ƒ4Ø•çÄ®jn§q&Ô1§hü4G‘ÏQNJ;0š“ºH›k^r|b"Wá#=_ÈWç†k…2UΔ³±\1;  rФJ—1ï©ré"´êlÆ)² ;8©pšÃÖœ+WçÈ:rŠ˜ÁĨ S #yãK¢í¹‹ã¹ì©p~ÂL©Á< 7>%ÊEü°¹2ùT—~<€Å,_.òu)_•ÝÈcL6-WžÊyÊ%þÝÓ·«oOßî=ûq… U¾¨z~=)ð’ ±Þ%Ôb1sEFe®PÔL97™+ó…Q$¨0%‹]+“ͪ±YP]ÅÄr.Vlد°¹W—YZåã2I~ëc€zS3ó©ïâéâE½e  qœ‚7t…„º‡Õ6¯&Õ/Òj}iu*­Þ—Ö ÒHkò¥5«´–ÒZUZ¯HkÃÖµ§d r¸é¡:™yYHæå)Y's­‘¹ÃÃ=KÜV(Ü:‰Õõ°è´bWpÖX¤¯TÕ·2OEiYÈ*³ Ìbv;}½2Ý/]!ø­Vø­ÑE_Vø­Öøu‡ã×¥ð[kâÁo¿nߺëíp®ˆóŒW˜S,oö0“ë…&ö.Øz‡Æ¦Ú­=hE±Á‰ÒÁŒÐN¾6æ°0Ž›Õñi‹oD­WTÙªt…m‚†Ç¡IB)¿Îפ-ºI=¾b{U±ÛÌbW‹6õB›<Úv]Üv_q;Tq}º¸9UÜqÛuq;¯·ÁùÉ3 +hŒ³ ˆrwé#\;£Ó.½0ì>†*¯= hç‡Ñ¨‡¬»pÎÜ–ÖûP.ÇÐ~…Ž…Ÿ5î;$¬¤ÈNă÷íÒz`—Pþ!…ö S¦JrJ˜‘aS´Ã£;=„ªIj,@®eÂ=BU¹7•›˜ÏÏ‹vö̦ÕF;P¹îðäêu@YØÔ:â÷‘å5„o‡ÞŒÀôqÆ.gæ*ì}L’t-dHÑ Í|FÕËF5i¸?eéNw(ÝiÔ;ÐûSh/„½}©óÛó öWÜ£ L¾£ÏÕæØ@ÆDä12ĘÛÃ’WXbŽÅå‚ð¨Ú*”],ÌJKÏSœ¤4; ,..—¾µ:ÇÜã¼óO8Q<Ì£5 1¸ÌÓƒ²À`0eídJõñ…ÁIÀÀ¦É)É>œ†ÜÓ¼Öa>¡Âq:å+…„¦ÑC¨Ñ‘CèÎë+@íèa±+»ùⰛůìaÎÜö*273˜gº ×2—1#ãÄÄ<1Q+FT~æú* !TŽçŽxIžìþŒÝØ`êãÿpâ¼ì•뀲ØB{ŸÑaÍYEÝõ0ÈñënÇ•£Ü·Àõ[˜sÐðcÔ³,ñ-ûwHÛ£´ƒ¼••Kó¹ë=¢Îß‚dYé(ï?AœŒ` ^c×çätІ‚—|^í­÷\ß%ñ!Õ¡8/'Iå$d9ï&¡÷R3µ]„+â–uïCBÝ«­Ȭà~Þ”Zæ$8qª†I”Î¥•á +¹UÔw_JýV0,A²=\o“;oDŒ±‘IcOŸÖèW¢È«®×ÄHöð¶gÙs43DÊ¿^EÝ-[´Bõ®§‰†-gîÃŽ£ÍÏDŤµYŒ¶@—âØ1ŸYÚ£r´&É)‘¹Þ 7êjfŠ uyÉãb1• ›¸¾fNÄ°˜9râÐÍ£¼›‹‚ìYÌÓczÓÜ}é7 ôSÔ›ÀÿN¥qÛ{dG.;™4µNõ¹Ämšš"kÀm'3¨Ù$ñ¡åšð€¤„nb>hÝ̳Âuy{(Ÿ‹ì¾gŠLqO¦w ¢4EâÈô{ +»è›ÆùbŠ¾˜’äEfWYíGdûoÇ­púqÂ6.±ý=2]¥goÆe{3¾ÓÜŒMƺ’n•vNñ„4ª:Ñ!IöQñqÐûè¼âR,°®f]ª0±ËJ +qN€õ¬¨~U2H©•±Ñï[Õ )(pÏŠb±Õ½Õá¥ÞãÁD•v´—RØtkA¿l-è­+’ø­7Ò ¢¢1çocFè ï<ëðÕV‚²Ñ7RÐXÙq_“R59²&Þ°·Kª½ö9dãI¨¤&Åë®·Â:Y‹Á$Krþ®Àzã„Óeœ¿O¦Èæ‘#í + ÞÍôeµ :îSø÷õv‡©§½"9‚vÙ¡™©]‚iv%Є!Õ×¹<Æ;çoHí¸0l\ +V}±X}&êÃê}Q¢ÙÓŒsN³¸î5aœ‹Q:R¼Œ×›¤Ñü3FG·ª–B<äº]ä:åÉõlH®g1WTäz£'×Cr½‘Œ#”ëª'×µ\×0× ‘ë§<¹Þ’ëM˜ëQ‘ëÍž\o1r­0r½…¨< y7Š¼?íÉ{=$ïu#ï·å}«'ïÛB°}bû‹"×Û=¹Þ’ë˜ë5"×;=¹Þ‚ç» <‰¼ïöä}wHïÆkÕ¢€• ú? ÀÀþ”XuÒ0NkpœÖˆbŠ8WkÐDôE­¦U/á8r+5îëÒ²Ô~k5ª1ÚèÍfñÂE +§;¼+ð¨Eäj5}ì"k}ÅH|.¥„y«¶)¼º„ Å‘ D[ >küèÿŒP2?ë‘=H6ÁXBõ­2}­,Úo™ÎÞ<&ù^«âo^'y‚Ëhµþ¤NEÜ÷àÎD¦Ñk€SpŸ“»ö{ÓêÌußÁÌcÃórؾÞ6ž»Os8txϧûo-ò|µ·g‰à”MpO³÷Ûη¾U¤–„-êíƨ÷Á/uV°ŽQ•^ñ¸~£I lRBÀœCDf“:‘ÏìiBRc·ÅÝÈü'; ؤ¢´±§%|!Žç$B&dŸäè†bŒæ¿D« ª:`‹zz·ÌŽ¡^@†î½j€úv*’7Åè×t5û·Û¤žì]MÃ6ACœ=fSe…Äç‰ ‹ÔhAˆçÃr#”˜€ÑÅ Ã%0ÙO|WÈ­1†`™ìÃ!ûér•{]G|Ýç9&ŠèŸs?8z£¾Îºo$*Ó¼#q¥ ü îÒ¹?‰âŽÐ‡ŒKC÷a€;_e÷#TÚGéŸÑ?§~þùýóIª0‰J; "Ô²¬Ÿ’kÖ§Óvr-&/K®Çäÿ “)z•8}¯Ääz“׊änLþXXá­˜üoîm"w&ÿ¢7¹O$oÇäφÞ„É¿äͽUäÞ‚É Ëíbr{Xr#&ÿrXr &Ψ{SŸ„6õùeê³ K;ÚVÀ +2¢³­ç~! +¹®}ŠÏ0ë¹`³9m8àÕýÛF –á€×rEiNÁ²ƒœ&(«aÔ!l:^i*ΊßN(?V²[ʼn-¨ÐŒëZZ¡q“×;iAŠDQ4Óµi…'INŒŸþ +j¤*HH¸\ÉÔЈÖ2ŠZ’σÜGv‹T±Õi[½X&AZ šœv&eÚ1±°5jà& |´¸Y· ðÒ,ÚZÕ0ß.†ùæÛ½Ã+úÎa»1ßøB2^뉬 éeçу=“Íñ`na˜'xm!LÕ=ÚMKÅœi¨§~AÑf<:£Þzðo#r (àXð‚ +±iiàâ)i©‹A‹Z úÄb°ƒ¾àÅÀš óHB¾kÏÄî +_¬,zúËëÏjØW ‹Õ¹W›ëËGÛîØ‚¥µB~)HiÏìaÙ|™·V­ so}Z0Núpb/Æ3âª|µÌ)JŸæ zÓ™ØÖŸÎeT„Ó¥Baô’Š±Œ³'ó…}yî¸W&Ê<Ûy]£¼‚8—(Æð¶×.Èx¼(q‚çœ*ÃåÏàØA oêÙr®R±Ío;³á¹³ZÊfæ8ÝÀwc©lá™™±H'ƒ“pÓX¤xýìòt¾ +ŸeSå\®Ècgsü¼6—Ø\®P(]fs™"›ÎJC_' >FË™âT.xûÁ³$ž÷Œ#¢y.GI<ŽfL‹}},4Îjã9“™A“weîæAÓs |¥íP¸S$9£Ô×{ÖÉWøß$_KIJÄuƒro +Ï rfa ×êš[A Ö‹@Ý­ Pˆ@ýõnq‰2ªV&ÁÏ{30$Ãi ¹’Ñ×12º¤0d$2¸ùJdš‚Šè^¤ž¹·m·™ïv-ü×Êmü×ÎËøo9ÿuÄ#I`eFoäºÖ]Ác;ùo%ÿ­â?ÈÝÅ«ùo ÿuóßZþ[Çëùoÿmä¿Mü·™ÿ¶ðßVþëá¿^þÛÆÛùoÿõñÚVPm¯B©™»Sä]à³¹»“àÖÁÝ“÷ÂîÞä<¤ÝÆÿá‘ûx$ÿg?‡ä‘’gæŸ_GßûÞ6æL²ß˜gÉ:*~È=Ì+½C4âHœ¹ýüw”ã¿ãüw‚ÿxÜ`\å<9O"q–‰œ­D($Ü)þâ¿Ó‚˜Ãü7È›UO¹—¶½ß©¶÷b{߀ÛûÎàË©†¿„Æ–:Èt-;~?UÃë]ÝZµo¤_IU7 õ]Mq i`Vá,¤Èë?ÆíEã†çly‘èoö8ú8‡›Þ“iH²"“f@Þk-ïâ*e¸›C÷8t-~•·_žvÏ Ý&ÅrFg«ž«¤pù‘Ê)ÏIøQÄ.3ó=jPÃ…ÂS­îî!˜¾%i\‰RÐpOüwÈœ3°SÁeN“L%G|å,µ73¼¨.´ÊK«X+°@lVdÃÛœò–Øeh¬j5.V¢Óˆ—Œ +„ÝÆô_»p®ZÎAñˆƒll‰ï´äÛB°zãà¹uˆ÷Ͳ‘ž81MY2ÔWÚîúú¤oþá!fbâœqË+é»aâ*sÍ_Z­J«£»;ÎJT[HCùV¯y²¬¿¾Ì[Á¸¬?9ßDÛ^´˜»L_ì«C >+ÌF©j¡‹ÿ͇:n˜æ ¤o›P9t}æƒ +ŸbY„Ûª)Õ&žÞÿ´vÁx’÷J=£pøÖÅc±¬¶]Q©ÝôÞ@å´«úÄM3Þþe€hÛtìZËå>eøÑA\Çâ7çM   ÛNPšûhëÌÝ){c%îómØŒ—¿îjßu5è%:®Âݪ)ku]¼ÅŠì­k¯®u²®õuÙµ }Èn¦4Ê¡¶ºÕøl$p3%°WÂ1²Éo~Âã„™ÄfÃx”,:"ý&5·h‘^‰}BôʹÞ.]0û Že<Ç߬§•y{ð 3a·¦„цŒÓäÙ˜–YV%oQÞõdÑœöZÓﺎyÉ-6:hÂMMdFÿGÞ·ØG1£zÕð?€OmÑ£6FÊ~Î6kÒSj›ÙK‡˜9—63Á4ûÜ›ðUa¡*oÛÉSŒï4쌼ڋÄË;$™²c`§ ¥ó.ÞþÝ‚6ò €ö{ä„Ø+׳=†ÅX3³f]ƒjím×›„-[”6Ùn\ººÜ}î~¡’öL)!2: ,gn¶œ9è 8œ¼Ö¦L`î€+jøµ¾šáëˆÛÜ4Í`aà±þHbò N^"/}RñÒ»°´£[P~——.VË¥B¥ÏvýÕxn=ä¼Ö›ü\ CM™laš«ö1ÜȲw—«z=—i³Û´ƒsqàUn`¶\†Év!ýP”s“Â!Å…|95|ìäOèeBxáRIÆMÛ*¡ðe ™ŒÉÙ<¢›çÜûà‡`l¬RE.„ùüãÞ ºƒB`écGŒ‚/#± €~˜4%Jà˜ÿÀëT¹>Ë]œ™Î·›e'õg53²ûÕã‰#pù…T SÄU<ÞA€d¼¦M%™ÂD°Ë(Ÿü|L—.xüªù ¦õiO4”vÄàuÚÀ 7xŒ¹\¤coÐxµ8:9 C…làÕ£UÞ{ÕrEEb»«¼Ï8åØì Â@iœ­¨š(¥Zá@˜€(s6¯€(¥šg“¼ŠI^â$”0É¿h2¯u¼Ú¡+9”9Ôyò™Šðcʈªç"š²Bd Eç^—ôÄ&}ý`”•@Îz<€*lœHKE”sš§,œ­ãÚ¹ª}*ÌÌVKéÜ Ÿy¼¹üüÁkçùBfÎô€†%S,Ì ä ÛyUPä5Ì¢èã“`2v‰N·i:ÚgA9Yá 5q<¡OÁ‰vvF¶DDˆ/€Ueñø +8TâBN-?gÑs9ú!>2dºò¨EýAV÷ˆ³˜í¹*gN›Š'æ"˜ËÁaÐçáHžç'àA:À›Çý%ŸMµyNø½Ùá"Ì,\y™ø/V¤–D''(L4ðNN<Š‘P¢UF³:ZÇ©JZ´eFÈœÒT¨úTf¡aôyÈVÓIÌSš‡¯´C÷ûW¾l‡ná¡Û¡éùêQ…¯y%?¨ wÈÛ¦Ëàe.ZíqäGGuÞk‚š'}Óxšs€Iä_:ž\ ¼§Ãl©…<ᬓ!tx¤+Bª“"z_GzocÁ0þâÖyŽÅæeƒŒ–=eÑÃÏí¼Õó½Û½ÍïDà˜ð 0cÊ—ä*õµU}Á¡Ì\Þcx@]ús¢ ¼)"ð<Î;xŸ®9â¾'€¼€ÆDàèTBÔŠ®.ðëç݉¯6«ë +•ú•úQ•: ¾>¦R?®â~A}u¨¯O¨¯Oª¯O©¯SêëÓê û¿:Ý‹¯åîω¯ûÜ__÷¸?/¾Î¹mâë¼Û!¾îw?!¾îu?,¾†ÜOŠ¯A÷#âë¬û)ñu—ûQñuÒ•?N»§Ä×÷câ+í~Z|- 5E8'‰®9/A†CA–K;CAî‘ #¡ ÷JT(H§ rŒJ ÷I»CAî— +áÈÒ_ÍœZ§9‡xœç}×Ééx’Sz÷Ê9ÞƒËQ,xbôF'@¯s?à¾à¾ß}Ÿû¼û^÷9÷=¸ÞñÔHmám\ÆI1ŒcžÇ¾b{ÝŸÓ¼ÔÏ ë92ù01iAx÷£8;ÜœîÇpF¸×y…/–Êû ÊûIÊû)Ê{Šò~šžÌän!’¼Åö´òá¯dJ$OÛÎPdrF$ÛÎPdò„HÎÙÎP>³T“”_V&)»±©G×3XDw‡™¤(c”¿\y®5Å_»1ŠÏ ŲNAÔÒ[Öô Z¦:­”÷ŒºÀ1iå¡5Ñ3iþ¡ì$”…ª Q½fò í/Ƶ‘pèóa†Å ¶ÁP뇛oH§)h  ,øÇé|õ8o‰¡~ªiÏ£p¾ÃêA>ÌdHºŽ©øb8Ì eâ¡=,eɪxz¾Ä#¢Ø}^“!ãEŒ3УÁ2'WÄ uøªœ0(¹˜¹‚d˜Öê~³aLXÒhkvi>cГ?øGÙ@)4Œ -#†Œ_T€ïó™†:†‘À A¦©³ÀVÊÿôX°ñÜT¾x*_(èWŒrÅ,FwBl´…€ßz@¼pdÞù“”ÉÒ£§kInêÿmÝ¿m›ukªmt‹vÊHèÖ¬´m‘×DÀc»ï!˜‡¬”ÕQ,ÐÊß~;-Èæß´Cx¥Y¤š_6‹ƒ@3:C® “y&e&Ä‘ªF¾'Ž¡Z¥¡ 3Z¨7ÓË™Š«1ZE¬:N7.† ¶ÜoZ ´I6“¾0¾’”ñ–òZ¹`'ÿ 1¸o.ÄÍJè×"4ÐLi ËÞúZÓÊMD›ö ¢Ôµàùs™ö$±ÜPŒt¤†¤Ú‘„ëêq ~šN’ã Ú³R<Ù OGn¶½pãµC4è7¥+U^ýŒ ïØ»½`ßx'ºã”pȇU¬f5)Fõiõ ÒŸñ¡8â(Òö-œ˳ Žß&†k†ÝäÆ@™Nð ´z˜y-)p;Ð(ëüš(lCR¶a-œãB-‹‘Êɘ»Þ+„KƒœÿÝßÅ–9¾FÀ(UèŒ7¡$,H»®hûˆhT—0‰°,Pz°yXX±‡ã6Ap tÔJþöyÏÄÜ`¼zc‰°w2) x„Æ+@èÕ„Þ¤.ÛBô b»DׂH(S|[9éï }Ç"âö)ÿj¦­vCµLó6Å.Ô­=¬EhC³´,¤õÄ⛽dÜ¢±zïIz#Þˆo„ëˆ{#¤¡@­ùpÊn­‹¹{ Ð${!ÐØ¡þ{[ªN}\E¿¿ÖÈ÷$×Yšäe•}Â?+ö ϯÍæqßR}B/ÕÇÕ­¡±Ò.ìÚ†Õ.of%.bÐWäI¡„Q[¹Üy³B£ð%èÐZÉ@ +lÒ>_Õ²ÄûQ¸´Ä—¯B€xMò“E ¡›hãäh䆩u ŠÓ~ÅÄIµo {v£ÃvIºmVÂiÐÑ6z`åfp"\Y<¬øÆ;C¶Á»T1#ª˜µŸ]£8æ~oqÃx+Áɲ?µò®·:W2E¸½Ö“/¥OY¾W7ÎÈnnç@Ä(>ÅÔ,Y7_d,(Ò ŠŒ{"Á»êÇQíKU¶|Ãb×…Gô,ØD~SÁ)Ôe›f/ªÕ`ã¸áý=÷¬dåî–ŒÞÙÀç…Ò<¹‘éûp ÇæQÝx˜P€šŠÁœ÷=tuÕ6êÞ«”÷)eÆýAÊŒ¨û€x•û ØAú U=ä>,¾qǤý]|=êfÄ׸úšP_Yõ•S_“êkJ}M«¯¼’½?¦¾.¨¯‚úº¨¾Šê«¤¾fàk;|=î–I°[¡ªB'Kÿb‡”¼}x9ôöáã Þ>|Ü{ûð +FÏáß'Ò±ÃpòE=ÑmBÃC#TˆxGPÄ[QO+ ð1‘|“/y“·ˆä^L.ÉK¿F ˆ÷`Çmä Ÿ0{<âܪôá5!ã‘ñùFÞ6|msdM€œ˜r1o.ÃÇ_ï ùFùL!?‘Ó¢cp8á-Éç/#¨<ß º{67 ‚ÁÇÇèJVIˆƒ”|v:S̨(–»2‘›v–™™)̱j¦<ŹùÓS¯³{DEøJ;:Ô¦§×K™ì_|ôŽo$/ëe±Ç‘hÔ¯,>-Z™\Þb§HŠã)ù ŒxypÅ“-yØŒ9Ã=¡§fy„¦6†"#iA9‹¥ñ=ê“óÊiS³ºØOÝúgá>—äB¾+„S·6XL末F]˜+'|¯ŠöÐPz Ò +Ò ACA•ùmãõ.´ïe ì+°bwÁ×f0eÿÀn3 +èl•pdWñ^”Æ`ÿ*=’›DÇòêø§Ê«#SLA#ƒêÔs[̃ZÌmEJ?ðŠK³½+·É뀪v4¤ÛÅ:¨€‰5kÐEb"Ú4­b$îø†À @zû¼b›Z•Á‚$ái³ ƒé\îDF}5rCòáˈ¬IK%ëàÕÍ(>ßç™Vo†ªxo9ž›$ÿ°¿å®86ʹjª?&LÕxôÂ.<É%ÈÕ?à1ÆebR8¨¼±¬·z[Gb{@`R<>^f* Ö7ÊYyà–9·>ÚÝU´CwÑ?äa„ž:]ª[«Nµ­íÛÚ6ÜÖöok÷ û7¶?¯…Ì×NG÷…olþ|zk تîÊͤŒrsrë(¡F¨T¼KÜ>õor˜vÏ ã¡Ï^§ ¥°JP¾åˆÄRüŸ{Š¸Fp®š«œ/UyËd`@oZÉTU F)ÆfìÛzÇÆ¢À#Óñv“›-’U’ͺ¬‹¾9ù¿™ÊD>¡ãøQ™ÎOVjù +ÁVËÒÝ^Pøqdãhž%êJ—GxD³‘KXˆW¹ :¡ ‰õJÓµ¹¾µóeÓÁ«${è¥7Ã߯f‘ëW×/e¶áªº{J +î|5ê‚hmÀ¼¯;á›mÚl%ÒB³aår  ÖAˆ"#þÍ*G‹ã]"G«nèë…¤º5³V‰|[(H[Ê{ÊmOûüêh:·Uo6Ë®6®R Ý*%#m‡$ä +2êeEâ¶ÿT·ÿÔÚä•êJG(ˆºÓÛ +Ò%AV‡‚¬– kBAÖuý\Ácbtwû¹‚n?W°K\7$Ÿ$õœ:ÍÛ½^¾A+½jIP””‚¢'ñqðµîzwƒ&8Õ0PÜMÞèÍéÌÝ‚ÖLæÐÞŠñ=ɼº™VÚ5R¯§8„`¼zÌxµz4AÒ™ø6€“Þ¹ð¢5Gv»Ï}µ7mÓW ÛãֲŗWL¾<(«ƒ ë)¸Câä·®oiçÂ-¿¨(2ËOJf¹‹檆%eø­êî$>6œa9ÑD0gH‚—]êAl îöß.ûDÈY Ï¸k‘çÕ/‚<'„C°8Jœ#‚4±HãG2]žoÌí^ìÜ^- i{ŸH¦áM”>ž³ÉMbZ8p‡Û"‚q‹¬t]l©|òmŠO¾ éz´¼¼Gx(ÀýkîJµOšÍ û• + +Dæ» ò_+:¹0O°`¦Õz×i(Wº˜£·É ¿°ô×4ȱ=ÄÚž_Ð ÿˆˆ+ìŠö÷3#LÐ08ÇTQd¿V6 /U«¥‹Lüã}-MxAù¯Ñ°qüVZÙùŸp =D\6€‘Õ•ÌøB–ý†…~} Í /kÙÏÑ·ì"2±£4+Æ´z³]ZyX[ßS>—=Ú•ò`¤ üÆÆr>¾#ãQŠ&m+5ÔΤq¦Q!¥r—Ã¥ºi9¨=¡)£Oˆ—þð«÷JßOô!|DY®…ÍJŠ†Ëz›žù§€‚¹É\™÷¯6·¤/3í´~9@|z\ YaÑwšºäe±|qe‚Ÿš2Yýž‚ýN à'ýu® +z „¤wdkŠ›£ßx6ÅÊFlØ#+¾Éa¤ýØTY@2/ÃYZ´cIo¨ ÞÊâ²Ù„)›M‚¤“¼ÃóÁ™ÍÃØq¥# ß&j¤ ¨–倫P‡ õþ„†”õ,™N ·8›ý ôPf«?¡Í~S',³ß+Õ ˜°ÂLÀv +‹zªt•‘.èÑE‡Øæ|äÕþ®¡¥Y-=Ó±gïv¹ëñ¯’)2ðfÛ„©è7ÖÝBÙ¶v)|È"îö8 ·‡nÍÇÝ^è•m<°M¶óÀvØÁ;d úRJÈÈ ŒK«8ðà"£{ƒ£·GoŽÞÝgG#Z»8Z»$Ž»y`· ìá=2°—öØï +®awpôžàè½v4'ùmšðI1’‹ó10iÚ¶ÏoÚ¶ŸCzèöÑ[_$Î`²ÝÛ÷vj|Ò=ÈI’t÷«BäÓ¢‡ä¹&éV>w?&j8„VÏ)Pæ¿FG‹’)ÿ#m‡Z·ŸÏß~1Å$>j;[Á¸cHšã–Ϭc+3g²÷íò6]Ù¾AñÀ)‡Ù CA’EÌ}R÷Â%•ó˜t(‘tOùh,Õ?jfòè1NÝå³ú8•Æ~2û «ÙMyâ= wÁjN#-†—øðüÇü½!ÏSP_݆•ˆ}Øt¤z@Y›(9Æ/Ö#ieÂÆúáÍHÉšöšÕŸ!ó‘Û< +[<9žÑ•5k³3ù5Ѷ”IW¿t·Ñ‹Òamog!°—’Ùî^B¶´•úNÃß9ê^7Ï’ö;çóöãcõÓìÆv²I~;fXoh3ŽÌÏÏ»çñ"™°Ý°Š‹o>’¥]Àyì¦cNRtÓ½BG‡Cò^·qÔð†ÐÕ;¤â^òŸæÖð"ÏŠkÔ1ÑL<)ubî}šöWɜݽÏ+¯£­å~’×ÅÜ`_DÈMŸCq¯²ã°’u%ëòû0–]“¥>""êE¯+›:Ü”¨1CKˆC>²¾ îì£Ä'5 C&Kî7ø'W `=Ö›€rm¯‘Ž¾ì%¿ÞŽ6Ÿ›_ ˆ'öGCäžÆ²ß%_gËx¸ =îá/Dô„gÏÑY±˜ j½]¾S‰ö!ÒG»Œû}o—Ó+üì¿> +®½µ„>[.`}¾ªÞ\ô¢?rˆräµ<º‘w´­/~ì§÷åx˜|1× á—[\eV£L¿¼Úa©ThVoX„aD?àh:¶TS³XûÅÀ¢'†ö,¸I§×âéÚ?FúB—¯˜ˆ¸•†ô]U¼º +Q,äL®ZÎOT˜0ßɲ&*•Å-I!/B$ +ˆ)iËð)l\]õ]e5 4Ò|ùQ}Æã~öÓ€˜ìy-иŽH%×Çí‡)Ýó8 M +Sœ'èÿÊ|Sg­ÿźWä›:‹Ìý:¯v&܇™~7¢Ñ£Èy‹¨·É”?4[Œb'F¹- nýÿµs«àiÿŸœ·iQ,h³zÙÛ ·yÂíFX6}Y8wݨlª—?W -ÁV(»Ë†Å(±\Q¢cI ¸¢®Pk«W­)}»«Ä*Û%@£îjwøêv׊¯uîzñµÁÝ(¾6¹›Å×w«çM ’«ôHñHo:èÉ‹maÉôäÅv¼Äµ}‡ZÛˆµž¼8¸¶Ãã™}ÆUåùÆ7uBÎk߉ì]à!“y¿Y¯òÆÒO<ÝÈ·—wc€ø4/ /k›Ë¦IÏ…I‘¦áœ.~ãæYác=«Ü¸+ùoºrŸ%WîYéÊ]b¬„Tj ¥¹À‹å°„"ÂåL6îý­—¬Ò®Ÿ–LwQ^+pA7|ßÙþÊ_Áïd¿tRÛ¯.Xë!ùÅì4±8‰àÂÃíÉ‚ù<Ï–±Ëw[Çk:R—6ÌêííµÕ±Ë,:Íþ°=ÅË“~cš¡<®ÉŠsôöÀQo"HïÍKz5´ª žK{$¾ÖCà ‡Ë °5IåøF : ð«µXB:!°²™+!°îX··Cqè½_‹ÞX+ì7o¾ à :ÇU^:u!’LÙ¬fÉ» ä¼ÈüÝü¸§E÷Àx|4¹wï^&´»õò†ë´Çí:Oá«ÒRé<ä¯V¥ðúktý¬ú‘ßüæ7=—úÚƒŠC4‡hmŠ†/q—‹Æ!qé +JbD5‰Ðjb¡ÕĨæŸþéŸT5É¥TãÜJ5| ?¹Ñ·àèÕ=:Ú0÷?þã?²ä׿þ•%Œ¶6Bô§fÁR¿ùÍ߈-:~Ú†þ¥.©ÇÚ¨\ús«ýÐFMõfæÔý릗bm Ë÷¿ÿýÝÜæíƒ[=|^½Äum|%¬| ÞÊ~ˆ5øG´6ðîh'4_Î…aOÃK´­íùaH0ôÿ=nk‚†?ÙÖ–:z«µj[ûêW¿´ÔmM¢÷Ýï~w‰»W@æo|ãÿXâ&Vó-nRðQ1YoþdŸùÉ>óNVäì^ÎÉú;‰ŸŒÞŸŒÞ“\R½ó. i-†ÄÿÜC_·ó'œØRgÈwØ¿NL¨•º…À´7ÒÏ,{*’Êk[ûL̹Tq²ÕÆ ›Ü¸øÚ(îUÚœ¸r®Ò#¬Gz½µû7º¥õȶ@oÍüc»ÒäÜŽµmÜÌ@“s{¸&gÜÑ ,ƒ|×þ*þÌÂz•EkqÀrÔ.*©âUÅØfóKÙLá|9S¬ †fbŽMæ  @û Ô¿d©Nß”ÀèËó(²ù¾òd©X=•¹˜/̱± +¯#È£3z–ÍKHY¼eL¡ÙJN=n¬µ'ƒ⪀°èYa_šÉé€í©L&Ô=ù"µ¾¹¶°‚»²KCå|v$_ÌñþП*VXx‚¹Œ2"ȃN§J˜M– +<~”#‹>zÏ—s¹S*J¤JáÃW§S¤ôf<’ËL*€T)KÞ˜yŸOp°ÙrΪ`Њ6 < zØLifvFµÊÇÐœ ?]z87J…ËÝ7%‚è{ tq¼t¢t…¥f/æÊðþznf&G}po`[lSkiêÔÂÍ1dRfƪU…1¯¦TÄG¼Ëya*%.tÀÅŠáâÌl¿Ð ù}¼#K—e°Ëà0âï“N¿ ¼Ÿ2Õ Œ‘|¼+WYÿÕÐ{8þ)r ØÙri +?‘)³ã½,§ÝiDl÷nÅ*¥B>+†—¸Hr1SžÊGÀ¨†>ÓFôùÒŒø:Af6| Wó™ÂPf† ¢“øïlÞ»b6SÉÌ•fåÅ®ûr¹ ƒ™9q÷}fƒâÊŒGé*¼ÇŒsªX•ÿÏןLµœ¿r_q/Áõ²9v™M³²TТcð!ðÎ@à>•,áèÞ¼„ñüŸ‰Ù2¥ûp†wq宲¤óée±u·f­mÀÍÿy¹G›B²‹_¿!CíÞHΕ;êælÔ­Iž™J¾S›|æég¤¾/vþzàð«Aù #S;‘£ÉÈ©ÍÈjŠ@KrƒNiMþ}DÜ涋èeÉz ³<ùëó¿'É?šÿ¯2à +UgòOþäO$ÌJ3° +Ý6Š@Wò_t;Ж£»“wì­“0k“{ÇT†uþP¶éhòòå’~÷èoþæodà8?.ü– œ0ó àQ{Ôâ¬Ñᇃ58¼p‰8J£fà˜8nN˜P“ytR2»œG?–ñäÙJz6&b -‰tñ;¦:m×­^I€gQq«_`5ê^j¢Ø;­ÜwÝRî÷Œ•;õCå½EÌÏZ¹ï¾ÅÜö OßbîsVîó·Ô¯ÝÉÏ~öã²_½D¸çÖIˆ_ËÜ{­r|7,iÐý£ö ÃÀÁä›Þù&x ¹W¯ex®\À þ{²Ì[åú¾D ¨…èØ-Ñî ˜ßØ"p5Jó]ˆX°´eÉZ¹žÇøÊ••D{‡Qîø­w‹¨¡Î¬áHx ·8†|MÏÞbÓë5bzŠÂ.+wŸÒkÙòæ\a±9–¸ÌâÓ,ZfÉ æf +3ÓÖÆOØlÙ”`DY ²ÎÓÜPÄO ßXæp.­âRÒ´ðA¼ööuƒ@-Hˆ–«—åk!2P àÄܨ`>¢íÊá?¸<‰»$ý» +7foŠ‡.ƒpµª…,‹»næóJ 9` ù«KLNþÅQ¾iOÖ_E_ô¼˜6³ÂûÐ Íx–U ÀARæF·$|Öƒ—'Ž²¦zH}ÜiKœú³·=ô|úçêAZÙ®‚Ëz…p<ËÜò°x +´ |‹·85NÒ-“ð,âVP²¶ÂJ¬Ú‰kÑ—fR_wj:%¥iÞ,͵^n…¨M¼ï…¿8ú¥ÃONÖƒó=÷ô7îþÛïßÄèúáæe; ½ï;NbÈ0û»”^æ² Ó aTH¦Õ[ùÊÅÈoäŒÖÅòìœà ý‡i9–]B{†ì<õam ÜäëPµ»N‰ÔÞM/oŽoR‡7 Ù¸ÖùêÅGd°ÅâË׎Yí‹ÁL”§z/€¢ Cž±aåñõ­l«Ì#Û´ðZhœzç‘)ùžSBß'èŒ÷î ‰/±¯Æ¿¯Á¿¯MwÀßì÷p¡¯3¸ÐÜB"Yþ7—R‚d”?¹xOHiðSö#/¼>°M"ñi¦·&;~ƒ’D6na ;>.;Æç[QÄ2ßØݯm^Xx¬óŒƒ€&_œ:Qº÷ÿ´cûq:ãYBÃ^òÊd›­Tu‰Ò·ÌØ•ÊDJš£Éæß•AäyÿMIŒ¤Çô(Ï’å^S.-ѯMI¿)Ѓ +è¹[y)aBÐò —”3ENðr… æfªÓg(Ä.€ôÌxKñx“9"ãòUCŽÅUÄÇñq@ÏçÕÓÍ«›Ö-®9vÅðî£û>ñ”L±ÄNªÝÿ.$Oêô2p… ÖÉFì+јÔ9ÑJ’Œ3%˜‚³§K_póYe2XýEo„x»®3oÔÓxô ¹ð ²ÕŒÅÑ%¾žÀùÓD†%Ë|žðáþ¿/ 7ñ_3*ïÌ3‰]h íUÄ·’鎑¯¸eÖ¦n¶O½¬Ô"X\ V'i‡ßÒ2·û2/£{WKɼ̗y¹ƒN¤—’y¹™܉$öîýƒ£{ùõTÌa'Ò:TÒ>#!øÌät&ª4ªIÉ5x”«¼çýöt‡—ô‘¥‘ |¤_4s»/³&ý¢™—ù2kÒ/šy¹™yÒ ¢*u·¤î6ˆúâIè½·@Bÿè½úGï-°nô‡x¼àÿÑ®éÁÉ‚ ^o™pïŽÄG¨ ‡Ú(ïK2“â?ÜLZ€nòµP;´¯»*ž¦[Ðbß[u·:dèÖÚïQ¢]ö”(«È'.îMÂ÷N2‹Ã[ «åÛ~ ‡œs5àÙneè\BH±ƒ®¥M×éaßê=Ò4ø ç6ˆç”zX 91ÎÊÜQ† QpÌqUz µŠç-PŸŒKuN—ìãÍÂǯÛí‹YmÄð6ý%“Žx‰wÎO·`¥[ñoîýq™“ðéMZ€mŠc «•MNtô¦öW ·\ËÔ§½Ïm÷¶mOŸÖo8¨Œ;d;T[û|mí󵵺câ7¨Nú TçîL*GWMçHäMˆ¯< ‚3TvFÅ:๪(²fsvkw@”gQ#x œ†Sò^½?SÄmF„<“ÆÜnѲ}]¢5œøÂYÊÜN”T8S§²¯Hßo²Âsè<°ø¡s­,iÿ©†Óí$Õ:@œ©äùé|És”’¡¹Bé2›Ì³)°È¸”Éà&rOÏNNŠ@EÊNÌ¡³ÓñY^ŽoäzNF•R¹zj¶ˆöDú’'ºÞ‰`Vtœ+ýÑ<ºÑ ʦ0›¸Ê¸I*AŽÂ +À]  f1€ÚÅê¨_  a1€ÆÅšB¬[Zèö?8—Í°È8<‚i3­^F 5=%ž¢,?|€^±_TÐFþAv€Sƒí>a‚ÞtÂ]¼}µ²þ›Úm«(kÙõ­øJ{/‹iç{n&3‘cQð ï3|—égÈÀÁûUásÀ_éòÔ$qØè8ÀŸÞé)8à¼Cð˜~ )Tä…=zÔ)DÄWÅ»e©Ð‚VÞZAq@ [æ("­ºÞ+‰d¾bÿo†LîKE&w2ï¥-@¦ÚV£ÇR‰„¯+it^pú]ÚóQ #AV—a¢eÏ‹&á³Ôêxט–ÇwõUù¸u2 kRòIè&Pu&ʼná#q½ÒËòÔ&ð>ËÓå»õ¢ÎZP+FݵÔôåÙ…ßgGQT#µ-ë„?ÎVǵãNÔåDÁ–¦…*ˆkÍSC:´!+RÆÛ(Ž»ž æGö‚{½Gö‚9XÒwòj®·Á* ïÞjÒÚ+饣TSÚP :öÁ³QÐÛA9ƒA|Ô1†–ˆïMyˆŒÉSݦ´ðÚ)*XO¢émý!ýRÎ +ÙR» +ÕL‘/|c*{cJž ;ù²Ù\v;) ”-¡FÌ3Fˆ×ó{ÀÁ"ÏÎNØb·95%Ä+óæÔ"¹‘hëÐb5Õ Ê óèµÔi¡y<¾7ÙoF@ôôÀïGhˆ.¥’FÔÑä[´KéÄ”î„ê`ÓÁ»IA’¶øã·¦ÄÛîæ»™öû<xÞÍŒ9q³·6´î àµj¤€ÎíÁÚ{iIà”¿9%$Äcªd•â¨¥ŒÇÞ dY¸ÓA’‡:=áïôúëÛa-OöÊiG'µXVŸ^Ù|™.¿°? Î S[=?j´;~UúŸŠ©—|”£l§_’&ªXz‰6!ÄŠ½ê%ZëqRàî– ÄÏïàŸ"=+¥°Õ±ïãTb œ£®ÌÒѲÖ$N N½&N§ÿÑÞ%§[Xÿ\{P&” ”É53ÃeR Êß ¬ƒ’oVõDþýãŒO¦Ä.6ÔzeU…[q½mm±í˜âMí6[zh¼&åxÝŽƒøçƒ Ù’’‡'ºƒ¶¢z!N~0¢íˆé£Nœ›ú¬·ª°…}Þ½s§µO Óš'yÓ_™-è[~:RÍÁÅ›±1‚%kë:¾”àJ‡¥Ž#Q´ªã´”5 Œ_]ë‚ÝMH³>œ(uŽ;5Bg>1]CìYŒm=ª¶u§ÖÓôø<ÿÓ!BÓŒ\ñl/…¾»^$}?Å‚hæ£ï®¥Ò·îô‘£Ã¦0VÖi¸Î&ðÒ¨u`^©Ú»á¨^×Ëj5Ã1V“?wüÚž3è=Í•)|´¹‹…Bì&&âfįbÄhæQŸ¹ô&´5[×GäluÅonJ¯WæóÑ{“nù|ôÞáZ.0\rv5¯¿dw\ -0!üdøF…¬'ÑX_@þ©ekÛ¾´\×_… NRªã¼9-"H‹›¾¥S÷-¨®üÚˆOCj³J¶"1ˆ›ŽŸ–ËYR¾×¬tÿ ë9q‚ùæï•_b/C¯¼êV{%„NQ°¡ýóšNªõÿÌÂZ/N ÿåßtë÷ùZŸÕ£$”ë§Ñ²Ø¡áEp‰€ ®YŠAÌšÔUý Ã,…#ZœðõwBó¹QàØ5×PDñYMä±9!=6ÿóóq¹D9-¸ªZ \™rVRW³äᵆæø|¨pXlM`¿®( 9#TÊ^@ö1Þ†·=9?ßÄD`sò:°%ù\ÞÀÀÖä“&S–'sL:’“:°2ùeX“üŠ¬Hþ®ìN~•‰ÛÁõ¶Ã.êî§;€É·§…ñ`ˆñÜ‚:ÀDÐ뇱©ý;¦ýCKI­ý{m/ä¼ö;‰w/¤ý³2ùªÐ¦˜Â7³¸7}v¶2Mž©Yp\%  ×ÒÆHçuœÉ\áûöp1›»¢ô`UÁ?P“Æctˆ +x²TVïÍ„r®PšÈTsìÜ\¥š»(+@+å/ ,7Ñ&j¶¡ËÚ1ŽÕ£›&“&ñ¦óÙ“ÑrîRŽSžÇ[”††dfª³eõÒãÀt¦8Åë“?^†WÿØ9é#µWo¯g*Õ3¥ÙŠO ªì3<Ó%h3¼ú.YÌHµã©\ŽPbù +–…Å—s•*ïzJÈ–F2¨ÑÌ©âÈìV!V°CÊOÐOTg3Yöèl™>¡nL Ž +ƒTG…•Š¼%ª ú˜®à5{&þÑ^@Ÿ¬K=YÌROCà˜'S°b`ÇË¿GÚ!C¬ÞÀ~Ôv»Y‰“¿pü)ð|gáN?ÿ7ÍËÊTrúkt¶ZN/Ë™)’_à ƒCI¿âS¸!/Vr™òÄ4tÏ }žÌ¢¡y3ä 1Gvl2_®TÁC„ˆ…a C|¸3€¾1‹‚yÇEy7ó\â…áÐÃÃX*@ 'cvüÀzð ÊPþÂP-féÙÑr颚€„µx T +úB.±îð#*ëî|ÑaœâŒ5¢TädBˆ<ÏyªŒàøØ{€HUÌú€´YúD!?qiàûš”ëÌ…¬Zø¬Oç«çs¨%ç0ÇåœkÄÙhçX©¨'•6c‡ÇUôøä!5tÇ®`¡|q¡aÉ*œ/ ÑÂ-J»gƲ®§¥Â 4Zùë7ta¬ƒç{p<’©x,=,ƒ¿a‹xŸeA¯ +!Îü[„ùBŠµŒÃöøc5!ؾÁÇ ¾¬ÏyŸ=©QoÔšO&Ž‘ù¨‡ÍëXÜó||!­Á¯zøâÊn­Îg¸è¦û;”¯N¼Š/±oxm,•(ˆ¸â¸ÅS~Hñ”$–; SúÛˆ\a¹ÂYÁ)6Üã:‚å)aá&â´ž…œî‹‡N·Û"ùíœßEhaq 8ì3ÈqÆ$[CFbÑ=˜6@WN{» áÄ`Šþ=‰>ªgè©´Uñ.]1_‡Ž;ñQ3|L=¼EáŽ#›8ä™9›ÙV˜Ójè ˜7É&°«"Qi¬ï²¨¹¨  Ö¡_T0 5{Ì·¬oëPc¶Æì™1¨"H˜ˆ ̇EuÃÆ0}0 nˆDŠj{Šx 3tÚVæçõ¾ã ÅÄ*¹…›év +]žmdKm;H7šQ²æÞ©W`"ÍÑôЇw¹wvuÝwuÉŒG=ûñf/ý‚—™}äú~°£oèaî Kä‘]uôQ®&›/³úB©tav†Õâ!‹ì?XwCHÊã†& AXìÓgk%ûDz6שó³Oî°R·`,^Š€Çíè>+úË2Z’}ÂV¤„}^FËW‹GLi_*(r4(òlPäÝA‘é ÈsFd­Œ<ßuPüZ’‚÷ˆôž”Ö}òt댕<ó½‚gÞ¥¬÷ŃbbGZQ(îCŠ;ºð³?PxØ÷KJÈÍ?@^Š4Š³M5d,6â\9îKyÄ«¯2xÝnœ'µæöíô¸5ÖŠ‰ù ‘å£l)u?´pÝЊQÖ¡`¡¤:ØMÁ%>¨¹Í>ššÔCŽ<5°ò;±Ÿ ÓÃß…Úô°Õ¦e}Š6©Šý%1y˜ÄÒëÄkì`±ñ©ÍðAÁ×Úç—¿wÌóKB>šÕ>š¢´LJ/‹ÛEÚXÊìÑqµÑêú&?Wc÷¨ˆ4­ÂZpBpR¶y‚̆R2鳇:¯ÝÎb¤tzé+!h=˜Ñê#MD]³ÜNV]3B…€±¸"´aæ š ®ÜºØšÖ@Ò¡&¿]n<€tãžN/NºñEI7LºñH7¾0éÆo™t¾†™¤WüPÖG“¨È„iXÄh’]”&Ù`šd Ivašdo‘& 3i’U4É-@“œÈº„)–[”&¹`šä Inašä^4MTÃLšäԺ݌kØV²O!¦Žœï€Ýn x¯á•¸8;™Vfh ðË‘GMU)í ap ¶1÷yñ²páÍÿ`sðˆ^–Kj“¡s†6ø€s–XëwJëQi¡kšB´R"ñ¯(túMd{“‚ChÝ]ÌÖ$ôƒt‚{Ús¦4·6q"DŒšw/@‡7|ϦË鹣ߣ–L‰–€ß#(â3X¯ Ȩíñyl‹+¼óff߬¼FU[¿ù9¤·©%ÅL÷â ²ŒÞ¨ç}$Zä +!‹h×´:7M_ï—5=Ì)I?®y|xü¤ÁÛ?+o”D•9LLð-êdß©$QE¾˜¶0säa߸ÙÛ˜Ü&ù¨sA´*ÜÿójFö“„=˜M63á¨@HÅ +i±|ƒ÷Ü6ªçŠ1 ⸒ÅÄÇòcJ~<$?‘Yù‘“òc<&Š¾0–È ðóÁçUŒc}_Ê¢ÙóR~1ð&¥M «j=ÍyäÄ€v·3‹§m5;jBÉǘܵeÌ^f1tV¾q_¾œyÈöv߉%t_ÔÛ}QÑ}ÈžõŒ™%Ž‰ +5–‰7ÑN#ö•ÛíÒj÷C¾v? b=ëðóÐU¸ˆÅqJX3dÊWÐ#¾ÕK +‚p°\$õ“¨ ¤±‹ž‡z#n›Š£)­µY€š[ŒKŸÓEÚ ¦=eàÑ&çg½Ø õ™UºK¥Ó_]Vœ*6±†•<ÂÁ§}ÖgôjýŒWÅð8²KçluÍî2ꚣ>ÝéþÚêÜæV‚¤ë¨kÌ=·êÎb[ åV="zIå¼ Î?bp—%Á·¾9Ø·áʱ¤U­ÊÆ5)Vá¤9‘úR¦Ñ4È©l®®QÈÌ>²ù!¾°x”&XiøÞ'ïö^Aiµd‹”X` aŸß÷`&Fu‘àX‘–UƒÙóeãCÛ[~ßú¹¿Íyö·1qÊÜ›²îÿ¨Õ[l?ôïvì“+´Bk…–¶9¤P.§Î›Å›óî ÃIŠBuk®êÙÛ ³QÈFI¬oh¥èè'V'Rj#¶¦¾áKcIá;¡"|YÉá¿å¸“Óþ˜_'ø†$èþj¡VÊ ºI¾"H‘µÜÖ¡“¢á5iŸ¡¨šˆ&Ô@xåЯ%Á˜;èMy]zTu,_ìWp¬ŸLYQ<ê)#J[ο^ÍÓ§=‹ÏZ±žõ¥ôÒ0´4¼ÁôM”]WÅfn6×Ýu;Q±$uÈå€è¡5Œ}3ÄP÷Yš¿”ìðä…£ƒæ™ââXÞ(U¼ëô®;í+ò*þ½æ³þ½ŠU] „½Zâ®ó# gæOAcqĽÉuÄ×›=à"ú-îO‹ñ{]€F•Æ-J¿WFìVÜݳJ8øVkþ¿ ÿ¾=%MHïàâø}‡\7ß™–Pr&¿K'/âÀF¯îPÆ«w`iGùhäcëŽ0ãUÛ6s¾ñ/]Èz­#zûBÖ«v.m¾ŠFœc¦%T,¦* §…ÍW®lK12¨4Í,ÏUy±lìÊq¯Q§ÏÊslÌu%à¢4ÈméØXP¬×bÍ[-ƒSQ¦mšŸY¶h`¼ˆ~XɬUXµÂËIôn|‰'‰2øxÓyÎꎰ49ÏÎó¿'XúSV³ð2¯EÊ /¯¶Ymjkñ™¦§ÐÀŠpV# M[°Wš'ÔS ßrðfŽqË5â&ž«…9€‹òc‘àe.i(ŒNÁ çÓÀµÎ^g]Œ&Æ´Ö¿oðu]¿ LÃ08`ñ·¤)Ð3—ÎXüÀÍaÀ-À­aÀ­Àm©QÑíZ`1 ÎW‹Xæø¤ ˉçR{ÕŠç’PΤæÚ;ÅŽÛ+vÜ}!{Ø2¡*¥*•V÷˜*_A—|Ô]âr§ŠXmrVkÄÅ tCÀ5@×jS¹'Y'µ5([ ×IX±â.±»nXpD¶ÉÞ¿Þ!˜õÆYÊ‘é1‘¾!¸ ”¨ü™‹n4Ê eúçEú&yHöâT¨8»›1Ó†€LžZ¶È fK‚jØ*2lÖ¬®Î`–<z4 ²1hÀð©Ç„ÃÇm/I^BÓ·§ŒÒ»œä‚髹·ÛÑ +Þ˜È vÏ‘œ¡â»h©|*ÜìQ\‡ \plÚ­_¬Uá…ÈçJ“Êìq·ÁÉ“}$¡Tf¯®ä¶c£&ŸÄ„|Ò>Éëí_*Ÿt@ñIGŸ´ù¤#a|\((dffrYzÉÞ ýJ#d¿–Œn_ˆWòç4®ûLç&. ó}ÙÃQ[5ñUâÝÛ}¬O^¾/ZÉé·Fب`Æ'˜qBwôª0“£1y¯=2Mønªx÷‘˜ áOÝ–‘výÊb­,†ËÃHá÷¸3¤Íó«2^ð°j•™B~B^òw’ÉÄZó +ö°þÖy#Ïú¬oEDÎؾCÁI¨pÜ…Ò«·vÅ')…s¤Xñ뀼 ªÎJÖ¡žD_gr`7+ç^—.¦?‚nƒ^§Žpäðk@Þ„–{4%ÏMàÆçë‹À›ÔêÚìÇöí¶clÑÒZÒæ–²I©6J²·"o\JñÙ6êøÚÇDÇFják«k‹Xü]Ø.\9YætR ²L0Cm\Š‰òcÖ!ej²ß^çã |«­Ô®ÀQ¯ºðUÃs–«Z+²>ù­rw’€Ô”©®BÉÎìIñ´îB!hIaÙó¾ûQwuZ*³…¿®›(ù” †8­]4;âvVr}ó¤5 "³r²S#r`kü{·ÌO¬®}i¼ÓÖªÁµÎ8q­ ¢§=°D®õF®Ã! F{ÃE…q«x¾ñÑ8qí£‘µGbtnA’ƒrëc±9ŽßY~Ówø•ÓË€òb`¿/fùŒ«ïúnx©xW¾ Ü#˜ž78À‡+ð2Y… œƒs!=SF éÙâùüÅO°ß$÷’ZüL™Y˜íÃì|f}é^6ûo>FF$œ-¯ãIuuøBVSz"Â5¶Vu90 ·b‘­1Ôµª®vs{$]@­x¯ÃÌP½Uj•Ká9ä„8U6 BLùú±yÉFtýÔ”"3]Ën¦9 ¢–€Š6UÔl«è}eù–úÖ”®E,ø&pc(0؈úeŒm˜ÖŽ—^A^®·e|(¬ Á-(±«dŽ«‰$)_"éòà/¢W{ªÑk<­¸µ‡/»ÕB}T,Ô›p¡>ê}øW¢>s%šo¼¯²];Ýôì¥íÒ 2¸¢8ü+—/X’EÄ _Ýá}Æ|%•I‘/D#×±BîR®°‹M §•g¸¨ü{ä+M5=NÈ2è=Îp¥>†PK _£e(S¸gáåSØ–…+ qˆ¡¢+5pÑÎn(S±TÍOÎ!¹ +2`Õ{!ʧ V1‘™˜æí˜dùâ¥L]³:òñJ"Ë„@ªœ/Néw-+‚tÆ“ ÒS‘ ðpq:WÎWy®-Æó¼§~:² òr3ø”µ]CƒPƒµ§þ|ž'Kl_®Ç|¤EŒ‚ÀvÎd‚9Ι<Û9“9 +žX£Ÿ.×üŽ2ëÔ'Ö]ïºiqB盌B(îLšKœ[sIO­s8©¸ÃÑn/G›š£ä觊£³(k+žÁF?ecÂÓâPåÙTyU°œqiŠœ(²ÆÊÃ~Éšæ¢9VŽVèË‹®E3ч¼¸<,O–‡ÉdyXÉÈÃBÈËZ†<Ñò0ä•|y`$Sy ÀTF0•‡¡˜ïƒß|wád¢Z7üð£àó±ŒÈ®ºÙU~SyXµå!™«ÒŽ¾î–êñïÒ ¾ÿfò×-E¸]°+Ëø÷çªø¨xe(_™¥ ÀÞ#ÒlýE=—”£æÀùŽ!#x\D?W(Ñ‘ºŽ5¤ +l`ÏQG¤]üB¶ §µOËtúñ7F‡qMHœd0¢ø´ø +Τj#½çÕžžÒ+¨O .xpÿ… úƒôÓFî¡Z};µ^¾ NÜ¡´FôAé w]ª"QU‰†H4T¢)ÍvÝÚgEâ¤2ÝÔ¡—¤­–Ênäg7ó³gílAàEÝ@›DNqµ×1¡¨5ãª^:J›±¢ô—vU¿˜ê$n’N&ßtuïnïî]’§öKqZ_ ·Àäü3òñ’'O-!à¨Ï Çâ|rÁ:um >?!ÿ[=qÄîî±ÁýûâpM…õ9<=yoô{CiWµiAõ{÷÷Ù¾JC0ÎÞÄø¢R}L´âDûãDx­ÿp4 +NÞíiì¾;ØGÿw6¶?Ô…¤«Ð¾¬Õ€gFëÚx ³‹™EvàäQdö]J!XÝÛG­ 8¬•­\Ý¢vÞÛ—o õŒ|Ý‘m=Æ[Û¢ëöÅ¿!Ûÿú¢Ààz˜ÝÞ•Õìôvß#lÝÁÎæ =ؽµ%ûOúf}c»ßG”[ow 2]†ñ !ãÓÔx¦C=°ÊQÔŸ¬Ãw±j3×a¬Ó;f¯›½dv*Ûô·s+G:pýÿÕ×LYŸ?wW\’aþZ˜>^#º‹9G¶OJÍËE-N`Ysí,¢ô¸[FèXAÿ‘ +Úv颾øj:-E¹÷Z+XHÉõÜ°W1ã¢ä–¨A}«l´,ó¦ã¸& ÅÇILÍÀˆ¥õ:U6Ý~Õi`Ùõ’:»B¶8'´Yo+;.ÒÑYbƒgXZDI§0Ÿh}Ú—‡ç úôˆ':Ï ¡ Ž­äѽK,°Øk´iReœ Sq7"3tôLs 0×\ÌgsjeÀªæNWƒµÚ´;V›NlÊÜ7k°gÚz‡íÉ]ªV°Š 6ߦs'Ë"¬lª§4ØB›%Î8 Ô8­ä˜€yñÙœøD:–§ûœØÊ€ƒE=íˆ_’”„˜µ¤|r‹âÿ² `VPÌk¼*ŽSâBÞ1ÎÁû÷y~b.iÌëNa»¨õªLM‡6Z|š:<<$¯Èœ A¨mòm`©àØx†;ðF«Ûâ€Gñ‹øç¢^îõ.W:ŒtõõЊ¬˜cÅüèÉ…lO~ðÁoYôäÉGVí¸Ù¦{ž“j?Vo¯ý%**aE¥B£_ç}ì×ËЯŸ°Ñ¿}*jÅê>|È¢ƒƒƒžk*L‚ŸH (øñäü¦@œ–ÒDo°TZtf8ëY ö2 ¾XÂ_ÿ4Y)0øN˜ñŠ€ ÜÅV6 t&‚¼hö¼x)ú';j}9ib.Ìÿ9µ¼6¨jg6ˉ¾jVIQjwÌÏÈ ÎU-vÙQW¡ù’ªb((é5Qƈ¦7nH¥m1ør§®ET½½®61’¦M3š!’ãJV)”“JF §Ù<ѱœs+§íÞ9éÆ<Ä@äWXܽʢî* »×XÐ}™ñîuv·T\Ø£³ÞÄáci(Cì3תÉ,tù4EÛœÏÍa:`²²âœˆ,tH+™¤'¦÷¬Uw¥ì¸ƒÜÒ±èã¬yËC)J·t‰efÝÄáçÅ×é¸wÁÛÈ»Qøe8Q|~¿ +¿7”2Î#ñ×r‚–ûð ±@!ª®W„^ /¿ß$?óñkô´¯­îȧåøuM¬áSÄp<ò†~|M?®éñ(ŸÄ‘츄ˆ›ºÌ›x€Ãˆ ñyºŽ„’ê2¦®àŸ«Èé1¾ï­ÉÖKוÖïv.Ÿg•ôM©¬}_<αÑYÆlKÑŒ¢¦5z–å)p !Jñ×Mqâètd-o‰"M&äNZ‹Â$@êo1lQä"…Ù +J Šó¶È â o¤ áý¶(²À$¤Ìê:Ù`L' a½+ŠœUÔæÇŸk ñiÛ˜Â|_y–‰C›låÛ-±1&¼…êj‹"ÏI?‡Fj³Û–lž™Q˜3‹Š3ÝÁîþpÐß»ôöö΃~g¬œB˜o‰"K2Œ¹îIRa¶dè¹ðÐ=ÏF§l"SòfÕ0+ÎÆ“£Èb{k§Cš*„óo¢È2{ü I<êÞ µ{6F•œ·úh¶¬ð©´«,éûŠþ+9/KÊó,kæKZp`ïÇÆ~I€‰j¤ µx^Ð3ÏXY¶8?<#¡°¡¿7 öí{Êljó•ÓþDübÛ}xÁñƒO Le•r±Ÿ6ŒÑÜ|¸c›Wý&…9=K:ÖšÝÉÿ’¡·ÿþÿÿþÿÿþÿ ÿþÿiconÿþÿÿþÿicon^Ê:–?bÛ…®QgfÿþÿÿþÿlabelÿþÿButtonÿþÿlabel^ÊBÞ?bÛ…®QgfÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacement^ÊD‚?bÛ…®Qgfÿþÿÿþÿselectedÿþÿfalseÿþÿselected^ÊF¨?bÛ…®Qgfÿþÿÿþÿtoggleÿþÿfalseÿþÿtoggle^ÊH?bÛ…®Qgfÿþÿÿþÿenabledÿþÿtrueÿþÿenabled^ÊJj?bÛ…®QgfÿþÿOtherÿþÿvisibleÿþÿtrueÿþÿvisible^ÊOÎ?bÛ…®QgfÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeight^ÊLÊ?bÛ…®QgfÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth^ÊNP?bÛ…®QgfÿþÿSizeÿþÿÿ *<?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="Button" class="mx.controls.Button" implementation="Button.swf" iconFile="Button.png" tooltip="Button" src="mx.controls.Button.asi" modified="1059073889"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +<class id="mx.controls.Button" > + <Event param1="click" /> + <TagName param1="Button" /> + <IconFile param1="Button.png" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <method id="icon" > + <param id="linkage" /> + <Inspectable defaultValue="" /> + </method> + <method id="label" > + <param id="lbl" type="String" /> + <Inspectable defaultValue="Button" /> + </method> + <method id="labelPlacement" > + <param id="val" type="String" /> + <Inspectable enumeration="left,right,top,bottom" defaultValue="right" /> + </method> +</class> +<class id="mx.controls.SimpleButton" > + <Event param1="click" /> + <TagName param1="SimpleButton" /> + <method id="selected" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="toggle" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1121281616"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1121281613"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1121281609"> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1121661005"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1121281616"> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1121281616"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +</component> +</componentPackage> +Media 1ÿþÿBitmap 1ÿþÿ +Button.png÷´EwDEàÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hhhxií’Ñ @!E›éíäNw(w*¯ øQa}Æ$K=™ÙÚÛÒEäFsW<_µ ,)œCQj>˜QYŧœïZqªuDÜŠSyK0þzöÏÏú ÀÏÃ_Y?AžŽ÷7šÆðIsŽ›$ÿþÿButtonиÿþÿButtonÿþÿ +Button.swf]>ÛB+ÿþÿBorderÿþÿBorderÿþÿ +Button.swføQP?ÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ +Button.swf‡àÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ +Button.swfqÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ +Button.swfÁ°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ +Button.swflÀ>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ +Button.swfQ?ÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ +Button.swf RP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ +Button.swfÏSí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ +Button.swf=i„@ÿþÿ FocusRectÿþÿ +Button.swfÿþÿÿþÿÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ +Button.swfCqí>ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ +Button.swfRP?ÿþÿBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ +Button.swfqí>ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ +Button.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ +Button.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ +Button.swf‹RP?ÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ +Button.swfŒRP?ÿþÿBrdrBlkÿþÿ +Button.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ +Button.swf’RP?ÿþÿBrdrBlkÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ +Button.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +Button.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ +Button.swfüH?ÿþÿUIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ +Button.swfÚH?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ +Button.swfI?ÿþÿDefaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ +Button.swfþH?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ +Button.swfYtÕBÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swf]tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public f‚ýÿÿÿƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿunction getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swf_tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ +Button.swf_tÕBÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ +Button.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swf_tÕBÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swf]>ÛBÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ +Button.swf`tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ +Button.swf`tÕBÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ +Button.swf`tÕBÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfatÕBÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ +Button.swf`tÕBÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ +Button.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ +Button.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ +Button.swf`tÕBÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ +Button.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ +Button.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ +Button.swfatÕBÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ +Button.swfatÕBÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; ýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€ + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ BoundingBoxÿþÿ +Button.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ +Button.swfÿþÿÿþÿÿþÿBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ +Button.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +Button.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ +Button.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +€M 4 1212170633ÿþÿCheckBoxÿþÿ‚ŽdE¢?@HêÿþÿCheckBoxÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿCheckBoxÿþÿmx.controls.CheckBoxÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPcvc5e1p0uh..swføvCWS&«xœì½ xœÉuXÝýw÷“<Àû !9Ãá fÀ§É¹4¦n=lvCÝ :GÒH¤Fcê¦EI#Ù:,9²9×Fr+¶"oì$òÆ^ËV6‰­ÏÙØZ'Jb'¶ÞQ×ÿÿ €£‘<ùvç›ÿªzUõÞ«ëÕ«W¯žÇžm_­11Ÿ››ûªØ/„ˆ‰³±ïˆkòß;wÖ»5÷»ÿî·¾öòïm~vø·WÞú@y靈K>ù'·þïÿ<úxñ׿ð[ßsM2c\fyO*“ÿˆ2|¼} §fëõJyx¢R_edBÖñ± ç„èhk}çì;¾á»7ýä÷Kw¶üÖ‡~õ¯.ž^}êÆÛ?÷‘ÓÿêãŸ>ôÙ{¾'«y£ÌëÉ\ÇOʯÛ]BÔ§ — •R¥ +ßÅšè½Ý$Òq™*._“´µKÅrMdnw €…üsº$3–ë2^bY+Ô1éBýz© ²=DGBѱ éðD6—/V.ê÷15IÍ1¤fÙ=‰¯Ÿo-ÿìíÿëþï^þÁúýòÓ‰ccÿùCOtÍ×O&þfãðÃ?+~“©IýبIºÔ¤‚Ôì•Ôl‘Iiq^üŠH}GQóàã|äßþÎŽ¯øe¥ÐøA™!×cä[_f¸ ¹TpgMpÂŽ ‹ŸŽ©°Ê ¤S ,—oʵӖäšØ†‘ÄÛ¾èÒ™bþ®ì¨Êd-l»eQm†ë”,‹ì—ñ=" 2‡i’¸ q„Xm@í ” „€öf{æ¡6 ÓÕ¨¶½‹Âioš÷eqVûû“±Qâ彊#˜ì$ƒÕÜUÕI¤pö.ž×f”FÍyIèÎ"˜ìïû“bTÁªFäÁLÜÙf† ¼“"tJŒûÚAŒ•b–+›ÊÍÑsbe ÿ¦­þ›Î`Ý "–R t¨÷ù òK|X‚]Æ‘r™Éžÿõþnkê¹O±|UÖ.;j¸Ý.ÒžäqZõ⼦Åe}XlfTN#X@Æ<ôHèÖ^:±öþ¬C“b›,¥7f'èÑûã$,& ›ÿp²´N†õôøÀQ˜Ï}_×! xˆ©çÐÑ«éH᜔ðRRRHaµ¿7çôý„$Ûs«Ãìjä¨yNŒÆ‚{ ‰ìêÒêàáU]7ö/ùšñÐ@š›I$ëÍ7k¯–›Ø-¼„CÑVM‘ç"!UÊ_ž‡|sÎ)Íî–G¨[Ê™ìÇüã£&tÂ? ‹Êä8b†ÊìÅh+7H¥œÆ|g`Ì”ü;tËâµÜbÙg1Žhú#G{XcÔ"žMâ±çcBŠt±˜˜œœì<ðþWþzÝàŠú¯Ýøný?Ï:ÂV¥#lQzˆÉøS•Ùr^J”§*×X™Ó¦ÕjW¯^µšHÏþÛ¿ßñí›å#²´¢]¦}0Õ“ â»ÐQÄ7÷·~M|,Õ—Q¿ñ¹Ï}ë‘•§9eîø¿øWÙƒU¶“*æ h$‹µÜx©ŸWOóê’ü2i‰"¥ë ÿèW?´v­ˆ§žŸ«V«m@YúFuÃ?ìøÃkå$)û¤ÌТì¿ý3š²o=úgŸ×”M®|ϳâ¥T{BÖ/ç €KFsàéö”„ûçÅ×ÄšSÏx "}ˆ|äÑÏ}ž#Å7ed³DÜŽL0—"µ6+W˯’CsMï“Ió7¥CðþÖ_ßã?éüï%Ü᱿øoÿ=Š^1ý1 ·M“ê D_§Eßè•BU¶eŸLèRmÙñÂçÖ_ëøÞ÷°-OÌíÞ½û¼èXú÷¾÷íkåÁCãBö6 ¾ô.»ºæŸa'¢ÛN¦x!´±_|Èï +4 ÑÒ‰´,µhydF°m2º[R2-Þ “wî?":ÚvžH_HýÍ©ýÏüæÇoüȾç¶ÿQþ “ ¨~P/»Û±öa £[´#?»ãÁ0—#N˸/Tg5þæšÞ"“–ß;q`4fç‡Á~3•JÖ/QÏ4Dñ.Dn¹…øÓï?*“z^ý^’ÝDdÛ„öBiÌGÍ;¨_‹ÖÁ.ý´ŽfÿÇ€œÈ®/1OÛ˜Óz²Â`.»û\(*V¢êVSZ‚Ú…x1•òä<¶êמÅï%r̯úôׄxo*µBŽ™åßÆϵ²«v!6ÊÆ_õâzŒî“üYAûe…+dF{úXI(Èõìd­V¨×¬uVÀ2v•ØÓ ‡/¼ð‚èèþZßï~ùä¹e÷î’ô€¾v5Òó”üº-k¬Mçò•«?¢ã—UjµnC\W‹SÕ|õÂtþ*#ÚˈþÅü ‰è7ú~çËg~;‰g.€èÑq< ü!Úë"º=Šk’ÖÊȯ¦dË‹­@ÆïC7’(É8h´­ ™ã[_·„';ã$d£Ò¨Û¯Š—gJ:ÎÄ¡Oä¯còá?I~ìw/œúíÕ÷v3ùë]ò+Õ|¡ú#""¿^äŸ*]’xÊ>+68‚š<ÞÿŠXû“¿óÝwµlÏwß ++¨–7"¾c€¯œ¨§‹SÓ%8yíQ~PÞ ¾0ô5xéÀx#¢}¶X‚S ˆ>ÙºrÁ›ìÖ]/þÍÜÜ?åÖí¤ÖÝ(¾õ1*§‚Ó¢X—Ñ0ô¶&eÙßúêÜ1zJu…4t…Ÿš{iîÊùÆê +4¸79]a¸Áò,#i™‡f‡@hšÍHàE wßʸŠÄþûß•’"éûLw@¶æF¸ñ +ÌÔ]Rt7AÏËéHDѽ١§VØvl1gÜmƒ…ÉÜlIÎz°Uð½U<2L +üÓ×ê…r­X)è.GŒqÙý s¥e–÷¥–Cq]¿¿GvZHȬݽ_yÅ­o›.Nöô 2j»û¯ƒüû |@7œwîÿ÷ŸüLíCYý£l³Lè ‚ÍíŸë<0=#ÞBp™ÁûÄWý£2mˆ¨‰íèµöá?e³ìØzK¤Æ†ä]=7~6WΗä¢);ú\´ÈN³þØK•;ñÏ5m’±»°—Q;·Â¤¡!Æ.Opöv̾Kœ©LÌÖ²@{;æš²2j·ÅSnþ$ÑÈÍÔg«˜?EY6h…ãé±~—XñÙwÈøE`ý6Ñññªâ< –»©ús¹rnJK­Ý¯[{õK|*—g*e98 ~¿L¿'ÜàÛD×—2ÔàIYE÷ß<ÿ 4É¢–ï}x:æpð»xY((»ö8¯Rœü߆~ùýφ٠$¿¯Oþ5×»Iôœûw1Ð&{K÷?š{=²Âåÿeà3.#ö8##º)Öʨ½µ/µÕ«ÒZ0Û^Ù)`GP)ûÂ¥ì•óObÎDºO@·Ð¡iö d?çÀl-Aþ£Œ¼7šu¿%÷ÛÝÏG²î«©›u%{$±‡ÇéW‚øV˜ûK)à'ÅšÛRª«W¦¦ä"Dý‹(”IúOÆ0¨Îè!(Gîåb™-,­ÍRŒ'»e­”Üèþú;×c{­–|èþúç(°FRL›Ý÷2$Z%úîšØkWŠ•ÛrŸvü:}@»²ú‡o±ùñó Û¡¶P@‡l…Rn¼ ùĬ¹ÝÃQçKröÅåST‘ü5?nNÚSì-ÎJ&]’QqŽzZ~ý<¤¢-Š!ô$Ú©‰Óyï†<ƒ^ò +cû2×ØB ãí;ÉCblì|nâ’œ‹jý—¯õ£TÒ!̵÷$ óÍŸ•Óº²À² U’f"òÍT+õJýúLAK3ÁìÐ)‘¯æ®Š± Œš*ÔIÔ©”OKœ«gª¹Ë`òr%W*‚š•]©èrñÔ|òÂ…Bý|µ2s¦”›ª¡êN &.FJú*ªMF•\üÄh KÊ>̱Ö)ò%ÊGêAÌýg¨:YÚCïIÊ ‡†|ˆ‘ÌX'¯©[-h4×' }L/‘ òF<|¤óT?}BÛ$”¶×í#–Òt«Mû„x´RÌË刪j6çW1¿%kRÙžÛI´DIŒr!mBÚ•´Ê_Sf”±o¿Õ=7±CÄfD|´ÉÏš:c‚ŒšÚ¢øÍ^|”¾R.wðï’ )T¤­!H›ij"ñ´L.Â4Ê™D~-1ê”tN‡<QE•Àx”Òq´‡GÖ}<²ÖãȺ/0²&äÈè7K[û—7AŽ›ÿ ý÷"†›uPŽàZ½:;Qç°SÆäjlLŽž±12wSÿP[Âé)¶T˜¬£QõG½2†^Ò4ãŒÍäª0ªòÇ+r¾¬ îdÔ9=kŽ™ ´æÄSÎËVDÍ bh’ÓÓmÍŽÕe¨pÍ ËУÊvMMëÈ´éb¾ ª…+Éò|±6“«OLŸ¾dq‘ÚäJ4ALESµÇ%ëðC©X æ ÉÇ0Ì"_‘“YU\.Ô§+ù‹°þ²R‚a²Lv„ÎÈY[™ÙÌŠ0ãIrp"e³ÅÚtQ6N–Jƒ”»fe +ͪõI°¯£é,åv(ÿ8üyBÛKêÞ¥zšÛUÉêNBÛå7!”…R¶kYHF‰#¸ÌÑ÷ŵú™b¡”W Alìà q’}R†E ðÌ7(—² ¬×sÓ88a ”«ÕÔºtýòx¥„¹èsô*˜V S`MXEPÛL’³å rÀUTH6é`aFÒ6>[,åñ“ZmvFLËùŒDïä•\±‘Y»š›Á¯š¬ è7#V9¹@"VÅ<üSC&ƒD i±«^çUÕ^Nâ*L¨cN&~Z¢(Ǩd¥žàŒ–¬.ÓâZT…œœ˜(ÔdO/–Šõëà ™C ¹ºÜxˆ±B9?  ªÓd*W1ï™jå2Pu>ý;Ù„œÎÕ$Ïai.Të×ÉdrrLQÒ>‘“#$DìŠ5jé Ùª`¶¦ &J²`Ähb‰ƒSe9[FCÕ¨À±1œ2ÇÆŒ‚;^¥z9W—ý_`nµ/3I ØÊr$Ô¤§ðÏ™Üåbé:~âð ® Óê¹\uJ6ÈeügæYœ=è,‘b]òs‚ÊÀa({hƒÑ"Yèÿ'ñ ìŠeý1LŸ`÷\…¡…‘’ø +Ó^¸<^ÈŸ©€äǶËÈ  ÜúT²pž\©L} ×U`@ +÷0™kÃe9/ëªeŒ-¦ªS…@G¹"ÿ¢ûú÷ôïëß»ïÎ4‹ÀU/wܧ/5›UBOö—s×TTîEÍT “…ªœ9A‡)™W­\>¯ûfI7•àéœglX¯‰ë¯;)³²:$eÒ¡vb%X(¶Úæ:‰MQ2ÛC²h° Ä#e𠉓eCŸÍûD‹yM™cœÖJkÑi­¡´6Ö>OÚ’PZ‡Nëœ'­K§íà´¥H]wFÕ`‡ŸjQ™—5ȼ<£ª dn¶2÷¤g…Û +ÛJõ}">­EãR4æôUºú.¨¨'« +Ym²I8ÂîÊPc¯ÊS[„Þø­Ñø­5E_Õø­1ø­kŒ_¯Æo½]H¿µ!üÖü6Üê†}ERf¼&¼r…d³§…2;ÝÈæa1b=ê›^’Mnö¡iç&/N°„DãUøÚæP€Å€µت·OÛB=j£æÊvCÐ5±OIl)¸!DÒ6CR_¨ØºØv±k˜¦@SÀз+TÜn]\¿)îº.nw¸¸]¦¸{nuÃåÎ3hBŠ Op¹{Ì®[ÐŽi™öž@;œ}`ý'7£ñ[÷à˜¹7Ë&žÐ0Oõ¡ƒÔ =Õ ‰khÍ oüdéjîzM|J(–Ž Ù.Y¿™/èzŨa Ë8]»µAW<ØÑeЈ[û8rç7æ 2ŒÂ7ùÇç|Ç?Ñ ˜#Bpä Ð2$„ß'Ò×DêºHª áY½Thce˜˜µé LñÒ¬&èðRX\RM›@×&Ñ9។Ê‹ãf>­ƒÁU‘š6TƒÁŒÅ¶Ó}Ó@¦h N.OÎPOá4䟕µËÕ§3þ°Š54Mˆw¡DGu¡o­€3˜TŸH\Û+'‡½"ymŸð®ïo hÁ2ÓC8—ɘ¤Š¡/"&ˆ‰;1\ù¹[«‡P9î;’yÜ&y¸³ûcq{o„ýqøÃKʲSTv†çmFŽFȣʚó¤,Šû¡“ã×Þ7ªzyh‚;æH`ÌCkÔÑÀ´p44íQÑYe+/®¦æ ·ú¸<)ß‚fEé¸l?æGvF0/‡¾ ëKJvzhØ)K¾¨×ÖGnmƒ’d—Œ›PR–“¦rRªœOñ=•G‰Lc¬ÉjE\RãþcȨGi#Ù:>.Ii^Jb´¡š„BéBV[Ób‘Û¹¾Ç2úßFäèyâÖRµI"DÄf¡,€mÚDª7Yý#š#o¸Õ +"Ý'iÏ‹OÐÈôR™ð|÷Ÿt hñjÜhp>}Š [.ü§=ÏØÄsÅÏd­®¹§Ô±c![ùgUoMVC"w«M-ÔõÜÝ’%ódª›¸µ‰FNÌ°„Ýs’ÐÌ£²™ËÌö½Oé¾€ü›þñ &È¿SY\¶à’”§¦\–¨Óm®p›&@e ¸Ý#,.@6Å|hD5'<¡8aH,FÍûÏf¸Þ` ³<É^’k&gJ2}”™Z2I¢p,PØåÐ0~.SÅT”,2ƒ²Ê2 ?Sô߇Ká<+õ Û¤Âö·é> uÃ4©£ ÖpùJ h¢mtͤŸ½juÄÖbŽØZyšm-œät ¥ÓNðÄÖn€—à«p¨€;4p'/΢­KwóÃÜÍ·a7?ìæh\Ñ?páØ°íÆ\û+iÈx³/¶>ª§”›Çtö\>oŃ¹…ež´…°îÑn¢\)lã Ú< 6Â&!+Œ»3â@û'm²{Œ×Û ûOÉPžßZ5槌ƶ"ãd«ñæ¤}–yˆ…–tXÅž6ÈùJÅN®'šdGÕ§›KL hÑ ò·ß¬æí–l]Ýá»®.%üVjæÆÓN­¦¨&|ï ÒÜÐgÌmúŒ¹ñl·ð¼­ôãñCshIc-!-iÀ¡WU]Gãê:¨ºÎײº®ÆÕuQuK_Ëöï–åt7lÿîÛ¿;ªý»Ïe¯%[–7fËrbKÏkYÝŠÆÕ­ êV¾–Õ­j\Ý*ªnõkÙè½`Ó°Ñ{lôÞ¨FïE<×¼–lYÛ˜-k‰-k­ê»¼¯ÓËû¼¼ïÆåý†Ë{Ȭr®ý7ýæw¥04ß"Êi–ú æØ¢,0mcD\sÈ $¶e%.\™Â-ä]àÁÂLd‚‰×Ÿ­ß£ñ»\£áF ž¤ûœ¤ð´à/ôS²Çí’PɯYö1Ú|^ƒúKöÙ¨\BJy73êœP9rŽ +âf@¶{¸L)Y”RžO˜ŒÂ4 Š‹É¹@Ümt¿¨¥î¥Ê*ƨªÎiýÓ v[¨<ü…‘oq4GΆ ɺ4nƒVjTm&c c/¦ª…BYÆÎä~m +.3ˆë…R©rUL\Ï•Åt®TBø:`ð1ZÍ•§ +ÑËî%q¿gmí}!o%q;š³-öͶÐÚê…ç\nMÞµ »ÞtÚÍÀ†òõ¶B}8ñêv‘ä!Û\ïY¥_‘Ód|­4)1ßʽ¥qnÐ3³y€š«›îæ -wƒ@s$­·Öñ%ʸž™D ?ÍA—l„L镼˜¹Ž©‘1%5B¦M!ƒ‹¯BfITë(BfîÃeÛï«]§üuÉßRùë–¿eò·\þz’±4ˆ²£·‹Ý쯱+åo•ü­–?ÈÝ+käo­ü­“¿õò·Aþ6Êß&ùÛ,[äo«üm“¿íò×';äo§üí’¿Ýò×/k[Aµ½µfþ=¦#ïGÊÂß›þ¾4¼|àïOÏAÚ½òy@FÊJHy(}nîypÀøýïïþýiñOæDº…Š?Åö•a"Ž&…LþŽËïòwRþNÉ߀ŒLêœ÷CÎÓÈœeœ³‹…Œ;#Còw–™9,ƒ’¬Vʽ¸åýA½¼åå}.ïG£/§Z>!Ú;[ ÓÍTâLãû©Þ,ìúÖª{#5úJª¾Ihîjò%¤i˜…ó¢®ÿX·­bR²•E¢O Xãèã.vxL¥) %ŠLÚu¯µR~H.¨”áRá:z,¢û{hñ«Ÿ iÌÐmR,gt¶¸J +—©œJù‚ÂAnEÜr0ó°\£58\(ñVû1NÙ­¼H{hÂM$ +«ýãÀï»l£„ÕF;t÷?OmÑã.FÚ~Î5k2Cj§ÝJ‡…=–¶ +šCoØ ðM¶PU·íÔ.†Ã»™‡+co"±û²D³?M¦ì¸‡hé¼GÒ¿—y£öh°O ˆýj>ÛgYŒugÔµijï½µ„mÙâ´È®Ã©«×?àä#éÀb•Ñ!m9s_´åÌýþa&àôÍ¥Úæ\Qï­ðÕ_Gýc(MÓfã™ãÆ)>—xÂ]p”´*ÿÏDo2tj”ÂŒ +8™ ˜Ô4!;O)Õø@Àú#Ƀ&y‘²ôi-KÃÒŽ·oÀùc!Yº\¯VJµ~ǽÙ\û…óæŽôW"jÊäúD3RuHàF‘ ¤»B=è͘}¸¦RŠ{³ÕL®{凢Z˜d‡—Še”Ô&•;gô2ÁF@¹TQq“ ¶*(|´P%c`r¶ˆè¥ôþ&ðC06V«£Ê|ùñhÝA!°òƒ1‚#FÁ—vlà„&Mq Ž9ñ< Få‘냱±Âå™éH»yqÚ|ÖsS {qŸ³^_·cÈÚ@\-àX&ÛaÚvP’+MD»LòÉÏÇt媅ãW/NƒhèôÄ@G A§ rƒÇ˜«eÚVI‚ÆëåÑÉIè*dûSgÿĈI]¶^½ZÓ‘Hw]¶™äœ˜A(€ó5]¥ÔkóeÎ5¥Ô‹bRV1)Kœ„&å7Mu'p¶wÀ;tE£º²„ºH~ÛÀC~LYQ5ò\Ä¡)'D–P´ÿu)wiÊ×&L9 ä¬'¨ÃÖŽ´RF=§½ËÂÑ:nüݺ»ÂÜl½’-ÌÈ‘'É•ûY»ì>,”r×mhX2ÅÂØPÐøjß°›W9×0‹oSœœ“±+´»ÍÒÐÝ ªÁ +{¨‰Kô<Ëìhgg%Á_«Ë’ñ5p¨$#XO­>gÑs9ú!>*d» +r}^Ö÷ñ^Ìõ\U°‡M-sÌå`3òp¤öóðÊ màííþ¢÷¦Æ< üþüpFÖ${ŠŸÔÞýõ”Èqj€ÖÉÇv]yCWb—GSšëBVWJ.»uјÅúô§ÎhWGó8UI“¶ªÃ +ÙCš +ÕŸÒ.#¬¶±7Ùz8ñ8¥qøzÛtÿÔªÙ¦›Ÿ ±7Ý>ú¯dCÿç‚â¥mT¨¶g{žð[ôIÍlßcâ6]à¢å¶P–„2“mIhÝ58s+„/ú¡NÍX÷îAJ7 ¸ýàŠºôeí‹%ø’r5¸Lþ–« = A¯€-¦’[WÑëEïfƬ¶6[š½x™ð© ˜×'fìš[«”½\èïjTÀYè[öóckõUÛu”?ÉWm ä—¸Æõž'bü6 ç© n²Z'î±ÜO ˆ/wb½ª©ÜÝÜ&Ûob¯µ¹nŒÏã"ŒÂ–yPP@‹®|+©tÒ}±Ô•RìÅŽš"Rù§sÿ/лuÿ'Ü[6´ÉÞË;á÷ E´î”¹7´× &1¢/X{„ÂÊv ­ÉŒÕÎkã‚RNèçêøšG·ðw™‹èœˆ8^ÉÀ:v›Ù€ÀS´=r¿V üç%3*7­îŠã5ù·pŸãSjSã镪.w°‡Õv÷dõÜ°!CÙ ”îžðwÝzÒO!þ4=_z^]L©}ŠìÕýa-Ý‘÷W +¼#ŸÝ‘WY¡n±ú  ×ÐT0 8’°uM›;dkµZÞ¬²wèæNKÜßßÀǽ¸¹·º´Yîopü€SÕ…õmþÕØ—Ó4fL3Ú«/ÿÙž˜NèËñûrœúr\_Ë_ //†‰ª$«¿;~Öf­Ù ¡W…®@¯í +¥è^{È(y +àå˜0Bד˜÷ÑþtƒãËû­m·×aTºpåû"3)•‰ÄDÒ»E躬™e õâº7°¸~.¨†ÞdÔm1ÿKû³ï Q£i+ê`Mø ®cÊÕïQ{àT"ƒ»ÕŠ•d¶ÒŽ«´Ý(A<€¨(ŽßêP*´£üí*¤ñ„!"ƒÎ´rä-ÊrÂ6 ÚN¨Éè˜8XX·Àœ#¯ [yhÔÎp +F–“¡-œA;>[¢ú ) ¾CÀù_1Nº—% âM4[,8­–Ý3 å±`ÈÉ1gÕ,1ìY|”¿‡T`DþΩ@†J¡À¨üW‡=¸F åÿï É5]®\ é‚’N—+éHºh“´Ü&雤Gm’VÚ$=f“ô¸O«Íµ—'‚íy¯ö·:£=gÛ‡G½!eõô"òäB.¶ÌzóTôAæôª Ï&Zµg¯§“1g ~šLµ«xRW±©“¾Õú¨íã?öþý\똞3Ç«ŸÐõ<Û ž1]Oέ'àÉï™GÇc¹ñÆ~ŸÍ7ó•Ÿ•_0å—?©ËŸºËò§MùÓ‹)?ï–^3Po8LmOàD½[w½CÃKRk66-5:v5}¡ÈŽxVŠà ¬Í ÙÚ +ÚGQqž¡ð\`¡zSúKÊ÷ÎQÿX°ï¥ó¼’9tžWVKK™³‰-àgü7*ˆ*¸òkR¤@{ý¨ëµJÏŠEV¢x1cÞ4=Ú£*¾âV|5\ñÕ@Å;ç­Øöpí¨âçõ@_ òóM†ŸoÕøÚWò£h ¸ÃÁv|6Ë"CP¸èrûU”Ýxo‰"Où¦ sH(äßÖ°3¼}žòžÌAçŒ #ž·Y~ ‚š@̸ƒióôF®åáZ6ÂÛ–w†ÝV™†m„Ú»fŠb(gz!I]Y‰\{·žÞCsìÔanøC fí"¤èØ¥ôêjOÌ¿¡FÒJ\¯¤X;JOÖ[‘‹"!p“¨™9ÇóßkË·+õ¼ñj8¤S²¥µÉ´÷Ùi( ìf9A)wÉ•i~)4Wn×üø ã´ ø‹¯·!îöWmp¡,Üྠ\­…ÚálP!Tt´+¬ÕÉ¿o!¿wŠh˜pq‡ÛâKsŠ ‹òCª¥~„¥÷‡b^2«Ýì-•rhõAäÿzaD¾Ð(äìz5Ù¯ëìfë‘•–¥Ê@Púawßb¦†y‡ &~Dw4ú¸û¶ÿ“|®ý1EgwÐçN°g„Ó¾$Wë¯íú 6}dæòq˃ž¥‚KÁÀ'q›Â—qÜqàS¦æ˜ÿS88ð +^ãÀO£S ®]]à×ÏùŸæ¯¥ W!×:õtêgtê€þú¬NýœŽû¼þêÑ_¿¨¿¾ ¿¾¨¿Îè¯_Ò_Ø>øµÒÿ-÷†¿ó?Ï_ø?Ç_ü¥üuÑïá¯Çý_ä¯GýŸç¯!ÿ ü5èÿ÷¿È_ùŸá¯Ó¾røqÖ?Ã_çüÏòWÖÿ%þZÖÐá‚r&º¢!ÈE2Üd¹y°!È# +d¤!È£ +$Ód¥‰rŒJ )‡‚<®@VÁ–¥¾:$·ÎJÉö¸(Ûn¥äãiÉéAÙ*d .Gµà©ÑÛ+zƒÿÓþ+þOùŸò_ö?éÂÿ8Îw2µR;%Ë$+†±ÏËØw@ìÿgŒ,õsl=GF ?OBÚ/ ¼ÿþŽ ÿ³8"üÏ™¼ì‹¥‡òþ"åýåý"å=Cy ó"æjµ`‡$/¹žV¾ÄþJ¦8yÚu†¢’sœ<î:CQÉœ\p¡|i±&)W›¤GR·o0‰od’¢Qþtä¹¹$ùÖùŒQBf(Žu +š à)½cÝAo•åêÓúð’ñ,pLYy˜“耊2ÿÐvÚ ñx±‘Ƀ±¿7F Ÿ³,^ëX¿±ù†rš‚ +ÚrA~œ-ÖOJJ¬ãg>š¼ÜŠ°¬ÔÃL.€:B71µPŒ„9¥M<Œ±‡c¢-Yà(žžÀ€/¾qD{,h2d½ˆqZô2XæÊx¡_•cƒ’˹køH†M´9î· lIc¬Ù•ùŒc@OþàmC¥P7ZF,?W€oÚ†:–c† ÓÔX`+~ú ,ÄxaªX>S,•Ì+F…r#¬» + lŒ…@Øz€_8²ïü)ÎäéØõtnŸÿ[/Nºgÿ®mÖÝý »´ÐFBwg`l‹‚&ÛýàÁ¡id´Ðjm¦— ×dµr¬ÞN·/„ ±Ü_²è ÚAç…ÉUtï^kìäŸ!÷ÍÕ†¸C+ý:ùz¥Ð'ÐÕ`}]Yí&b©ñ ¢kÁóç2ãIb¹u0Ò“RÇŽ¤\×kÈÝtŠN!%šžUütäJx:r«ë…¯¢A¿­ý[¥óšgddÃ><mïAwœÊ‚6™¼YÅjÖÐÁ¨Ù­~Mù3^ËGEZ¾ÙY°ê8Ë`ûmc¸Vc¸ŽÜhÓ ¹`À©f^O} +Ü´«ƒ¿ á“(¤!­hXûÅ$ŸE«bÔádÂßTÂ'•Aο7±cŽo°Jå3ã-¨ ‹:]×¼}†‰êe“Ç’µ[‡ÙŠ½1þèa|F­ÏÏ?8˜›¬Woö=B©D"¡ *vÂŽy´.;œ3ˆ].½ó"¡Mñ]Mäd¸Ì‹˜ß¯Mü鑼ºg8ª3b8Ø·)öP§îê|š÷ s¾SO,¾#ÈÆ k v‘t0"Œh +FøÁˆd0B +4Û§ì5g± –p`?Ú{tGÃïÍ´èè÷×éùäçB“º¬r€ý³bà {~•Vÿh¶€iõïÃæùpÌör‘f9ÿ€·„´ƒÚì¥[ôMûqÑÃw}šhjñzí Ü$¼–˜?j×7Œg1iËJèuýŸ6{M-aŽ›‡½Þ‘ é–QísÙ€‡J”K¨œèe•¶@MC|›â¨Ó„£vþ]‚àz-^Ê`ƒ0-žob¬Æ€ÄûuÖ8èÔd’oq»Ãô›]DzC@Ù¦šDr¹yh¦"[ŽšygaÔl³Ÿ›ï86߀Ðäƒcš—vÍuÏæ ³Âó|$o\‡r®c?4¦p§Ø¥ZFÕ@ÈHoÃô6oiµÌ Kþ0ƒŽâ¢(ž~N˜³4:Ù<šªO™©ú¤¾5” Qú?°]ÛÀ°^åí¬$E †Š<͇0z)W+ožO~´Y PgøI:àá«ZŽz?—–ä”< Y“üdÆÑBèÚ8y¹¡Ãz^âlø`â´^7†«ÑnI†Œ¥NÂY8£mÀªÅàTãÃâa-7>Ø`|H3¢‹YïÈÙMZb>ÌÂ7\A¶bIVü‘“w£Ó¸J(Â嵕|)}ѽºqN5s· +Ø Æñ)¦%º…"Q‘^Td2‰>4_;Ž_ªŠòM ]1£` ùM§PWEbZ¼Â\;o:À2!qÃû{þy%Ê=¬½ó‘Ï eer»0÷á@-£ÖáfB.zs1ôhÐ#ÎUÛ¸ÿ¨>ÌxLf<u˜÷ŸÐoðŸä¤ß:Š@ §ü§ùëLaø÷ñ׳~Ž¿ÆõׄþÊ믂þšÔ_SúkZµîý9ýuI•ô×eýUÖ_ý5_»àë~•»5ú§Îg²ôìc—R·¯6¼}øÆyo¾1xûðF_Ç¿oÊ2bÀÎωîåꡬâAoM?­Ààœ| +“¯“·qòL®ZÉ‹S¿E+ˆO`Ã+Õ')ˆ¦ —NU®‰¹öúëæ{™ùTÄ:ƒQ³zØèxQQ\#…jðèZÏ^ê \ 2 +e¥´o±¦R«7o‘€)¤ËÌ][Ìͱ"i‚ñU\šï‰jënž]³¾|F˳­ ü±ë±Ïï7’Ü+OÄð-¨`n÷r”I½è^–rœëSnRèBU §ª/J÷Ô@êÖx•úFWc®Tí .FÙêÎ×›ròÞW9©Ê^X-äk ¦Æ@M¨™®‰»/œ´PÎTXÓº9[³ÖFŽ}7mfÒ_‚n:ìMv'Bu±b'¤Z@¶ÖÅ°~9ˆ"— óî£Å¼»é/GöõhW|AÅóب¿„¡v¡öo +Ü8iQév¦pžÎ•ó%*J®Mf@¼¨‰ÜÌL麨çä²Tg¦*NV«¹ÐÙ×Ìlmš^ÁñR%—ÿÛ_rþ$¼ä,ìTr¾˜ºC$ÞˆL£vÉi¦þ¦°ÕVoâ­oš§er€ ÎÏ1¥‰GUýižec–¿e/9ÌêÍu&@;Æž©+1±óXšœª¿0§´¤GFOEÔ¬Ü؉¤Ú™î‰‘ÜmŽ^Z½ […stènŽpŽ.Cè;ø轫!f] +ù¥ A–f‚jûîlÈQ ¹àw™Åf¹ÆµÇÅUÐw©£ž¥‡ä +2~6Ná¶üÔ²€ü´²!É«ôÕ† ÚIIoC^Ü5f«Üd­åy$,<ǽ{]X*X– +Öc‰†Ôë§í®$(7+žf:ùJ«“/)Tu +¹Ãßèo2 §¾º:Š¿%½5{»]øÛÐ<ÛîÚÛ1¾/ÝŽçSDûÚY“2TÒB4^;þ–ñê +˜¶¨×Qvœr7Šžc$²»ÒÁÛukÔùÙNã3ai H•{wTn­æY¡Þ!*¥(¼Ä(…qícu6ôî õÈ~Ë ‹#—×l¹<*«‡J çmÛüóJ:÷ÑÍ.ìg7\T…å·+a¹—ó5aiE˜î7ü{HŽM¡d˜FI4-’òe +zܾ.ÿ‹ öý–g‡=o~ì9ÅN“x„cÖ$æaMÙtuŽÍÝÇnyýætw€Óös¿ã¤Òðjm¿Ì¹ÄOclZ$pßÉÁ¤†EQº%±X9ù^-' _·÷ èÒQþì ×êýJ/§E5TˆÌµÿÆȳ칶‡s¦ˆ¬ÎC•C…Êå=¶j9º§¿¶BßuyﺲÃ3)üÃ×Ä5s 5Ã6õ¼.tQtˆUµ ¯Ôë•Ë‚ÿ >ÿÊ®9¨þµÇo¥õAFøMÚ†›KÊF‹v:BRÙ"Ÿütå2oÜ¢SÇ”e ô­šˆîŒÀqšc›ñ»>:¢mèí±Bã_S»d47ÆÆ +¡' FÅ£M]1@P»P·M¬ +e(S¸jEXoÄØW!ŒkW}‹âÕ?õG•3Kú`§—Î[ v%eë —O Mù ÖÜ¡/;í¬y +‰?'¶cN˜ÛÎp—žÍA¬#Ÿ›»¦\Þ<å>| 8ÂÉ|]¨ƒa„Õ3?÷à q»÷[ïÀY]ÙŠmôj\hpXiëªÍ""Y–á-® š‹±¤w5G/eÉÝlÊÖͦAÓIÏÝÈΛ-Šï‚K±8mYä2Ѥt@Ír=¥„Lh '´eœwVM=.ÞN —¿»Â KÝÅMÂ2÷v“Ѓ +ì¤p%›ÀÒÛë«­tæG/mb;Š±7‡7¸ÖIÍ%è½ly*o/–5Éðöw- ($ÈèÄu½Þ$6¡-å5…lÛ(¥É½yÊ–#𲺿ÿnʆ*Ùœ!‹Ç`¶-˜ŠŽðým”m{¯Æ‡ <“~Ÿ—òûÈ PÒß!;T`§ ìT]2°KvËÀnè—þŒV2Ê“ÊÌ\Ò©èÑÑ;££wEGîw£­=­= +ǽ2°WöÉÀ>Ø/û-ì÷D×°7:z_tô~7Z²ü^Ãø4w„ô‚Á~ÝTÙêÛê”Á[èñÒC„FÇÙþ}^“Ÿöï—ûI’öêBÔ[é‡Õ¾&í? ø,×pÍ?¡AEØ/MJ¶ÿHÖ %´bþ19~ñhäA|Üõ‡q'5'' 'Ve:Ì{²S÷ãÊ]Eß ¿Ø.aöCWPlQ]sŸ6­pEç<¡ A,¤ ®T÷hUÀ "­^® ¾\ ûØ~xس.Xƒ +àË ßÍÿ˜|!êåZÜúB¡³˜­?lÝàÝ1D[ë-2wßt¹’ÏÁC¬åî:äFm…‡ðÍUõ/mUìwXÍÛ®7ÿö‹ÖÓ´c5Y‡y ¶¦ÞÀã2œWdgkúYY1ÞèMWU@£èYÞ‘UäG\ß `×:¡7ªê³uu߶ÅNÊ® U‹ù‘bYîó¦Í§Žå§oAëý\z}5ǯø–dü¨DmA/V …3:ŠSJ•ÛŠštŠT÷óG +¹I ©äÉ¿€ló 6[-8 :ÑT ¢Á@‚˜©ÌÌÎh¦â³¸ê¥^zVß÷%†Âé^äVy<ð†¯ýêð@åòx ·3³— UxQ¤03S¨ZO“ÙªçôêžãµÀ~=8øöð¼ö†ž² =ëwßNž™­ãúÕxL6dåªjqƒ n½¿ŒïîæsõôN>Y*Të"‡‰kèÿ”%â|µ2ÏfœÊUÅÉ ‰^^òŽa{÷š(Q«”Šyî^ó¿ÔKß+3üuŠôr²£×‹¹ÒPnFà;ÌÓÙز-$vå|®:’»^™Uš½Ç +…Kƒ¹ë¬|‚@Ÿ„Ù ëLÈ?41:©`ó¡qx YÔåÿrþÉÕ«Åkñ]’ +诋«bZÈ!—/ÊÙ]] A@6z¸€—ˆè°£‚ñòŸ‰Ù*•C ´s¨”åÜ5 ¶ѺSëSëÝœ²×GtbG¹,5"ÑŠz½h¿vú—ãK^µþ…$õ±‚¯NŠõÑI\JðÒ-ßciN¿ðΔ¨9eÑVmkÛ¦o¾´óÍ̱ÄÊ©øî.:Ó›LJWú¿Ä„1ØíæèeøØ-–§mî·U 'ý{sÿNeX¡ë_™þö·¿­`VÙÕx‘½é¿6t¬ñ×rôºô‘ý- +f}zÿ˜Î°A¦ìTLF”Å1lIONNªÀV;°-ýgög*°µõñms¼K[÷GÛcöýéÛ†¢{¹µA’ê`PœÃ}“è‚c± þ>»mîOãßpøc•{x±åFæ~à®rñ:¹ÝM÷Ëð-EÓñôÕ«ãÉïÏÿüÏUàdú›ßü§*pÊÎ3¾sçƒbÔÙª¢ÅïKÑû~¼ä7Jãvà„8iNÙèÁl[c§pGu¶FdÚ¨®3†Å :ùKèÆÍ‹Ó*)¸+ËÛjô)nÕ1¼Ø:¸ØÜÝUîÿœ“;óCå½KÌÏ;¹¾ËÜn'ÏÞeî Nî‹wÕ®ëÒ_þòçT»™ðÈݳ¿–ù:å„¶Ø ôø¨Ûé0púÅ¿¨O¤—ãìµ ÷à°ç†M¶ü= YæœrC_\Æ3ê :vW¼»ŸÇ7¶1®Vi¡ñ¼¥-K7«ù"=—¤·ÄL7µ§öû„hËû„wM$®‹ÔU‘œñªHO?Wš™Î‰¥r‡-–M± *:Qü«I™æ¶~òdr˜}V`™S ¹t±Vjš½ª` hü—Äýç Ð ª—åú­”fH‡ T¸å°*ØÏBø*†oÄ7o Ÿ,ðÈä»nò|:AI¯“´F½âöR‘ž¶6Måë$ƒåÔä䟗‹ödë ô®"‹YjWøš!]GãFØÞmSöÚý +·‚ÏŒ—De`+¤¾Ñ[š:óÇ<~øåìÏ´‚þ ­%n€ðR {–ùÕavn½¼etzM^Ú¯¢u’ì 54Yá$ÖÝÄõx™"°žå•|J+£ YrCÔuƒ/Ê{q/žúÔ+rü7xûdk qôõwþÁñ½ñ?ï`t+¿:œÂFk!»ý”ý:Ö•ìÂ0W]˜6£C*­ÕÉïQþkV~+g¼%*V–àæ—? åXv|ô´ ¹yZÑ@¸§ÈØ]Ó  +x/yÕxK|[”cã¶!×Ö¡P½)v¸6¤¾BtHÌš_ f\žn½Ž¶ ú†“'Ô¶ŠV•GÑ4š¯ŸÇ‘­û¿®ÏßD{¼ +G.µÅÇ7ãß·àß·%˜ïh7 …¾Í’B ó©dåߪÁQ­ŒÊä·/\ã›”2ùyw‰QêáwDÒĉï `zwºãwiÝñiÄñxû6ºãÓuÇèU,síëÚ!ãÍíñæW›<‹|¡Ùr´kP¡ÁP.ÿÜl­nJTÆEc×j9(é:ýKîK]5P4A¦Zc¤´8öõAD¯T è¹ï4 aS@áRèAäÀ]ÚLB(º“p9W– ¯ÖÄ`a¦>}ŽBâhÏ,ïÀ'ë˜,W~z%BWã“ã€^èZ‡¥š×Ö\ÌqâÿuqÍ2ïÒŠýzJ¥8j'M÷ÿ'4O›ZÌ4á$k÷ #îÕŒxBZÒL’Ö¯"¥pïéÓ}Ù×-•¨£Á­Ö¯;¶ØžZù®:\O­mÚعýÖpà+@R>MåDº*ljì>â/“äÓ‰üuàÑ©½'q íÌZOõÑ5¿JÐañRøé£Í©(_,â°vÕ ¿Åeîe^¿Åe^ʼœn.&ór;3Ø“¤öïÿWÇ÷ËÿZ!¨…Ãɤ °^G;Fb9sYÅÙmT ¹m£Ï¥T ý±àƒn z‚¬-Žõ6bý‚™»C™ ë̼,”Ù°~ÁÌËíÌ °ž™7L+¦j_ 6S_= ý÷.Xî½wÁÂpï½ ¶ŒþðOübæn2˜¸X×ØÅÞïEæ#T”ëQÊûšŒ¤ä7’@#‚Â-! +Íæ–ì¸dcÅ!)wÛehj]o'ô¸ÍóÜQV“QNîKØø*Mƒ>퀬Q{l׿Yg¶Ywª ë†YJhWÐõúéÞÿ7k¤m‘I÷í7±ƒÀ>‘@ILŠ2±¡ÖfØb® $ºØ¿jàÓÚH¯jã­|ÉË_ŠYcÅHšþT(Ë/YâÃÖí—mXévüÛ‡kRå$|v˜÷aãþN-1lF b‹½c.¬ÇÛ¢Ö#½]Á›‡»²gÍ%~q·¢CÓÚ¢µ?Dk?4Ç<ÌoÓô%|ÅõcáæXÇ‘9™œyàÎ:²³Z(Ñã(z8֌ƌòì³"š¸ƒ'àÖ(%ï7ë3EÜkE¨=iÂ_Ç”èej$ó75îd™p[c¦d u:{Ô;­BV6‡Þt®W›Îû"ËæÄûïÞ2©Ùì.ëÝåDæxûvÃïL`w©ö=ýξg®ý¯†œ7ß?±½ŒÞ,™ 4f iÝ’q6P{*µºX l¥TèT¡T¹*&‹å|,2®äŠ%Ø‚qîéÙÉIÔô¦ìÔu¼í2>+ë¡ÂÑë{`gT«TëgfËhOdösõB­ÏBõJ!ï`mîü(Ü/ ÌVe)°_¬”ê’°q¼\‘L£ñŽ½‘tsŽMäNÌ\ð±”Kl¨1;#òƒ\Š¸o—³°ç^’ÚíÖ®æf˜`#‰¡ +%õwyöòx¡::yr¶>-yP¼\É]‡vÕï¬tÊ\RW÷g$5è(@\ÊTÆ ïüƒ7œÀÙ¡b¨«V*Î)Ó}ÆÆòv¿ú[߸þòŠÐ4¡Œ½cÿïx'•é«ÜK¦a¦™ÅŽöÑÌ!ÝäÅО3ÝìÅðr~ ºÅ‹¡ƒœ@t«cP'ºÍ‹©9ÎŽn—ÑíáhØP.ÉŒª ¸~Ú¤*·þq¸Á¯ü…šh^ e!€Ö…Úh_`I€FÖ-äÏnåDlÜ:»‚@WPèÊN±seùÁœ+ã +–’>èphˆ}låÔWñ¼¬#àaRuo‡ËZvk;¾;²C$ŒsP‹½0“›(ˆ8\¥„ ú)Œ*¸á Š†èsyfòeõ}Tz¦g`ƒó!–1Ã@+2x×ÈëÍJVß`ÇU™†­º»‚’€Ræi&­¾µC1É~—å6ù¯›üyØÞ1·›šûD“éKid.¼¾âÑE–ô{U{§ EV¯e¢|+ç?@#w”z{מUÛÍ õ\C:‚€µåSBÖ¨ÞÓÁ‰e$¿QŸË&ñaæ¤+—ñ­\g3+ÆýõD ^æèÅïó£xŽÔ¤N[6ð})V'ÍÍ <ˉƒ-M'U4'OmÙ†„¬ÈXÎ1<#ݱó<Õ +þ­>Õ +vgýÿÛÞ›þ1¶CÓ­¥üȱgXÿKAM/m¥–d­DÏÝx¶3¿=Ô3X¼A¯~ T°Ä,|ï¨M¤~oiK–¯4$B© +6’ª@ÝÌÚxظJY¡ˆ¡c—ár­ž+ˉo,FeoΨ½!a§\úÛäz°Ú)] ¢¸7Þ0B²^0GW;ˆÚ;t8&»­™)VDÎÌ[3 äF¦m@{ˆ5Øytl¶(ƒ"Ü¡×S£5̸ü¶Åurƒƒ€t þeŒºèbZ mµ@ ¾[ µ˜HM™HéNE; amK8~{†_+±'ºZž8NLxI»µ6[¼î‹µš”‚ÎïÃÚwД 9_±N±7M²JñôT&ã­F_l™¿ÑSQÞ 5z*Üè­·vÁ\žÞ¡†íÔy³{Må‹Uºü"¾Ý ;ÏÏmíÒ¢;yCÝKhW.ú¦¤wL±&®ErEšbµâíŠÔñN ²ÂÃJ€øÃ9’ÂC„ ̓m7O‹\mR¢®ÍÒÖ²ÙfNÊbN«aÎÊ°×ÖE0§ )lºXÙ25o§LQ§L÷è‘Ù¨S¦¹S6…:ewJ¹XµûFôg0>™â)œÔVmU…Kq«km±ó„–M]N,žê¯iÕ_wa'þå¹hFvÚï)îÎòZ¤N~2fìˆé£…÷MýŽ³"¤°?¸vÞã¬üŒ’Mu®aAß ó‘jŽ.ÞŽM,Y[·È©g:,uœœ kسJ×€:~„ÓŒˆÃ¿ƒ$yø"ÔÔH—qò*×IKì[YœçÕ²î5HOÎÉ?}1b4ÈÕ±€Áöbø»çUò÷‹"Šg!þîY,[ÎŽ;z\ce+-·¸ ^·Íé£öu°UoÙ!šÀ³f“ÿà…OdÎ(‡Š«2èµ·W4„ØKBÄXøˆ £‘Gmæ“S`g´nŒ©Ñ곓/?cæ+Ûð>Ädò¼x„¦ 7ž]ëßt®‰&˜òdøIA…l$ÕXDþ&uÊÆsÛý,Àè5;uÌ©yC^Ü MªødhêÄãÊßùIƒÝB ›X2ƒ¤éäY5¥•Ã^}ö÷ßbZŽw0ßáVùñ#h•7Üm«4àS<Ä'$ô؜ᓦþ¯D#êyÇðoþ—¦þ@ˆú¼é% ¥~ê- m^…”‘ŠàF¤hbf6™×W½ùD +)N…Ú;eäÜ8HìFàKé¢å,~¼8¥\3þc–#’jŠò"(¸¡)0OÆšjÝâNwØ-´œó°ì×5”d„‡²—P|LCɘߞ›["8°5ýØ–Ž} .o``{úí1¡R–§ BzÒ“&°*ý[&°6ý X‘þç&°7ýM¡_‰òÖÚ «¨Zì&ß—å3Äûœ!^˜÷ в-íЧCXŒ:ýjtú‡–’æôï­; çÍ–úè|§N&ëÌ/hŠÉ®ÿøÞôùÙÚ4¿ÎWk\ <Û%a¬tYǹÜ5¹n—ó…kú¬®"䞤ÉX€…3D ¦kxÍ^ð?Æ œ'›RO—óÔÒ8æɬYØðD‚ÓØŽÆn÷²¨Hö—.?™ï<Üé·^¡Ó_£³õ4z¥³ãÖƒ_P|Àá/tÕržüNV+—õD  »¡·¡t2!Ï;’ åÈ~|P[w³›zâÃ8ÅYs„y# (sžçÐj"4¹XÆÜĪr~0dÌÒ'JʼnK÷û0ÿÀXÈë‰Ï¡xºX¿XÀSr sR °f@œ-:Ç*e3¨Œ;<7`ú§ é®;v •“ ý SVébeˆ&n.í‘ÀãóÆÈ| ´gkóÚ«rÞ’ ½)Ð +_RÛ­µ„ }óüZUšîÉŠøý ¥V‘TœtdÊOk™’Ô²I/ekÛQ*¤GfYR\bIL(–§ØÂãÌ9 ½:Þ.wŸï5b8a”Å °Ï¡Ä©ìë <°¼Î)ì‡ooï ôò7 ‹¤=š¤fÜA¨×Ñm®lDõP}€+ÚáC–˜|oÆÜKô˜jrqoU8}0ŒÓ}.Nó\Ÿ¹?Â?çaVaÚ§­d«nFÿˆž#÷…_ ?ª1}ÀÌÃRbäiƒµÇÕîv-Ç•ÃN³-Å–>z>ä±á‰J òÙ9ÊÄÈ#›%`[E$Êð&8iŒ+“q,roÆœ~S+ÝAŒ\ +G0´VçšAŠUG$«—-Ä7¸ú#ØN„½ynuNfn˜Q)ê«Q\D÷aÚ]9ÝÑk)'3ôïióL%Ð3Y§â=¦b9ô’£vø„vJáSž§H +Œœ­b3ÌYÝuì›dØT±¸2Ö÷EÜžTðÔáW0`NöVŠÐD°¡¥g@W|˜û,}¹Y‰OtÎæ{-añÉÖÇ-‹—"À»­ÝïDÿ–ŠVlA…°©`_VÑÊm­õ°pÜÏDEŽFEžŠ|8*2yÁŠlV‘{/Š¿“¦à#<>’1§F_øÝßzãG•Ìü(ËÌÛâ”õ1«x8Øã—!]ÕæcÈqÏ~þòqÅB¹õ(ëBñƒVq®©†ŠE"žÀ™ã±L@½úKÖ]‡ã¤Ù^Áž •—Æf˜OZY>#S÷Só× TŒª§¥Ÿ¢’Fhâ’6‚S|¹!žÚ ÔSžÚYµ‰ò;±Ÿç‰éiÆw>šžvhZ¦Ð§h›«Ø^ +“§I-½Ýq?ƒ9xáÓ‹á“,׺û—ÿâÙû—”òšŒÕ>Ëïwæ¬÷;wqÚXÆnÑq½Ðšú&XžkrÛ‡+¢“V¶œ0 œT4OÙPFå¢ó졈Æëv³X)+ƒüU4†Þ™Ñi+ ¢¦Yî&릡…ˆ¾¸¢!av§š ¦<ˆg±M]‘¬Ã“ünfÝxëÆ5œ]˜uã ²n<šuãó°n|~Öß5ëB„Ù¬×òP>Ä“8gÂ4,b<É/È“|4Oòóð$??OòwÉ“Âlžä5O +óð¤ÀY1Ä + ò¤Í“Â<<)Ìϓ«æ‰&ÌæIAÏÛ8‡m'û´êÈùØí6÷)QñÅÙɬ6£@c€¿‹pôPUÚžÄÖcö:/#þÑXBxßu%xÆL˽ÈÐ>Ã|X€ß£¬G•…®m +ÑÅ/„·g”Òé×QìM³„ÐÖpu±WX›ÑOÒî=¥½´ñŽ”™'4ž‡ïú¾Ë‡WÓrÇ¿O”L1%à÷ŠøÖë2zy|iñyà 1ïóíÊ›˜­Ì¤~§K iîrK©™Å.Al½Ý*Ûˆ)òYÉÂtMë}Óô­~péÑÔ'¼Š’ñ“FÆ÷AÆO[²ý»Õ’¸6‡I°Ü¢wö+µ2®Ù—0fžÚì[7{»#³€ûôìu>¨Ve«¤ûý$aŸî‰Šðû¸ÁÌQEÒÂ~•€"“I0(ŒƒÆ4\dÑÞÁžöÞñn[ÅѤãxh6q¿îlâž ¼£ùyïR2©ÜI:w“rG)z“Öµ„.fYWP¾à+úªÁËqóRlFuí0&éHx3FšÓ»‡•jn}ÖZQ!o8Dèµ~7sàe¾$^æ³äĤ”q§Ë´@LÊÀb©Ÿ­¼ZÇgNé>•So¶pæàÌ:bã9¬P¾3d}FÏÁÍÞˆâÒ÷8ˆFwÏšÚ?{OPEågÆm~-J»^ ¨º6àÛ½ui±ßîmED¯èœWÁùGäÒwÖÁ¸‡òmU—¶qMó,œ¶RÆ6š=•+Õµ³Àn#WNaõ…#£,™F®}ênï5ÔV+±h^vöðù}¾·€O´›"Á±"M«–°Ê&»v°Ùý¾ó{}»XßÆx—¹?ãÜÿѳ7/?ôï.l“'´Âœ +1–®9$.g.ÚÅÛãîM–“”êÎX5£·'âÌF#'µ¾Ë UÜ'3úì7NªüdOhè+¾2–$¾×P…¯*YËþ[Nz)ö'¼’ óýÍ|¬Td¾ÿŽPrEÔAÖr÷ Þ~˜:<Ž­“|êtPýÖ,?5Ly[vT7¬œìWH¬ßžq¢zdÔóV”±œ‡§ï L>ëy>ëϘ©ázÔÔð.Û7Q›®Ždn¶çÝyÏ8îÁˆE‡Òˆ^àSóçÄ40Ô}7 •ìÉäˆGÍ3ùâXÞ£Žx7˜Uw:Tä ü{3dý{«º û0Pâo# Fæ{Xìq/ú½/ÎÑ/ù?Áý÷ƒÆõ‰[œ:,~½Q?±WKwïÖÊÁ÷;ãÿø÷ƒeB²=–ú!5o~8«þ dzÎô#&y‘ïkïÖÆ«g±´ãí²7ʾu¶‘ñªk›9×þ§>d½Ù¿o>ëU7—1_E#Î1ÛŠßœžçÅi2¨´Í,é¹ß±k'ƒF!+ϱ±pÔµl„‹Ò(·¥ccQ±A‹Q4ou NF™´m~æØ¢ñ"úa%³V¶ju;æ'‰èýä‹RÔY1rQ\”O‰ì)¡­fá m^‹œg/¯®YkjkñÙ¦§@`Õ0¤m özó„z&šn"Þ̱n¹ÆüÔ'ša à¤ü\,zšK[Fg¢`Ðóiä\çγ>F“`Ú^·,øŒn¦m°„)Yé™Ëg,aàŽFÀÀ]€»"€—fF¹-ºÂbœ¯D±Ì i–“̥תŸHC9“Fj_É+î^q4XÖñÉxTù«tù«©´–縫|]òQ ôòåN±Æ–¬ÖòÅ ¬ƒ€o®7¦rM^ºE9jkÓ¶¾—rbù.±¿a˜%"×äï_oŠÌFk/å¨ô§oŠ.5*ÌjÑÍV€¡Jÿ*§oQ›ä Q…òØߪs e +Ôògئ2Ø”DÕ°3l6¢®É`—ÝúŒ²9ªÃÈ ©ÏU4*ÆǧçMß ž2æIï…÷VçI_ÂuT¿Ý…VpðÆo £Ä=OI†ÜÅ÷ÐTù|c³G¾9Ḽ۸P!«¢/Mk³Ç½–$OöMú]Óý¦’{OŒÚr’$å¤JÖ;¸X9é–“†YNÚrÒp#9 .”r33…<½do~£²ßLÇwÍ'+…sZ×}¦ —†åº¨¬¥šä* ®í!ѧ¨Þ­Ì[£bT´à-8¡;z]˜-ÑØ2DЊ…&|7•ß}$!ƒ=àéÛ2Ê®_{#Т•#p)ü>w†Œy¾uU&(À¡¾Q­6S*N¨k@áF²…X§q^Ç^âïo½{Ù(°„¾;4#¢db\¡à$õ£Fãk?¸û¦3o³½Õ?c[É7j×-ÎežÈ‰ˆËÞJe{8šÿj>ÊÂe¾>òÅ…™ÊVEõ…¦=¯Æ‘½¼]nŒÑˆˆmêÇiŸAõ^æv’ìþG}VI„Ø@•Õ¡Ê¢þ–ŠôŽÐ¸5¸µpÇâôO¼4Z¥ ÒþÇÁõ{àÀ¯ôhÓxSð¦FÀ›#€77ÞéAe”·Ê}úèaG ïB~ïÕvx§Þ?ˆƒäxû^ƒíÁÀvÜSô®Õû-Ö­â¹ög“PÄÍÏÄÖGl‰Ñ¹]HŽÊm¶ÅVä8~çå&ÌÜá×Nl/Ú‹û¾˜³å³®¾›»á•òCÅ»G°=o̳o´g¬ÁËd51pö…ôLfgË‹— 2Áuü}“<È >ú™2»0+:„ÙëxÏúÚ½löïC‚ 'Gì¯ãi}uø¿6˜Mé‰ßZZõåÀFð°¹åI¶É:lÖuuÛË#4ó{v†Ö[]êT¹RbÏ!§xWÙ† íëÇ•%ÛÑõÓ’ ™é:v3uFT´%ª¢÷ˆ>TVhªïʘZx·ÛƒhXǸÓºñï²È+ÈËͲŒ5*ƒ¥}@ìkãêù›êÁMÎÕÀŸ£×ªâèµ*îîáËuz¢~ˆ'ê-8Q?|øg¢~{&šk¬²Ý¼ßõìexî22¸¢8ü«¦/˜’9bFÎîð>c±–ÉeȈ ¢‘ëX©p¥PÚ#&ÐÓŽÎ3\Öþ=Š5„¦¬Ç'Tôç)¸R CxJ _£U(“ݳȅ€òil«ì +†£!Q"TL¥.ÆÙ e*WêÅÉëE®‚,Xý^ˆö)ƒULä&¦%“¢X¾’+¡kBG=^Il™`¤ªÅò”yײƬ³žQžŠ˜ÁÃåéBµX—¹,1ç=Íã иeP–›Ãç¹ËÁõÀ¬²¡Ç3#r[ëÊßúBr½-4ϯüŒû)x.2.ZúDØ`ÝÞ_—À! µ(¹L­Ž›ñ7ñáTÓ0šÝ@óQˆ:1ÿ¡ÅØ„qÅa+Î&uÞoÅümj§`·£RêŸÇ~!ÅK0j¨ÁŽ»ƒÖ˜ù4€<Þˆò„mƒ,e¥¢µ«Pz=0{LÿõÿøûäKÎóRé_›ûmðÓ•oÍaÀɘägæÒé¿ù›M°`ø{sÿNüô—ÿ|ŽNÿßöŽ¥7®«|fæÎÜ;3;‰ßã‰íÄÎÃyÇN-4¤iÓmÆà–jñcBMO°ÕeÕJ F€H`)‹.úX ± êU¢Š²)/©Ù²«`ÓE¡ˆp¾ÇyÞ;žëÔ©”Œï9÷<¾sÎwÏwÎ÷ ‚¬‘öæ)QB½¸¢6a®…”/ùÙ%ô¦QŒz”&X/ù×(E}vèY‚Wh cjû§õ@–ú[ŒiƒÄ¡éý÷ci[CQ1jºÙë€õ} N½sNîº<|×ó¡œq“ÑÁù!ëEÕ0­U¿Ë™»­ïoØäI‡ë·’Aî1×Ëíˆçõ¶2ÃëjAL—o+g·%¢8!ò«¯6k¸çæ ÑŠô¦ñ—Ì)›Ù&Œû·ž¦nÆÕÔµÇýfÆwÆøšïFfÍ)ò¨( eF¡L©‘L¢„îL|ƺ„?E/aä[Ò/xËñ±¡Õ÷ì¹3öj÷;ͧG^ ü-ººžîûb:ÓUžÛŸaï·6V#䈛Âôî{Nùuç‡c2Æ£= +tþ@.È+m»ƒ@ƒsÿÑþ|²&vΠA`p>4¤± ï:gr±àŽçœ)ã:g²±à†ƒýl\ó{Îìç5ql½ûmû&—§ÉBP<ßî[ +ç[2ŸÖ~ú¨oFC´^â­šÍÃŒ~¦f´—(pçDƚƜžÆb 1ă*ãB•± Âí,U䢫%=\ÊZDÓÞ4[ÒÑ2K^L/f-z¤§‡¥öô°Øž–cô°€¡” =,EC A9™†X1”5= eEMCYQÓÂüßF¿ùÚÂA¢Òoùá'—£22»âgWúuÄèaÅ¥‡¬>líJ—Œ¹›æã¿Ä|ŸgÊM;.Šh:ävóï¨â#Èâ…P9¥–B{•As övãžÊfßÀ‹FQ?6ôe@IŽÔM¬!U`–VŽB/eþŒ‰>ëoÓZø‘ø¼MHÞ QÔ'ÿ÷ íšv&åM QÒ;¨Îôœž ~JþPí_X¡?¯E‰—j%;u^V7îh#æé¶.™¨¨Ä€L ¨DU&ªuÝ:õÊÄ.¥ºiB/®–ÊHή&g÷ºÙÀ£f€Ž«=M ­WõØfÜŒ ÅÇ8îMGZæñÍ“xy#È“xÁçI¼¶¸¼zì\se5Í÷f¡ÂÕ_ŠIÜ(+¸lÌ=2Bmó3{̵Ùïs;‹ ÄK˜Ãä+—æYëùAc‰Fq.ä}uxI@UV‰ù°Š4¬¨ (|_÷lQ†]¹ÃRÁŒJÔI(Ýu6-bOܱƱ.$"ÖŒD \ïæ¡ÒÕ[™c-‘Ë*oŒ3Xqž]P뿘©R«ÄB'ÔÀW³ØÈ…ÆÚÊâüªh^¼¸Ú€òsNöRãâšX“§leŽâÖrnQhœÓÜ¡{ðK”•ægó³ÒbõÕÙ…æëæ•Fo¶K0óÚÍsè^ÖjÙ¤}^½÷øoîTØ– <ÿ´8Ú7<š»oß0½,ØßpsZÕMd=ÿ]I¿+·ûöim‡gÝ+ZÑE;=KËŸs¿]¶Ðe‡Ñôƒ˜픵wù“üß#IDÿz. g…®Æ Úõ ¥wyén/Ýc¥Ïè›GK±ÚÁ\Ÿ¥‘ÄG`w´™‰>=ý©ŠâŽ: ÷V?âgW£!ÞekÚ8mw4ÌO#Ñ(?í‰öòÓX4ÎOû¢ýüt :8íšš‘%儺ªò,ÑŠøúp«×¤{uļ޲¡Z÷vŠ²POÜÛÕŒU¿(3äÿÓA¨yõ“ÌÑ–.R¢(QbKJ B¢ºƒUHï–¨§/¹°zïg7Fj‡×®ýŠ}emÅÝL4äÏS ç)¤Än9‚Ý"nÜcý ëáwàçîÝ»"œšš¢õ8¾j0~&Es*ƒ†cŽÝƇŒ?õx·úì¿húsúÇÙ¸yó¦©l` Ú€ 0 AK²-aÈ&ÀЭçp›û°æ¹‡“KÞ蔉»)´ì&ײ›Ü&Ýܾ}[w¦é&ØJ7`o—Ù8¶)öšl‰mXûÖ­["üè£ë)°­›Pˆ~Š›¶zó柰¶øÓMeèÇj5ÕŠuS»ô³Õu覡ú•åìþ«k;ö†„y¹sçÎ÷mËñM +ü®¶¹kŒÂþ!÷àƒâsìÁ_ÐÞ —£‡À¼ŸÃde›ÈÚäç™ÒÔÿ2’5žÃ‡d--ö®•4Y»qãôdM÷駟¦¤^ •?þø¯)‰T«ž·H¤äpR´>ÖkéÌC:³+žìîçÇú§ÂCì}ˆ½ÿ“§¤Žàá) çšQâÿõÍ8žÄÒ~!Ÿˆ/ÏIŒÅJ#Ì0=”9“äg™™ä~/þŽ)…¦qPåÉR56Pس/ÊóS’é_¾®¥9y~:M°²Ç!¿÷¸AɈRù8œàÖLRŒúÇ4öª$9Ó­%9Ž¨þÝPóêxîùÍ%9‰òzßDýèéȦ-åð¾\‹pf—+iÅô¶Džìf|1{K¶—÷Ü%ðu¸Ü\nÄäì ²õ˜0úš½“ÎÛYž6ƒ-æ"É›¢È©n¬‘Ñ Æ+†QN-ð8›WÖà­%èJ”2­É+bNþ[’š—)Àðâ2ts©±|…[›o^škÖ›Ëç`ý 4ïÓ‹KKÔ$´ÖX^ÀŒ{Z­hT¡¼i„XqÍ wr½‰©9X +¶ÄËV–Xm.-&ØÕ|Ie`×»¾@XÞÕ– W܃,•ß§u&ä¦q[óÝl„Z²U¢Ú‘ªý!×.…†£Æï¹³–ÔÑ­y™ºC%ÉéÄÂuµk–Ãt¿D'ö7%6öA^W´ƒöä¤jµ‹RÝDµH™B©bœñXòƒäöN°âÃß‹ZQ€Ýø°‰NNp·Ñ%Ȳrb!hcì:êÞ +éR›;µ€ëÆV‚ÝnÛÕ"¬ùÕê¬Z–‹åTØÁFUÒCífOàC±–;±åN¿å!l¹“ªÅªUlEgS­Vgåh¥sìUë°Õ¦MµÝu£`%e¯Z«•ýjÃuV §J¬ZɶN2ÕFꬓîái^ái9ÁP&eìvs÷°H×ÍÝ+?¿b,7­âŽ‚s»@Yã*$Â1g" A¯„8è *òÞÑ”Up”ýxî|Ÿkh]³"ëv þºSóÇ\³SÙÜ`¸a{²ºð˜îÏ—_~™Ï´ty+ƒòRcÛ ºª™#™Õþ¸W5Õ {âEI“-9› Ë‘ÕjÛËQ`Ÿ¥é8Üï¶[Wœ®ôµ­Ç/4}×jSέ Æ!­©ð_ÏlLYÓÆ9ŠŽÐŸ£f»7JδÓAgÛ¶BÐq@[è8ÅJŽÄWò½÷~w§œÞé°ÍÚSízßÒjOYë%;ÊRGÙTma]‡s´®Çq]ÿ!6†Dt"üLöJݯ¯¯‹ðúõë sn °¢ù$`о3Ç|„!3Xtëç6ëÃÎØÌfD«;) øh–|ü³äm%òí°vObD$"Và²j5g74Ó€û]œÿ-6Û_vÙ-§žÿAµ½¤®lAUµÏ–…‰9Ñê¾O ók‚4iÈÎ[hĪՙÂáT ÀTæ”,*ëšÖ(a•vÉà#3ý†DõקÕ!`šCp"Ÿ²Q.ú›Q“ƒâ¦óqo?D±/ˆÒ„(ΟÑü¤ç§Daþ”ÈÏ?"‚ùÓâ¥lzbO±š‹Þ<&s,àŠX†§ÏÞ«ÚO¡?O|̹çÖ$p S—•¯¶<в6héñÄž6Ex—ã]h˜fiá b­&mÙ$(ýÒYûêÚ¢_&:­Yg³I¬³¯àâ«øû(þ>¦Xgx‰¾Ö‚?†E¾žÌ]{\s×δæ®e¢oDg™»6=¡õ¬ÏMocþÔ6öˆ$¦Pª^ TÊ!i™îE›˜!Ì:•ºµSb£‡[[^[i.­²òº¬Ô+X'=]kß’EŽ€}„7«èŸi†jÊ)7ÉT­¾$‹’” +Ûǹ㚬& ±ë¬,UËe‘cB^OD{wqµqÑÂ\ª¾ãŽCÀLkÝŒÿ¶ ÏÎH=3'ÔÌèÕ{qñÒ奆^C93NNª–ÏË"'ÅÆNk%™JHAÏ©šš‘E¦É5@+ª]°ß|DÈû›3ø'ÁIý¹æ:} :•ªÅ_ÈMdN[ÀÓ¯mÈó¨jVÔ!¥[3‹¯_‡yš]øÁ•Õ5ƒÚD)ŠâQ8JmjM¡Ëx0êdÓØ(±(»CV/›í6›iŸ‘¸¡æÞÁŠy^¸û&Ç{-ÉZ0'½®…cŠÍî¼Ì÷KL—έ† +‚[â# Ã*°Aa7 â•uÁ,/J¾!˜¥l!S¨ÿþŒ’(–)z¥Y ©_ÀÁ´?-åŸ2gR\}J„°*1kH%z1|rÀ óKäœP-²JûœÞ¬ñJž{<áeVÅ·Aêe¿dº‚G|ÑR`„ˆm¥S¡á°„ç°¸Ú%±öìèloÜ„[û••fsÍF€‘ +T¤UŽ^0¿Ò˜]k`En,aüEùKcÏዀ̺óÊzÒO*KÑÑ + +„”›z-Ê9:+“ÿ ¤ÿþÿÿþÿÿþÿÿþÿlabelÿþÿCheckBoxÿþÿlabel×!V¸AÅLµ$%ò5;˜ÿþÿÿþÿlabelPlacementÿþÿleftÿþÿrightÿþÿtopÿþÿbottomÿþÿlabelPlacementáöq÷ĆE´’«¢ÓéŠÿþÿÿþÿselectedÿþÿfalseÿþÿselected¿Ç˜Fz…–H—oÒhîóœ ÿþÿÿþÿÿ¹2<?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="CheckBox" class="mx.controls.CheckBox" implementation="CheckBox.swf" iconFile="CheckBox.png" tooltip="CheckBox" src="mx.controls.CheckBox.asi" modified="1055744780"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="BoundingBox"/> + <include id="CheckBoxAssets"/> + <include id="Button"/> + <exportAfter id="__Packages.mx.controls.CheckBox"/> +<class id="mx.controls.CheckBox" > + <Event param1="click" /> + <TagName param1="CheckBox" /> + <IconFile param1="CheckBox.png" /> + <InspectableList param1="labelPlacement" param2="label" param3="selected" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <property id="label" type="String" > + <Inspectable defaultValue="CheckBox" /> + </property> +</class> +<class id="mx.controls.Button" > + <Event param1="click" /> + <TagName param1="Button" /> + <IconFile param1="Button.png" /> + <property id="_inherited_selected" type="Boolean" > + <Bindable /> + <ChangeEvent param1="click" /> + </property> + <method id="icon" > + <param id="linkage" /> + <Inspectable defaultValue="" /> + </method> + <method id="label" > + <param id="lbl" type="String" /> + <Inspectable defaultValue="Button" /> + </method> + <method id="labelPlacement" > + <param id="val" type="String" /> + <Inspectable enumeration="left,right,top,bottom" defaultValue="right" /> + </method> +</class> +<class id="mx.controls.SimpleButton" > + <Event param1="click" /> + <TagName param1="SimpleButton" /> + <method id="selected" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="toggle" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="CheckTrueUp" modified="1062224695"> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueOver" modified="1062224688"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueDown" modified="1062224684"> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckTrueDisabled" modified="1062224679"> +</asset> +<asset id="CheckFalseUp" modified="1062224678"> +</asset> +<asset id="CheckFalseOver" modified="1062224676"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckThemeColor1" modified="1056417032"> +</asset> +<asset id="CheckFalseDown" modified="1062224665"> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> + <include id="CheckThemeColor1"/> +</asset> +<asset id="CheckFalseDisabled" modified="1062224663"> +</asset> +<asset id="CheckBoxAssets" modified="1062224897"> + <include id="CheckFalseDisabled"/> + <include id="CheckFalseDown"/> + <include id="CheckFalseOver"/> + <include id="CheckFalseUp"/> + <include id="CheckTrueDisabled"/> + <include id="CheckTrueDown"/> + <include id="CheckTrueOver"/> + <include id="CheckTrueUp"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Button" modified="1059073889"> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1164217982"> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.CheckBox" src="mx.controls.CheckBox.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.controls.Button" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1164217986"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> +</asset> +</component> +</componentPackage> +M 1 1212170146ÿþÿBitmap 1ÿþÿ CheckBox.png¢?@H¢?@Héÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2HxÑ­” à ™);±Cy'ê£ýêƒTDš¼D Æ>Þ¡m)Ϩ×Zïœ FO©«s9jo­ µ­ÅXïÎ1Ît>`uPƒœ#?pÒÖW#'×Õ‚<G¤:‡˜ü¨–R Ïbpžä¸¼öé{fQã ù[ù!?¢|À­¾ÅQ|¾/ùñ<¸Ò{?ïø\ùQµÞ‹³<ç×ûQ¾3Ô“öð…V~¨Ñ Ÿ³Ši“µ¿îéªf?úŽÃmwv?òúïœ}ß<ýÝÏü‹•ò¥è;ÁÿþÿCheckBoxиÿþÿCheckBoxÿþÿ Check‚ýÿÿÿƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿBox.swf‚ŽdE7ÿþÿBorderÿþÿBorderÿþÿ CheckBox.swfèCP?ÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ CheckBox.swfwÒÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ CheckBox.swfaÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ CheckBox.swfõ²°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ CheckBox.swf\À>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ CheckBox.swfA?ÿþÿÿþÿÿþÿButtonÿþÿButtonÿþÿ CheckBox.swfa/ ?ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ CheckBox.swfýCP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckBoxAssetsÿþÿCheckBoxAssetsÿþÿ CheckBox.swfDP?ÿþÿCheckFalseDisabledÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckFalseDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckFalseOverÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckFalseUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckTrueDisabledÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueOverÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ CheckTrueUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckFalseDisabledÿþÿCheckFalseDisabledÿþÿ CheckBox.swfCP?ÿþÿÿþÿÿþÿCheckFalseDownÿþÿCheckFalseDownÿþÿ CheckBox.swfCP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿCheckFalseOverÿþÿCheckFalseOverÿþÿ CheckBox.swf$CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckFalseUpÿþÿ CheckFalseUpÿþÿ CheckBox.swf&CP?ÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿCheckThemeColor1ÿþÿ CheckBox.swf¥÷>ÿþÿÿþÿÿþÿCheckTrueDisabledÿþÿCheckTrueDisabledÿþÿ CheckBox.swf'CP?ÿþÿÿþÿÿþÿ CheckTrueDownÿþÿ CheckTrueDownÿþÿ CheckBox.swf,CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckTrueOverÿþÿ CheckTrueOverÿþÿ CheckBox.swf0CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CheckTrueUpÿþÿ CheckTrueUpÿþÿ CheckBox.swf7CP?ÿþÿCheckThemeColor1ÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ CheckBox.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ CheckBox.swf-[„@ÿþÿ FocusRectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ CheckBox.swf3cí>ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ CheckBox.swf÷CP?ÿþÿBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ CheckBox.swf cí>ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ CheckBox.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ CheckBox.swf{DP?ÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ CheckBox.swf|DP?ÿþÿBrdrBlkÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ CheckBox.swf‚DP?ÿþÿBrdrBlkÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ CheckBox.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ CheckBox.swfì:?ÿþÿUIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ CheckBox.swfÊ:?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ CheckBox.swf ;?ÿþÿDefaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ CheckBox.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swf~ŽdEÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ__Packages.mx.controls.CheckBoxÿþÿ__Packages.mx.controls.CheckBoxÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.controls.Buttonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.CheckBoxÿþÿÿ>import mx.core.UIObject; +import mx.controls.Button; + +[Event("click")] +[TagName("CheckBox")] +[IconFile("CheckBox.png")] +[InspectableList("labelPlacement","label","selected")] +intrinsic class mx.controls.CheckBox extends mx.controls.Button +{ + public function CheckBox(); + public var __label:String; + public var __labelPlacement:String; + public var __selected:Boolean; + public var __toggle:Boolean; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public var borderW:Number; + public var btnOffset; + public function calcPreferredHeight(); + public var centerContent:Boolean; + public var className:String; + public var clipParameters; + function get emphasized(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + function set icon(v); + function get icon(); + public var ignoreClassStyleDeclaration; + public function init(); + [Inspectable(defaultValue="CheckBox")] public var label:String; + public var labelPlacement:String; + static var mergedClipParameters:Boolean; + public function onRelease(); + public var selected:Boolean; + public function size(); + static var symbolName:String; + static var symbolOwner:Object; + function set toggle(v); + function get toggle(); + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ CheckBox.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ CheckBox.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€x.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ CheckBox.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.skins.Borderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ CheckBox.swf‚ŽdEÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ CheckBox.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ CheckBox.swf‚ŽdEÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ CheckBox.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ CheckBox.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ CheckBox.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ CheckBox.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ BoundingBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿCheckBoxAssetsÿþÿ CheckBox.swfÿþÿÿþÿÿþÿButtonÿþÿ CheckBox.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.CheckBoxÿþÿ CheckBox.swfÿþÿÿþÿÿþÿmx.controls.CheckBoxÿþÿÿ>import mx.core.UIObject; +import mx.controls.Button; + +[Event("click")] +[TagName("CheckBox")] +[IconFile("CheckBox.png")] +[InspectableList("labelPlacement","label","selected")] +intrinsic class mx.controls.CheckBox extends mx.controls.Button +{ + public function CheckBox(); + public var __label:String; + public var __labelPlacement:String; + public var __selected:Boolean; + public var __toggle:Boolean; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public var borderW:Number; + public var btnOffset; + public function calcPreferredHeight(); + public var centerContent:Boolean; + public var className:String; + public var clipParameters; + function get emphasized(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + function set icon(v); + function get icon(); + public var ignoreClassStyleDeclaration; + public function init(); + [Inspectable(defaultValue="CheckBox")] public var label:String; + public var labelPlacement:String; + static var mergedClipParameters:Boolean; + public function onRelease(); + public var selected:Boolean; + public function size(); + static var symbolName:String; + static var symbolOwner:Object; + function set toggle(v); + function get toggle(); + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; +}; +€Media 1ÿþÿDataGridÿþÿ¿úBwDEøÿþÿDataGridÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿDataGridÿþÿmx.controls.DataGridÿþÿ`/Users/Vixiom/Library/Application Support/Macromedia/Flash 8/en/Configuration/TMP1uru759snc..swfRñCWS¹Axœì½ xœÕu0|gG›%YÖfy_%/x·1^dK¶$lÄÈ 1–FÒàÑŒ˜y  l('†LHK k“|éMJRÒ’tù›6mé×6åKº|¾³Ü{ßû¾ïŒlSBèÿü<ŒõÞýÜsϽ÷ÜsÏ9÷&±ãþ_áþ©©©—Äz!„OtûÞ'àï¹sçDuÅoú&§¾ûçßzùñß_|SÏwš&ʬ]Ô=ãã?œüÛê½6õk/|ë 1­†‚~(ro8ìƒ?¢Â;«fPu~±{¢PÈfz³ñ’Ø‘hã!±sN Q]Yq×¹ø›®ë¿§sÑGÿ%}nÉ·>ôÕ?ê{%÷žÓw<÷á=¿óè§7?{Ù ™[ lJí \_gk…(Œ&Ç’Ùt6‡ß©¼h9?¤Š±ˆ‘?šÊäEìl”19Ô1{ÒP0S€x€2Ÿ,PRád:)â Ü€êÇ,êGPÄC©ìAÝâ:Ù›ÆõfÖeWú*2Oýß—¿‘|ü§÷ýÌ ÿô¡>2ç•öäà-ì¹ê)ñªìMøëMÈÙ›°»7k¡7K )"úÄ—Eø Õ›+¯½âÃözÛWnÜÒúà÷—ù£mç—Å$ðÖ;|D_GÀ[¢¿wÂÞ)Q÷HDNçübõNd~I‚\öŽuâ»LtŒ&š0ï |æÍ™€6 +‰Ì`²§SLd†’éLrú˜IŠÑdjd´ Ž§† +£¦PÚÍ‹ì‘›±ÝþÔ{“"_Èõ@¡ø!G¹]1Ú¯„FÓÉÌ”KåûǃuâdJeFD&y¢Ðy±ƒã”˜7ˆñD.ŸãùQ±R¼OlÀ âÞa!–‰÷ˆ[9½÷ÈÍÉÁ‚¸žC»r¹ÄIþìçªáß1Yã"±æ„'’b8‘†šU?õÇ5Ô-ê澤SÇ’}¹ä±TòøDþ¨Ì%…äž±ñÂÉYˆíH§Æ±ûœ˜NB7Ž$GR™½©tZŒe%fEp’™!Š8–ʧŽÀø œ'… ¾O Ž +Àø€šO§¡»‰át"?šN`P’ùÁÄxRd3‡Æ‡ þ80‘.¤D"ɈƒûäJCCI‘Éöã7À‘‡!i‰¡¡ý‘̉‘töH" ƒ³ßî/TOæqXrÙlALVAÌþlbWØ›Åq6(‚>KÄ:Ïú…åë©}Ü/Öüö·à¿˜ýŒ9[!ŠSb$ÞðX¥MB4Ry é=âÃÜQÊ]ß19S“,ämÂÈÚ$A(ïÙmGE+œÁJg°ªgÇä,“2`=mþ¼øž8 +íiØ5äG &aXÈÿ8% uýÖŒX7ö (‡‚bËâðêíµ˜!$ÎùE5ö*èë£ ü¿¦¬„*º™,¶A@EÁUUŽ+Áô Ð?_:[ e?g®¬Õš³J â¶Ý,·{gÕn7«†šg v-ø¯¥oTÿÝ)¨Ì˜gÑö/ÂÄÐnÕ»Ö™Û=­ÀxÖ±T ‚;ÎbW åcbÚJfm‡†ü„7?c&`ÕÇ/Ô0w™h€Ûwup‘¤¦†±®,7N1œ@Œæú›g›HùLTt@k¡‹€z€^ 0ÑIhSGcQ$…4’~ìEϨ°šx®ñìiŽs×#H©À]Mõèþ½(ûÌ3Î(Sƒe‚Hÿ–%é»kŽw4!BÁ`0Ð{Q5zVýþéÐœb (ôËU¸¸6ñ´rÌæV4k„´xr6$$6°½Ûã‡gœ{ùÁçÔW"Åý:§^®Èë2zÛ"Tž3gî5SˆEñq(VÑàß1Y)wIšŠßó]<ýÏ¥®4›¤eæ·}ç›?}¾*_ËôùnßÁxâ®HúaL:Í@”ðœËv£3Xç 6ô¸[µáÊŶjõ0/’´Œàýs€!ÓÀ«õ…i`qÏ~l¨–Û À +ŽTÌ™ 扳³„µ„"¨ /Å9ŒYj©=ÛC¾·Ìˆ;h™¹ =›AΊ÷v¨êf1ÃÄb-§WVê—»j0c [ˆ“VüÅ®ìåPþ0DÈ€ý˜ðÖë©EDÎ’X2¡-ÆÓâIŸ +«Š/…Ì°}s©&{b%E2nWX¢¥KòY+㽪±±­‚ª*m¬s2T¹âDy{HüfŽË Çl;±D®5®ú]=áLkã ÓôÖ›§¶Tkk/ +¦µ%ú¼.N«ªßZòõ2.7è\2b£ADÒ™KWDÌÙû庾)¦˜4ΣB ²`@ïëC¢WåUƒ('3ç”Ķ)Öeçw¤â“´¶‰b{Írò¦p,ºY4¹è7bÐo$Fmÿ¡(²•B¦Í-‡àùd£™Ž|™…ÉAkS±ôlQ(oŽ›u¡6ˆ³U"Ô“ÜÏ»ž_îi~hªõÂ2rÏÇ"Ø8ç‘"‘¬ƒ‘H@¸ØÚËãŽ>)´A-->3AÏÞw²coÇhø·Æ°hJàèD)¬—Ç+¶ãznYº•"œ@ :úÑ¢û¦5) §¦fÊAûk[¼a²Ú>ÕÀ¬¹YôúÜg É™ÍoçÝÅ…Ããºm¢`èmásil†¨[·:°™«Ø$²=Zª{tƒ +üW0H¼6å¨Í$ËmL–p"‚ÜaíìµCíÖ.\X¬ÝvÉŽvd3¬ÝöYŒr\Ë*·ç<ç‚»&-!ÞÎÃ!ÕÝMqŒP×ÐoÛÞ eEåâ&–!ú°t>Ÿ®ÙøÁóÿ1¯³±ð«§;Þ,üÊ))¬PÒÁr%ÁXÄïÎNd†€£Ü=!^ +íƒØJÑ'®§üâ×_{­úî/ü¯Ûvõ¾*üâÛßþ6²Žb~ÝËKßü£¯}ù»û÷Ýó¾<=þzâŠt}*ƒì¢zÖž§üàéÑïCzŸl¼Š÷CͲñzj¼Jt& +‰îdb(™Û<Ú•‚žÍ´$+o÷‰xêÜ×îû³ë¶´N6Þ9*+­V=šá¬´Ú¨´÷X2—†cÛNk+¤ÕˆkZ(ÊÎ ?ajÊ'^{íµ)ÿâß?zîî³ç¿vˆ:=„w/|öîþ³çÿuÞ–CÕ²ÅZÕÕb#µXk´ØŸOæ…l:‚©3E{àe? ЊõÛDõÌÏÿãWk:2KÔ¨Ô©>ÌT5ÖRuTc6W€cgö8Ôµâg‰n«8H?Áx÷ÝwÃH|;øçk›Î¼röoÍ=ü£–ûéÒÚ—üê_ýÆ?þÝ/nyå+GÖÍ+»û_üìÇëdƒõªÁYªÁ™Ô`=7XÈ% ƒ£»ý ¡A¸ç‘ûöž +ˆõë×W?÷»¿n=\I­OaøÙömѾ{Úu„˜?+ò…Õß¾÷“^ß\6úìù§ïÔþóäðýÖ^xpßì¶æúñ?}´ÌÿÙsBÞ¼üûŸ½ÿžàë_þµø+Ï=X¾!ýú—ö~ÇøÓ¿÷;!ý§â7ýaý›ß7êÕ}ÿ™ºzi2¸æëGãGº:ÖÆÞ\öɧïztÓhëSÃøçðSÃ÷àŸO>ý©ל{ úWÿyίî.,’HjTHjpŽJ£œÈåQÐHh‚ÜWA|‰4q­÷a¡*Q7U†ŸA ÅÆÄù3áph¤ú/ÎßGal›Ÿl_ŽÊíõôSðY •7Nù&Í1i¢1éÊ¥†våóÉB^B×LíáÂq a³ÎÞ‘MOŒe ;.L³!‰³UR¶Ù¢39œÎ$/3´è ”¡Eêá#þž…d&ŸÊf0ëJ\³ôì¦?®Çêj¿¿È(Z×ò•óÎöæèꀦ@Ô\1ð¯úý™‚Pæ«CYqÍú¿èøø3ùý8÷'ím1$Ìsg›Z?U³qt\ÜÆùb[ÄKN‹ù8³s1c°býÁ"‹ÏΰM%^®€¯Ä‘îDf(Ì¡¬x*Š·$ ì1Dا¢‹àß…ùRÅÇKqGì…r`lPv²Š:¹PìÍNäãØË©hâ¨z)\Õ̧Ö;ã…‰\I,€ixôGE](Ÿ½³Ú'îGŒÎÕæBk¨­EÜÖD&1}àA\¬±™2-¬wdÇƳ™dÆ9Ž—Cúï8ε_ˆñ8† ‰ºÿ:õ¢PUýÚ«F}Ž]c‰Y½$Ž¥ÞJ—ˆºS“ç©žrÀ`ý½‡}ŽµTô'Ó€´Ä‘t2ëÜTtž@Y·§¦¥Px׫N –i‚碻Ü39iË)o_.{,5DHÃÌ­%2·òbHé…¼M¬)Ð\v«ë^nýî—v˜µa%T…"ÜTÕ{àë,ÌÆühb({ügt±Ñ&ók…ØÊõ—€®”€þÃßüúíV\ÏÛ#‡ ÚÒ”ø½—Ť6íÃXŒkãûœÕ¢?56žNòÝfgöxFvÿ2Ù}üºïûnÿîïÌÞP'»¿ÆÙýl¨ágÔýËT÷+à5ÔýÝé£'¬b­ƒw†ãƒçÅܾþæû«>¶æÍ÷á„Òæuï ÜÍhjd4W4o?È÷#ÈkÅ ]ÏüÈq{¼ŽÀîN¥ñbh*z"×›ã¶FüÁÔÔ¯Ëq«áq['~ï Ñ ;ã‘‚U?Œsmi†ø÷^šz‘¢GÔ GpŸ˜z`êÿÌÙ}ÊdÞÒÖ;¹'#‘²˜¡„“=¢"‰rÞ@¾PdÓ +,jÿeØ , m¡=Œ)F§\Q¬â®úÅàÚà€ëÐ8À…çüŽ5¿Ym¿ÜõÅÞäÝ=pÑ¿׶բæúÿ+ïzÑÐwÇ›¨„fê~iŠ—ÏXKëÿ¹ãçV°Ñ@1¢79VÏûyq¯Î=ªŠ–SÑMÀ÷çx)ÄB›½…6ÁÖó Ÿƒ6 ÜátAÜx¶g–-RÛ)²ü D^^-ß‚sAÝ©¢hy)|FÐp#À°æ²ŸiŒ¯@úÅÅ99$Bp,ƒ™BѱR$3¸¡@¢‚êêƒ0'ÆRyÑiFgR<_‡ÚÑô/ ¿ °Q÷Ê]ói,fê^yŽs Ç0±{¹ÐC‚hÙêd/ÔðmùBvL"”O>WÀÉç«¢|œ'xò÷ýÙõ_k]ݼïÎ œcÖ@–mtÍ^&|ÕÏíþ[ëvhCüy\F¦V­ZµoÞÅÈÆÙWÎÞ<·é³^l‡φ«|ÐÂ7_zzó?‹7Nœ¿¿bò Œ÷cüSŸÕñ¯­¯xY|,\ÀøÓ_ÜüÏMí2ejçoÿH<® + ¯_ùÜë€o‘íÕ~Çî¼]ôæ²éôÁì o­»úvžt¨oå߸«»|ùS ­/Wýù½wìý÷š_jú·ìo +wZW`U*{õ íËýËøàÓŽ}ìÕ•Wú£öÒ–•Uuµí‡÷4Uï9¼©výl~õÁ7~ Ú[IÈîëeŸøÉO~%º_ö½ñõÍ7ÖŠûîyõð™;¿öêÃÕåßëØèÿ¯?8M"/¹K•¨~¡q‘ÿª3/{q[þõ=Ü¿z÷k•¯tž9u㇚žiøû_ß²ú4ŠÄ½Ûqâ«œQ6çkggßR·i.¤¯‚ôhâ§|–DBåe§^ì¼sÃ×þ³í·þÉü|¼«úðÚß»¡pïÍOüçƒÁЂ"ê@ NâibΞ—5uŽ¦~“Â}¶ ãœª}ùÃáª(tK‡y¤ W@J±Ñuëp Ë²oþ´íßvÀBh 4i i§SÜné`Ú™ÊóLãñݣǗô?J/+ƒì}Ç”Aö8E{m:4X°]šb¸%Çš{ÐýŽõ ËÙƒnOÖH_€´žihh!×a¤…抺(¨ÌEAå@Aœ¾)(ð1ˆ­0)ˆë‚ØJÎAmⵆaw°©ë/pSxâ~òo)J‡¸©›Šž…Ô+/±Sþ‹í”wZT¸¦EåtÓ‚!¿Ò 9ŠäÔÝ÷sŸºL0ûÜ0×ÂíýDòùjÃéîž÷ПßyÍ¡†¾û¥Ë¿öÇûb[`qDÕÄ*gõ³¿².º÷SŽõxV÷Ëßzãë›F6·|¯-úÝ·¼üüs¯Bx’ŽAÁ»„_±º•Ýó·ðŸ^YôËoV¾úûß>í>Gy'¿^ÚÙð(O ö̯ýðÁeùOþÊÑÍ ›¿`¬ƒL}*lÿÛº}®w‰v—›Š"}Tû Å~FžU7ô Jóèà#¸ÝÅT° ýA”äôrddù O@PAsã›K˜¾JO͉±#»³ÀŒË$¢#®1Îjr¢âñsßù ÷ßuË÷ZÆÛþú‹o|]./ýïØòwjËõ ‚Þ¹>.„¤ƒz€¤†Ÿï¯r žŸyËwšw×ýð¥=·ý¾„üÐ;ùA'ä‡Ü¯ˆîƒ¤«½£ÿr=ý:È+ ·ƒ$BÅH"ì$‰4l’„x휼Åé„E4W¡^ñP·æš‹×ÿ–Á²k¼É §Ñµ?ëiÄ‹êµ^ hÉÚ©‡a‹y•Ø‡ç¾ô% ÂŠ»¿ï;³75m8ª8ýØÌG7¥×>³U4­º÷ÀìMË6œSñÁªû9:7'×AÙ3؉âÂêaÄìaQŠí¹Î¥+—×óy*z r\ÿNûX©õ[mχµ›½›â±[ é=ø–º^ünùØ«ó ô7àõ¸O"O8 ¸Û÷xºÍä‰W)7("¸^¼^ÿGMýÅMÕ“\¹ªJ<ÌU—Ú4op×.I GçÆ‹ÞÙntWd²Ójƒ´ZgÅyܯš¾µ÷§/;ö+’áÝÙøÝþ»Þ„fñfû&Õ):ñTþœxÎ eˆŠóâ£Ø½ëÅ«÷Õvî3x˜!%CÂe(¡üÉößGäF€^¡0/ æ.q“ õÔÐP:iP.X /4“ˆ‰ëU…„.¨¡ •‚.‚5ýÕ`@3Ð2àf¡…2dç²(2Sâác•àRQfªéX€ãðB»ÿ®ƒâ¼ÿ8^¼‘}ì+EëŸß~£D”xvR,Ó ’Æ£Ð'y!tøÝè8R +CâÕ—7¸‹ÖëmâÕ©§5:œÝOz»/IïL‡§£uŒv Âìøàyž|ó ö6H¢¦½:¢fÈ~,{†×ß +ª—ÞŠOžâU÷ ¯ºUWµOò‚ _fK³©¥³¥ƒYs}† £ŽÆ&yr¡j<äj<¬ÇR6NdõÃ÷O£n`˜Æ®†ÄÔ4€ø/ §\ ËÑEtßü6¡›Wì›] Ѩ¢ˆæ襉h~xùäM—&¢ñ9ì¨)¢1Æe™iH¿Ï-µâÎG<ºG–v8²DY“|X‘¨ ÑÀcJõ«?¢Ê xõ ȾªÝ³ŒóôJK`;% SÑGqç,œ¨îÅKTë<Œîö¶Êä NTÕ|”…”}¾v5½†AUå«jÃ]¡ãkÑ÷ñ•·¡1üLµÈdŠ£ò>·zΫæ2†ù£NôÙ­Ob§¯än˜peœpI¢Æ!ξsCÌfCY'(Dö¸Ž“<Ÿn ˜×ÛmÃy‡´t\ì.dôñU½åEY(} •­BÁ5pzÉ©ÎwŠÆµ÷ÕÒ|¨lx>çÀ‘¾î•5óásœœë¾-ÎÃçf8Ú5>4t-|nî½ñ¡# Ÿ]À.7>”¸>{im|è¦fø<Lcã—ŽÂçµÀH5þxñrø¼¸žÆ/Ä G€oiüñü2øL3Ðø«˜a 6ÙÆ—wÿ|ž€)Ûøò®|Þ[AãËíXì4¬Õõ¿Qs|>+eý·Ê±‰Õû›ÏÀç°ºÔÿ¦‡ÏOïÿ>ŸÏÁôjšz¶>¿”Ú0um7|þ&GÿóoÀ8~§ì{¨‰ð—€èÆGºÿ>ÿ +×84ú¦9†99†»9­•ð à3_RÈ_¶½”ÿ‚„ü—‹Šç›Bþ§1Þ‚™‹(œ‡QL'Ž$ÓB‰ÕçœmQ}éÄ ³Í"G2ý9ïôõÀKaäÖÎÎEÓ±ß{ÜVl[Ŭà}§ý¯¿†löCßôrÞÓäE·H9„…âCøêòm/¢üàšßY÷ÿ‰!lºý™wÉ6<×ÿ†=„“{æ¹®Ú +âjs‘ p á4ª+8zRE£^T¿!U46‹ºW…n%J­Lˆ«Ñ,n*ŠSôØ¥ÔÿRø(SG^4ì5±ÄŸÁ0RƒWfÞ™i€ Y¯½zÞ94Çä*)Q‡ +AÇ ÔÑé¦B˜ã°\Ô?ñ¾Q©GÕ*ê?µïUy%¼TÔ¿xm7j âÆß½¼Y5ÆìäqÙ+¬ y#4‰—Y'.e´èÎ÷¸¨)ëvŽÿ A5î¬ÀžA_x ŸÈY¸#Šxx¯ùÛí][q*4ÿ$i ¢hþ[Ž‡·Nø¸Õ‰Tx¯¨z²›a«»"'—ÞYKĺV·ŠƒÉ…žÌøöó8Œòm—ÒÏ°‘&Ñü;µÍ¼@ÎÍ¢ùc¯ï%i  x™h~´¦øŠ+鉜U?è3©i5ÆC;c¨à?žN2æS°ªázð’"uy¾ÂånÍßø‡>eÖø ü9Ó+ÊDr(EÚPb<‘ÏÏæ†Dz M%N µh^ä’hA–H§Ð€ò¿±Ô lyW²Ð—ËŽïM'Fò¤X.HOÜÇ&$*ª¢l…q{oƒ™—UÑ©Ä\G%X.p¡r¬¼N¥ÿš ;|†n{ð±F“6ibŠváÉrræÐ*ƒ¨Á@€-’i[ûY‘vmíP¶êÆS-ÑÉ*rmÑ*ÄÕY »•Ró¾Ì¶®òYåq#Ž7œ ‘t WVR骤R°!Oü¢±^ }Õd’m MøƅГ§ì6}‚MYËYJ[eA/…Ø¡gÄXÝ_f©,™¥Re‰–ÌpÁÞ>÷ã_3ìAuÔÔ¶K”Ý_¤‰™(¡Oõö9³î3k>ͬ;\3kfÆj­ð;Uõ¥EXâÌ×#_+20³­ 3V¶‰Á‚ ÛsÊv00³g`€1¨?'ý4è¿›NÈåõG!;ŽndH0ÿ90žÈá¬vÔ„® ”;ˆ: ×Û{éÍ;â¹ä˜‘wFp5¼Xèe;oÆê:T8ïCèjåYAí„´ÑÔP6‹cI@ùP*?ž( Žî9†Ý’Uj‡ \£¤Tr¤p- Ž>T&kä9 xôæ9,†²ûa1ˉ±da4;tVz¶¡Çí`8Ã^.k ,Ò)¡…Âöªˆ+t‡RéT#?š‚ÁDÇé]x³M¥óF!ϪZ&f†jA?"›ºÿ9¬½yhêR”DÎ rìr2ÚáC!ÖEzßN¿ì2c?q7ü\ËÞT2=¤6ÜØi'˜€&q£Ï#œ1Ä—R~+ +…Äà(M™Ð‘AíK'ÇŽdÓTŠ?{£ƒ‹\r}]ä(«éÄCBV"«B0¤ÉqèÛ‘‰Tzˆ>yÔ&ÆÅp*3ðvK¤ÒÉ9óÇãô…l ößž©¸ËÁÙÓIP¥†ðOžŒŠ¸‘Æ ºÜI¹«šÛ©\…t*);? + ÂT:Ãò£ƒ¢ÕÞ\Sª’]ƒƒÉ+ûž;’Ú›EÎOzÖ!lWÇOÅ7I s‡“+S„u耓.f©|OÖ¥TA #ĘlZ27’tÊ1ø]·zÍêu«×®ÛD+¯"øÅÍ'¼çÂü<TTâGç’ÃÉ,Œ2A‡9YîZ‰¡!M›i=TB.çrÅÆ=ññÞm\fv¶‡Ëd“Ë@úϨ0É‹÷P¼yQwG؆ƒ9NÉZÒ¨³UD%›íiež´rVáI«ÔiUÓ¤Íð¤Uë´šiÒjuZ›L›I½«‹©\è°â]åªð¬…ëcªWá2£pƒ‹{V°5jØš˜Õ´ +ÿ¨f5–éͺùZáj¨!®*™mV²H8˜Ý&Ï`7Çw¨#BK øæhøæÚU×ðͱá›W¾ ß|³|s=ðͳá[0Y‡çŠœ>Á#»ÒÇ'óâB¡t?9•aß ØÍ»u»¢×F eÞs¸X¥Ý øÝ„¾#F.vh´wv¾9åÊÑè²h‘µsšÉ·ó±2Rÿà +!#ÛQÊV«ˆœá“"¤„›ôV¡]éà¬[@J0"ÅÕÁ0URK¬G5N»µ wÐO‡ùâ`uØáQ‚œ„ 3f mOLûÁ‚ Á„À‰“½Lɘº¬nhµ&Ti˜öºè¡YJh¢Ž$¡rG‘Е“x÷nkaqX+B'Ö‰àÉuâ:öÐ#g0ÚGkÄ„TÌ~Ž ‰ ¸büŽÙøÉÙˆClœÎ¡!:&éd÷§âìÚ"Þq¼ÁÔæºcrÐNŽÈENoaM ‹üÖB$rúº*ìUTîYàv880-H¾Rz]ËÂvϲ¿M¹ë‰‰· +úÕÒÜ?Ù*G ü-J†ˆ•öÃøI|ðd„kp=Ò´tÉíÔ|Pï­‡&—aM@’~û ‚z"\OXÕó éEíjî¦íJDŠiKõ[×¢®¶o°'Žk¡+e"Bf®¨P õǵ¯ªr¹lþ[ªb\‚TOÎT;t"ÀX,”טFYôÍÒ¹n²'D¤ú>$ã™ Ǽë•ßºÞáÞ…7öº×Ó÷ÈŽÕ ë†`P§¨†oŒÛždl§J;àñät“¢ÖðV5%“•j£.$FØ·Ô|D.¦ªcƒ“‹xæø‚˜-`RN‡¹†9#Ñ>D…6M¯6wŸ$ü #þäu'À¿#qڶЅ_P-;‰8÷N¹‚m”»€"k„í2a`‹)äã ª5á°Â„ÝÅT±uÿf× +×â¡T\.²GaÏ”…B®B‘HMÛ  °ÃUÙ˜gßì‰Éxb²Š'^eö?äSýßB[á4;õ- mHAûööÆ„çÜŒsÎÍøJs36ë|¼V¹ +ù¸"ÂQ!èïRhï•[¼g¦4/EÛÚl¶¥+“»œqI!Ï ¸þ£ã¡_T Ò÷2Ð*Gøv¹UuòeöÐYQ.¶öh5¸±wKq¤N(×sÇbÔuÇ‚~ܱ K°N(äK°îe§¬Œ3㤷 ‰¢÷ºçY«œ€·:´[K#…üû­Ûbº¥ j :ö°ÂÚû#6ž…JzRÜ>Y‹ëd9.Ã"ü]Z´…¦ã4›0Ú’|D1½ì\Œçà*õ€QªÑ(õc¹Ë.–et•,QvÒ(û¦à²t•}¨´´_”¥v•úP‰R¢R·ÉR¸J}¸œ6àl—e?â*û‘-~„Z,Ó‹vWÿa…aÌ{Ÿ\uâH§Q¢Ó¨¬&Cs5J^ÕÎrÔ^õB>ØÀ‰[‰Z·ÇU­;«QÔh±»˜‘ *—Uh˜¶¹Wà˜¡Œ€+³ñ㬲ÌS‚çXLz„SÂ6 W‹´1³(à–®Ä æ¿"­ nºÈõD|?m™ Óæ:O ÝÇ5zv*–7…Šà5dãÕßy&öÔèÚ8œ)qH³Çìªjù<éã›;-ñx©Ò”KNƒ'‘šýäc?‹Š#›˜ï*á(TÒ.“’}ø}b|;¤\åj+(¿®qeô'­§zÏ6àWŸu/c™ç‹+¥@€ä_è~Úú%J·ºŸÖ!ó=ù¶âWÎú ×ö ÿy–ÿ<Çžç?Ÿå?/pƒjPé1¢fÅp%xQ­YŸ‹;“Ë(¹¾Tr%ÞNæèÙòôÝLÉϸ“çËäy”ül©Êk)ù îÒ+déVJþ¢;yµL^IÉ_*Uù Jþ²»ôrYz%¦Ti‹’ëJ%WQò/”J®¡ä¯mO£ê¶U}¾ªU}NQm;«ÐK€BÅ”èœÚsÏû±Ô™a†”Òž+®6g+¸ïþJ ŷ抾9EÍ~gDkuH¥©Óñn»âÌ{éäåG³¨q^qúÓ^h†ìVÃö…¦ÏŠL6ñ‚äó“h2`KÔö+-<»6¼*-ŒKSâ ý'­r1úï¶Iöw!EO¯­ê³Â¶Ä6+GXWãÖy—¹Y2-¯ˆ=bg);;F¡êÛÍv ¤Ñ‰ü·U¦ÖíòxƒÙÜÖKn.,¬ +œj=v‹{-VØUE‰ñ=GBsG}Ç\©ï˜+Î*γJ>žÿm Í(¡Œ¡%0ô–š«.Ý\57Wóv6W[º¹ZnnæÛ9þuPO]Éñ¯»àø×ÿ:‚sÖÛ‰–úÒh©g´4¼Í5–n®‘›kz;›k.Ý\377ûíôT‚)9è-ô–bƒÞBpÎy;Ñ2·4Zæ2ZæÍ]ìö>OoïwÉí}mïw•ÜÞ=j•SU¯°ø™7šn“÷”´·z·æÀEi`šÊˆ´ç°B0rlJKÞÅ]8y +gÖä3sgr<‰<Áà»O×ïjÿ%îÑhQB·‘V·aº-ø}Çjp’$6ò«†~Œ«5KîÁŽƒúæÝŠ\÷ÚêŶñQÞ©wìÈËk…úÒ9•>³+J夹]1uoû´`œ8ìÉq¼8’Ž´ èM„?MÿÚ¦«qÔ­çç2ìp<›N£s +ãPÎN¥Óüåò€·ý—({;6ÓîD£Ž1|±£¹ÃQO†øêÈHíD‹Çv:àp§öå’ù¼3Ñüv6ü‚²C‰“€7|î4›sÀ™w N‡Ñå¿LI£CÝ㣩üÉ%“ˆHÂymÄÉd:=.O&2b4‘ÎvQüÚÙð£7—ÈŒ$‹o?t–¤óžqD4Ï…ò(IÇÑ„©±o s Þx$ÆIå]ë°ëC§yÐt(ßm;Ô#·vŠä÷[móžùÅä+ðo„•¯•$ÅgYÅJ/)]åÌR=@­ÕÑK Ì @ù¥PV€ŠÉyÒˆÒ¯W&á£Ï«H’¥€©d¹RÐg›cj`ìšJS©€¡ÍW3£Xó.Pn¥mÛª†Ý®~µð› ¿:øÍ‚_=üB¾²²½gS˜»Ìj„Ø&ø5Ão6ü°t üæÀo.üæÁo>üÀo!üÁo1ü–Ào)ü–Áo9üZá׿ð[ ¿Uð[ ­5rkבÔ̺Ì&ä5ø̧°ÖFÐßZA£|k}Mó­ ð"7B$üÙÁ¬Í‘S§ðy°ù—º<"¾1%"å\ýF¬~«u4ºMvb{HX;à·¾Ûá· ~»á×q!]òr,¹‡3K–¬eDâö¯ ~Ý™=ðë„nUpé‹ÛÞ¯ÔÛûÝr{_DÛûÝÅS‡KªjʱЙp`oiûT;¿½±k«U§Ejq“TmIhÛjJ#¤ŽQ\…‡0E™ÿÖ‹†…p¶P%=ü‚{Ø–òy•¦2)VdØ (»Ölfl¨\àhò$¹ªbû=ÒøÕdCÚ¡q¶&¥zz' +.SR4~äz²™~EœõPáØ£:uv4(ÜËÑÚv²ÙV’†I”ΆxñøŽ*9Žû0Wœœ$òI¤ò}ÜcÚÌÈ +P´*£UjY 1!‹‘5§²;ŽÕ½¦ÅJcà˜ÃRÖ˜^C°£ê!)‚Au6 ;-¿ Y=ƒqpY’½ÙPG‘HWœ$@S–Ì”únÛ]ïŒx–áÿþEˆ™î7¬¼" K«kF=ie:­œmw‚Ítm¡åkÝ +æåZ²br>ª·¢rjßÄÛž?“<Î_›¦C•-Ì*uÕ†ÿÕ[Κê•|ß‚:¡Št=êƒUžfY.ÇV­©™òàmø§¶ÀÃ0*‚Ã-ø5‹U³uKu¦÷®§N·'-Í ÿûµ¢S§ã2ykYï¹à÷“ì>˜«(~mÊÔÐhDëŽByî“®3tºIF3+îÃ6lÆà+ÙÖ¹Æ\zX=¤ÃótWæÛmÁ0ÊÙÝÖO[ T[ ‹¶å¨Yôìò"¥J£ß€´µnmx³¹™,ê+,ñªŸ@œT“Xj(²F‡o‡‰Íe¶H/+>+Ç@ÂR«W˽ +Ç*à7Û©î< ̼ËcRiCÅÙèYWEš‹%/Ó”Ú“A¢[ÅûhZù™nt«7Nƒ¤ÂÍ]ìÆøûß—8FcŒÚ4ùï*ŸtÑýNˆ´þœS­ÉžR+ÌQÚ*̹´TH¦Ùóâ¶9¯I Uem§N12¼Jâ°Éw«ˆUDËæꫲSà2 Mç5Ðÿµ7ê @úëÔ„X¯Ö³u†ÆXµp̺JÝÛ “3¤.›Ÿ7Ùy´tµX­MòJÚ5¥¤Èh³ÖœÙR\særk«ìÀ‘33µ +Ì64Q£¯¥øU_Û­ÄMó –Ê3;5f:díÎ Gq«ðïÎXñC†N-&0ã +vÅ]*5QBçn%ïpiD(¹ÓN¾H^zæ¥ï¡Ú”ô{ŠñÒìÞ¬êÿ”aî3¿ëßUŠ‰¦Œ&÷lóÔÄ•™ÌœÁ÷¹xÙšNmâîX`‚ÙXýÃÅ‚\ºÒ Aw#'³ÒˆÌ’™s:“@>n7p”ÚsLâJ¼Ð“Œþ¾Š«R}¶R¶ò‘¾ >=¼~<ÒÙľ֘Ë$Ò¬ðbÆ ãôXGm?¤¡(Y ¦vi*èòð¨–]Mäw'“%‡­w¹Ñ°Ïùc|vÈ òó¡NGÙ!¿’~æô«`¦«ú– °¿åf0›n¸p0«QIõD¥ÐÝg‡^’›qÇ^4m«¹ ΄9À&?¬óÝÆâçÁšÐ +ĹìG”)’%×FŸ ‰^Åã]^¹&ÅŸTî«Ô5áÍ +©T +¥Øc;FȈ³³‹XDª=C²¾ž½¸&«7t©™žRö´˜¥¿Í3×k¦b¬„¬¨A^æfwŠ7 É•Òv(€–EšsÒ:ÊøoŸÚ¿=…&üø°Íä* çi—æí­%c›ô1¥ù1²ÌòÓ;ûìÉ•ÊJÕžÁT&_@WJ¶É ƒ÷Ê×è ãJfõ­©Dj\¦¤Â<‡ò­—:´T˜Ø‚úîëU6µAµ]«n¯¾Ø"óâŽ#Äãè½dQºOó¡F(Yî…„dÉU«û%êŠ ©‹êã]4PÚØÖçtÀ¶(î4UkŽ;YÓÅxtd¶Ö#^sNïÒƒº„+ˆ´ŠQÁ]>lÕžàݵûÙVí=è®59ö¤ŒÍ†ºØ|ËV_7Ì­\šÍ]¦f3qÕÁÉßã¹€+5(—‘½[HÀ?_™¢Z0û¿Õ^èJûÚ2¦ådÍzí‘6MzDQWW¬×9õ><5}9 C×Ö“Ì®R«Ùr=OH[cŘys²ÑJI²ÕV¥lS ïf¡Ej.î‘GÏÖ +y¬è°Gt%A½ŠþUË—Qhi_¼6N.–CrÉ\§![ÿXT®!ö²È¶éÅøj§èb½,ë³60KºP8 JL´n¤7]"·N3ï +µÁÚ&ãZµéû|+ìâ—ëiÚ®â.~¹‘’wÚÉÉ/·k~ù^ªmg¾cæƒP1miõtjÕB?8óÐ4nFe^›kvºK$¾¹d/ë…„”%jl6ŸÌÞøÞmìŽõ³P…æD>IELvÇ’¦ÔÍ¥<ŽXš6£šàʊѦß*Ç t&¬0 *(¢ÒªbÁØŒöK÷¸yZ_jœ.JX滼UO†°Ð™ŸøV—$.#¿M`2âR®4ˆ +éüD‡0ÈÕH¢“â¼ÈÃqK ûL3š|¡¿1öC&½”iO›fV¬\¦ÝÚ½îÿˆ-Qw‡M5#Í£>ÀíêNeJvé'J\³¡qÄ©zÀé.u'*ÌãŠÄÿ»SŠ?ß{Gþ®”â_`î›òû 8&²%UUœ5¢²> ÷lC# ÚÞÀ‰³M¬ÛTƒÖH𛉠ì§ÈévØ–¶T +ÎX5ÚÖ²Zë›á™®pöz~+ràQ™ê‹9¬p;Mö”¯×˜p{ˆ+ž•½Âéµµ©ø¾ßlÍ–«l‹Ìê·æXså×ÂÅ9ÏÒ©ªy–N2\ý§Ì âž]z³Šj߸åÙ\KÈà¡øO|¥FNž`þ¸ˆ‡½/‹ŸÁ¨\w©£RO~ž¨£;¦l<éÞÿ»(Õ{ybøƒÿѽßèéýM%%¹þnårÚCÃ[à2ÂE&¸ÍRD%2£¦oëiXŠ ìqØ3Þa›Ïõ#Çn3|a=A4Ÿ5ƒoÓÂê6íW„—©%*X¤§u¤ëoí‚œ©^,9øä°Jh>ì‘[€SçLqF~<Ìe¥®Ré¾.255C™,üÔ,‹ø^žš’å‘;|ÚÒ >’:ж͑oÙ¹‘oÛÆÈoÚµ‘ׄÔô÷Þ8â¿u¸‹Z›xÄ6Sò–¸tUqy WÓ¿¥.¦ÙqU£<ÏÝWLÅÞ­ø˜ÿ5Õ8œj5EÞ®ålÕ뵎÷ké [õ€­ë ÛœY‘T¯ÑZ6ÅÞ{UA‡MÒéI£wµõ¶³¦ +©DšòUÒw9,ò8%Bš{û"úŒåÙ$.싨C·XÖ*Â8I¬ñtb0É·ÌZp¨ZGùÎ(bÏ£ ÷D5è‰9Šï +(AEÄ6VsÞ0iïCRÍEé)S°Üë‘«Ü +­—|tX [U!¼zŒHU‡(¬Ú¥Ø\íT +]ì>ÔÕþ½Uk+™ÎÔr•Z­Zÿá:•;]1ý?.ÍbY=này§‚sÇC8„ƒ“R¢:Ë‹–YEÐ2Ë~‰e1ãdÃÔÇðl¥Þ68z«žôp!¢gOiÂD´Ulö«ƒ‡ÕàÂÉ,×›>7Nf9pRCú­^¼4Å{9­¹Δ ÷<ù˶[æ °f£ÎmYÑ¢+7Œ £DŽTjÃäõ+ ñcJ¦‘Þ|õšI£väÜcêu/ð΂"ƒ³À18ºó< ݘþ²Ðý’׸ÔÀã2z‘ÁÛœìÙ}Å÷õê!ÞÈ 1Á¯zk7ÁÅáFùÎZ2î|ä¹Ë¢7~Š%,­Rî¢2 çBMIU>›+”sÐÏß»CD©òk®V65ؾ^3¼Ã&q¢ËkGåË]V∼š!É´—í]Tª¤%ô2×»²'vƒjª-• NÂõ¤¼|[fSݤGy¹ÔäbÄ„¾*ÆÂÛÔ-ØŠ¸J`ßૼ «)á2oÂJXëMXG ë½ (a£7a%lö&l¡„ËÍBÇV9 ¯ ômf:±ÉÛ‹"ÿÝ®”ô–•Ì²LeÙQ2ËŽX¯á@€s±½l;ý»K›ìvX*û¬©ïÓ&&=gAË0_‰³ Mº¨ ã&®žkªÆmMP3³Vp©V…8ÛT`)RVŒ'¬rn×9s»åÜn ð‹Uß«÷ËãD+'îw'˜[íæ⦪ yÈ|f©on‘…äþÜ¥ —Å<ÇHM´üx:5˜4ÅawMo1Åêsy‘¡«&’ÈÀÞ2Àì¾Ôl³UÝF™¡4W%’'ÑJû)ããé“êLÐMyrÅ­!H·ŽXaÒq§“ËÏ/ý¡÷êäÂÈæ‘É_›ÜBHãq¡QÙû3ÂtAù^ù´O$f^ÿùÜ–>%Gè––Hò–ÉÞ6‚¡}5.×fÞ©ä:^ÚŸ}}êê…)í²¬Z»µàaýÓÒÇÔ‚½¦XÀnYé#;{¤/åÈŒôù(KEÉ,*KeÉ,•*KUÉ,U1Û¶åÞV›ÓX¡fˆŸ† ¿–úXW¦.}ª¡‚Q ÊQüOÅKóYб/ÿ‰ëz)´É Ï”Õ4(ª¤Aµ„é;Š¼aäº+Ÿ)wÕȶ³Ä8ÖÉ Hg~œZ©´«¤Dæ— Õ‚Ý|Y+ Y”^7¥o'•·…Ý.W3Zk¢ð1Sw‹\C—zöÕg«Ø8tüôx¥kZ}›‚Ñ +vÙܹùB›äkƒÆôo¾¶VNÔ$‘:Mü¾4>HC5¨Õ¿ˆ¤‰oZBª œÖl\b7ʇÇ mPA»YBèÒ;"=Ý…×ÁÓ¶× ¼ž9½gç’PÏšÍÛ8[Kÿ:üÐïÅnkMz[û€ÜÖVжöâÛšW<1Uõ—eXøL·céÍ[ÎÞÚŠlUû’'÷pÁ£É“jëÈ’õQ6³OúRónr”vh\À¿ä,¹×Ù•rX'cV”Øqb6ƒø#EhNÑ™K¦äk²F»c3öl½E¢ÐÙ®ÿî&-7[B«B›r=7˜’žiáo"?˜Jah};b-•ç¼…\ƒìšEY,­³%yR截ôûaŒÓ²ÛÄ%LÇ«Õƒ¶‘õnIÍôŠ¤~f†UøfŒ:!‘Hç ûY"µ~åhý‚(³§µƒÞPØzRšÌ{­'y›åpšÍ¶\o¶ +ˆˆÒ"§¼Uú|0ƒÁ–¬ƒôåó–¨Ö%jœ%>,KÔÚ½SjäÕ–„¬V?³d–™1·òf[Û|V¼Ç>×b¢z kƒÖZëVÉêÍܪr6:sú½†µ +¶ ñOåàŸŠ]¡”Ë‹w™evÉ,M*KKÉ,-*Ëœ’Yæ¨,sKf™«Y¬9E¸‚›%uÏóró¼\Á|ªqAW¼Èý$Û"È›ëáæÆm-N§©à¤Ì6ßZhˆ~$­.FB±–¸£—ÆÏVÁé:RÛ«AÚË)¾5Rã òaJKøíË9nkG\m?g¸j]OD*Wú+0ŸòM7“°+#n?{s”(c…í[a¦«JUzU±ÒJ$Ê >8À TX1P_!v5l« ÏŽ—:¬6Þ tðåy“//V4’Â9›£Þ*O^!‡¬Ööö縉Uù‰Y¾C1Ë-Ü1Kw,¢:Dá˜uó±aâ #ĉ†‹s†li¿F?OÁµ1þ³%Ϋ›izn} èÙ­ÔKbJÕVûé)wvBÓñ)ùÂâ:éÃÑjc¶V¾°Hië%ÝIRi$Z %gX¬¢¿›äyVƒU#ƒ!—XéòÀÅòÉ4ŸüáugÕB$ý@±Ûä~ò—/ݶ}|6–9S¾¯ÔE²‘ÝæŠ) Z7§öeÓ©A¼}u„óî …ìþìqôhO®ÔŒûÐ>à9Ñ7_~ªP.{¼ÿéÀg +&Æ2×PeÙ‘Mç鮕[àÛÔ>¦&ïS]°å½‘ïjW®cî¸3ðMi±ºÝ‘ E_6ŸRv«Ý: ÀÑygª !&6œÊäe+:/Cd¶sµ»cf;fªpÌh‡jKœ°sB¾¤n³½fX6éÈ“÷äqW¥|ŒãhœQÐ+6Aµ+—L(ËiýB[Á&Si8‰ÄD!+òãÉA8ÙH²#Bíß-dxw"ç²ÅeXñAÎA÷ܦ:¢ä}8)Ž”xËÝAôH®-ä1È4Ž•Wøx7/ïÛ WÛ0¨jâÙãyô Ï ÁIFû"Ä›x|²LS’Ó!žÃg¸íÓ¥¨ ±”œ>{ \@dwçˆN…„T昄K)60t,‘?J­9ý0ò“›¦óCv¹=ÐõìD>yÍh2™V†ÃÙŒ‡§L3HŸŽƒ²2œvVâHž —™ÄjPn*ÃGNGã­TÛH Š7®ò:O¯.ˆvõïèÜÓw°[ì¶}RÚÚ&†ÓvÛJ6êïkòŽÂÁú½0¦¨‰cè”ÐtÉ}+>Nì…Ãá)ı49æžsÕz·vÿOÝ;wØEkI§·Šb¾DªÕ©aœ1–FÆó˜èeq¯Î…áÙÇW§(/–«äßòoµüËšúa!Íz4ËZÒwG$nûåvúÈ)zÜ!ÎŒï°ý!ÇE½ÆECI\Ô¿“¸h,‹YMÂEƒ6.šK71[7Ñb+¿À‚⮎§þf»þÙ%p=WãzŽ³òùÎÊç)ÏWg›¹ö{¹ JC¾PC¾hZÈ{ _`C¾°äKb¶³Ãé _ê„|‰ ù2í/{“¬s©¼/>m8}ÔÚ²þsä¢Þ8\¸CA›FÁŠiQ°Òƒ‚Vm®ãc¿wUÿë«”ÿõyo­/+`*G«l´Õ¢öYXT¡Á7¾D5gSøâÍ¿,wœ£"¹ãrç/×Ìwåqõµ/ìêîjûI¸rm”ì¼,§ÔÊ©•r€/ ©»É5[Ô;ÏåJä¬$ý²°ó€X©Ý.ðÁ휦ɱ•°è²jm¬œ?Öñ.8åˆæp¥®§aCü´ýX k l4Õ CÁh·©­2m" ÖùôÐâ¸f>k3¹¶?&©`3t½ž²Fþ_8¿Y[lUŒ­°XV RüwNî+”6ËFs¬îÅš˜}Ç †ÊÏÖDR]`j;‚!ý2wT½á £¾Ï͉Åý^Ôîìq"|ž1©V¸§3·Ü®1µÕƒƒJ¯U½í”XæÙ%éf·¢›E7•L7‘¢t£ô¦ŠÇR;’ÓÚ$/!5©- 쪶,hu¹¨­Þ ¶Õ>½(ª%SÕÒÈ_#UuZ{LªR¹ÝijÄ$ž¥Eˆ‡°TåÆëm•¹è¦Šb#Û¢b÷R¬Õ¥|ðvźŠRÖ!¶p Ëe~“¾‚ª3Kôµ7¨Ü†Í–éã#ò«+h™”V_ŒÒê‹RÚÒé(m©“Ò–:(­±›½ümweݪšS]ãJ‡ /ä ÿÎWbÎ +ÅùÅùm‚-—)kUŠ^gh^«ÂÍdU/ƒõ«͇UXûðûcÆûš h6m5o“AµM.õ9;íÄIŒÜ+·RÁ\Kky/ÖÑzÞ몡2ÆœÁ8ôźdáÝ4={Ë5^,Š,þÎI¾e²D¸Vð«Ì¹Æ~l‘¨½Zœí9€í A39ƒ8kªVw3ú*úNù\ëG\•¹ñx0n¬3‡¶60ÞãÙÛíË:¥ò±Ö&FDõieô„¨ÓÛ$öë´m!›Œ’7ÇÏV»Þ1Ðu"·gµÒÖ˜•±²\³T-7/žÆõ¸Ü"OMöiÃI,·Ø® c®`¯…_Ž¤!×Zysp-©sBúM†‰ 9GÐ`»ŸÏã:ëñ ÕjgÝnŸÚ‡²ƒxC[ï<˜ ÑŸÐNpt´$ Ü#Í¡OÆŒµí½’(HݧœÇ4‘¤*sZšNZKNK³å:J¸U'ÌåõÛB¸&ÔÈ1"ÎJ_HÅGï€ý`Ó141˜²ý¼öñËoOZ5·ñÉ/Ø$x‘¿T8,éo3]µ°Þ§}«Þ®}«ÞQÜ·ê)ëNéõ.í[µÞÚ$¿,k§tb½Äà)b®;¢Æ1Ȉ’rÁ'S«ÜÙ+Ýîò¹Hõ2틶EÛàmÚû•ªÜÝqŽV +…3)ùwò +™Ìúû÷ÚÉN¯Ë(9å.½H–^@É£îä&™ÌnåOÉw«wFßê=H°ì¬Z/ôÜêe +°4çWó +MFfø‚¹óOU형œ¹Ëz±è5—ŽòÂ.ïq?o¿Ü$¯ +ÜwRž;ªb7W©<7y¿¤ÝšÂÃ(×7Þ÷ÆûõÞÇŽNŒ¡[ãÎÅ|ûidܤq÷’y ”+G‰¡±|©r#ErhÊ\a"‘î.æ"Ý|ÌÔ|ìó/\¹Ÿe²ÑÁGS™žN +Ó µ§º&·QaÓîO¡ýênò?.†é|R½N®-xå*ޥœãа˜ß•Ëe#dÜÔ!ŽP üŒ<Á(kf稪§•#3ªÐ`:5xÔŽ–×tòfoÀ¸Ò÷UŒô»ë‚£SEÙ‰ 7Í)ÔÉCã„ ï¡qÊÅ݇Œf†íT|‰ÞLÅ0¥êöd]:¬Ëë]Æqí8‘O"¤ObN"Rê +)ÀãE'µ_À¤ƒYnl,5ȳãP˜’èRÔNa/Å”2’KÛ ]2i‡Zî·'TWÆÅîÙiæ¨GuIgr6ÓGæÖ0 ¹Äö_ä ‰\(Tß1g3q~¤W=Ök/² Þ7Âl6ãeHʧ†’æLÐh–Šœ’¨ñ‚JW‘P1ÇÁ‡yê°ˆVWΫPˆ#©š÷®ö]ßÀI}ÈPó5¢ãò1YH¤Ò®{FµÂR‹j­ÓÔ‚…µþrÑž‚Ø+ŽOOä99•‘_ê^ÔxÙ@¦IWœ=‘tãEQ^£¾F +׃Îd:AŠül‚}cé"^ô÷ VN‡¸´œ£û]'¯*çkƒãMg×È»ºÂ4Wô)”~» » zYâøCj…p†©>G ! ŠÛ 'wÚ ƒ;ƨ¤Ó\.ÌyS\èÊ,J´Ì‹ê韴¨TϤâÑòŽ¨LGW˜ª’/ +-·=òTQ»3Ìoµ7]=™&ÕVÈ!e‹µRÑ™Cuš+¯Ð É +Ë+Íüõ1y”®†)ŒR¢äZ¼—´Qû®Ñƒã<~Ï]Š›#ñÒ„x)yó;Û.˜wlñœcœã¦EC3ד6O§Íwïsîóý|õ¬t™q."€„Ô×Býã"i¢m„ᬹ„¿àT2Ë„¸ŽœK]Ûoøôx)Á )_J!yÍi(C·ª£j-Ö† ™NŒHbà³¹µBv)`­tÔ®ž3£#bÀºÌ‰Š€–Ã)Ú•5¼Ö†›4r,ù:B×Z(´žú ýolˆkã(¿µ"6)¹ôflQvÀ—ÓÁS¶Ñ®Zö‹a»¾²Ù1-;K€?}îRC»ar1Ô‚êËa‡÷tåï¤ø¢ô× ´Ð4Ø¡¬”Rìvº‹Ð2vɼ)Ð =dâ¿ÌÈ»×ÌÛeæ펱W +2u «.÷ؾÑo•¦#|eˆiX¿c¾Ïu9ÿ)á%6¹„YûõsÏD4ͺ‹^ô©ÀUˆ«@?ŠÚ•YJ)tâ§xŠ¤_mŽì5ZZtí䥲V§mÙ£SqtŒËa<²]~jmÑ–Ï:Œ÷`^åÂÊ]°ôÙhÈSõS„0Ò…p/ßoTÛKå\ûe[\£ü¥Ú,Þwäð¼‰(¡ê4¹*ݹf( ¥±w8<’˜ž:у_ð«Ñ¸Ô¿.¦œÿª•Fd…¾Þf‡+p®‡ß{Pj3VGñ!z &óÝ„s©{ò‘ùˆ®®Ôëp½xäŸúJ­Î–Yú¬A¢”!¯+–f9¥’iX䉒ec‡c^ôÉ„®Jµ6T0ÑmÀJźm9~¹™ëèYæ%_Àº™tã»…ÊsZ¾íò9T¢çȇn'Ôþ°ŽReË…§¼¼’êcD}Ùj·Õ—€H¶‘™œ¥DÒRÐDîYw8EÓÕƒ&jê´¿kuíY×°0AÛ+™°ë4;Aoñ*ÊQƒxs¼Á»MÇ:‡Ü–ÔËK9Õü*ÉüÌÒ!^EƵ^ÇâuÚãdצK^¾§{{­æ…í_Î\ë–`€¶Î ÁÙñ,À]‘®3ýån¶•Sýågk½ms6v‰ƒ˜ãû<‹HÑÇ<²jÌ[kBž&Ì›’cÆ-‘¾)9Š¿ÈÔ±Bû î53êòï%ýRš²'ƒ|ÂT|ÉÅÙ¯->Ç3([[¤Z‹iMb¡[2@ö:àiçdÑvèâSq)ïÅw)Èš,œÊ ŠÐŠušôK z[·r×6莣Û|/*S u‘ÃæFÂÛl(¨èrœß*ù†ZÝ™ÓÒë\añºk6ª‹ªnD™šЃÎûºré—@çï6ª»Íù}¶gÕp0ØåD¡¾zw.ÿé§Û‰xïP#ÁÁS¥6ÒŒ0³ÝiOæ2áÔ´§œ»ÌS×ÑJ {½»^µNöý°uº›®¸­{¬{U÷OÇñ¨avUýŒ%ÙH'õ?ä¥þÁi©ÿá‹£þ‡4õKhG]ÐÏ®ñ¶É•}¶=Ä·:[·zgÑ24L%Ëlq•i,>>êö9…uŠãÄ +Éklû$Uê¢û°;¢É}óÝbÞœ»ä?ø²é‡å× õùuJ­·Îʯ]ÖGå×ëcò«Ã:'¿vXʯ½Öcò«Ûú¸üê²—_1ëò«ÏzB~Å­óòë õ¤Ô]îì„ÏzXv‚wÑÈÀ:º÷–íÄMÈÀ!ZVzÏκ?im³ÖZwZYµ¼Ú<ÕÞ{v¦|JêX•üç0ÿù4ÿyšÿ|&bîZ+èOrr(Ÿq %þËÖËŸšv +è<êôjVó,ýû\\âç:íDq¶”ÎÌ!yÜÓJKày©DÐìP"øŒ;Yixò#µŸ¶“ + s)ù³FééUügÕ/hE„IªsgÕ³c²è3äùBvL?DþÇ,væþ5%"w”øï?Eîº0g¯mxGd_¨&FöëËrÃϸ”êkhÙîÖc^Á&Fº€2._#q¾$M.(ë;¡oO¾ë>ç ÏÞõ}©ä`r?ÄÊo¾1R¡8µi^ͼÛ.c^ +yfÔÿðW§y0[³ÍR6Ueï²ë'‹/1ÕæþZcÞÌÔƤŠ: Òf¥>°DR¶6KGÕ“ véEfåêlŸ06–€±É £¾ F£ ÞFgÅtkÔxz™Qf¦#CÔåæ Nˆ›½Ï.qËEBÜ\âæ AÜ\âf ±ûɾ?r2 ù¦• ð Íuö೨¤î-D#Q¶y±r ͺ*×£ð2¯‘µÁÙ*ç;ú½À1n -qÜBb?_Ö¨Öù1§˜"à:hà +‘h¸€æ’‹`.RÒ†R}^¨¿ÅZµrIqÕÊ¥Ö2¹é/ǬÄU»™¢&“)j‘L9ænµš­«Šwâ¶vYÕ k…üj´VʯÙÖ*ùU ÜE±Gìç+`uÑGìçÙÉ©¢x™æ >Hµí¬Ú(l?x)*Š¬s4UÕba5g¶}Ñ~Z%E®Á抰.¦À©¥õzN¢îáIÔ:J ¿Î%F¸à)J-¦põ”*Ž©ÚH:9Ôñsë`°Ò)£SšGM°]Ã…dNjIJãú·Ïíº ˆ"t«@+í,CWÈ£ŠåŠVêVÄG¡"r;Z¡LqQy¯¶Ôh×’‹¢‡%Šjè)dz‡‡Q[ÑàËÛCŒ±`ÄÏu×ûsgiÞ>ý’r/sÄÉï€~‰S ¡Å­…UæweöÙ¼ŸäâëDþšHÁšJ5™Bj:-ÊäW¹¬Ôv|U(Ö}Ú̦ÚÅBÍ÷ñnZ”¢ÚqË{íØ­€Òe[ÀÒß +–*Õ +;sqFJ#¿FK¹•­‰ÎX©¸ Úÿ­ziäÍP9Û:RîCåZ>%›vëÁT Œ5Ѐ4ÆUé.ƒÏãI]Öêf%œ¢·Èɘy±Ý²½#Ñ%œð“ú…5×[Ë•ï„jל¯Ÿ!^à"•NµaÚ¬‘ö¡>÷BUj.h‘«òmÅ+÷º(p»[€ªt¥KÞ¾Jíga—JwMøh§3ÓR…4ãYÙr–ÇÐÜ÷RC?F;PUžpWÙæmE\·°¯º“ÞÄ*]W92®63ÚL'^¦™œ5ED"k”Œk­–q­s‹¤Ö#yÍį Ö2k£µÉÚLbkKû…|›9E—kFã!ªgÕrƒøP)Fáë>UÕ¿Kži‹|e:ÞÂQh«3H¥ú hï«Í°˜Ê·æFôþ–æd`Š(¢KífÜá³*nöj«º¢“)0<‘rêg ä è£7nü¸:AüeV›ù ±…êAû¥'ÌÎðQÒˆ¬Af§’Òü yœë+ä¸ÉäØøhY„!±ÇþDáIb˜¥ý©cIàK°œ`ìSñüÊíäb ãòb( µfOÊ¡C”Á8 p'¥ü`"=(u·•¬HŽÖÏÌÊhö¸‡„¯6 ¤ßÜ™Î$—F,*W¿nKX ); +,Íêÿäi ;ds4ì«›°G´£WÈåu$õ»c˜ò )+…ÂP^·Ä)…CýÞIËþ Ò²ŸiYÊxpئ§å‹A¢ªÉ ÷ ‘C@­kÆj`¿™Yë¢ÚZOŠ¦ÚͶrfR|‚‘°Ÿ=UIç–ú,2/U¯ }K(_Oô¢ò‘F¢6;¼‰ö1¥ºÝœx›Ëàˆ]jÄB·vôi;UÚ*â ® PTvjmÚ@–O”Ÿtùš4(§ˆÇÛ¡`Ùn:ãÖvᬉé¿ O‰Z<„£ÜÕk@ÃŽ•ÞÚ=ê mIGGί !?Âü;¦ŽRä_k0$ª5Ù‚=jÛÝ{¡òÈt9ÊcL·Z%z¸z\ ¿}*€ÞY¨@,¨í•|¦QOAý¿u!¾¦ÖÉ׸ºÔAN§ÖÉ鸺tÐìR½Ù¥Cf—®6»Ôdvé³K×ê\lG£‡Ýã¹A« ÏŽñÌ^èTþmñ-¯Ó›Èõòdï7ïqe½R¨‹\¹šh>Ô\½nÐF>«ì°³‰ëÝbgWÛÙ1Ûg—vÄŠgÿÕ²Õ½f ˆË'ÞaÝÎM%ÚÐí$œí¸üÒÞèÁèÛõHi¿·7iÎvpÚú‡<õ'íú“¥ëÖõ\bý£vý£Sÿ³þ>@}à°[;L õ*M.†êùì˜Þ?ýÆj|ØPªukÙ´²]3! ›…±…(wh F1©i¦ÂÍ®ê½îÞµŸãÝá¦a˜&Ȥ­1³6ÄÉrÉç´Ç­[lÍzÜØòòÁA« •¸ó.nوŸ­=±½A5|ÌÙðqoÃÇ] ¯˜¶aó섾;éªã+n|¾×Æç­½^ÍŸÌ)ÞŽÛêÇ›â’ep3µNº:WÄðOÞmź'»ó>Ww6 üí%‰áŽiê;åZƒØŒ l<·kG•Îªo–/·ž£´i¨Q¶r§·•’ƒpû¥‚lå.W+6h·–Ím¡Ð2-Be¡»]…fØ9€µ{ôÚp/¯ xRǵá:›qŠX‰vJR`5).ý´Ãä +ÙZÜã«…y, 2gâÊS­9Aë>“¿m’*¿uL=»¥x;N«Dó3¸U’OPÂç*ûü€g­\®ññ vNAøðù×˱#¯Œú¤JÜ»…Sj¡N8 Tˆ.銔êÄß“=RU²hou »\Çâ£SªCFÏ7«‘ràÃËíx9°w»‡Ì#U«<>LøŸ/l–Ï3 eñ½•â'uñGäcxMBd’ÇY&ßá€>â<·ØKôӅ?¬•ä>R\IIøf%k‡s¶€ßj— +r”g ¤¾fë¯åú }¬f÷¨[Íî1SÍîã¦íÁã¦íÁ'LÛƒ'¤íΓßcx2±aú¤õ”üú”õiù5å*ôõ´NýŒN}F§vè¯guês:îyýÕ ¿>«¿^Ð_/꯽úësú‹Æ‡¾š¬ç´‡ÇOʯk¬çå×!ëSò«ßš©­9ä×µÖgå×ÕÖÓÚ&äùÕi}FÛ„¼(¿öYÏhk“mO²W~°žÕ¶#Ÿ“_³J*ô+•ƒÆ’Yª,=%³Ôksüi\5È,ûKf¹Ze‰•ÌÒ¤²ô–ÌrÊrUÉ,ת,ÍxdiůjÀV7ภÆã Œ]àq`ºF¥F°žÄ‚»{Ï6aîÖ“Öyë ëÖãÖǭǬGi½Û-õKk ³=Dó{'ƶYŸ´y©Oñ†;“­ZØDÅú +r<Ã&84/¬giFXÏÙeŸ—ŠM\ö³Ò „˾Èe÷rÙÏQY‚¼CíÒºåºDù¼’ ~A¿ŒÈäQJþ¢;9!“Pò—ÜɃ29IÉ_6’/N÷õ´JÊÃÔÕU.¢—RII§ò…A©ùÚ™($øÒ;‹F2W4`-g|Á¦SO1*Ž +lU•ûeç±Ô‰T¦QK½ŠÉ“J+ÄKÙz±˜M¨kúÿKÞ›ÀÇ••w¢·ªn©n©´Xò¾ËûÒÞÚûnË’-É-—Üey馻EI*-¸¤RW•,»›¦›¥±ÄÐ1h $!“È&¼Lf&ó²LÖ™ÉK&’L† ~ç[ÎzoÉË„_^ÿÚª{öýœï|ßwþÉ{&‡ 7M×ø(¦Hwµ0a»¼)Ð)·çå©)¶òW™¬TËš¾*T!dµÓ¬IM+u(u74¬úGYs†7¯ +8.dÍZx ^š·DÞ/Ëê‹h@Ûª“ˆ mk××Hç´D##¢s0kºQª”I¥î +E#”T.LóCÒ¿R*cN•3·P™X´¶§S~Q»¹,á­"£„Ÿ†vd¼\AOL„d¾r€&™§_Q/4;Çõ…šb¡J¦èt]+Ü)èMŸösÜážÎ +VTžeÐÈx±Z(6a.còšÅ¦¦ ˜ýs5@°ê¦›§aÈ\‘q–NMWÆDA} à¤Åð‰ébu|ªX ˜cÓVú€ÝC0C‰–s&AU¢f)+Þ8”ª2б wt±\)”Ë…azFv®\š€ùd‡áƒ2ôí&uÿæ©/´F3ÿ¿iêË„ÞÄ—6TždCå_©aé:ÉŒJ¸“Òj Ô)“¹æe$&ešx9Ü΄Om¯U +!-@¬,Þ#b1+xíâ´d,È0ZølYoI,¨Ï+~ã¼âƒêõüâ7ϳ> æ™ËÜã#ª†|„ww-ˆ$SÛ¼$Ì…˜cÀ¾Nlbkò>åÝ[í­ï©phaÙî`ªš³ÿâ\×q°CŒ“$üt½Ùºÿ, ZWuåNÞfÜx¿&Ï6ÏfY.Bˆm‡Ó,¥IØ ³ÌWx¤M’Á2ua[~·A«\Tb Ž˜€‘"PP +Þ«šC©g¬Æž]#Ù2«I?À“'q¢”Ú¬¨¶ ì¦õÁ†»i­¡ºÍò^­X›î®BƒÛ¼Ä8îõ>ªIož2{¬Ž¶â“”Íš†zÒ ÊÚp®ªÂ¾½ÊÚÕ IX3$aŸÉ­¤¨‰àóïPDÉ?ù€ ìu÷»Ð¨hB€Öj«§Íä°wÛð ›³zaàLARSïÈd‡ïSª³Ñ] ƒdEˆ¿®u&³Nw½Ë†¡ÝrÚZCV>R³ Õéú°6Ÿ{àpì/æøVco0£Ø0ÒZê-öñ»‹X`EÇ7ñ;~™{+‡Z nQYÐ!©÷` þ3dL þ\‡Oõ­;J–†â»Ô«KjúTÇr‡,Ë*‡¡Ññ#6ºÊ*î#åT[õr›Ö¡õa”ìMàp_õ><¾žóy4?– š¸@FÝ’š´–ìDîü½UKm²EL*Ÿ±nÿ†\ÑÚ-*ÛPDó{i…/µŠÝ•µ4ŒRt(œ+©Ù‡S\I{ÏÒ–à«ÖœñæT1Üò’ÞI+Wn²6æË@\B’Õr~’9‘^,<Ç£Öìo©5ë¹V]³¼¼AEFÉ{±^+X2y9Û…-Ozžm¹ÇZÂ@èÛfAˆ{ÅM.Q†% +ÆÕ ü„»´6x,è ž ^¬ ¶ƒÁ£Áž`W°;Øì 6ËSË<AÌçeèSŠ ÿÝX!Ɇÿî¹²á³÷AÓ —;?oŸ^e0?6¼ÃøCª¼â!¯º“ß­‰<ÇuN!NvïÛ~ò&]O¦ ^/X¿ªT{:‘™Ü):¨§s`À`rW¦ŠãC¯#?9Yª¶ ÿ¶üd09Û¦ò•j[u¬ÐV˜n+àg§\2‹Ã®xÌ*P¡,|MOVÆÆGª^~jªxËä<‹HtèhŽ7òs±c-Ö¾æà›ŒëV¸äUc¸Á¸žoÞä~k†?KLÆ=ËÀ«oÒ’‚tž½Ô¡ùÑÀ-×<üÂðxõÜR¹ úÖ÷VQäYEäÜÉb–^ˆY"'ɽ=Lã•é{5˜Æ‚ XzßÎqj[ ¹…â53‘œc©<·ÕU7Iœãd„TAnÝx?H"4[)õYI*¡‘V& QFYZ#š®µQ¿ûÇôÆŒÆ^lBümʃŠB›íl¤÷‚hï–hïV·.A\>¯ËxÁBCû Æ*Cl‹5…¤9.ò%j±•„©•/|œð‹}}ªf‹Y—kÆEœTi&–g!E•ÕŠ`2š—Ü]¢ÑvIõºÒ…fâ° íE' â\ž¿K‘t_e$Àç!\QË6 Å·}ÄŽk5±Š¶]©oHT‰eFžÆs§%*Å*0]lÕ~²0C»Ò»Í´Ïr5vˆ|>bgK@þµ9~®³ñ²€º”²q^Q%\\‘Ò]’a ÔpC×m&n¨ŠÃ˜++1‰öõlF&ú¶Ÿ4(vq77á¥Wo ı(ö_†+,`Õ¼m­ž b6[‚­Á6±3lÙ&­¶øuÁA©A}LÞx‹ÁÛuÚ­´8Ôi¬˜,}]Î6%½Ë¹´G²š{:«kh g°5Üé»ï.ã«Ïèà"–Ü‹x/²–š+À¼˜¼” æ:|˜ˆíEÞXÃz¾ï ×èQ—#À¢‘ZvÇ·C/8ª¸!{™.Á”ÈÐcÅ“amÝx°(§_ I~sBŸÛqbß4XÝûq{ë´o)B 2Qöt(š§pØÀåŽë‰p€%‘¹ên: +üø(~õ\iˆö\ïÂ|©™Ý1zí—V½žÔM$ÿ˜gŒ£X-h"ñú8.ÖG\¬xpBœÉš‹á¤fâóæ¤ jÖù#'D›ùZÅ•«#퇃^” ˆs-ÄRÜæ§D-ÔD +Õ` ]_Ž'ƒuâ³"8ì 6ˆëÊnqQÙ, V§RbnÁeϪÓÎq;×{Ò|n:uÓy7fyªé°ÓûÝs¹é°q?¼îÃeAÜv>´ rºóÁgçzÛ eâ`äP8Ò§Åü­Òt*0çF¯å +Œµ‹W‚¡Âx‘Pò.O™êe­—rÐ%Àì XùÍ•fž”Ê8ˆ¡`DRªƒff—7—BYD_Y Ë*+Á³0RŸ²ÿ©•’$ÞM{ÕUBÒש Bˆ€Õ«Ü×øWxuCìœj|Åtˆn²RQ†±7t—1ôFÙɆºlÔø6 ’e2 b¹ `•ÊŽë(‹ª†L'_k9Ç!;æh„YX‘ ]v$4 ¹¤}eÓÇrÉÅN&õÅz-+íéº1+€RéQÎbÜð0¿uR£=¦ÛÌ@û¹I®˜ó‹µ¹òƒG#iP\#qÊWfòS…©êX瘩1§Mó¶WÍË3+ÜõÃè‚¿O»ûF˜3 í»Â_±ðáçB~Rl1e±Ô‹¥2á@J_¬e õÀ¬úÂÒgò•Ç +·TŽBÞcX% láŽW5ÆÒ4t¿, 9ÔÆ¢Íóuy!åü(›pÔŸpa·Q}$¦'ð(ë¶ÂëRm{·ÒÄïx™p:uH„LÉA + 08'Xo­ ~"I?ØöDûÎÜ +«ÄŠ¢DÕ'dÏäÔ4¢÷ÆŽˆß^C‡\‰‘ri¢c,_î€@ˆÏþ×.ôfÁ+_îÁé*èx2U7áËde¼Ð /S¶W7"‡#š†YËßcb*Â^ÄC¥èx× §«:qD€‚>“õ¬Y°„G‚1Õ;˜mn]|*¬µÙ•C`¶Ž¾lÿÙlçÙ‹ýÝx$Š¸€òFÑÎNLUoéS 1³‘ìƒ8.ÒxEÔ–>'ÆoöTµuxm–aOu¯çhÇŽ©µ~I-(:jÕI#¨ +R`O±X¨¼\D:r–¹Û@ DÞ:Û¤ô—œÚ'ge>vú<(†Næ›…G”ðÔ‘¼XýXd¦¶°Þz­ Ô8ì½Ý$ þÕ"þµ˜fßz Xq÷½&Aq‹«À-/5ã5ŽyOÐý²þ(^íÅg&«QN0·F– ×CÌ&Žd‹0Zû¤|½9›±P€Ô` Eã§HTdH!:poOÞ†{gÏ£3í§*O«Ï&ŠýÔæx6fWÙ5OÅT^®èLc} O+|Xƒ5HJ¥+t õx²ˆ À +nÅÇyKé˨ßÅ>6™´Ì´ÄF¯Wä\å6z;V>ë‘„–É6 `©Ë¨ÕÒüfÙ)©”¦ Ô×Rš\”¶\Í |`¬Ï)–b³’ÙÊPR–Õñ»_ƒú¦DÒM ,ðÏ‚W¥Sß@¸ÀNÎÔbÈf°×¥!5«iö Û¨òfÈ¿¶øI Xæaùýe£|r½­†‚fFݲ·ë·†7@% sÈ(e‰GÂø‹«æ£~-¦Þ¥ ˜q!ÂÈ·;õ#ÊÝfͤ.N³Æ¬ØãhÉôk£5Ìè5ƒúËzÓèfí½,nóâöÖnêƒuT»©»CMÝ«›ºŸ"è¼ 6ÑöK –³ ÅA¥BœÊÊ&9ù—Yy8#ƒÃÊê¡ ç¦åŠ]¶é/>˜C…ŽP… /D…œÎ8ꌣº3Ž†^R³õ˜f"ÉÍøx(ã:ããnb9ÝOªé>k“N„*vRU씚ŒñàÈ9õ:ªW»®×i'­¬Ö™¹U«=T­3ªZé¯ÎP½ÎêzuÖê¯ss«ØÙPÅΩŠuÍÞ_Ý¡zõèzu×è¯ós«VO¨Zç M8”6-÷Å=Ï›N@­mÅ`}ë²Z½ÅC5ÿF³àÞœÜ|=¾)Û5jæÃ4ÕZ$Š$Š[}Ôˆ)â‰ÝÝŽ3*U!ýÀÜÆ.ä(?P«e*J)­ÛZR°¨§â–ÄeáiCßÍùA†ÔU9¿ ™n@wZ¹3¸WÔÓ¦›$c~tŠ³l‚,ÑÊeŠÔ{1Fk@Ú~uåÚ‹t=ºiV2Kq 6î³î\§­M¬b]ÕLCèà%À„L£=Õ¤E%Á+…Äï'\ûHò”$~Ô“@€hú)c8Mš !˜TxmÀ‘(Ï£ á6dT‚† µa¶Ž©¯ÑT[àûîñªÃ\Û¾0mhVø¢Kw}’‘Çy:7Êóî1µPs$4Ü@¢ÿƒ¶Ä…:óRM…5¬\˜ï·uàd4(ú¶N _"jø4…ɽ²–Õ®´‚Ë®ØêØ××<å>uE#o@Ÿ²×t"¸:¿ì®Y1UVx>òññeÞep=¯)ªˆ/O`ÅŸÄ¿¯Ñêö +{³µUò‰0A•u¨··»Äµ&Tx¦½VI±×fÛI¤ô8)²fƒKÖ|ß(Ä6W(¹Ñ>¥žÊÉOKíÎàÙ»{@~Õ¸ÍË(!F¡XŸ/K3ļ"âçù¦ýÚˆ‡O´eÇ2j>Ònolýú!°'ð©Kô¨ñIÆhWÞõ ‰¼‹åYÍ—ê B]ÊÒÞ ›qƒ—jñX ãÌ(äðuˆBD„ΞB¯aW×ÉFŽð#B-$•tñáæÀëûš ƵºG’w×Cñè:ÙjåCxÅ·ø1½}È{ȘBã÷³yˆÞ£AãFäe{Lã6Æ%ºØ;]íèÑÜR=ûC¥k³ò”&Ò“ðj))&¢Ú˜âÆÆ4nª‹†ƒ7°’¹ïwÉu‘Ñó ?ÝÅÿÉ«1®¢rŸ²7¿§r·åšUæ ä³ +oÏžÖdâ …}×çÑ·ñގꋾQ«•hhŽ bÂÍ1F‰ŒWãlZúuÁõ”û0²(ë–W[Èms)¹ÍM²±ÈI }URÐWÖÅÇòKžZýJ·C—'ŽÊ{‹DC%œX0 jà›"LÏ5˜•Ô"ÚáYÞáñ|,×ýÁ?ýÙ©×þù¿_ïÇ‘O!þʧ=T§Š2‚8 ñQKlÂ@}»×½4Üf‚›ª ‰pŸ‰Á芩.àË9’ÈKc²ùŠÛböE—Óê VX´u@‡!«ºipÓtá@趡ëñíØ[ËÁrB­;“ˆ¿¥`óžsNÛ7xµ§áäQ÷ãyùñzùuB fç¸:ÕêxA½àðÇ'‡Êb§´²_§g?pÝáÆ¢CÞúw«µ'› ;†in5UÌÁ}Qnܹ̩‰=äNn_ÛhZ¢2ÕϘ¨Æέ÷º„3§M^ÍànÜ.<ëtxÕgë6ÜÑòdê,©v{9(8ÁŒ|˜^ð6ÇÕà¼"øÆœ3#âÁ›pƒm'ùÄÓz€ ^Àéü…˜}³FÎŽþA+úzýEϬ^ÈpYxf´D°sÝÞ—×ßÈÝêU`Õj¬Õ뿵Òe›L…P•¦=³Je•q+±ŽáFí³rØ sL&´ÓÙ ‘j˵U:‰(x3¯îƒNcò¦Ñc¿7x “!Þ +bÇÑfõLý²ù<ê­Ž6ï[¥"¸—Т_‹…êÍd‰ ȯ1@¡ÇduXwº8u™»KKbµÈwÞ>‚Û«úy+Eç¬ä6f%M¶ÑPDüõä’·ï1•[Ú2œÞ¦ Lúq„<ØèÙÇ`2x{ÎÑf|{N*2R‹2ØÜûø6´ÙR‰¶öJÚÝÜ­ØâüÁ×Ìsð.âOÏ®w0Æ¡Ø™ÔåjŒ§åwÚ‡îwÏÃ~WóÐÄsùõâßs Ó9àÌ[ŸÞﾧ¸ª€2þ]T;@½Pï‹®ÍêAý6?¨ Þ©ïÞQú¬mÐç‚ЗÖ?73굎âïÞÍÇM—„swÎe®ö+Tí¤Ù©÷£«m×Bº=ó<‰š·o÷b]˱Öß#jŸK­ïEL…ïÒµ¶äyÏË'¯ÐH5óž,yÝG„ &–ÿÚi—÷êÀšEæŒy‡ªë{#êzh–‰q_×bÍ{xEåù>ÇÖÑK®nóûä¡ÿ~Xøõ¨¾Nßmw0kl-ãFì”W•’:ŽÒsŒ©èò­©zϲ…ÄûS±ónÅ>$͈.ÿ>Œ$ñ÷Êr¾/ÇU­Ÿ—ÿýŽ|óîK²ô"­¨!þýŒø÷IñïSâßÏŠ?—Œ¥<ĵÄ:4¹ux-/³x0””'ÂƧ<Š“êçå¤_`øÊ>‹Á¿èwqpÿ’|ŒƒO`ð/»Á§8¸ƒÅ ÞÇÁ{1øÓnð.Þ‰Á¿jÏGÝý3JÝýìªSMm,†Wj©»³Zûï.€wÖúó©µ;êë³j¹ºÑZ½ÏQ³sTïj©Ó‘;¬ÚÊkÏø¨Þ.T¦¥6ìè¢+ml[ß[ªÖ«÷· ?*òé6ò^ÚÉ–ä!ÎÓ_ÔBèM3dÁîRq|è–W-õ–fXY,nâŽÒ:À¥‘ëS©«W²ù,âBŽf.ªåñ¡ŠõV ZšcP­–&”yW©ªo¿8ãš/"Ò"}rzP ¯JðVÕK“µÞ«×Ía„Lx0l^–XGØ«ÂkëªÇ½£Æe©þÖ曄›¤¿J"EÕ‰|å:LH¨ÊuÔÖzÿöc5ð¹Zz+bd|tº\Ð +Ñň˜0Ô_ Óê>K°Ÿr@ÿ« Azä^©8|…úØ4çiXùÔêªQ6>ǧ.æË"PtjÅPà” +ÇÒ.­\X:*ÅÃIJ†ÔT!ývÓÿÜÝ %cßdû– ¹™ÆCV. µ¡^[mÈ4pé{A=Ú"îwFq¿\ú"M/žÉÒÒ•hVBÃZ £8(Fn§¡¢e‘ª-!ʨI+s´j{+ qQö$%£l-9æÜsÌñX’íR,¸¥ØO˘™Òj^DÍËŒî§VÕÖvMž´ ¡J+³¡¨VälŽZ­Á#¡D©Ç²R鱬 S€zlÖ²1¬/®O¹bà6||¸®Ç6ç¶>t·Uu]›cÕ x#|qºBN­Ì˜øz†Ê¸Êé!ؤµØÊÞ0ó$úqó‰ÚLš-¦1Œ­Dë6PŽÛˆ_¶KÆé#æóiS—q Jê—{é›^pËKV¯zuÕn/1|ÕK wí +‡d—R¸Ü­”0÷(aà£Ø{‘Ò,û›<×õhqø}iÎ(Á‘æôñ—–{Ê÷ýÀO“žªè>}‹PØeÏ"á÷åÒ`¿‰Œ{ Ç®%‚ƒ¶óí<Œã¿Â3æ¡ þÖÈ!k4ôüÂÕ §Ø +IWô1‚U[Év?gí9pxãAŒeªZwÄxòn­ŸÒx…Âk;‰ê)ãΙ‘—SVºKÉËéß¹—Ó°Ê^SŽ§¹kýñ£6k³ýôíh%'—C&3ìf „fÏ€f’á¬Ôá³E=p‡ø!u¨Ég]ëÞùÀbµÈûJ}]Qzzö=ý¦Ûgå‚?gŽËIœÖ]"le„¨Q®0:Qºe=ÙˆUHqôZ<ï°ŽËî]ÛZðÕÔ÷} ô}¥RxOVî¹#d䎡5€iö [M¼ÉRU>êöÍ…Ð4 3¶ä ñ%Õ#!ë‘Ðõx„CúdÈE²;kÆ€ƒ¨Kf"“@wÖQqz¯xÜ©½|–C>ïÆ)#>dÄ1Ý%¥²FŠþÂ=AáRnx #¾1r<ÿvP¸½¶^’•»³Ï8câ‰ãÏ•ž7¼^ *7g¼¹å:8kfko§³u1HtƯõjwî}´,Ç=*£u…ã)I¼†ŒÄ8œ[eèˇ-ýrž\&.˜RÓÓ ¿.û~^‰¶²a†ãâteìÌ´ '%Í«ë/&PC£GÙV#–h1l*EÿáRRn//âÜ( Í@Œ±k$†MŠEô Ö¬gR;Fí*T¨ýØÕZÂ6¦¾ ð ¤@ô&+:î,ö`B郾Tš¼$û¤4‰FpXÒuvr8zYUöÇ2­ÊFº“7¤xÉÜbÀ 4{L1–‘òê™T‚¿1cÿš,UÇGná7™F¼"¸(Á›ʹ2[AMR…pßc"™´)~3ÉSs¥ØG¸A|»Éë~¬ë[-¯3%u)†È]îíqˆ)ÉN €Ï +Xicýiɥ͘Š:P¤ªÝ^0|Õ󇻽1£¦Á|+јeEÁ:xà‚jÂÄ›f$–&É»Y졼!å'á! 1Ê!!ŽAîG\™ÞÓɼi îô(kc›ZÂ,-íYhI{n˜ÒžE³H{›Ìß%–´g©”ö,Ójò²#Øg¹Éy6w¤4­Ü X­Xÿ%J²³ÊxŒ¤Äe+ Qž+Œs`VËaŽéµ2=C¢û% mËö´2öœ‚h“®“¤3×kˆ!}OAØïðäþž6TD—güÀ(þÚƒ¨Ù.ŸÓÌäŒ xƦ'~:ãLk2°¤1í'!q +‡ e [¥º4B™³|3ƒ"Òåa_l 4#ÕåniçrŽGW.þÆè†B]ðrH:Ü­Yß+ë¸JÔQ`¬p â›ê•+ð-ƒ¨êüÊ„Í+j*\­ éuMÉÿŸ˜ÒëÉPO_ÕzmOÄmubŠkݵ0.¢‹poŽ2;ö©â7¤½kŽ%ºë^x÷‰2› ­Aàèt󉥌Φ9Oec‡¿‚ý²‡ž¾»PZ´…ßädä-^{LoV9ëÀxFðŒ¡¦&ˆ¢ Pk“ŠÜñ­kÕkño>Û/Q7Ó’T‹ŠvÉ šÒlÀ›äÂ~0´}Jñ]µ{æ gLfè±Á :½4˜½ètÓÇië †üï_Íj9ùÁp¶‹w•\$µ] »ø5t¹€IÈ}»Æskj,¬§Õì-€‰^%¿h5%ÁæoB–(ôHDTãŒ5f1.†áâocƸ…æIÄ´°ÔÛ³b(bK$&ïaÅø´˜QLÐ 2,CƒÙý˜žµF3Ñ5!"ŽÆåNÌaü®C™ ±Oâ+†‡(íÔòy·–øÆ>ÉVÔõ¤¼e°ùıZõþÆUâN}h–3>aîu 0F·ù„½–ŽÏ-383X„¡êÊ‹G)+±°˜-e£"gº¢òá:”˜ò}\vðç¿6‡³§—Ξòìù’Ï—›£|ÀN‰Ï¢Úà”¤·ÊXŠì-¯ü_:¥'FKºwª†[ÁÍ 0-÷Ž9ÚÌÜ•Õäæ2“s· BçJùMءلÙW)“—Ñ–U/ŒnªF·D„Æ¥ÀcÕ%ø¡uz.K*”¹¿~ðœ¨Ëj£vzfØÌày¬­Ÿ6 ×çh÷’ÙÕËì^ ý3u-íVÖ{E¯½A÷Ë™–{ø8¹F BãqJ}x#¢²HšY„:ç›ïç¥û¢fº/q¢®>b%¿7Ú—¦Ô|-ô¦œbĆŽ!XÍ°¸D‡Vßãò9f,VΛUDÏô™aoÁÜñ:”^ö%Ï7¼…p¶ …ÜÿßŠÕ¼í§º€ÀõMÊ%s‡‹$°ÍÙ@›ÁMÏf'öð ÒybolßßF „fÑÙÐôDà'ý”Ô`6½Ý¥ÁfðÂœV,ÕÔE\V"ä#ÿ óíö|û$T3øNí†oA€2QL½%¤ÔüæOð溃'$y9 ¨J~(«çä|r"K¢?íÄ!ç´åMòŽrÉy½q±öÕˆë¹k¶1¸ëvç§eAŒ²Ò¸ÜkP` dÏ!Å\ûïÊ©Í) ®a샫ñ ³rÎÉÖÀ÷‡oÒIž&ï¤Ã/x—Ár}IÊo@²d»¸ï0„—ï'Åëæ+Ú"€[‚WÄêøQÎ=¿Á ‚¡¸fîÞ#É?‹yÛ';ê½µ9]÷¯à}³pºÞÚ¢Þ«9]ï× A¼Gd£zÃèðOk›÷C/MÕöµëÿªªÿg©ÿ‡Bõÿ€®ÿ‡tÂ1Uÿ¦ùÖÿÕ–šT+ú(FZÆèb 8jíäË|bf¼5ø°Oxül,ä{qC|+³¹¾§Õ÷›öAhKüHŽ™/ÚÌ9]Èßbïq^¢s­.øh–öq)NÑ¥XRà/*8Q‚3‰ƒ3øA6ÉÊÛÇ[±¼ +Ñ:È,ûX’=ê‚˃î‡ñRü³D€"àÕ¿ÁB¯èBa¨EoÕ™½ª"pûf~Ä­ƒ(çño8ׄZfN™ºàGõÎ~Œh’ºàÇ¥¹Ôà'Œ"ÞHE?)Y¤TÄOiC«¾ˆ“ ÄïàãG=øý´pý´_§+ÂþŸþŸHz!ÿŸþ?ãÇL0!|Ò`¨á9ýÓXþ§²¸m5ÉÇ¢?«yK$ˆJ?—ôø˜ÿyQí_gþ/ +Ç/IÇÏ +Ç/Kǯǧ¥ãW…ã3Òñv¸ O .&Êýy·Ï½w›{ïßFô¡¢'E‚3{2k£ÿ.HÂNR“ðës¼9$¡Óú(#hæ¯gÙ-û,J´’¢eIlÐç]‰V»ãß¹üõÂ?‡åY÷QAÊö¦Öü¦Ú¾à0½>êpoÏ"E$~@EO~y¦I†Õÿeˆ§›=å'2þ­£åßu%¤¿’™^p_©¾(Ϩεig\’T ;Ÿ·‘IÛÿ`Ýo¤øû?šPçŽj—¢e\&ÚÜ`àÚ'ŠâÐF½à?¿üg½©þßúówÅú="gêë/øýº¯®û§SËvvö“hÚ7 Ôdádoý •Ë„·p¥Ž{æ+Z! H¿x 1þÈ@±E/Â/  ÿÁ¦D<ø/Xm•WøC¾Z{>§[š/ÜnuÇ0ÛåFh£Ê<4w;—p'¿0ŸÚÚ³á kâ ({Ãû!2"Svƒ»xÔõ–˜‰Ïñäÿ#T껣÷ܲÞ5âlÙJ^8Ð!·Nùǧåõ+¸iñÚùŸÐ½5|‡[ +5gœü—+ý§²¾TÕ?Óû®KØr¸ä‰ØÙ¼h‡ÿ×^¾yjSf†ìŠ?ÿþöÉŸnï¤?"!Ñþ‚W\-ãϲ”ñÅŽ s³™ÿ«Ìpü"ÆùRÏm-ÉûS¤„þßU‚J T˜ëË«OÅ àî˜P÷fºiA™Ñ‘Ä%R_GeTóR*Õ dHC—´_pd°ïåyô3æöÙF8„Ì.+m†0|Ù+”‡­5&bÚÄB³ì/å}'j–ÅÄ,Ûk̲_r(Õ–ž‡=Çüe§iŸ 7ͨeT[”;êþõqì÷—è ïHjè3c¼¬b¼lƈ쉿zXO íûŒÓï÷"š¤†ãgÐ×$òušçöçÃÚ›yh{nŧ©Î¬ó#±È1Ñgû|‡ÆÞ*>#eÀŸ€ÙV®è'4¯ïÿU¼¾/Ý–RÄxðg¢à§´d*Œæø õJµ÷ïyþüu–UÁqµÉø€ø›œâRüiq!ŽãÅØ)!Œ˜Ç«1–ûßµòÈßjë) Ûú¨²ׄ:Ì?'>Žs忧 NÌ ö>ÇÔ*²¯‹g•œ>$-b3Çz#GÜå5ò×öÊ⨠ð9³cþ6ðÈÍÈV1ÖÔÍß!™ô?Ø2Dð}ê¬`Jðïñ|øJðòŒþ)#2ÎùxðÎlŸéõ²øúGÃKlèX)üOuá—òò¯¨µóN ÑûµXþ1kãÞÿÓ‰¥r¨Ãé­ïþzz«Öòˆÿ+pS©/Šf_ þ9Ôü¯2Û3üoÙÖ¯Z=‚këkä[À›1äqþ¹,ˇ2¡nú¹¹vz}UÅz Ä%L¿3Ls"SËñ˜çft^e”QA´Å¹¬äšCõyÇTÆ¢N›Ï…ÔÉ:b²×q†…€_Ñ*ª0–ó5Cß:n­xÏù]†‰‘8ê²ÁÞ”öb°19è<¸ q+ÿsæW­„Ì¿¢«iøþÏ£KÝ™ðÒ±d +HÄéxL#!=¨Mð€E±¿Ò‰VÏhvÚ! Sû15ê€ÁÉ°­04»»4nóRC¥RyØk,—òÃùJÕû"ëð–’ñ–Rúº˜=Ä+êm5UÌm'd”n£¡ +îé) +^ÑffQ{¡É¡–š4›^{*K—, ØIÄ) +(ۜēxWxJ©_í”ó½!k(ÂK"…8Ë"}Æ–zJ}*(c‚e+uxY»ÛZxGÖ(–e>èZ¿KÇ•§>b$R1¥ÀÙ5 +c´Ð ÇÀÛ¿ßzÉT(!µgq³Tp×Û²0ù‚X¿Íî)©ƒ²¬9ãA.éù‹z$ÒõøJK*Ð/ŽÛ³Dxõ€î xöëÓ™˜ ÿha3bОtcL늚bÑR™wÊ náu\{'¾APÚ Â£ÞVä§W5 +o=o‡‰Òn=Ö®9ÔÏb¨ï“Bd£¸âç¿ìy",ݳ+ýS¹>j炘9>뱕­±ÜRʱõ¼]õY!oQ!ÿÛ yYµàe1¥ ÒÓd[™ ^RYÉ©´ &ïX`ÏFx,Œ¥î™]%·×ZɈ¨‡†Ã(Š–-ŠaÇ.µîÌ_<ÏÈɦ¹² í}KpîÖéA«—(jé¥Ð‘ð€ ½,–¤æºó)ýz¤ÁK/T¾½…ÑЬˆÙO°)ØâˆóÒ+©­«¸pØ~Á˜3öÍê˜^k<´¯.üD×IJȽ…/á‡N¬ùÚ0%1q[ +¹.ft‰(h}ŒØpR…¶N® c²:²:ôuÐlŒ1=5ÎÇןxfã6u³<‰ÿ‘)˜w:‹FÔaSŒì¼-ôœÑÙË…S×ËÔé-1™¼·FI:îV+î¦YkõVU+ã5Ý°åm1çàþ$Y©•rñ¦·Ñ nI¥»YšãñüxÓ6F¤Åþ[–ñTjüH o8îIëû£ +7‡Ï{Ù¡i†51‡ÛôvÓ<nʆ­œNkc|cɘq€oõ´§h潬ÚØ•ß+|<™‹Ëºš‰©ôN]É1‡ñãØs "zNñ‚À_ñ‚œ¨ê!=Çš[ <ëM[zW,Gú -^¤šT‹&’à°¸Ò€XÈ#/=ÿº!;cw—XHf½,nÛÿÑÕŽK¾XR©üÌ¿í¤‘šÄªÿ(Y)R°B2@ÉÛpš-|xŽgˆ´º"!ƒxQ}OÚÜJ`o'ÜÞ6‹MØÅÞqç¸Ø½¡Õkc{0§V0nšÔe¼Ó.U›ò¤õÒf³.hMÌz§§—"¨\Qú%Å?H.u6íš•k ÄÌIˆý6ÎTŒ=oÀ(Þ×xòì–KÕ+µWÑnEˆ:)]&j¡yxý„1uå©". mäÜÓwŒWì3ªCkeš 镬ìˆ{êañZ¯öj­Úé99¸+S§Øi÷Åãªr1.ˆ±ZS\îØ:1O‡cŠ²””=á˜:Ñ‚¶|Q•gàûb³ž¶{!Ë8b÷Á›MÔç+NWD¾êˆ¹ÙÄÈÏ&[½¾HZ'5/—#5‘ òau,«Ž£H…$€’ ™È#³S®Ý–Yb}l·Î!¶>¸[YÕ]/f»}û­•L}q”/kcjÖlæ+ný6ïј3á aaÄì–wC”ãS2êd=Ân³Ÿà›÷ ßde¨ñ|­R~ͱl”À—Ä´¬3î'i,Ïãs·$ÖE4WPkP̺ƒr£1'Z½—>&f£4‰B»O‚ßæ'mðŒZÚ¯YO–Úƒÿ`ÃG8úiýÉè}‡ý;mçlç´›·å¼%MÒͦ—÷‰Ã4³ŽÐÏјdì¨UØŠ·”>ËYÅÖ{<¹Ž×@Qø‚ónü· p"vw+¼Y –{ÉÊX¡@¨‘uÚàvj²0C82qœ£u³ ÿ¥“tæs`©ÝsÏyíMêú&p‰qÛÔÚo‡5÷3ÓGqê¥ü:¾8ÈpŸ.à'b®ÈÿS¨é_¼Í*7—M`dÇD}t: !½¢ÿ©¼û4}:–n¡w<}&¦`?¦ÌðüšújT__NÊ$1õY‡—>”Ì–PafسéÎXúlŒc6qLÌvU’tjâés1’íR¤ïM}ÇBåx6uG;þ[êõ‹=™¨!–z›ú£ÔÛµãR¯´(ÇO¤>ܬŸ5³ûûÔ—D'ö½?Iõ¥•;üùtWLöowŒû<Á»ïUŒÐcE`ÎbV2 1Êùpä<>€ GxGx/Fèµ"ÌŽ–Ðq˜¾Sp¹÷°YÒ|Ð=.—ѱv:Öƒ¦ÇÒâÎ[c[#ÌÙPZ„êåá¥.A/„‚„O±.ß ~†§ËyÂËĺþq±ˆEeÒ>Ìt·§ÓkG¸, P¨­SÓ•1OÂ,õ—®‹4Œ½ LüÉiS¥PUß9D­ÂíU‰÷‰¸‘*ÊpI}†ðÕIkº|E›žr ²èÕr!_ŸìSl5 ÜQ?KÔ +¿¬B€±"Õ·êÓ±:àî&1Á€/ m’“\'ë%Ä€{¿mCBÅ9“›)ÙÜpÏBŤJR§tHS¾„¥”!‰4’à ™ª^eöóG}øébˆuÞ€dv›gÈË«qVH«&³KoK«XÐHÏcãÛ½X§ùßJ›/E Ñ¹ %Û7kE(–>£à…úžò²eÒ¾‹#Bg£Ú'"/Œˆ¼¤f6‹4l÷Ò}ÜËøiõvyŸoŠEWoAV]µblÉÖºí‚oà™Må´rÞgǃå’EÖ’U|PÑiÉê|Ûi÷÷‰[ÛL_¢Œf~{»ˆIÄdùõ¶^:–~¢F/Ô&Wœ¨5llâ;,fÎv¾,½±F® Lu™–H}"ÙºD7sœ,Y,7n%‘ºmŸ`ÉÎV)›è+éJàoó^ñöó:Ëã$%´ZkÛÆq vG‹¬hÝu3%¿Æ )×Ø7‚TVF‘FOœPÑŒµ²X‹Tiš.ãqó‡\F²>hƒ>´=ô!àe‰xÕ}¨w_È¡+`WÆv£%ërŽ +ëw3DÄ}$åÎ%sçŒtŽv^RÑ¡AI%ŸÓ·#Õ§5§Iß^RJ¼€=»ªFœ8™™Å°æÙ Z.3îü‹}*#t\zq8I¬„ ¢‰¸h¯»»Ž±EÄ«ž?è%†¼Ø0ØéJÉ¥ÜSè«ëÒ§AG¡‘†íOðÉ_¦AUmVm³zâ×…¯Cý®“¬ë¿ÀÚpƒ%h–•#,²I"ëSŸÊE[“kÒ[ßE‚½‡I°ƒH‚½§–Åz|—=þ éCõÏß‹™Í®ãìèåúÜBFfM}1"gÇ¥K§ÙYÙ1ùƨ¯ έ~+ÚÓ€F‚†W4ª9cª[àï²f&´ÂˆÃGKüwMat:NÞ5?é$5:Çðu<ƒVµÜ¼ÐRЀܶ[ätÙBÂ7bªX£S[Âzã—[ꂲc>ÐEçJå‰|ÕQ@Ž1 ‘ºn¯BÌŽÂ8¶úË9ušo ’Ýš-ßn´îF/"XäáÏ-º‚aNW}f'éh†D_z$‚N&˜E¶úœ«MÒåOT5ÐU¥(ÄΨ7¡U3¡‡c êÉU#ÃiŠ]{F`o""H² ›¤*®¥œÒÄD xvrÂMÉ£‰®üÀi5¹¢”r¡kçÁ}MÓ7@7ØtCF?EK™OÑöq’E®=ÅÅD¯†8uKuFKU§låÊ/¢f¾ª­c-Ê’¤ˆI ÙgËê0”óÎr%–+›j¨#¬óÙšýeû¯ÒÕZ«åªÜպܱKªÜ5N¹kç^n›.·-TîUî:Ýç#ªØõN±æ^ìF]ìÆP±ëU±›¤ô5†ÆÀáú@¤;“¾úðלv³Aý i¿¸³6²ý,„1 €S¼M9ɃÛ` ”DÙæ¬ëЋHuÙ¬Cô_§ýeÔ/[³*Z«ÖÍóƒmTÿvõš¬bMt±íwWÏ4½<–¬Žxuƒ` 75¦Tz&+UïZÌzœ(s"[V©`GÖè³ +|Æ`§,~ÚáÛ®ßùI–°?R3¬rTÊW%Ž“2ÊM0x£lߘ&†´£9Ê´yÈæüÚ° iCo¨Á"‘ˆl7 ­pŒ‰lŠ)'ZSš…¸¦º!‰MÕêPm1â¯2*¯ÈV6pe›1Óh£T'e +.;Tˆi«G›é!ú뇌JÇŠ¸hâôÔ™.àPWÙ~ |H³bעܯ]èÍã[úcöùª¨ýàt {I‹7hÒiG›deW¦¹‰½}WÏ^ê [ƒ]z28Æ›ªå<ΔQñ;L= MÙ võMº†hÀÏ0C#­Ù wØ´òߥIqCU±•ƒý9¶ü¶ÍèˆJ]o¯\(LNSÏár-*Û/–ÍiJŽæ„úÝj[šR&åj™¢Y [þdÌœÈ"Êx…ÍЉe.XÊ)h…ÀL"ÓXYcÅ vE™q¬ÃئcÀ^‰,Mûä¢ÍËœEá+C¨i‰ÃÚ‡úFBwÀ|±Z(OæÁè +Z©~•MÃrŒa˲áþ攚±&ÒŒž?ÂaÌéAÿz¯{_l­uÝû: d¨»\{—#F\`ÞåÒ„%›ÙæÕW'@SO[Øʸä"Þ–ˆTÀ­5´)øU€)ÃnÌIÂÉ|³CV•¢Æ¡ôºNKR!m°}x¥¿ «ô“A ’|­!öœ)?OŠ  áQ£KŠ›W(õ"ýY,S/É4íR}%ðåE5M‚‚:&*Ÿ%^”CKYÍrøe +‹S“Ë‘ÚC9s"X!(ÄD°ÒB]BI÷râÃ&íÖ÷Öµ®IùÕòé²Ì. Šˆ…”÷Ò&Œ˜gÃx é§èqÐZœm @µïi 2Ö‹bABŽ5Û5çɳÁy?t‚Ÿzm45|¬9SŸ5zy†ð.—·å…žò5Œn[]tÛüpÛ’~]Vùn«T±‡Á² +¡ACk¨' úÆ*–-Š!V¸"›²Æ‹%q«³| _3¶šLŒÍŠñ½ ßØ«u#¥òPͲýUL.;¼:pÛw±Œqëéð”_Ü# -ß½9SØêКüÉÉüãæí¸Ì¯—3Á—³È‡ì”‹a—Ë"ŸòïÀF¨ÛŽ§n;žºãȯ½âK ÿÛñ†”ÀÛÛ>¬Ã©ˆ:,1ë ºÝ7–¤Y ‘áѹ'ßjÖ¬aHâÁn: +ÇAé8$‡²}rÑ‚f±”a’æd¤²Ñ5:ÊØû½{-⮤kzDÍ €ùh]Êf½¼Ù +ASÜ£ŠEṟKïÀ싒ɣʼnŽ;júGacMj¤ÞÐì:™€ÚØ7×Kà”jöé»k>ΧR‚N%èX¾AIà¨vàÙš‚§Pß|ü¸Â:W¹7¸7btSî»cÆüÆûxpæ¤Å;¥>î©þ oÁ«úéA3()þÙ,ì^K9ι¬¹‚ÏfCÆd¾J¾-_ ÓŒï°×Ó°PŽ)”c‰ÛÞ­M}ÔÇ’z6Þ%gÿÏ? ~Ð8±™0à]wÁ^4ìã>X{`Ç%áè—ŽËÂqE:® +Ç5éxB8ž”Ž×ÇSr7{Zí\Ï$eq"€|¼Ø‹;q3-QдàÍË µ—Þk5Ç|N©ê 7ôê1mbqÄ•·sÌñn¼ +Sr]Wbv²b§Àâƒ8|·¡ºÐfŒxÞ—2†n£~%é÷†™´D0Ä„¯Gß°m}ÇtX¢Ž¡™ÛìäVyÝPyÍXyQWÊÎù.ì ¥´ÐÐW›¢mµ{D?«…ˆµ»ÂÀQâ:¤ñœJ'ìGÏâ|¾å§¡óVz³,9‚ís—Má“‚væ-ç9ûÉ^Om›¢œ•JDDÛè +Úüà@ +ßMž·sÚn?•VØ«”ÓˆZ\bB˦èp«“‡[ƒ”|$Ì M߆!9okËqAŒÊ­z‰’ýªeã'dšqj¶ž¡W» ”ñz¼¿•¹‘L')ƒ[Ì`ƒ ¹àËquÓÕWaªî áê.De%ž9jáT6,-z1â…Âf[½ŠFûEçøzQ‘c¹0ýhÓ‹1ƒ—rVO7›Fã*Ëþ¹eù¦‡fùf•å'ËõÞC’¾E%½6ߤ/«¤OÎ7é[UÒ§æ›ô6$E=¦Þ”÷+è…«÷d0ɧñÔ—¾ô%©õ¾‰ßð?TÆS§eÄ©¦}Ôñþ|šHÂ3Ù +™Üéð¯ÏW›É–ïÔ–Õ`ð•Šâ¯Åv^³pÞIZP(Šêv7ŠS˜‘Ob£!i¢ŠÄ¸Èö¦OCô¢9ô¨ +VÚpv$*,Ђ”Œe‰‰Â‘’–©(>z„è +ï +{ki‹)S©-yA»ÜÏŒL!÷œ“–ÃD +Ó Õ4W˜ä +¾XkßãE‹d )LV‡úù¦–û)y™”“ Ü’ÖÑGŠ¥RÙÊ” Ñر'†9|‰ )ËPò"D $”ØÏHÔ’p-6P" -ó`… )›óû^éu¡$kà&™“7$…¦u÷™|%…a%db ä—qhGÉä5Šè¬×Z-Q˜ÕL7øåÑnúˆìAj­+®ø×+H¸ÚøD@Q"Å ö¡sÁ=xë%Ñ—‰Ê +ÿ6XЧA£Ò™ÈIʬÙaSmvïÊÍÄÿ±´t[”]ïV'y–OÆRÙ]‹Ðµ˜ýj<,wUÂâ>ù7Ћ‡´Ç˜üX¦  ¬Œ»tºDJ8~,”ŽÀÄ“|S[i @ Íâ 2™VIJQöbq¯fâ²CbŠ1ÎóâV:äkm>NÂÔËŸwfm™ÝÔ™¥ÕÊH¯¹ˆëÜÔÄ–_­ôë¥a°L}mP_Œö&¸³IHì-Ø·g+£Q'‚EÌUJÛ€Õ)coŽí.Êtß×ÃG>ƒèãV=’U5Ž`‡«ù¶SΔ]YiŒ@ÃIˆÒ€›¤Ê·9lcTlÕ–÷Ýj¦ìɪ»j˜†¹ÆÛ×xgÆ]¬¤èÜ«˜È¬ )n^ïªm‡B®5œ¼½¡WËòÍ0üCüc3t¿k«âÕQæ⨸_ÌõÛ<ŸYÀib0{ëo<{M)JŠ–dP Û;èfä½­¶7! ¥”ñ +­‘— …xËûÙÜúaä-/`ŒÎ¤èj­´æGXfº7ÌO&ÎÂQònL1_òÃ낃î+á3üØÝuðŠ"½MÜgÅqêõÉ›‚ÖòR3^Ýà(XÃüјٶ@«éƃã¼Ðâb)…Lñnbyã RxS`ˆe“¦¼î´äS¶S*¬à‹Çae—ÄÈèå"ŸrP 9c„R]Q¡þRS¥Å tƒíÌÙ²nò=;7mý\Î.÷Ëè’ ý„‰ ^#4ãu«YßC Ýôr|øNg`Lø߉…&<ÍØ:šð>Ïþó=6"/ÅŒH˜d“$£BQKV\0¹)ìá+ˆ9xÙ£²=:r_­È[9òE‰Œ*"?yV þÇL.Š^®<';\yŠÍó’Ѧ>{ ý ’|ÁÝõìâžÁzöSqu\ГsüÔà0ï¼’`ÌÕè¯P€_àq¾l®Û+áÕzU>z¼"-;åKÕ‘»#˜ñ¨ì¼1DoÕŒÑq÷¨{÷ƒù1®^§WïÃúžjÚäA_¿¯ã +ø=“SÓUïAÓÇ–@²;¿—¼;«J§˜Eù8?<ŒP½(¡7gôž”0òì›|¬p«³43é‰_`´W†ÆÇ=Ì—¸NÃŒx@à˜Hå[R©‘}U$žb'UóƒêÞm(âŽÀ}]³^ˆ·p¹‡Û +ü¼C1¢ˆKÌ5ðèÙ”:^,’°\äýŸU.Åò‰¤Sr˜q‡Œ z¡ÇàŸ$›‰³““R“ñ¹€ÇOË"Ó3è‰\²ŽYe&?ÕY˜ªŽU¼ütµ„\ I1Tê5_u¢}ß ¿ò] |WØOF0ß!b­+ìÝ?ž/’ +8Ð’áÅEæ“|?HZßæKKÅŸ"Ojç…Bµ<>à#U¯Œ‰ªb–ªÕÒ„W¹)þÝÿfÄ¿1deA>r¤ChøÖd~b|HT&¯Á7´™WC6 Kq¢Ô¤`Nš‚ƒã“à ”à EoRó”ðªcã˜÷zƇ)¬2=U ½tÏy¾X˜,ˆH°D*V€pe 3†ÇÄt±:<:oFtÖÕr~ÊP7Fî¶;t"SÌ«rÅS<’†›dÓ—س\níðÛøƒS+·[Åï« MM) kÔ­ü„CÇÇà‚n@Åqcø”˜áÐpO}pDÃM ,?HÌXõ!ç°ãÈ Á9!ºBQÚ£rkb5Ò'1$oÊhÇÞ]{víÝõèރƋաâøÔÅ|Y|Vá­jÈD¡,–y‡ŠžŽtÕU\%×/U˱OØïQÍ^Ô]úíÆ@<· ľûz~¢Ô¤Ëê«#þœÉä î.ƒkDr¹—(àFê ËkA:D«>gCº‰¬‘Q\ƒ³6ºBV£â~+f½hì )H3GI.ÍDª|ëûâ¼zTª¤¬‡X·¤Å~«/£ù€áÓnAz·âµJr:œÄ æv  °N|‰J³DáÓ,e†S,X¦yL±`¹Õÿ+ðïJ›;¨ßv†€ëVS„ÜR+Áýðr’A04æÅpR¬5-MF¦Xk¦Ôæ£rwÐzUÅš,”„ílàzÔ”­MvŽychWËAvš½)Š¤õj·HHÏeÿ²Ë5Þb(Ȳë°Xi‰îá + ±MÈóGŒ1×µÙŠwØóag°KöÔîÚ7÷(€ŽG ‡•±íXÝÜê‘Ýúmìžú'ñ>ŹÛëf¿U¡î˨¶þµbŸàØT»ûU+èIUu[p0bLU ö«Ü%ãôP–®£ä:œ=i7ìž‚Hµ›|ÄŽ¨`êçëUoÔ*D*\ö}¤BÌ9w§D¼W¡øRµè¨û*_OÐcŽ:ý×Ùñ\H“Ö`|Ó ;ê@ò?•3êyš¯µíòZËl5úíÈjíW]½!Êm‰u :žÖYÐðAu¯sNõ@Ç9Ãa]N[ØÄy±˜*LÀnòÃa:„_¯íS ùˆ8gª“}##"ÈT_à ‚]mÑ™ˆvDâÇÂÍ*íù†Š8õØU x$ÛkÈ·”Âö +;-„xIbïE˜ÙhUO«a^„ŽùH¹P³èYŽ‡FU6£<{ØIœ60¿Q @(ÊâUX Ii¨feŒËyt '¿ƒ˜£ t uó+<±kqê n,ÖÄ%$ÕÉ©g¤ª¸‡8ß/Oá" ‡Ÿè ²eíåu#ŒúÀrá<àS¥‡J†!f*.ûM•§]Ðã”èCå©O•N–§CÌTŽÊ]!˜¦4:Š‹—µó©Ç"ULaðpF‰­¾iì·NÅ´€I¤øŒ_Á'xˆïœR¼†€EL˘c:kr³ñ!u ëAÆ;1ÅKZ¢ßSiX£ŠyT–Úô° +6© +6?,j³Šº€Vxñj~,)è½$§%&¨„Öú{@š2A(ÙÔr¯îF¾LogÜòZsŠï²Pñ]i­j )´]ú%ºéRÉCÃr­åJ]*#÷"‘¢•Ó4ä> ¬§;¥ÃâZ¡Ò®TWx1°GpRÁÒL +Æu‹vC+“1Î]ä¿Šõ‰±˜Õ®Bñ¯HµØ5ÌP^®ÊmÖÄYlsöMöçZ`ÆÒ­„80¼§9qÍ)à¥5I^Ú:-€’ ° )Ù†6à”Å7gÄlÒ¬kš0dj;v¿bcúnÌé +¹2¡¹)Ê@Ò§ªoŸáF­Òz[¾´@è››±U›g«Œq+Ö»j[ïzà,Ì †pÏâÆìfNâÖ0&ŒG²]sf¶‡Hù­Š”¤ÆmBÇØaWbÕ¬•à4;¡çHx€X–Ž…íÊÊyyÈ‚IÚÝ+ÊP·ùR`MêÖm^K‰I."´¼ak20³_àvã#À¸nˆÀA7…pªl^}HWrÕëM )Óöe°ÍìØŽ¦¥j¢áï~ia?*ˆÖ;3ß Î(!ŽšÇå¶|jUdžà)Sjãð¼;f²ðûi— øÍÈ‹#s×~*£XjGðÐ;Šïïik úMY\D3¡hAŸY^r•S†.ö±,3ýq¢¿ †V§ççèÈê?.¢¤2 8éQÝdôPŽ <­xßèd‘îb¨†Öö™éwxÿ„Ÿ¼. ’+ãÚÇücÌzPIãü@ 0³÷eÙ†»ëdÑÖ6êèQ§¼¥|¤qØþg-c³õúä„?q¸ý: h½$ Î±H—±¿âb§®Ãi @ÀPƦ} ZS +Ô2„lfØj•ë:ªö5 (ºÃÈõg ñ¶}³sÒÍXhtg ›Á2®< ÎÔÖÞèQtãùÇàc*›^•M›EgÖÜ$Ú®S²ÞYi×[ƒ+‰"ð/õcVŒ­  r˜™& $!šÍ‘™d’Œ¸ž‰(O?Ê3éxb›mû¨å¸¸åÎ*h MÙ^½ +Ô>Ž¶Šf¼Ä˜÷az,Fžá0Ìâ‹’”{\z#D×q|uÒä jóÂu€µx™ˆxâÄ0Sý¡‡ ¤T¹\vc§\U\ÉkQ®xð„Šðdð>Av¹Ð2OOKÀ­`€¿¶‡ùëµAž¿Õ×úV_õ5¢¾FÕטú:øëuêëºú*ª¯ õ5©¾Jêk +¾PL÷lP&^n…~ªô3M?7Âbº™ž8 âžUL÷¬+¦»‰Þ·H*ÅtǶü~,ZÎP+t[E²xŸg©“Ô%:ƒÁ7Üà-¼ƒËFðÜįW âWqà¥PêÕZ â+¦Pêm HwçkÞêÙ˜ÄWæ#”Bžñ¬r£‹°ˆ¿¹Â£ËSZt„Ï2´ä¨¿4eŽÎþþ·O(þ/(ªÉMÑÊÇiSJó[,tyæJiêÕ“KCJs—lµà"ŽLð4'XQBCT)Zï…å@á"­ä@jCmâ®c]i)j Zy'X¨ä@‹‚Åüµ$XÊ_¦¼håÃRÉu¼J­ãò:Þ…ëøƒ¡u\.ì*ܬî’üϳ7«…IX"±žÿm3¤¿3é"׳X[ÀoHª×u~x¸«Pš(TË·ìg2ô×ä¬Úojì§5(WÀ?ìqÓ»©žEˆ%I²tÞòTV$ˆ(›ñ‹þa&¿”;)á59å¯Ñ°Aü. k†qåú¸>øÙ"1  ô0ìr>|2¬Þ*±WÁCN>±Ïe2mÊ d—È%:ÈpY%ÄVÔ+Š²m6Ì tÈ_ û—’t9;™k’ÌqÊ÷E¸}ªÇFÆ“4…{ã +Õ¤¿|é„B2 J÷¤”m¶§CÆ##S¤á“"^>)0"e2„(6¤YȤ d‘p&¤ ™´ÜŒ¾"Ðœ ¡çs¬ºWõ6¹yìte žHûCùÊP~x|r”'LÔ\at¼‚k±$–ÕI]ªÂY +n©¸ÁO­%nÎþÎÂxLÝ2W€ákÍfÃ?´8Œ°ñóó›‡ôæú„¢”çÓÙ‹—ƒ:à0œÂ¸—Ûš#^lzÜûh0³SAÛ¥%mÏ|(€L5„1 )@z Â-ÐXˆ‹Â‹1`I8€Ì-3°…Ë™õ·ÃWáÜüàfÁxìù`6r{µ¡`‹hÒp(׊/.ú«“ajg “5ÄSTkÑ»M¦ ”ÂO›ä}¸J)Òc!ð +ŽµŽ¸ìøwC.T"ù6†“m¢w5øw %ÛºJÕ‡[É`›_'ñp’ÁváØ.Ç#Ò±C8vHÇNáØ)»„cW L©ðmÒ¼V"Ø-J•ÞÛ£½‰öÞí½3Ú{—íÕÚ#ªµGÖñQáxT:ö +Ç^éØ'ûŒÚï‰.áÑhï½ÑÞûloÑåûuǧx"¤:´ÆëM%£8–QÌ- ICdOF¾R¸vø8짃ÃÔøTpD8ŽÐ[µTpPe"-2Ó©WãŽ"»çý*ªçVëÑ\øyÄñœí>AÕhÙ8»¢þ<pÊánçBOc×´ã‚mô(éiŒ+e^Î]÷ýZŠ]Ù¾N|…=±¦‚ì9u0õY= +7TÊÓòýF*8êûÓÙ“}f¢6›è¬1\¡«Î¹Ž[—9nXÌ£”öù1C7öE &¤v2?~Òzyþtx4öÈ µw·¥Í€Ÿ@nO(¶¡bTmpkÝ›S¼hà¢ùÁ…,BgeIû Cáø(ç¾DMÒóý +ïyta,6¸€QMø¬TЧ:2„ÝqL3ΗLöø’å¬d¢£ÏšÑ—hxƒq/Uñ>Çuîáùv{÷vC/õ¥D$äÐ×à&ÙŸªóÎÊ +¡ËΨ÷ ý8L§ýÓó‘ו  ¥1y¡ìǪ—ÌÍ+>^ƒ´Èò">jh_¹¬ƒ#–®ê¾¿Mz ÁU÷.OG˵KŒ®öœ‹s“Eçß“¡G»‰à5ºõd‹X„l¬“s}†=xÔokó Æœiõ¤F3ë÷ÀÓ ¢“‘ “9Ÿ4èWdÄŠØ`F”{{Z²·üÛI ¾®¯VÐõ¯æ‰˜Ûþª§Ê;T{:ô{9g>{;ÄüÐTv+VÀ‡°Ò’¥÷!‡€÷Ø]cùbiW')– àk‹!Ý¿L¾%‚@W_Hâ©$KOÜ^ÆÄ}@ÑU¥ +~÷¦‰Òp¾ØøXxë‘ñ"‚@ˆ êuõKWú¦„M‚ZL‰;’8%gg¡˜y‰Kâ¹üÄxQÜ}*¢ ô ÝÌÙŒÁMW +Ú_ “v5Lá… Õ•ÄG9lSК³ù9ð± »`ËÀã¡?•/›Ösœd¯A[ÅÝ‹uøGJEáß'*‹ÚvýåBáœòâÐŽb©ÂÚx:œ<¥^bo!?¢"Ê/:ʉhÓå‚U@§åmÄr +êt¼©ÒÔô”êÔª˜C·¸ûéÖKœcêPD‰º*»føhl軣41X:Sºée§' +åñ¡KÕÂ`žÀ´ãœ\½œ°±´5+cùa6åçÚìä ü”Uªt†˜×p1?£g‰b_¨O|U diF7ƒNŽ3þªTß#§ŒÑÍÁíÅB¹êåñ/õêã„Ù¹X.00ðåÛ‡Dõ†Eß‘©yïÑGµ—W)LJyz1'a"_Ÿäwð™3¼‰©_ÌP¿‡òÅ®ü ‰:ÆJb°ÅXˆÚMç˽ù[¥iÉÙ»Z(\ïÌßbæLú¤šu2Ï„ƒŠ!Få\¶õ9(z½èUÅÿbÿÉWËã7ûaë,ñ–7ãybGÈ\2¨øvC †B˜¶tƒšñ¦‡¦Ë7LÜi5t”&ÅÞ5 úÁѼSãSñí”bÖGLb‹¹âæhx}»É/¾yü—SÍ_7ÿ…(õí±B@>vEvéÔ…/IpþúÔ[Þô…¦WhÚ ^Ü5*‰_Kü0E³‘C0Ø?:ZRtHkê+1•ñÂ`{/N5è8KRŸ~ðéXšúÏþ«L°L•¿<õ‡ø‡2Î +Ó±0ر*õ¿t;ðe +z¯Mß—‘qÚRûT‚u"äéXÏÍÀÔT/ ä/5‘ŽÍ¦cKêË_þ²tlMµèZl ¶ó÷âàzÐ×î`´jìåäûR÷t‹ös)ò‚$&ÕA—œ#3m‡@¸eÙÊ ›cs$õùÏÞê#ߣsÍ72õ±y¥>œ°RŸœW›Žˆ ð;²M§R33%é8úë¿þkéhOýæo~V:Θi:R÷ï¿ ­3™ ô6ãj.*7ô‘ã”é8m:ÚMÇÓÑÁµ˜;±Ag%±+nTçàjd›Œ¡ÎèšSgH3¢‡õ¬MØ£R:BÒŠ_WÖêðž¹–ÁÙž·R?6¯Ô½Á+uöJÝ7Ïš_´R?>ÏÔö$ÏÍ3õ%+uÿ¼Æumêãÿa9®n'\žâ×âàŠ•OèŠý]ë³':Ž¤Þöî·IÇ©%¸{-Æ;8ܹá’-þ=l+ßÐçñ Fµ*:0¯¾;Âë[¸®Fn¡ñ¬¹-FÃ܃ÇA݇ˆÎ#ßÁù —1K8Q»„¡yΡPÓ‡çÙô]1= Š +¡ã°çÕ{K¶yþM/qË«›ñ’c^¼ì¥†¼ _œË{ Å Û[<Ê„¨×‚ä_EÐ4È_Aµÿ‘ÖÕÅ>__@¡ÖÃY»)StKÙ¼Á B ³±dÅß²Á‘­ŒÌä^âs’™ü’}Ähpš¨6qà›œšÎwüfÅ;þ0ÖñT`#Ä„«&ïÇÅò im$¼³5~lvæ±N3 šñÉÑ3¥›ðÚZkfÙÏÌ €C +†òï›®TuŽ +ŽYB•Ü¢_z¶m³ÊÀ r^r+Ž‘äâú*aZc¦'‹¥<« Ѧ/zfñãž®!Ùþ#Hémxö'eJªÏöœ!xDQ ‘‚ØäÇMTYèqK·¨!ô€p‡ y½#×ÍOŸÍ„;e;T[w…Úº+ÔÖ]0³t~£¤ŸD£]»µ†›¥§ÐœAgˆìŒJ€Ù7±n†ÍÅ ÚŒZŒÒì5<Ò<Á€CÁûôùLû y'M*?\ÌVqkDço¨=ɲ¡Èµ;%[›¨SÉ—E„42Yæ\:=üÒÙ&/‡#óæÀ#ó×Lª×·Ë£êvù½X™SMð¦+&\öíRÞ{èn)ï=š^Ø)ï|®î{"®—ê²d%šÅÚ?þa͉‹Ó•1†­‹ö«ÔŠL6^&bNÜQÆ4ÍüÍ~e°…ï}¦i…m7 +¯]nVUä‘RyBVsÒ (Š¥!@„»tKÜä&dc9jE\EnpwÃ[)>©4n‡Îݚڈ׊âBÜòá.eh“Ѧ,&AÚuZcø*í÷uÚn£L㲟Òh‰“…N~ë¶Ã.¹­Të9 bú·ÐíÂÌ]CÚÐ2kyZmˆEÅ&‘éÖ~øÒ¢pk9@kW¢¤04cÐæl°Ä´˜³TsÈc™á¡eA浓L°KkS¿æš[!'ÇJ¾¨Å‚U ÕyÚÜIá½Fü[ë(XpP›¡­‡ÝÕ„$ø:e¹ŒÜ ’¶{¥²;ÖŠ~œÛzÙ”&ºÐ¥IÜeÂþ³wß +yeiÕ†V±6ÉX›ñ2Ùì¶e zo•…oc8nÊn;fö¶ð±Ã~’áB×Q¥5:âN¬;.˜-peD ÂlüM˜MbpÁ° =ÜŽ+;¸ ˜­° V¼ ¹·Û™åÏ{F“ö¨&Õãõ2HÆÌ1—·DµTqAû"^‘R'ïÏjÉdp@ŽyP5çÏVY§w…ëtØ®Ó, ô#/ôŽòK-×ó".âêW{äÞ0^Ò ÃH–Ú‡ÅÈ;Þö|çÁ­ñt­GÇSÝFñ¼“j?äµagÂ’Óõ±”ˆ+s’З ÛJ^bÒ« Û$ÿÿÚ{ÚظŽãöîÞݽã·ER©©o‰ú¶hˉ-‰”-3RŽ2-ÛuìˆæÇQ¢Mñh’Š¥$mã$®•¸uš4%`þÑ$N-$EQ$H‹&hSÕ?’6i£@ ´@ -Š qÜıº;3»;ûÞ¾ã£#§n"À¦n÷íÎîÎ~ÌìÌìŒxÅ·Ž¿p–ž‡¹#<ìA"¨×ÔAUo—¨¢¾ÜŒSXÐSx…š/lÅË}Ï·Ý)pÔ†ùÒY:Ø—Ûуðm•Î»Ê†ä”Fþ½ËzÂz÷¨ÓðÛ°<‡Žª(b,}Ä<Äô`è!ìœí"Å sY:C\—4 S•Éjq](²üP1ØÔÀ}VÖ-b–‘ž!Óðí´fw©5û—‚-ª &Cˆù57Ì–éÞ¼ã@E3LÒÆ\¤9•Ù+NÙã¯â×õš„;¯<Lweµ“W2í6´i至åöFÔÆ€^'ÂwP@¯e]ñp„oâÏŒX's‡”$­¹_„ó¢0ìj`¯r¥©™Ñ4[«=~a^4À% ®â30X\ìÈ>5û:ìÓ—4û„ÖVaÐgŸÂá“(‹¤\‹ª÷­nö>'û¯u¶F»rúe7S—}Ag뇫,âV6¬ø2G|™§|™÷ú2G}™÷±Ìyº|Zuñ[ELÞOèýZ~r¥üÁë¨Á¹òG4ÏüñÌ;²XõA^yL•‹8ÈLŒø©×M?Ü’¿¢Q¨Knx]þ‡mâö·¹0ˆ‡àäx°2ìB~ãuû`Ÿ4p +öRz ÚììÊDš¶©ß¶ňöýùŽÆˆ;´“pÄû†ÛÃ)'Pú:Ä5‹.´L|­{ùï€ß_ +úÝ44û(¹¤¯Øcq}«ð0„Ö¶7Iü\Éjn9ݤ¡™´œÖcž„1·Vt­³'ñDO^‡[…}éŽâW—À=ô´·¢35ì©Yë~6S÷úÖâºÄñE5‰SyÌsKk¼¨½N¡nƒº‰H ÷¬Œº‰Q7áGÝDÔMÔGÝĪQG݄ᇦb8ÉR%Š¾˜'S+âdÊ“©:8™ª“©UâÄ30Ž“)ƒ“jœT©jŠ-V]'U?NªupR­“êƉÇIÕœÛmp†a¤ÙüIdêÐüVÅá-)ûUÉQ‘ê|½ +m½ðLJc¶ª–ö$08*w)Ãé¼Ìø‘Ì!<ûŠË!@3öX®"ƒ÷ êi±‹{íÞžƒ¬VçƒW$¶< jE ¾lo‘8„æDêÂ),GôÃxƒû`äNÉIÝH ‰Yìæ½uðð¡ºxx#3wø‡8’³4eù¬@|Ú Ug y|ÆÒ…Wå<+äóÆKÜJb G¿[Ä9¢.îbK‹™€%hYnRápD! Yh\ç̽éÜsû”Q_©_5Íãç-*¿Èxû§qôÙ.½rÄ·˜›}·‘@f ú`Yì#-îM¹Oõª(W]¨D«rV +‚|ÖèÞOcï‹ý"Wö>k{_P½Ï³Þ÷2ŸWNœ²Jb9Ão°ƒ‚ß÷Ó„pGÉäÑ=Ð^â¾î\â‹Dÿý'ïñh,º•¡ESÞîhAoÞ°“„´Há™Q’Õ¨R!Œ!Ÿî¢INàµ^/íCNÞáðæ-7gnÝúl}”QTU."æ/…<Ç@‚¬¥mTGY¹Z³Å6!´G/¸àÎŽÒñmä rß4b÷ +Ûy8Érôã!ýã¬þñˆþqFÿ˜Ò?ªúǤþ1‘Ñxòx^ ¨?Tû*'{ý`ÅÁÙ Z~¯rbÇ1*Ý€|9…»[…ÃÓ®á5iäcÍBSm3 †Î©7«Wå—ìèô ¦˜¾ltú²4}ÀžŠ¬™”k¢PvL|) Ñ•[ÝÒ÷#±q?drŽEÎáÔTÁ!–‡-áì³1@gb§—ã+ÿ<ªŸ¬@eHû†šcýÔ}àá®v›<ÜÒV›¥ºΙ8ãsH ÎE`…h×û³‰h SŸ9ÐC„žÑ^›¨«8c*6:Ãjáà™Õš‘6Šp>ªbxØ¥û\uîîÐ55 òº‹)Ž:“Û,ÂEŸt}1"êÚ¤ö^¸DŽÞ‡˜r« :úSóIeþ—SfíIú.):¸îP#­Z“ÑÒª"ÂE¾‘öUN®yÁD£Qr*—«k!9Ÿ#—O!ñ…ã´ª“FÒ>í'ó"H«5[TWb¥ +Þ€½W?x•dŽ­Šq4 ÕÓªg¸ï3o5¹´£päòûç×9}»¡octË@ň#+U§7‘üwÌI—“ZÇ¢Ua/5®ÝHק9x¾ïÞËÌ$%TwöªÝ½]élÅú.‚tl¢£6QEùù®ØÖ×"|í EøA¢_7ÒKœGƒmû#AŽ~ J‚Dx©•fïßš¯ð)²Öº:tT4¼Ÿ¿nKÚÇL®áîŠÊ¡u”œÆ‹~ùµÑ3±«.þzÅÉê’Y`Yz·fçÌ>ý`äðÑOöUìÑpÉw4|ˆ['Wiê–`˜[‡ù¹[WDZ4©Ô!·ä“Öü1ñrì¨Dûȧq{|Å÷9Ÿ= +Ç@á'DÛî0 ~ƒ•ÓT÷\ ä3ð÷rÅ“/›ºì-{¯I¸)Þ½3?bÂ|Ô8¿Ön$þfø[´~Ÿ3Îï Q{Üüz¸¹ÑpwOáàÇœýÿÛð÷ãmBB¼ºKþ„>7':Ò~Néa¯1^ý4@;Ü"W£\[ŸN2^um3¯¶ü[¨ª^îÊÞZÏzÕ­eÍW1ü:·„"¯óu|ΣA%7³D‡ßcF:cVžccñ¬‹£žGŠ¾‡‹cc¾Ü¨Å(˜·:§£L§47?slÑ”ñ"¼ÄD³V²juÝëïà¾í´duOŠQqò´8-ÿŠÑAa¬f•0c^ ˜§wž®YkjËŒø¸é©à¢8º°0~IPÉ·rdÙ» ±ãÆã5+Ͻf>Õ öÊeüÇ\‘)Œîö•·Þ³Î=gCÈFÆ´!N·XùFôZ·Ls2²G-ž‘´zmóeáVOᶤÂ7x +¯I*¼ÆS¸½2BsÑaÓâ`é bRŠPohÕºOœi˵wÅÝE÷æÖIšqü=Bk|Œ–Êx”ƒ3P&ïÚ&cç¬zÉ ;$úT"dE7ZS¹ógl-œX…†Ë…›†‰#Š¾Ä˜…Pf3» †:> üž£ï[ü0@¢òO$ÝÊ`”tdGùýÏèû6}IŽàô¥0ÅxÝâ©iå!ª°CWà#ñµ°“*춬nÈC#èþÕÐoY­¾#¤~W&×óu¿ïVþ¿ê|/+Ëu¾oP̵oÝî+8åeŽ.>v/Ðœ!-ñxT~ Ùìk¼Ž‹»Í+YŸ D»/.³Ç]…’ó7žl#7á|’ðI7k^ïPZ>éÃ'}†ø¤½À'}&‰OR +fÇççUðå¼Ty!¾Ò¢ª_.f÷Ôã•â5ÙsŸsÕÉLJ%]ŽpTŒT#_¥ŠDi{Œõ™Ñ†«ÖÛ°‡ò3>~Æ R`œ£áóà¯>¾L åwŽÏSœ°™ÅÊx}È$¹ŽÍªxàÄ$xÚ1u†çŒ™E(}_4Û¤†yÕ“jõã8h)Õ¯‘3,ÍôÖš¶h¢‚cWl£¬/Ñ [sµ¥™iŒÝ„®‚XYí'Éú”q£uGã‹;‘ÉÇ&©S 3sg­g[ü¼Šª>©¢ª;‘¾g‡çÎUf–tí8‰‰8øµáÙ}AÆ"ôÀRÙUFwú?'$—šcgq}ág6,(‡±YÑØ/r0q + ìõ~_¶¬’¨ùø2M‚»M¿—”S¥a2(´·†;TÖ‘ú„FkF Ç­8Kúý|Øõ›õMÁ~ˆn¡ÔßdÞŒÁˆ[!ëx» iL= `ŸÏ¸Ñ®ãEÚI¨ÈnuCϘ°>A±øãŸü)…è +6îT„ÅÚw1 ‰S1OŽ&‹ÅŸþô;XVÙbŒ*H„Å/ý'…Ø‚¬Õöæ1Ñvq%óD„¤rT¢!šÝÞ4Ja‡¶ëDÿ áZž£ì,%Â!T¹>þq¾×Hý)ZiÝ(¡i]oÆÔ&÷¢gÔz¨i'¯l}CÜ„sb|§ª{¬c±ú{Æ= ùò®tuÙ8tx‚ì¢ÊG¯U¡Ì lÿõÚ<ÙÇÞÛ»X2ÈÝÎOd•‡D'Ý+ËA „.÷^¥®{®_IöKý"¿x®Z]‚<7i‰Vh¿ËÜÄ…ÍEϸÿ(b©›q-uù¸?áã.ຑÙÏ)ò`( +ýŒB?¥I0ªÚ3qŒµŠ(Š|¼¾¯Ñ¾à)Çdž1ßã¸ÛbßèÓïq4ð·äÚzºß;‚q%îVXìïr;À€Á}݆Y1O­ä• µ‰ØhUö9W= ,#-ƒ‚Zƒ¯>;É;g—A`×|Ñ’Xy×9“» +^‹8gʸΙø*xÉYýô¸æO(³‹æÄyëÝÅ-îÛl.¡‰-RPœXi/³—ìÖÚŽ›*ˆ`´¯—£=£y…ÑW4F;‘·ôgs¥À¬H¯2n¯2¬WpœÊ¹¤»•Hg³ŒhòC3‘Ž6ÚpãÔŠE"£‡AzzØ°2=,­Lcô°¡4XzXJ–‚F?=,BÅ¢¬hèaQV4ô°(+zX»ñ=¦ˆ‰fXYMœðå°ŒÌnŽfcÔ—¦=lvé!™³Sé¼}îfäø§éßÏråFExírc@ðD tñ>ñ*OÞ9m–‚{‘ºæìk½ö¢]©·vŒ2„]èwõÊ°KÏPÞ)0Ž3Ga¦2ÿ¼nëÓFù¢Ã¸¼yâG7„õi­ü¿Þ®gRZ#½š§§t¿‰ˆ +ï_È ?oTÞKµÖ:wëwAY#æ@è o]še¢Y'ÖÉÄ:葉žŠñoŸ ;eBGmo–Œu æ¾ÎŸÝãÏît³e÷ÚÀ$äYº·Ü³ò¾zÒŒ~-ÇØAGZáñ#“øÉ$Ðaòç’Ãñ ÏI%G\mùh·ªyùû™½õãñ°JV2ÁÂ[ƒñ9XA“ݳvŒ)4¼Vrß{$4Šëcƒ› 8“?èû=ó‰Šz¦Çg«æñß)°¢V¿”¸¡¦<Ïb>…Bò­ +« ¬úaŠB®.I]½¤\ŒDû¡˜Ï¾>+ÇmV¨Ǥ —’üŒZ¯¢9æ±â1ñ@]7¤¿¸Rç—Ö&œ2oÄGiV‡Å)øw¬×SiOÜíXhîf%#o>-Ôu«ß8ʼX6MèàN½aRdωïv(s‹fMdZF‘×Pž¼€h6cuòQ{‡5g§Œ±be¦Ñ¨KVa‡J¼7ÀD§Jì,bb­J|¯„‰.•øJ&Ö©Äl3&ºU¢§ =*±¿]R©Ž Wjö¾–]Þ(À ‚‰âëç,·ÁÉ„ë£x*žŠ˜Ø G°AO¨Tðë÷IÞÃFû¸_ýQ!=‹yR=;‡ptY`ãå—_ŽF¿T}@~Þäб9|}È&ö!ëéC»Áá5nƒáy- ‹ÆZà_š)$6“Kl&W§™W_}Õ4SLÓL°šf”é|fy_ÝÕkg0qµAíýèG¢øío_I±ÚœP-¥ºP_~ùo©c+®'  ƒšjÆÚ.þYí<´ãP£•%vÿ£õZœ ¼¼öÚk?¿½-ÇwP¨óÚµÁÆøV8?ä¼Sü gðÏélÓÑÝ|3†ƒÍ׈¬üYPêYú¿Œdpx¬¥]½K †¬½ôÒ7Ó’5ݽüà)©—§ò÷¾÷”D*©åU)9ܧKl³>Î\§3×p³g÷fnÖ¿*\_½×WïÿK.©)¸Î%®iIüb/};ÎëœXÚò}ñËÉ‘B©¦»2wú¸oa&ˆ¹Eë&1¼i~Aùj•maž~ù¬øóä?ÜAŲáΰŸô6»¢­ÇmCû´öf··ƒ«³.µšœÏC«Z“óùdMÓ¿\mù‹vUóòÖ܉úšV)â;52àÇ)ƒèmÿÎêÒÂÌ䢨MO/Võ ¨'Œ +g|¶º ô>N­Ùêô’XªÍ‹P MÔ––jçAÁB}!X¦|¦ÿðéDLÞðyå¶h®6W‹çƧjOÚB*èÛ¬jÕ«KámÏÛ,‚³]–«æBÍY•JTW—Ð~BªQLÑ8k–ÔW¦èòj™–ä bBþ7+ Ôæ1VàÌœjæ|uîA›¬Ÿ¨UjswM©ùSQöîž™E +Zun +2Þ˜ÒjÁ,Œ¥—F‰–ç"7‚ØÈìðYw4^lRÅbmvÆc"ûKª»ÒúsÔ幬H^5»é»~°ªC-,Á±}1[4š­¬êÚߤÚöú^딇ŸC ðPڈͽÈ·0X€ÍU™ù>–höÄò6•×¶á™|¬ÁT;R-E‡¨±ÖÊ‘6DãÝuöÓ«ê¿/‘ÙUE¿È'kÛœ +8àvaŠh;ƒ‚¿ÓÖnS™›E¾ wö"ÂÄ0h(X±fäA“W ¡Z­¶®B¦$r²œ +mdß؃&%íäÔs} r @n‰B^[¨CåXµfn³d«•+dç¤Í‡"Õš¸”­¶¡bm¥2ÊÞ(R­ª5F«õVÈ 9”Xµnhl«õUȼ,²Nóz6zóg´ºÝÜM¤Òus7Kæ\Qoɘ‰xÚ¿ZÀ¬­:º +ôc‹â‰d:eƒ– YÞ;š‚FíçCÏjîH®Ù,ë6)šSóÃT³E›ÏBä@Ž¬V`•'“â™3gˆ§ÅË[ãr·bÕÏcÛW5Ë’1ðǽªi€.Ç š&®9ëÇ˃ºâå(à¼4²Ã]‘º–l´¦¯ÍF¿Ðœ7 5Œ)çVVvžÎZã]É,0´…»Gáüg¯=î­½žtª±k6CýªáVÑpŠ™ì‹ÏäW¿úeuwú†Ó:2Ûä±s¥ÖW5Ûl¾dCYl(›ª¡UÌkoçu?Ì뿈åõ"~V­ŒÂ(žšˆÍyÃÐœEàt¬¨ßE5j++Dº–å]K¿Nx”\wÙøº+Z¡YÚþ1¨¾ã!ëëe´tVÄvÝŠË/2¢³qŸèì¸QÜ +oƒ¿·kÑÜG·%ÈÇ ÈÛýÒµ;ŒtíÎdéZ&<!éZox”~õ…ƒ#Ë'Ô¯máí,óÏ\Èßmµ?ízT¿ä•ì.°Ì {l™ãxÃØÙár,‡”j?¦nÄ"¦C„À{V–ÒÀa/žW'|‡’¶¨C¹G,ï|~Ì--Ôf÷]˜™‰Guqß±ñ¥ñã2=T›½p~N”—7ɃÁhá_YG,€ÜFKrFUKYd½X^-1±â1ý-ÊŠ]²N¥‚ù¨,RË©÷ÆcILÌT^Þ$|â§T­Ü#‹l’jšV4$ì³I¥ÆÃû„ªÇ1®cÏÍ_Põ$Šl2ÌS²Èf!)t·àÚakJ¨6™ +êiYd‹¤[p÷¨ŽW“²$ü®Ÿ“T§e‘­B^‡ÄÊžfÊË[E‚™ÔøÞ¦bm±Ù³®_Êjx<#Ì Yd»XÞáÎá¬,¦w ú«×úµ'%œ²nVªvÎÈ";”˜hÅ݉­ôØ­™º µ‡vŠåíÉcQ O-ÔÞ33¥gÜÉIÝJÿŠ­ Šj¬““zÅÞ¬W¬iå¾™óó³U|S‚œTï’E‰åØ#¡xY--ú +Ô1Yä¢=N¨“ »/KB,àW*H£²È­z¸þ77eu(°têï6±ÜáöÐ °SCLíœ,ò¤XÞUg³Lª728Õ„‡>9IÑÜÔK`>Å\šSZŽ£ i7ŠÂö+AîÈ÷ϯ®:¼5a4pïÁáŽ/ T–N u)õÔV õˆ,rAH>Õ¦ÌTŸÄu ¿RA9)‹¼Ç®/ »A°ºõܯâûÅòZw´ú,$ÖB§RA|BéV7N¥×,/Ë;¹+**e )¤L·YQ8W7¯ÍŒ~´,Ù3­x¬,· 1E Ùì¿Ëfo—‰¢j©L‡ª¬V¦võ]³èMLC§£úœ¬u#œ»Ãó1«RÊ?÷y‘¨†©céTˆþ¢,r»¸<&4€‡.,.ÕÎ'AÀ\8S)Q’CÂña¸¢¾µ Êv˜™ ++Å?P˜/èv¯Dã&q¹&TóƃœÃ y;;¶P«-¹^ÏÁ#ºN(eu‘¼¤O.TÇ—ªP‘€y¦Mv¯ta>8¤¼v¼¥\³±Ê̵M4 +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="DataGrid" class="mx.controls.DataGrid" implementation="DataGrid.swf" iconFile="DataGrid.png" tooltip="DataGrid" src="mx.controls.DataGrid.asi" modified="1061846969"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="2000" /> + <include id="BoundingBox"/> + <include id="DataGridAssets"/> + <include id="DataGridColumn"/> + <include id="DataGridRow"/> + <include id="List"/> + <include id="TextInput"/> + <exportAfter id="__Packages.mx.controls.DataGrid"/> +<class id="mx.controls.DataGrid" > + <RequiresDataBinding param1="true" /> + <IconFile param1="DataGrid.png" /> + <InspectableList param1="multipleSelection" param2="editable" param3="rowHeight" /> + <DataBindingInfo param1="acceptedTypes" param2="{dataProvider: &quot;String&quot;}" /> + <Event param1="cellPress" /> + <Event param1="cellEdit" /> + <Event param1="cellFocusIn" /> + <Event param1="cellFocusOut" /> + <Event param1="columnStretch" /> + <Event param1="headerRelease" /> + <property id="_inherited_dataProvider" type="Array" > + <Bindable param1="writeonly" type="DataProvider" /> + </property> + <property id="_inherited_selectedIndex" type="Number" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItem" type="Object" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="editable" type="Boolean" defaultValue="false"> + <Inspectable defaultValue="false" /> + </property> +</class> +<class id="mx.controls.List" > + <TagName param1="List" /> + <IconFile param1="List.png" /> + <InspectableList param1="labels" param2="data" param3="multipleSelection" param4="rowHeight" /> + <DataBindingInfo param1="acceptedTypes" param2="{dataProvider: {label: &quot;String&quot;}}" /> + <property id="_inherited_dataProvider" type="Array" > + <Bindable param1="writeonly" type="DataProvider" /> + </property> + <property id="_inherited_selectedIndex" type="Number" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedIndices" type="Array" > + <Bindable /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItem" type="Object" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="_inherited_selectedItems" type="Array" > + <Bindable param1="readonly" /> + <ChangeEvent param1="change" /> + </property> + <property id="data" type="Array" > + <Inspectable defaultValue="" /> + </property> + <method id="labels" returnType="Array"> + <Inspectable defaultValue="" /> + </method> +</class> +<class id="mx.controls.listclasses.ScrollSelectList" > + <Event param1="change" /> + <Event param1="itemRollOver" /> + <Event param1="itemRollOut" /> + <property id="multipleSelection" type="Boolean" defaultValue="false"> + <Inspectable defaultValue="false" /> + </property> + <method id="rowHeight" returnType="Number"> + <Inspectable defaultValue="20" /> + </method> +</class> +<class id="mx.core.ScrollView" > + <Event param1="scroll" /> +</class> +<class id="mx.core.View" > +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="cursorStretch" modified="1058931097"> +</asset> +<asset id="DataStretchBar" modified="1058931528"> +</asset> +<asset id="DataSortArrow" modified="1058931153"> +</asset> +<asset id="DataHeaderSeperator" modified="1058931563"> +</asset> +<asset id="DataHeaderOverlay" modified="1052424823"> +</asset> +<asset id="DataHeaderBackGnd" modified="1058931126"> +</asset> +<asset id="DataGridAssets" modified="1062224905"> + <include id="DataHeaderBackGnd"/> + <include id="DataHeaderOverlay"/> + <include id="DataHeaderSeperator"/> + <include id="DataSortArrow"/> + <include id="DataStretchBar"/> + <include id="cursorStretch"/> +</asset> +<asset id="DataGridColumn" modified="1055796802"> + <exportAfter id="__Packages.mx.controls.gridclasses.DataGridColumn"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="SelectableRow" modified="1055744780"> + <include id="UIComponent"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.listclasses.SelectableRow"/> +</asset> +<asset id="DataGridRow" modified="1055796830"> + <include id="SelectableRow"/> + <exportAfter id="__Packages.mx.controls.gridclasses.DataGridRow"/> +</asset> +<asset id="View" modified="1056146210"> + <include id="UIComponent"/> + <include id="RectBorder"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.core.View"/> +</asset> +<asset id="VScrollBar" modified="1055744780"> + <include id="Button"/> + <include id="SimpleButton"/> + <include id="CustomBorder"/> + <include id="ScrollBarAssets"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.VScrollBar"/> +</asset> +<asset id="BtnUpArrow" modified="1062224271"> + <include id="ScrollTrack"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="BtnDownArrow" modified="1062224269"> + <include id="ScrollTrack"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="ScrollUpArrowUp" modified="1062224268"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowOver" modified="1062224230"> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowDown" modified="1062224224"> + <include id="ScrollThemeColor2"/> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollUpArrowDisabled" modified="1062224217"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollTrackDisabled" modified="1062224213"> +</asset> +<asset id="ScrollThumbTopUp" modified="1062224206"> +</asset> +<asset id="ScrollThumbTopOver" modified="1062224202"> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbTopDown" modified="1062224190"> + <include id="ThumbThemeColor3"/> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbTopDisabled" modified="1062224182"> +</asset> +<asset id="ScrollThumbMiddleUp" modified="1062224173"> +</asset> +<asset id="ScrollThumbMiddleOver" modified="1062224169"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbMiddleDown" modified="1062224163"> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbMiddleDisabled" modified="1062224154"> + <include id="ThumbThemeColor2"/> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbGripUp" modified="1062224150"> +</asset> +<asset id="ScrollThumbGripOver" modified="1062224149"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ThumbThemeColor2" modified="1056571376"> +</asset> +<asset id="ScrollThumbGripDown" modified="1062224144"> + <include id="ThumbThemeColor2"/> +</asset> +<asset id="ScrollThumbGripDisabled" modified="1062224139"> +</asset> +<asset id="ScrollThumbBottomUp" modified="1062224137"> +</asset> +<asset id="ScrollThumbBottomOver" modified="1062224133"> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ThumbThemeColor1" modified="1055381159"> +</asset> +<asset id="ThumbThemeColor3" modified="1056571332"> +</asset> +<asset id="ScrollThumbBottomDown" modified="1062224128"> + <include id="ThumbThemeColor3"/> + <include id="ThumbThemeColor1"/> +</asset> +<asset id="ScrollThumbBottomDisabled" modified="1062224121"> +</asset> +<asset id="ScrollDownArrowUp" modified="1062224119"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollDownArrowOver" modified="1062224115"> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollThemeColor1" modified="1062224277"> +</asset> +<asset id="ScrollThemeColor2" modified="1062224279"> +</asset> +<asset id="ScrollDownArrowDown" modified="1062224104"> + <include id="ScrollThemeColor2"/> + <include id="ScrollThemeColor1"/> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollTrack" modified="1062224208"> +</asset> +<asset id="ScrollDownArrowDisabled" modified="1062224108"> + <include id="ScrollTrack"/> +</asset> +<asset id="ScrollBarAssets" modified="1062225008"> + <include id="ScrollDownArrowDisabled"/> + <include id="ScrollDownArrowDown"/> + <include id="ScrollDownArrowOver"/> + <include id="ScrollDownArrowUp"/> + <include id="ScrollThumbBottomDisabled"/> + <include id="ScrollThumbBottomDown"/> + <include id="ScrollThumbBottomOver"/> + <include id="ScrollThumbBottomUp"/> + <include id="ScrollThumbGripDisabled"/> + <include id="ScrollThumbGripDown"/> + <include id="ScrollThumbGripOver"/> + <include id="ScrollThumbGripUp"/> + <include id="ScrollThumbMiddleDisabled"/> + <include id="ScrollThumbMiddleDown"/> + <include id="ScrollThumbMiddleOver"/> + <include id="ScrollThumbMiddleUp"/> + <include id="ScrollThumbTopDisabled"/> + <include id="ScrollThumbTopDown"/> + <include id="ScrollThumbTopOver"/> + <include id="ScrollThumbTopUp"/> + <include id="ScrollTrackDisabled"/> + <include id="ScrollUpArrowDisabled"/> + <include id="ScrollUpArrowDown"/> + <include id="ScrollUpArrowOver"/> + <include id="ScrollUpArrowUp"/> + <include id="BtnDownArrow"/> + <include id="BtnUpArrow"/> +</asset> +<asset id="CustomBorder" modified="1062224879"> + <exportAfter id="__Packages.mx.skins.CustomBorder"/> +</asset> +<asset id="ButtonSkin" modified="1062224893"> + <exportAfter id="__Packages.mx.skins.halo.ButtonSkin"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="SimpleButtonUp" modified="1062225026"> + <include id="BrdrBlk"/> + <include id="BrdrFace"/> + <include id="BrdrShdw"/> + <include id="BrdrHilght"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrHilght" modified="1052770908"> +</asset> +<asset id="BrdrBlk" modified="1052770913"> +</asset> +<asset id="SimpleButtonIn" modified="1062225020"> + <include id="BrdrBlk"/> + <include id="BrdrHilght"/> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="BrdrFace" modified="1051767541"> +</asset> +<asset id="BrdrShdw" modified="1058931521"> +</asset> +<asset id="SimpleButtonDown" modified="1062225019"> + <include id="BrdrShdw"/> + <include id="BrdrFace"/> +</asset> +<asset id="SimpleButton" modified="1055744781"> + <include id="BoundingBox"/> + <include id="SimpleButtonDown"/> + <include id="SimpleButtonIn"/> + <include id="SimpleButtonUp"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.SimpleButton"/> +</asset> +<asset id="Button" modified="1059073889"> + <include id="BoundingBox"/> + <include id="SimpleButton"/> + <include id="Border"/> + <include id="RectBorder"/> + <include id="ButtonSkin"/> + <exportAfter id="__Packages.mx.controls.Button"/> +</asset> +<asset id="HScrollBar" modified="1055744780"> + <include id="Button"/> + <include id="SimpleButton"/> + <include id="CustomBorder"/> + <include id="ScrollBarAssets"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.controls.HScrollBar"/> +</asset> +<asset id="ScrollView" modified="1055744780"> + <include id="HScrollBar"/> + <include id="VScrollBar"/> + <include id="View"/> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.core.ScrollView"/> +</asset> +<asset id="DataSelector" modified="1051766780"> + <exportAfter id="__Packages.mx.controls.listclasses.DataSelector"/> +</asset> +<asset id="DataProvider" modified="1052176331"> + <exportAfter id="__Packages.mx.controls.listclasses.DataProvider"/> +</asset> +<asset id="ScrollSelectList" modified="1055744780"> + <include id="BoundingBox"/> + <include id="DataProvider"/> + <include id="DataSelector"/> + <include id="SelectableRow"/> + <include id="ScrollView"/> + <exportAfter id="__Packages.mx.controls.listclasses.ScrollSelectList"/> +</asset> +<asset id="List" modified="1055744780"> + <include id="BoundingBox"/> + <include id="ScrollSelectList"/> + <exportAfter id="__Packages.mx.controls.List"/> +</asset> +<asset id="TextInput" modified="1059523437"> + <include id="RectBorder"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.TextInput"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1121281616"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1121281617"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.core.View" src="mx.core.View.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.skins.RectBorder" /> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.core.ExternalContent" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.core.ExternalContent" src="mx.core.ExternalContent.asi" modified="1121760655"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.events.UIEventDispatcher" /> + <exportAfter id="__Packages.mx.core.View" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1121661005"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ScrollView" src="mx.core.ScrollView.asi" modified="1121281615"> + <include id="__Packages.mx.controls.scrollClasses.ScrollBar" /> + <exportAfter id="__Packages.mx.core.View" /> +</asset> +<asset id="__Packages.mx.controls.scrollClasses.ScrollBar" src="mx.controls.scrollClasses.ScrollBar.asi" modified="1121281612"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.controls.scrollClasses.ScrollThumb" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.CustomBorder" src="mx.skins.CustomBorder.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.controls.scrollClasses.ScrollThumb" src="mx.controls.scrollClasses.ScrollThumb.asi" modified="1121281613"> + <exportAfter id="__Packages.mx.skins.CustomBorder" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="11212816ýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€13"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.DataSelector" src="mx.controls.listclasses.DataSelector.asi" modified="1121281612"> +</asset> +<asset id="__Packages.mx.controls.listclasses.DataProvider" src="mx.controls.listclasses.DataProvider.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.ScrollSelectList" src="mx.controls.listclasses.ScrollSelectList.asi" modified="1121281612"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.core.ScrollView" /> + <exportAfter id="__Packages.mx.controls.listclasses.DataSelector" /> + <exportAfter id="__Packages.mx.controls.listclasses.DataProvider" /> +</asset> +<asset id="__Packages.mx.controls.List" src="mx.controls.List.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.controls.listclasses.ScrollSelectList" /> +</asset> +<asset id="__Packages.mx.controls.DataGrid" src="mx.controls.DataGrid.asi" modified="1123725573"> + <include id="__Packages.mx.core.UIObject" /> + <include id="__Packages.mx.styles.StyleManager" /> + <include id="__Packages.mx.effects.Tween" /> + <include id="__Packages.mx.controls.gridclasses.DataGridColumn" /> + <include id="__Packages.mx.controls.gridclasses.DataGridRow" /> + <include id="__Packages.mx.controls.TextInput" /> + <exportAfter id="__Packages.mx.controls.List" /> +</asset> +<asset id="__Packages.mx.effects.Tween" src="mx.effects.Tween.asi" modified="1121281616"> +</asset> +<asset id="__Packages.mx.controls.gridclasses.DataGridColumn" src="mx.controls.gridclasses.DataGridColumn.asi" modified="1121281612"> + <include id="__Packages.mx.controls.DataGrid" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.controls.listclasses.SelectableRow" src="mx.controls.listclasses.SelectableRow.asi" modified="1121281612"> + <include id="__Packages.mx.effects.Tween" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.gridclasses.DataGridRow" src="mx.controls.gridclasses.DataGridRow.asi" modified="1121988443"> + <include id="__Packages.mx.controls.gridclasses.DataGridColumn" /> + <exportAfter id="__Packages.mx.controls.listclasses.SelectableRow" /> +</asset> +<asset id="__Packages.mx.controls.TextInput" src="mx.controls.TextInput.asi" modified="1121281615"> + <include id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.HScrollBar" src="mx.controls.HScrollBar.asi" modified="1121281612"> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.controls.scrollClasses.ScrollBar" /> +</asset> +<asset id="__Packages.mx.controls.Button" src="mx.controls.Button.asi" modified="1121281609"> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.controls.SimpleButton" /> +</asset> +<asset id="__Packages.mx.controls.VScrollBar" src="mx.controls.VScrollBar.asi" modified="1121281615"> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.controls.scrollClasses.ScrollBar" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1121281616"> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1121281616"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1121281615"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1121281617"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.ButtonSkin" src="mx.skins.halo.ButtonSkin.asi" modified="1121281616"> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1121281616"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +</component> +</componentPackage> +Media 1ÿþÿBitmap 1ÿþÿ DataGrid.png÷´EwDEõÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hhhxǽ“Ñ Ã Dû™-š²sd ÖȬÀƒ¸zH®®T1©"ÕÒ'˜ãbK)Ù]¬ÏµsØ…h­õªmÛ¾ª•gߦ(¥|¼3G8rÎÿÈs‡9j­ïÜ¿)ϲ,Fž¾Ù…zX«õ\õźø$àpýŒ3_*]õè÷(÷sf‡ò¨'òÙ}9ãÈù¢ž˜é‰¼èÜŒç_¾ø_ôŒý¨ç£Ú£Ü}iòüêë¬/à‰îK}¡å¬OUg”ãK{‹Ü}1ÞÄ ™£²ÿþÿDataGridÐÐÿþÿDataGridÿþÿ DataGrid.swf¿úBtÿþÿBorderÿþÿBorderÿþÿ DataGrid.swføQP?ÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ DataGrid.swf‡àÛ>ÿþÿÿþÿÿþÿBrdrBlkÿþÿBrdrBlkÿþÿ DataGrid.swfqÀ>ÿþÿÿþÿÿþÿBrdrFaceÿþÿBrdrFaceÿþÿ DataGrid.swfÁ°>ÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ +BrdrHilghtÿþÿ DataGrid.swflÀ>ÿþÿÿþÿÿþÿBrdrShdwÿþÿBrdrShdwÿþÿ DataGrid.swfQ?ÿþÿÿþÿÿþÿ BtnDownArrowÿþÿ BtnDownArrowÿþÿ DataGrid.swfOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +BtnUpArrowÿþÿ +BtnUpArrowÿþÿ DataGrid.swfŸOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿButtonÿþÿButtonÿþÿ DataGrid.swfq= ?ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ButtonSkinÿþÿ +ButtonSkinÿþÿ DataGrid.swf RP?ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ CustomBorderÿþÿ CustomBorderÿþÿ DataGrid.swfÿQP?ÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataGridAssetsÿþÿDataGridAssetsÿþÿ DataGrid.swfRP?ÿþÿDataHeaderBackGndÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataHeaderOverlayÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataHeaderSeperatorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataSortArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataStretchBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ cursorStretchÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataGridColumnÿþÿDataGridColumnÿþÿ DataGrid.swfR<î>ÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataGridRowÿþÿ DataGridRowÿþÿ DataGrid.swfn<î>ÿþÿ SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿDataHeaderBackGndÿþÿDataHeaderBackGndÿþÿ DataGrid.swfÆ?ÿþÿÿþÿÿþÿDataHeaderOverlayÿþÿDataHeaderOverlayÿþÿ DataGrid.swf‡Èº>ÿþÿÿþÿÿþÿDataHeaderSeperatorÿþÿDataHeaderSeperatorÿþÿ DataGrid.swf{?ÿþÿÿþÿÿþÿ DataProviderÿþÿ DataProviderÿþÿ DataGrid.swfÛý¶>ÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataSelectorÿþÿ DataSelectorÿþÿ DataGrid.swf ¾°>ÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ DataSortArrowÿþÿ DataSortArrowÿþÿ DataGrid.swfá?ÿþÿÿþÿÿþÿDataStretchBarÿþÿDataStretchBarÿþÿ DataGrid.swfX?ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ DataGrid.swfÏSí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ DataGrid.swf=i„@ÿþÿ FocusRectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ DataGrid.swfCqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +HScrollBarÿþÿ +HScrollBarÿþÿ DataGrid.swfqí>ÿþÿButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollBarAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿListÿþÿListÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ DataGrid.swfRP?ÿþÿBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollBarAssetsÿþÿScrollBarAssetsÿþÿ DataGrid.swf€RP?ÿþÿScrollDownArrowDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollDownArrowUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbBottomUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbGripUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbMiddleUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThumbTopUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollTrackDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowDisabledÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowOverÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollUpArrowUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BtnDownArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BtnUpArrowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowDisabledÿþÿScrollDownArrowDisabledÿþÿ DataGrid.swfüNP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowDownÿþÿScrollDownArrowDownÿþÿ DataGrid.swføNP?ÿþÿScrollThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowOverÿþÿScrollDownArrowOverÿþÿ DataGrid.swfOP?ÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollDownArrowUpÿþÿScrollDownArrowUpÿþÿ DataGrid.swfOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollSelectListÿþÿScrollSelectListÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿScrollThemeColor1ÿþÿ DataGrid.swf¥OP?ÿþÿÿþÿÿþÿScrollThemeColor2ÿþÿScrollThemeColor2ÿþÿ DataGrid.swf§OP?ÿþÿÿþÿÿþÿScrollThumbBottomDisabledÿþÿScrollThumbBottomDisabledÿþÿ DataGrid.swf OP?ÿþÿÿþÿÿþÿScrollThumbBottomDownÿþÿScrollThumbBottomDownÿþÿ DataGrid.swfOP?ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbBottomOverÿþÿScrollThumbBottomOverÿþÿ DataGrid.swfOP?ÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbBottomUpÿþÿScrollThumbBottomUpÿþÿ DataGrid.swfOP?ÿþÿÿþÿÿþÿScrollThumbGripDisabledÿþÿScrollThumbGripDisabledÿþÿ DataGrid.swfOP?ÿþÿÿþÿÿþÿScrollThumbGripDownÿþÿScrollThumbGripDownÿþÿ DataGrid.swf OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbGripOverÿþÿScrollThumbGripOverÿþÿ DataGrid.swf%OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbGripUpÿþÿScrollThumbGripUpÿþÿ DataGrid.swf&OP?ÿþÿÿþÿÿþÿScrollThumbMiddleDisabledÿþÿScrollThumbMiddleDisabledÿþÿ DataGrid.swf*OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleDownÿþÿScrollThumbMiddleDownÿþÿ DataGrid.swf3OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleOverÿþÿScrollThumbMiddleOverÿþÿ DataGrid.swf9OP?ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbMiddleUpÿþÿScrollThumbMiddleUpÿþÿ DataGrid.swf=OP?ÿþÿÿþÿÿþÿScrollThumbTopDisabledÿþÿScrollThumbTopDisabledÿþÿ DataGrid.swfFOP?ÿþÿÿþÿÿþÿScrollThumbTopDownÿþÿScrollThumbTopDownÿþÿ DataGrid.swfNOP?ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbTopOverÿþÿScrollThumbTopOverÿþÿ DataGrid.swfZOP?ÿþÿThumbThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollThumbTopUpÿþÿScrollThumbTopUpÿþÿ DataGrid.swf^OP?ÿþÿÿþÿÿþÿ ScrollTrackÿþÿ ScrollTrackÿþÿ DataGrid.swf`OP?ÿþÿÿþÿÿþÿScrollTrackDisabledÿþÿScrollTrackDisabledÿþÿ DataGrid.swfeOP?ÿþÿÿþÿÿþÿScrollUpArrowDisabledÿþÿScrollUpArrowDisabledÿþÿ DataGrid.swfiOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowDownÿþÿScrollUpArrowDownÿþÿ DataGrid.swfpOP?ÿþÿScrollThemeColor2ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowOverÿþÿScrollUpArrowOverÿþÿ DataGrid.swfvOP?ÿþÿScrollThemeColor1ÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿScrollUpArrowUpÿþÿScrollUpArrowUpÿþÿ DataGrid.swfœOP?ÿþÿ ScrollTrackÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +ScrollViewÿþÿ +ScrollViewÿþÿ DataGrid.swfqí>ÿþÿ +HScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +VScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SelectableRowÿþÿ SelectableRowÿþÿ DataGrid.swfqí>ÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ SimpleButtonÿþÿ SimpleButtonÿþÿ DataGrid.swfqí>ÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonDownÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonInÿþÿ DataGrid.swfÿþÿÿþÿÿþÿSimpleButtonUpÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonDownÿþÿSimpleButtonDownÿþÿ DataGrid.swf‹RP?ÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonInÿþÿSimpleButtonInÿþÿ DataGrid.swfŒRP?ÿþÿBrdrBlkÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿSimpleButtonUpÿþÿSimpleButtonUpÿþÿ DataGrid.swf’RP?ÿþÿBrdrBlkÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrShdwÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +BrdrHilghtÿþÿ DataGrid.swfÿþÿÿþÿÿþÿBrdrFaceÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ TextInputÿþÿ TextInputÿþÿ DataGrid.swf}'?ÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿThumbThemeColor1ÿþÿThumbThemeColor1ÿþÿ DataGrid.swf·äç>ÿþÿÿþÿÿþÿThumbThemeColor2ÿþÿThumbThemeColor2ÿþÿ DataGrid.swfú>ÿþÿÿþÿÿþÿThumbThemeColor3ÿþÿThumbThemeColor3ÿþÿ DataGrid.swfÔ ú>ÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ DataGrid.swfüH?ÿþÿUIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ DataGrid.swfÚH?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ DataGrid.swfI?ÿþÿDefaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ DataGrid.swfþH?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +VScrollBarÿþÿ +VScrollBarÿþÿ DataGrid.swfqí>ÿþÿButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿScrollBarAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿViewÿþÿViewÿþÿ DataGrid.swf2‘ó>ÿþÿ UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ +RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Buttonÿþÿ__Packages.mx.controls.Buttonÿþÿ DataGrid.swfYtÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.Buttonÿþÿÿ÷ +import mx.core.UIObject; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +[Event("click")] +[TagName("Button")] +[IconFile("Button.png")] +intrinsic class mx.controls.Button extends mx.controls.SimpleButton +{ + public function Button(); + public var __label:String; + public var __labelPlacement:String; + public var _color; + public function _getIcon(Void):String; + public var _iconLinkageName:String; + [Bindable] [ChangeEvent("click")] public var _inherited_selected:Boolean; + public function _setIcon(linkage):Void; + public var borderW:Number; + public var btnOffset:Number; + public function calcSize(tag:Number, ref:Object):Void; + public var centerContent:Boolean; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(); + public var falseDisabledIcon:String; + public var falseDisabledSkin:String; + public var falseDownIcon:String; + public var falseDownSkin:String; + public var falseOverIcon:String; + public var falseOverSkin:String; + public var falseUpIcon:String; + public var falseUpSkin:String; + public function getBtnOffset(Void):Number; + public function getLabel(Void):String; + public function getLabelPlacement(Void):String; + public var hitArea_mc:MovieClip; + function get icon():String; + [Inspectable(defaultValue="")] function set icon(linkage); + public function init(Void):Void; + public var initIcon; + public function invalidateStyle(c:String):Void; + [Inspectable(defaultValue="Button")] function set label(lbl:String); + function get label():String; + public var labelPath:Object; + [Inspectable(enumeration="left,right,top,bottom"defaultValue="right")] function set labelPlacement(val:String); + function get labelPlacement():String; + static var mergedClipParameters:Boolean; + public function onRelease(Void):Void; + public function setColor(c:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHitArea(w:Number, h:Number); + public function setLabel(label:String):Void; + public function setLabelPlacement(val:String):Void; + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setView(offset:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner; + public var trueDisabledIcon:String; + public var trueDisabledSkin:String; + public var trueDownIcon:String; + public var trueDownSkin:String; + public var trueOverIcon:String; + public var trueOverSkin:String; + public var trueUpIcon:String; + public var trueUpSkin:String; + static var version:String; + public function viewSkin(varName:String):Void; +}; +ÿþÿ__Packages.mx.controls.DataGridÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swf¿úBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.DataGridÿþÿÿ~import mx.controls.gridclasses.DataGridRow; +import mx.controls.List; +import mx.effects.Tween; +import mx.controls.gridclasses.DataGridColumn; + +[RequiresDataBinding(true)] +[IconFile("DataGrid.png")] +[InspectableList("multipleSelection","editable", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: &quot;String&quot;}")] +[Event("cellPress")] +[Event("cellEdit")] +[Event("cellFocusIn")] +[Event("cellFocusOut")] +[Event("columnStretch")] +[Event("headerRelease")] +intrinsic class mx.controls.DataGrid extends mx.controls.List +{ + public var DISABLEDHEADERDEPTH:Number; + public function DataGrid(); + public var EDITORDEPTH:Number; + public var HEADERCELLDEPTH:Number; + public var HEADERDEPTH:Number; + public var HEADEROVERLAYDEPTH:Number; + public var LINEDEPTH:Number; + public var SEPARATORDEPTH:Number; + public var SORTARROWDEPTH:Number; + public var STRETCHERDEPTH:Number; + public var __focusedCell:Object; + public var __headerHeight:Number; + public var __rowRenderer:String; + public var __showHeaders:Boolean; + public var __tabHandlerCache:Function; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + public var activeGrid:Object; + public function addColumn(newCol):mx.controls.gridclasses.DataGridColumn; + public function addColumnAt(index:Number, newCol):mx.controls.gridclasses.DataGridColumn; + public var asc:Boolean; + public var autoHScrollAble:Boolean; + public var cell:Object; + public var cellEditor:MovieClip; + public var className:String; + public var col:Object; + public var colX:Number; + public var column:mx.controls.gridclasses.DataGridColumn; + function get columnCount():Number; + function get columnNames():Array; + function set columnNames(w:Array); + public var columns:Array; + public function configureScrolling(Void):Void; + public function disposeEditor(Void):Void; + public var dontEdit:Boolean; + public function draw(); + public function drawColumns(Void):Void; + public function drawHeaderBG(Void):Void; + public function editCell(); + public function editField(index:Number, colName:String, data):Void; + public var editTween:mx.effects.Tween; + [Inspectable(defaultValue=false)] public var editable:Boolean; + public function editorKeyDown(Void):Void; + public var editorMask:MovieClip; + public function enableHeader(v:Boolean):Void; + public function findNextCell(index:Number, colIndex:Number):Void; + public function findNextEnterCell(Void):Void; + function set focusedCell(obj:Object); + function get focusedCell():Object; + public function generateCols(Void):Void; + public function getColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public function getColumnIndex(name:String):Number; + public function getColumnNames(Void):Array; + public function getHeaderHeight(Void):Number; + public function getShowHeaders():Boolean; + public var hasDrawn:Boolean; + public var headerCells:Array; + function get headerHeight():Number; + function set headerHeight(w:Number); + public function headerPress(Void):Void; + public function headerRelease(Void):Void; + public function headerRollOut(Void):Void; + public function headerRollOver(Void):Void; + public function headerUp(Void):Void; + public var header_mc:MovieClip; + public function hideStretcher(Void):Void; + public function init(); + public function initHeaders(Void):Void; + public function initRows(Void):Void; + public var invCheckCols:Boolean; + public var invColChange:Boolean; + public var invDrawCols:Boolean; + public var invInitHeaders:Boolean; + public var invSpaceColsEqually:Boolean; + public function invalidateHeaderStyle(Void):Void; + public function invalidateStyle(propName:String):Void; + public function isStretchable(col:Number):Boolean; + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public var lines_mc:MovieClip; + public var listOwner:Object; + public var minColWidth:Number; + public var minScrollInterval; + public function modelChanged(eventObj:Object):Void; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var oldWidth:Number; + public var oldX:Number; + public function onMouseDown(Void):Void; + public function onRowPress(rowIndex:Number):Void; + public function onSetFocus(Void):Void; + public function onTweenEnd(val); + public function onTweenUpdate(val); + public function placeSortArrow(Void):Void; + public function removeAllColumns(Void):Void; + public function removeColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public var resizableColumns:Boolean; + public function resizeColumn(col:Number, w:Number):Void; + public var selectable:Boolean; + public function setColumnNames(tmpArray:Array):Void; + public function setEnabled(v:Boolean):Void; + public function setFocusedCell(coord:Object, broadCast):Void; + public function setHScrollPolicy(policy:String):Void; + public function setHeaderHeight(h:Number):Void; + public function setRowCount(rC:Number):Void; + public function setRowHeight(rH:Number):Void; + public function setShowHeaders(b:Boolean):Void; + public function setVPosition(pos:Number):Void; + function get showHeaders():Boolean; + function set showHeaders(w:Boolean); + public function showStretcher(Void):Void; + public function size(Void):Void; + public var sortArrow:MovieClip; + public var sortDirection:String; + public var sortIndex:Number; + public var sortableColumns:Boolean; + public function spaceColumnsEqually(Void):Void; + public function startSizing(Void):Void; + public function stopSizing(Void):Void; + public var stretchBar:MovieClip; + public var stretcher:MovieClip; + static var symbolName:String; + static var symbolOwner:Object; + public function tabHandler(Void):Void; + public var totColW:Number; + static var version:String; +}; +ÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ!__Packages.mx.controls.HScrollBarÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.HScrollBarÿþÿÿ!import mx.controls.scrollClasses.ScrollBar; +import mx.core.UIComponent; + +[IconFile("HScrollBar.png")] +intrinsic class mx.controls.HScrollBar extends mx.controls.scrollClasses.ScrollBar +{ + public function HScrollBar(); + [Bindable] [ChangeEvent("scroll")] public var _inherited_scrollPosition:Number; + public var className:String; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function init(Void):Void; + public function isScrollBarKey(k:Number):Boolean; + public var maxMode:String; + public var minMode:String; + public var minusMode:String; + public var plusMode:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get virtualHeight():Number; +}; +ÿþÿ__Packages.mx.controls.Listÿþÿ__Packages.mx.controls.Listÿþÿ DataGrid.swf\tÕBÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.ListÿþÿÿÙ import mx.controls.listclasses.ScrollSelectList; + +[TagName("List")] +[IconFile("List.png")] +[InspectableList("labels", "data", "multipleSelection", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: {label: &quot;String&quot;}}")] +intrinsic class mx.controls.List extends mx.controls.listclasses.ScrollSelectList +{ + public function List(); + public var __labels:Array; + public var __selectedIndex:Number; + public var __vScrollPolicy:String; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndices:Array; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItems:Array; + public var autoHScrollAble:Boolean; + public var boundingBox_mc:MovieClip; + public var calcPreferredHeightFromData:Function; + public var calcPreferredWidthFromData:Function; + public var className:String; + public var clipParameters:Object; + public function configureScrolling(Void):Void; + public function createChildren(Void):Void; + [Inspectable(defaultValue="")] public var data:Array; + public var displayWidth:Number; + public function draw(Void):Void; + public function getRowCount(Void):Number; + public function hScroll(pos:Number):Void; + public function init(Void):Void; + public var invScrollProps:Boolean; + public var invScrollSize:Boolean; + [Inspectable(defaultValue="")] function get labels():Array; + function set labels(lbls:Array); + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public function modelChanged(eventObj:Object):Void; + public var oldVWidth:Number; + public function onScroll(eventObj:Object):Void; + public var scrollDepth:Number; + public function setEnabled(v:Boolean):Void; + public function setHPosition(pos:Number):Void; + public function setHScrollPolicy(policy:String):Void; + public function setMaxHPosition(pos:Number):Void; + public function setRowCount(rC:Number):Void; + public function setVPosition(pos:Number):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var totalHeight:Number; + public var totalWidth:Number; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swf]tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + d):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(vafunction set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + l:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ __Packages.mx.controls.TextInputÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +ÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.VScrollBarÿþÿÿ~import mx.controls.scrollClasses.ScrollBar; + +[IconFile("VScrollBar.png")] +intrinsic class mx.controls.VScrollBar extends mx.controls.scrollClasses.ScrollBar +{ + public function VScrollBar(); + [Bindable] [ChangeEvent("scroll")] public var _inherited_scrollPosition:Number; + public var className:String; + public function init(Void):Void; + public function isScrollBarKey(k:Number):Boolean; + public var maxMode:String; + public var minMode:String; + public var minusMode:String; + public var plusMode:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&mx.controls.gridclasses.DataGridColumnÿþÿÿÚimport mx.styles.CSSStyleDeclaration; + +intrinsic class mx.controls.gridclasses.DataGridColumn extends mx.styles.CSSStyleDeclaration +{ + public function DataGridColumn(colName:String); + public var __cellRenderer; + public function __getTextFormat(tf:TextFormat, bAll:Boolean, fieldInst):Boolean; + public var __header:String; + public var __headerRenderer; + public var __labelFunction:Function; + public var __width:Number; + function set cellRenderer(cR); + function get cellRenderer():String; + public var colNum:Number; + public var columnName:String; + public var editable:Boolean; + public function getStyle(prop:String); + public var headerCell:Object; + function set headerRenderer(hS); + function get headerRenderer():String; + public var headerStyle:mx.styles.CSSStyleDeclaration; + function set headerText(h:String); + function get headerText(); + function set labelFunction(f:Function); + function get labelFunction():Function; + public var parentGrid:mx.controls.DataGrid; + public var resizable:Boolean; + public var sortOnHeaderRelease:Boolean; + public var sortable:Boolean; + public var styleName; + function get width():Number; + function set width(w:Number); +}; +ÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfk=àBÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#mx.controls.gridclasses.DataGridRowÿþÿÿ¦import mx.controls.listclasses.SelectableRow; +import mx.controls.gridclasses.DataGridColumn; + +intrinsic class mx.controls.gridclasses.DataGridRow extends mx.controls.listclasses.SelectableRow +{ + public function DataGridRow(); + public function bGOnPress(Void):Void; + public function cellGetPreferredHeight(); + public var cells:Array; + public function clearCells(); + public var colBG:MovieClip; + public var columnIndex:Number; + public function createCells(Void):Void; + public function createChildren(Void):Void; + public function drawCell(cellNum, xPos, w, bgCol); + public function getCellIndex(Void):Object; + public function getDataLabel():String; + public function init(Void):Void; + public var listOwner:Object; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var owner:Object; + public function setState(newState:String, transition:Boolean):Void; + public function setValue(itmObj, state, transition); + public function size(Void):Void; + public function startEditCell(); + public var text:String; + public var textHeight:Number; + public var wasPressed:Boolean; +}; +ÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swf\tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$mx.controls.listclasses.DataProviderÿþÿÿuimport mx.events.EventDispatcher; + +intrinsic class mx.controls.listclasses.DataProvider extends Object +{ + public function DataProvider(obj); + static function Initialize(obj:Object):Boolean; + public var addEventListener:Function; + public function addItem(value):Void; + public function addItemAt(index:Number, value):Void; + public function addItemsAt(index:Number, newItems:Array):Void; + public var dispatchEvent:Function; + public function editField(index:Number, fieldName:String, newData):Void; + static var evtDipatcher; + public function getEditingData(index:Number, fieldName:String); + public function getItemAt(index:Number); + public function getItemID(index:Number):Number; + public var length:Number; + static var mixinProps:Array; + static var mixins:mx.controls.listclasses.DataProvider; + public function removeAll(Void):Void; + public function removeItemAt(index:Number); + public function removeItemsAt(index:Number, len:Number):Void; + public function replaceItemAt(index:Number, itemObj):Void; + public var reverse:Function; + public var slice:Function; + public var sort:Function; + public function sortItems(compareFunc, optionFlags):Void; + public function sortItemsBy(fieldName, order):Void; + public var sortOn:Function; + public var splice:Function; + public function updateViews(event, first, last):Void; +}; +ÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swf\tÕBÿþÿ$mx.controls.listclasses.DataSelectorÿþÿÿß +intrinsic class mx.controls.listclasses.DataSelector extends Object +{ + static function Initialize(obj):Boolean; + public var __dataProvider:Object; + public var __rowCount:Number; + public var __vPosition:Number; + public var __width:Number; + public var _getTextFormat:Function; + public function addItem(label, data):Void; + public function addItemAt(index:Number, label, data):Void; + public function clearSelected(transition:Boolean):Void; + public var createLabel:Function; + public function createProp(obj:Object, propName:String, setter:Boolean):Void; + public var enabled:Boolean; + public function getDataProvider(Void):Object; + public function getItemAt(index:Number):Object; + public function getLength(Void):Number; + public function getSelectedIndex(Void):Number; + public function getSelectedIndices(Void):Array; + public function getSelectedItem(Void):Object; + public function getSelectedItems(Void):Array; + public function getValue(Void):Object; + public var invUpdateControl:Boolean; + public var invalidate:Function; + public var isDragScrolling:Boolean; + public function isSelected(index):Boolean; + public var labelField:String; + public var labelFunction:Function; + public var lastSelID:Number; + public var lastSelected; + static var mixinProps:Array; + static var mixins:mx.controls.listclasses.DataSelector; + public function modelChanged(eventObj:Object); + public var multipleSelection:Boolean; + public function removeAll(Void):Void; + public function removeItemAt(index:Number):Object; + public function replaceItemAt(index:Number, newLabel, newData):Void; + public var rows:Object; + public function selectItem(index:Number, selectedFlag:Boolean):Void; + public var selected:Object; + public var selectionDeleted:Boolean; + public function setDataProvider(dP:Object):Void; + public function setSelectedIndex(index:Number):Void; + public function setSelectedIndices(indexArray:Array):Void; + public var setVPosition:Function; + public function sortItems(compareFunc, order):Void; + public function sortItemsBy(fieldName, order):Void; + public var tempLabel:Object; + public var updateControl:Function; + public var vPosition:Number; +}; +ÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swf\tÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(mx.controls.listclasses.ScrollSelectListÿþÿÿÞimport mx.core.ScrollView; +import mx.controls.listclasses.DataSelector; +import mx.controls.listclasses.DataProvider; + +[Event("change")] +[Event("itemRollOver")] +[Event("itemRollOut")] +intrinsic class mx.controls.listclasses.ScrollSelectList extends mx.core.ScrollView +{ + public var CONTENTDEPTH:Number; + public function ScrollSelectList(); + public var __cellRenderer; + public var __dataProvider:Object; + public var __hPosition:Number; + public var __iconField:String; + public var __iconFunction:Function; + public var __labelField:String; + public var __labelFunction:Function; + public function __onMouseUp(Void):Void; + public var __rowCount:Number; + public var __rowHeight:Number; + public var __rowRenderer:String; + public var __width:Number; + public var addItem:Function; + public var addItemAt:Function; + public var baseRowZ:Number; + public var calcPreferredWidth:Function; + function set cellRenderer(cR); + function get cellRenderer(); + public var changeFlag:Boolean; + public var className:String; + public var clearSelected:Function; + public function createChildren(Void):Void; + public var createLabel:Function; + public var dataProvider:Object; + public var dragEnabled:Boolean; + public function dragScroll(Void):Void; + public var dragScrolling; + public function draw(Void):Void; + public var dropEnabled:Boolean; + public var enabled:Boolean; + public function findInputText(Void):Boolean; + public function findString(str:String):Void; + public var getDataProvider:Function; + public var getItemAt:Function; + public var getLength:Function; + public function getPropertiesAt(index:Number):Object; + public function getPropertiesOf(obj:Object):Object; + public function getRowCount(Void):Number; + public function getRowHeight(Void):Number; + public var getSelectedIndex:Function; + public var getSelectedIndices:Function; + public var getSelectedItem:Function; + public var getSelectedItems:Function; + public function getStateAt(index:Number):String; + public function getStyle(styleProp:String); + public var getValue:Function; + function set iconField(field):Void; + function get iconField():String; + function set iconFunction(func):Void; + function get iconFunction():Function; + public function init(Void):Void; + public var invLayoutContent:Boolean; + public var invRowHeight:Boolean; + public var invUpdateControl:Boolean; + public function invalidateStyle(propName:String):Void; + public var isPressed:Boolean; + public var isRowStyle:Object; + public var isSelected:Function; + public function keyDown(e:Object):Void; + function set labelField(field):Void; + function get labelField():String; + function set labelFunction(func):Void; + function get labelFunction():Function; + public var lastPosition:Number; + public var lastSelID:Number; + public var lastSelected:Number; + public function layoutContent(x:Number, y:Number, w:Number, h:Number):Void; + public var layoutX:Number; + public var layoutY:Number; + public var length:Number; + public var listContent:MovieClip; + public var minScrollInterval; + static var mixIt1:Boolean; + static var mixIt2:Boolean; + public var modelChanged:Function; + public function moveSelBy(incr:Number):Void; + [Inspectable(defaultValue=false)] public var multipleSelection:Boolean; + public var onMouseUp:Function; + public function onRowDragOut(rowIndex:Number):Void; + public function onRowDragOver(rowIndex:Number):Void; + public function onRowPress(rowIndex:Number):Void; + public function onRowRelease(rowIndex:Number):Void; + public function onRowRollOut(rowIndex:Number):Void; + public function onRowRollOver(rowIndex:Number):Void; + public var propertyTable:Object; + public var removeAll:Function; + public var removeItemAt:Function; + public var replaceItemAt:Function; + public var roundUp; + function get rowCount():Number; + function set rowCount(w):Void; + [Inspectable(defaultValue=20)] function get rowHeight():Number; + function set rowHeight(w):Void; + public var rows:Array; + public var scrollInterval:Number; + public var selectHolder:Number; + public var selectItem:Function; + public function selectRow(rowIndex:Number, transition:Boolean, allowChangeEvent:Boolean):Void; + public var selectable:Boolean; + public var selected:Object; + public var selectedIndex:Number; + public var selectedIndices:Array; + public var selectedItem; + public var selectedItems:Array; + public var selectionDeleted:Boolean; + public function setCellRenderer(cR):Void; + public var setDataProvider:Function; + public function setEnabled(v:Boolean):Void; + public function setIconField(field:String):Void; + public function setIconFunction(func:Function):Void; + public function setLabelField(field:String):Void; + public function setLabelFunction(func:Function):Void; + public function setPropertiesAt(index:Number, obj:Object):Void; + public function setRowCount(v:Number):Void; + public function setRowHeight(v:Number):Void; + public var setSelectedIndex:Function; + public var setSelectedIndices:Function; + public function setVPosition(pos:Number):Void; + public var sortItems:Function; + public var sortItemsBy:Function; + public var tH:Number; + public var tW:Number; + public var tempLabel:Object; + public var topRowZ:Number; + public function updateControl(Void):Void; + public var value:Object; + public var wasKeySelected:Boolean; +}; +ÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ%mx.controls.listclasses.SelectableRowÿþÿÿvimport mx.effects.Tween; +import mx.core.UIComponent; + +intrinsic class mx.controls.listclasses.SelectableRow extends mx.core.UIComponent +{ + static var LOWEST_DEPTH:Number; + public function SelectableRow(); + public var bGCol:Object; + public function bGOnDragOut(Void):Void; + public function bGOnDragOver(Void):Void; + public function bGOnPress(Void):Void; + public function bGOnRelease(Void):Void; + public function bGOnRollOut(Void):Void; + public function bGOnRollOver(Void):Void; + public var bGTween:Object; + public var backGround:MovieClip; + public var cell:Object; + public var clr:Number; + public function createChildren(Void):Void; + public var disabledColor:Number; + public function drawRow(itmObj:Object, state:String, transition:Boolean):Void; + public function drawRowFill(mc:MovieClip, newClr:Number):Void; + public function getCellIndex(Void):Object; + public function getDataLabel():String; + public function getNormalColor(Void):Number; + public var grandOwner:Object; + public var highlight:MovieClip; + public var highlightColor:Number; + public var icon_mc:MovieClip; + public function init(Void):Void; + public function invalidateStyle(propName:String):Void; + public var isChangedToSelected:Boolean; + public var item:Object; + public function itemToString(itmObj:Object):String; + public var listOwner:Object; + public var normalColor:Number; + public function onTweenEnd(val:Number):Void; + public function onTweenUpdate(val:Number):Void; + public var owner:Object; + public var rowIndex:Number; + public function setCellRenderer(forceSizing:Boolean):Void; + public function setState(newState:String, transition:Boolean):Void; + public function setValue(itmObj:Object, state:String):Void; + public function setupBG(Void):Void; + public function size(Void):Void; + public var state:String; +}; +ÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#mx.controls.scrollClasses.ScrollBarÿþÿÿŸ import mx.controls.scrollClasses.ScrollThumb; +import mx.core.UIObject; +import mx.skins.SkinElement; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.controls.scrollClasses.ScrollBar extends mx.core.UIComponent +{ + public function ScrollBar(); + public var _scrollPosition:Number; + public var boundingBox_mc:MovieClip; + public var className:String; + public var clipParameters:Object; + public function createButton(linkageName:String, id:String, skinID:Number, o:Object):Object; + public function createChildren(Void):Void; + public function createThumb(Void):Void; + public function dispatchScrollChangedEvent(Void):Void; + public function dispatchScrollEvent(detail:String):Void; + public var downArrowDownName:String; + public var downArrowName:String; + public var downArrowOverName:String; + public var downArrowUpName:String; + public var downArrow_mc:mx.controls.SimpleButton; + public function draw(Void):Void; + public var idNames:Array; + public function init(Void):Void; + public var initializing:Boolean; + public function isScrollBarKey(k:Number):Boolean; + public var isScrolling:Boolean; + public var largeScroll:Number; + function set lineScrollSize(sScroll:Number); + function get lineScrollSize():Number; + public var maxMode:String; + public var maxPos:Number; + static var mergedClipParameters:Boolean; + public var minMode:String; + public var minPos:Number; + public var minusMode:String; + public function onDownArrow(Void):Void; + public function onScrollChanged(Void):Void; + public function onUpArrow(Void):Void; + function get pageScrollSize():Number; + function set pageScrollSize(lScroll:Number); + public var pageSize:Number; + public var plusMode:String; + public function releaseScrolling(Void):Void; + public var scrollHandler:Function; + public function scrollInterval(inc:String, mode:Number):Void; + public function scrollIt(inc:String, mode:Number):Void; + function get scrollPosition():Number; + function set scrollPosition(pos:Number); + public var scrollThumb_mc:mx.controls.scrollClasses.ScrollThumb; + public var scrollTrackDownName:String; + public var scrollTrackName:String; + public var scrollTrackOverName:String; + public var scrollTrack_mc:mx.skins.SkinElement; + public var scrolling; + public function setEnabled(enabledFlag:Boolean):Void; + public function setScrollProperties(pSize:Number, mnPos:Number, mxPos:Number, ls:Number):Void; + public function size(Void):Void; + static var skinIDDownArrow:Number; + static var skinIDThumb:Number; + static var skinIDTrack:Number; + static var skinIDTrackDown:Number; + static var skinIDTrackOver:Number; + static var skinIDUpArrow:Number; + public var smallScroll:Number; + public function startTrackScroller(Void):Void; + public function stopScrolling(Void):Void; + static var symbolOwner:Object; + public var thumbBottomName:String; + public var thumbGripName:String; + public var thumbMiddleName:String; + public var thumbTopName:String; + public function trackOut(Void):Void; + public function trackOver(Void):Void; + public function trackScroller(Void):Void; + public var upArrowDownName:String; + public var upArrowName:String; + public var upArrowOverName:String; + public var upArrowUpName:String; + public var upArrow_mc:mx.controls.SimpleButton; + function get virtualHeight():Number; +}; +ÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ DataGrid.swf]tÕBÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ%mx.controls.scrollClasses.ScrollThumbÿþÿÿËimport mx.skins.CustomBorder; + +intrinsic class mx.controls.scrollClasses.ScrollThumb extends mx.skins.CustomBorder +{ + public function ScrollThumb(); + public var btnOffset:Number; + public var className:String; + public function createChildren(Void):Void; + public var datamax:Number; + public var datamin:Number; + public function dragThumb(Void):Void; + public function draw(); + public var gripSkin:String; + public var grip_mc:MovieClip; + public var horizontal; + public var idNames; + public var lastY:Number; + public function onPress(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public var scrollMove:Number; + public function setRange(_ymin:Number, _ymax:Number, _datamin:Number, _datamax:Number):Void; + public function size(); + public function stopDragThumb(Void):Void; + static var symbolOwner; + public var ymax:Number; + public var ymin:Number; +}; +ÿþÿ"__Packages.mx.core.ExternalContentÿþÿ"__Packages.mx.core.ExternalContentÿþÿ DataGrid.swfŸÃÜBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ExternalContentÿþÿÿÊimport mx.core.UIObject; +import mx.core.View; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ExternalContent +{ + static var ViewDependency; + public function checkLoadProgress():Void; + public var childLoaded:Function; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function contentLoaded():Void; + public function convertToUIObject(obj:MovieClip):Void; + public var createObject:Function; + public var dispatchEvent:Function; + public var doLater:Function; + static function enableExternalContent():Void; + public function loadExternal(url:String, placeholderClassName:String, instanceName:String, depth:Number, initProps:Object):MovieClip; + public var loadList:Object; + public var loadedList:Object; + public var numChildren:Number; + public var prepList:Object; + public function prepareToLoadMovie(obj:MovieClip):Void; + public function waitForUnload():Void; +}; +ÿþÿ__Packages.mx.core.ScrollViewÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swf_tÕBÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ScrollViewýÿÿÿ  +    !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€ÿþÿÿ— import mx.core.View; +import mx.controls.scrollClasses.ScrollBar; + +[Event("scroll")] +intrinsic class mx.core.ScrollView extends mx.core.View +{ + public var MASK_DEPTH:Number; + public function ScrollView(); + public var __hPosition:Number; + public var __hScrollPolicy:String; + public var __maxHPosition:Number; + public function __onMouseWheel(delta:Number, scrollTarget:MovieClip):Void; + public var __vPosition:Number; + public var __vScrollPolicy:String; + public var __viewMetrics:Object; + public function childLoaded(obj:MovieClip):Void; + public var className:String; + public var columnWidth:Number; + public function createChild(id, name:String, props:Object):MovieClip; + public function createChildren(Void):Void; + public function doLayout(Void):Void; + public function draw(Void):Void; + public function getHPosition(Void):Number; + public function getHScrollPolicy(Void); + public function getMaxHPosition(Void):Number; + public function getVPosition(Void):Number; + public function getVScrollPolicy(Void); + public function getViewMetrics(Void):Object; + function get hPosition():Number; + function set hPosition(pos:Number); + function get hScrollPolicy():String; + function set hScrollPolicy(policy:String); + public var hScroller:mx.controls.scrollClasses.ScrollBar; + public var heightPadding:Number; + public function init(Void):Void; + public var invLayout:Boolean; + public function invalidate(Void):Void; + public var mask_mc:MovieClip; + function get maxHPosition():Number; + function set maxHPosition(pos:Number); + function get maxVPosition():Number; + public var numberOfCols:Number; + public var oldRndUp:Number; + public function onScroll(docObj:Object):Void; + public var owner:MovieClip; + public var propsInited:Boolean; + public var rowC:Number; + public var rowH:Number; + public var scrollAreaChanged:Boolean; + public function scrollProxy(docObj:Object):Void; + public function setEnabled(v:Boolean):Void; + public function setHPosition(pos:Number):Void; + public function setHScrollPolicy(policy):Void; + public function setMaxHPosition(pos:Number):Void; + public function setScrollProperties(colCount:Number, colWidth:Number, rwCount:Number, rwHeight:Number, hPadding:Number, wPadding:Number):Void; + public function setVPosition(pos:Number):Void; + public function setVScrollPolicy(policy):Void; + public function size(Void):Void; + public var specialHScrollCase:Boolean; + static var symbolName:String; + static var symbolOwner:Object; + function get vPosition():Number; + function set vPosition(pos:Number); + function get vScrollPolicy():String; + function set vScrollPolicy(policy:Object); + public var vScroller:mx.controls.scrollClasses.ScrollBar; + static var version:String; + public var viewableColumns:Number; + public var viewableRows:Number; + public var widthPadding:Number; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ__Packages.mx.core.Viewÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.core.ExternalContentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ mx.core.Viewÿþÿÿ±import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.managers.DepthManager; +import mx.events.UIEventDispatcher; +import mx.core.UIComponent; + +intrinsic class mx.core.View extends mx.core.UIComponent +{ + public function View(); + public var __tabIndex:Number; + private var _loadExternalClass:String; + public function addLayoutObject(object:Object):Void; + public var border_mc:mx.skins.RectBorder; + public var boundingBox_mc:MovieClip; + public function childLoaded(obj:MovieClip):Void; + static var childNameBase:String; + public var className:String; + public function convertToUIObject(obj:MovieClip):Void; + public function createChild(className, instanceName:String, initProps:Object):MovieClip; + public function createChildren():Void; + public var createClassChildAtDepth:Function; + public var depth:Number; + public function destroyChildAt(childIndex:Number):Void; + public function doLayout():Void; + public function draw():Void; + static function extension(); + public function getChildAt(childIndex:Number):mx.core.UIObject; + private var hasBeenLayedOut:Boolean; + public function init():Void; + public function initLayout():Void; + public var loadExternal:Function; + function get numChildren():Number; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + static var version:String; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ DataGrid.swf_tÕBÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swf_tÕBÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ__Packages.mx.effects.Tweenÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swf`tÕBÿþÿmx.effects.Tweenÿþÿÿz +intrinsic class mx.effects.Tween extends Object +{ + static var ActiveTweens:Array; + static function AddTween(tween:mx.effects.Tween):Void; + static function DispatchTweens(Void):Void; + static var Dispatcher:Object; + public var ID:Number; + static var Interval:Number; + static var IntervalToken:Number; + static function RemoveTweenAt(index:Number):Void; + public function Tween(listenerObj, init, end, dur); + public var arrayMode:Boolean; + public function doInterval(); + public var duration:Number; + public function easingEquation(t, b, c, d); + public var endFunc:Function; + public function endTween(); + public var endVal; + public function getCurVal(curTime); + public var initVal; + public var listener:Object; + public function setTweenHandlers(update, end); + public var startTime:Number; + public var updateFunc:Function; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swf]>ÛBÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swf`tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ DataGrid.swf`tÕBÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ __Packages.mx.skins.CustomBorderÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.CustomBorderÿþÿÿ™import mx.skins.Border; +import mx.skins.SkinElement; + +intrinsic class mx.skins.CustomBorder extends mx.skins.Border +{ + public function CustomBorder(); + public var className:String; + public function createChildren(Void):Void; + public function draw(Void):Void; + function get height():Number; + public var horizontal:Boolean; + public var idNames; + public function init(Void):Void; + public var l_mc:MovieClip; + public var leftSkin:String; + public var m_mc:MovieClip; + public var middleSkin:String; + public var minHeight:Number; + public var minWidth:Number; + public var r_mc:MovieClip; + public var rightSkin:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var tagL:Number; + static var tagM:Number; + static var tagR:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfatÕBÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ DataGrid.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ DataGrid.swf`tÕBÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.s‚ýÿÿÿƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ wfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ DataGrid.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfatÕBÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfatÕBÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ cursorStretchÿþÿ cursorStretchÿþÿ DataGrid.swf©?ÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataGridAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.DataGridÿþÿÿ~import mx.controls.gridclasses.DataGridRow; +import mx.controls.List; +import mx.effects.Tween; +import mx.controls.gridclasses.DataGridColumn; + +[RequiresDataBinding(true)] +[IconFile("DataGrid.png")] +[InspectableList("multipleSelection","editable", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: &quot;String&quot;}")] +[Event("cellPress")] +[Event("cellEdit")] +[Event("cellFocusIn")] +[Event("cellFocusOut")] +[Event("columnStretch")] +[Event("headerRelease")] +intrinsic class mx.controls.DataGrid extends mx.controls.List +{ + public var DISABLEDHEADERDEPTH:Number; + public function DataGrid(); + public var EDITORDEPTH:Number; + public var HEADERCELLDEPTH:Number; + public var HEADERDEPTH:Number; + public var HEADEROVERLAYDEPTH:Number; + public var LINEDEPTH:Number; + public var SEPARATORDEPTH:Number; + public var SORTARROWDEPTH:Number; + public var STRETCHERDEPTH:Number; + public var __focusedCell:Object; + public var __headerHeight:Number; + public var __rowRenderer:String; + public var __showHeaders:Boolean; + public var __tabHandlerCache:Function; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + public var activeGrid:Object; + public function addColumn(newCol):mx.controls.gridclasses.DataGridColumn; + public function addColumnAt(index:Number, newCol):mx.controls.gridclasses.DataGridColumn; + public var asc:Boolean; + public var autoHScrollAble:Boolean; + public var cell:Object; + public var cellEditor:MovieClip; + public var className:String; + public var col:Object; + public var colX:Number; + public var column:mx.controls.gridclasses.DataGridColumn; + function get columnCount():Number; + function get columnNames():Array; + function set columnNames(w:Array); + public var columns:Array; + public function configureScrolling(Void):Void; + public function disposeEditor(Void):Void; + public var dontEdit:Boolean; + public function draw(); + public function drawColumns(Void):Void; + public function drawHeaderBG(Void):Void; + public function editCell(); + public function editField(index:Number, colName:String, data):Void; + public var editTween:mx.effects.Tween; + [Inspectable(defaultValue=false)] public var editable:Boolean; + public function editorKeyDown(Void):Void; + public var editorMask:MovieClip; + public function enableHeader(v:Boolean):Void; + public function findNextCell(index:Number, colIndex:Number):Void; + public function findNextEnterCell(Void):Void; + function set focusedCell(obj:Object); + function get focusedCell():Object; + public function generateCols(Void):Void; + public function getColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public function getColumnIndex(name:String):Number; + public function getColumnNames(Void):Array; + public function getHeaderHeight(Void):Number; + public function getShowHeaders():Boolean; + public var hasDrawn:Boolean; + public var headerCells:Array; + function get headerHeight():Number; + function set headerHeight(w:Number); + public function headerPress(Void):Void; + public function headerRelease(Void):Void; + public function headerRollOut(Void):Void; + public function headerRollOver(Void):Void; + public function headerUp(Void):Void; + public var header_mc:MovieClip; + public function hideStretcher(Void):Void; + public function init(); + public function initHeaders(Void):Void; + public function initRows(Void):Void; + public var invCheckCols:Boolean; + public var invColChange:Boolean; + public var invDrawCols:Boolean; + public var invInitHeaders:Boolean; + public var invSpaceColsEqually:Boolean; + public function invalidateHeaderStyle(Void):Void; + public function invalidateStyle(propName:String):Void; + public function isStretchable(col:Number):Boolean; + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public var lines_mc:MovieClip; + public var listOwner:Object; + public var minColWidth:Number; + public var minScrollInterval; + public function modelChanged(eventObj:Object):Void; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var oldWidth:Number; + public var oldX:Number; + public function onMouseDown(Void):Void; + public function onRowPress(rowIndex:Number):Void; + public function onSetFocus(Void):Void; + public function onTweenEnd(val); + public function onTweenUpdate(val); + public function placeSortArrow(Void):Void; + public function removeAllColumns(Void):Void; + public function removeColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public var resizableColumns:Boolean; + public function resizeColumn(col:Number, w:Number):Void; + public var selectable:Boolean; + public function setColumnNames(tmpArray:Array):Void; + public function setEnabled(v:Boolean):Void; + public function setFocusedCell(coord:Object, broadCast):Void; + public function setHScrollPolicy(policy:String):Void; + public function setHeaderHeight(h:Number):Void; + public function setRowCount(rC:Number):Void; + public function setRowHeight(rH:Number):Void; + public function setShowHeaders(b:Boolean):Void; + public function setVPosition(pos:Number):Void; + function get showHeaders():Boolean; + function set showHeaders(w:Boolean); + public function showStretcher(Void):Void; + public function size(Void):Void; + public var sortArrow:MovieClip; + public var sortDirection:String; + public var sortIndex:Number; + public var sortableColumns:Boolean; + public function spaceColumnsEqually(Void):Void; + public function startSizing(Void):Void; + public function stopSizing(Void):Void; + public var stretchBar:MovieClip; + public var stretcher:MovieClip; + static var symbolName:String; + static var symbolOwner:Object; + public function tabHandler(Void):Void; + public var totColW:Number; + static var version:String; +}; +€M 5 1212170716ÿþÿLabelÿþÿ‚ŽdE£?@HÿþÿLabelÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿmx.controls.Labelÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPcx4l41p0ws..swfóaCWSzPxœí½ xœ×q øºûïî¿q_$¼O€$xI¤H‰à $°A5©Ë: º´Ø膻$`Ù–ä‹ŒíÀ7Z–ã#¾c;Žgg²_œì$™ÄqöË$;ÙI6™x73™|ÙL&›g7—±¯ªÞù(˶æÛÕ§ÿ÷^Õ;ê]õªêÕ{– ¼È…5DØ`tyyù›ì(c,Â.F¾Ãø¿wîÜa- ¿YZþ7ö[¿òÊì|väwº—Þ_:¼ãbóÇþ|é¯þëØã…õåßú[NµpÄ(GyW"áÿ°3<|º©³‹²sóµZ¹42Y.±o²c<2ÆËx?;ËŒµ46¼íNæ¥co¸òΡ?ñÝâ]¿õÁ_üûk‘ߨ6ñ\~²Æž¤ÐÙJ%»HŸW(kþwV七Zàáù<›Êyβêã1l– ]¤¶Ž ×ó—+ùë…üKÙê56YÉgkùó³sµÅKe;X,ÌAó)±˜ç͘ÈOJ +Å"›-_Ï_-³"§!ÿ'_ÊaìøõBµ0Áûg|/2âô^˜œaœâã,7?W,LòrtSÅlu¦˜¯ñNÉW'³syV.=2—ã0êãÒ|±V`ÙbaºÄ®Ž2Uääò¬T¾ß¼UÞeL-›ËbD¾ÂƧ‹å‰l‘wΨn/Ï8“¯B·ŽWÊå[jâ1£ålVØçØyvÛaNÄeé¡ÛQæFFÚ^‰²C ¾£=ð7–ÖßNš`În#˜˜Ìt¾Ü¨c]ˆïÂxOF:…Ðu™¥v5tøBÞÇ"œXÇDêGFyÙ)ÖIÁ;Øh›F–Ö™#ƒ¯§},Ze¿Çnó•ö&ß5:ÅG¬“OÂÿQJ‚çáDÝæôEh/¯A=ÀºòغŒªxË©6ˆ³;QÖ­r"—1þËPÈ„ +áYÄT1Ó€vã91̪V‚• À?¿¸|»‘ãðÚD ¸•S­ÍœU wŸÑÌzÝ:·í”™5Ϲ¨ëòÿz.oâÙÿ›ež™1Ïí»Ì¤Ð9Ùkû)_)¼?;p°´b·¡)<å'ÙŠ™¬;Å Š"Ý¢D™˜»>³ZÁÔdT¾§;ÄhêÑ„õ€<³LõäƒÑ\øæÙÇ +“ƒ¼´øjÄ[ã­ˆa…8Nâ4:º‰WDú[?‘hÛMsfφ 5= #•sWË#ª}_m¦gà´ŽãßuÅøÞäï„Nˆ¸ã8±±55ÖhY ù£+‘ßY& +Hò‹Užsq}ìÿ•c#•¢¸"HŸ ·ãLPÊ{3#úÐŒó.?ðwÖúAñNTAªåÊ"Þ°ÑÚ°HyÇœ¹-£Áý„ dˆ,5Š]§âïEÖ>þ7cS6˜CË„Ýrj€à¶® ·MÂõ¬ ·ýÔщš"Æï4QÒ&4U’O‰HÌ^¶»ì`‡ìñ,¶ÑËX¿O,¶¤UݼCŒe¨¾ÝÄ2Uy¹¾ÐØ92 +µQ¹1¾‚Ã(âÌà +la·×1wF "-Å1Ñ1µ[Ïöxd€âöql—™a —KÀYÑÞγzŽ5Gù`q÷âÎ+2Š]Õ‰¥‰Â.Ф~éÇ(Ô?!1ø~ŒtëM´!Û™¬1‘З¦iñɈ KÉ—r`¾}Ö>“à{b#Fm÷¹¬gX!EÜý™1‰dllxVšê”̳ìçñ, <‡î’¨ qClÔ‰!P‡<ù{ZB@‡3+´ÖÓVÚá5ÕépH›dpUºGã‘1¢å= +JDÜ«#p U²7ä áÌÙÛź~,-™4êÎkL `Áøx?gcVv¢˜Ì)Û±ô°†·R˜J‰ˆ±v cÇ8›eó¦üXôëöŒß¤1~“i,ûXÀVÊŽ÷<¿‰Žp°YœéÀ—¹ì¸Ñèï0–žû$É7dÌÕðYó‹xÏ‚%2‹?E»‹‡†7TÙ8vœøkFC{)jƱYÏ[Ô¬¾Zjâ°pbV‹v«9v%x§rþËq°ß^¶r3‡å4,ù‰ŒÈ÷ô˜qÏÂÂâžÓ˜ƒg€ÍpÏé³å†(—óˆwæƒåÙ¹r)_²Ñ žÞíDͬíkiDq^DÇ?¿ø ¤xVë?<±(ØmfÏ3ᱬ·S‹XÓ'ϳùâ…B¾˜m•%ž(Ê»YÇ_¿¼UR‡…l`£€È³ÿ(oÄz/ÿú,$¡H§!þæø?·yݲóµ2J Y‰×¯zœ83µÙ"çw7ñµ‡Õò ü(MùÂ’(%cœGÞBÏÙBIH匕³ãIv§£™—‰fjìF¦%–Ë)€ìA ÓMû°A=l|ürvòï·jÿìB? +[ûä¬ËM1@¾õi˜pBn6» ¥j$¤ À›«”kåÚâ\^ i +‚™ás,Ç86>‰QÓùIpË¥ó¼Î• •ì,*¯g‹Ø)ÑöΠä³W®äk—+å¹ Åìt\†ëg„X«.Åûˆ^H£gÆ:MXZ¢c³• àÅVãE±ÿžˆ±æ;/Ç Žz‚õŒ§órb©•½,6 {? Æb´óoÇ##‚Ýä%ŠÉ=Ú…=sI-5¡Ê§—±GË…Û/v¤:}ꈸõ#à[凱1‘I£'“FF nÿ¥Òc¢öMK0Ðc},2Ç¢“ºO>­Ëä[:îu %ˆn£¯„MüÛœ¦mP€4†‚4JT(¯§!(ó·yŒ¯úü«Ywª•Óàé<PD·nd€[NuŠ™µI̬­8³6yfÖ$ŸýzEnúúÀ¸õ/“ÿCÀt`½|ó\­Uæ'k"¬ç””óÙ3>NJ +ùÅ ý…ú—b‹ù©Šâ)¨>jå9Ï‹ú¨î\¶³ÚÊ¢\«•g¥š„G]R+Ö¸^¼ªV”¡üd‘gŒ5š„X¢àt‰¯–ÁPUÊp|—ÌñqÍ„àDÅW®Ìfk|ü3Ä–<¬NÂh¨-χCMqv +ÿ\ÈΊ‹ø‰Óƒ†.,«—²•iÞ!³øÏ(¬³¸zZÑœ"…§ç$åÓУ9DjMÿgñ ´Á¼|ˆ¡OÐVW`ja$o|Y´=?;‘Ï](ç'4ÎH æi¸ñ™/ÁÎÁ¢ˆƒ6W&?ê20È%°˜ª#%¾.j²yŒÉ¦å+ÓyÏ@¹Îÿ@Eôê?ÒøÈq\!h/*žŸN΋zÉ…Xïj±ŸÍ.ȨìEÍUòSù +_E‚ +S²Øµ²¹œ›EÕUL,çbņ=q-¾î¸ÌòF—I¢ˆX7è•L!kÌ' Žg:‰õæõHèzÇ)xCW;zYJ°y©ô€H«ó¥Õ«´_Z£JkZ!­Ù—Ö¢ÒZWHkSi}"­[ב–%xÈáf†ë%òºäõiYŒ¹Î@îôpϲn]ªnÝÄêÇzYtF±Æ]œ5éTñmÌSPgFf²ÑÌd³˜Ýn_goÈ È#BOHý6©úmÖYßPõÛ¤ë·%¼~=ª~[ÍL<õÛì«ß]¿mKp®ˆsÄæ”ÊÄ›=ͤ²p»ê?$*¶Ý¡±éÄ… ô*äv8Q:x€þ +UŽðµ „ØP‹Aã8°[ŸöøFÔvE•½ºA l4<Múm¾&íÑMêõeÛ§²Ýgf»I´©ÚäQÜèìöû²; ²ë×Ù-ªìø³Û¯³;¸Ô +ç'Ï(p 1΂>!ò=¤pŒNL‡ôÂpø JO€Î†F£²Â9sOF(æîEuŠCÇh:r~U”xïI¡h:ž&•£§Þ÷IEÔ!¡GªªO¤Méö´Ðb“Ž<ÚéßD)75 ·2ŽêˆzMg@½úÍeÑŽû=³i“ÑŽ€ª ¬èÍLgâlñFv±Ê>Î$IGQÙJ: hæ;T¹lL“Ò–þ€ÃG½} ªgìíÓH__ö€ðhPåïpO¯0ùN¿\5Ç2&"Ï€”!ÆÜ^–\`‰E— ³j«P*fX˜•Â‡§8I!&hq˜]\.|=j…êœqÏòÎ?çDñ0\­A]ƒ,1£kP5Jd;ŸVö!í8Ú’AüLFkXµ1£ÇŽû,ž•£5qRN‰ìR£Ü¨kÙi²ùâ9OˆÅT6lriÍœˆ`1säÄ¡›Çx7—ÙsˆÓcúÓÜ}é7ôSÔ›ÀÿNgpÛÓ6G.;Ù µNõ¹¬Û 5DÖP·ƒÌ  IâC'Ê5á I ÝÄBкÿœg…ëñöP!#Ùk|ÏHqÒGQ‹š"qd<™Íú¦ñs¾˜’/¦,y‘9äUÖAûãÙþûp+\a§~#Õ6.kû;dEÏÞŒ+öfü ¹›Œu5Ó&Uæñe„4ª9ÑaIö1ñqª÷ùeÅ ¤Y`YÇͲTfb—3”âœë?(äI2H³ÔÊX¯èá·Š­jˆ” 8gE±ØÎëÞêôRïÁD—&Y×ÓØtkA¿a-è¢Z ’ø¢Zï"ce¢VcÑßƬ Ñ›¼ó¬WLÀç­eîi¤ Ý›ã¾9­JrdI¼aT{ËËÈÆ“PIMŠ·.µÁ:Y‹ÁKrþ®ÈúâT§8_H“ù ¯´+jð¦íºÕb€Õq_Ä¿/Ù>®:œöŠä(šø…"S»Óì K  Cª#°Ópy4 Œ-ß–¶~qa#³–ZýMôÕÖêkQ_­>%š½M€ÑbÎi×½&ÌKâPçR”Žo';Èfiù££ÛTK!°îXRÏõ<#p?âÁýHH‰ÁëÔ¢€• úÏa`L¬:§)§)‘M çj +­nSÔ&Zõâ¾#·’rßš‘¹X«QʨÐN/šÄ3Y¨:=à] +W§écgYçËFÖçzZXJIa›ªW´8’h¬ÏfõÂ(ŽŸôÈ$›`,¡ú‚‚¾¡°¬°îœ‘ü /Uñ7o•<Á 4€|A§"îGqg"+»ÍÀ)¸/Ë]ûcufŒºï‚;æ±á¹ŠÚ¾d»ž‡¨žæpèô +2^É Ü1Zä#ø&oÏÁ MpO¢f¶o7|;ªJ- [ÕÛ P‡_ú²`;£(!½âqF“ؤ„€¹‚M˜MêF>S°§ I=^»=ÖèFæ?ÙiÀ&¥=(áãq<'2) 1û$¯nx&ÆhþOhµAElQ?•Å-³sE¨O C÷15@};É›âtkºšý»Å¤žì]MÃvACœ=fSeÄ牻/ÔhAˆW°JLƒOÂhŽâݳ2Ž#¾+Ä€VŒ!X&ûðÈ>D„\åQ×_yŽ‰"úSî§ÇnwÂ×e÷]Dešw$®”Áµ ÷§1Q˜›Æ°?G¸ÏÜIøª¸Ÿ£Ü>Oÿ|þù"ýó%úçgèŸ/SI,PÚ¡Ö¥a%øŠ\³¾š±“ë0y}Xr&ÿ¬N¦èâô½“?ïMÞ*’·`òÂ2oÃä¯y±÷ ì^Lþ9or¿HÞÉ_˼“Þ‹½W`ïÁäÏ…a»˜Ü–Ü„É¿–ÜŠÉß0Ê^ÁÔ'¡M}~Q™úlÆÜN7ýi„‡‚Œèlë¹/EëÖWø ³ž 6›Ó†^Ý¿mÄ`x-W”æ,;èþ­²êF¦ãõ¦â¬ú é„òckµUœ‘ØŠ +͸.5¡š7¹ÔM R$Š¢É˜–¨J+<©Hrbtøô’ª !ár%¢­eu$Ÿ¹ì©b«×*¶±L‚´49LÊ´cbakÒÀÍøh%p‹nEàµY´µ©a¾E ó=8Ì·x‡9Wô^¹6Âvc¹éI@¼ÕÙ4Ò ÊÆу=›Ëñ`na˜'xm!LÕ=ÚM }­aÆ*ÙÒt>xûÁ³$ž÷Œ#¢y.GI<ŽfM‹}},4Îjã¹”C“weîæAÓs |½íPŠ½ºS$ù5Ó×{¶ÉWøß$_KIJÄuƒ°w…cƒœY˜ȵ:u7¨óV þn*PX†¥-âeT­L,‚ŸfaH†U¦‘äJND_ÇT•Ñ9…U¦QV7_Y™æ ,¶¬’GîÅmÛmá»]+ÿµñ_;ÿuðß:þ[ÏñHXÙÁ±Û€®s»xl7ÿmà¿üØ=ü·‰ÿ6óßþÛÊÛøo;ÿíà¿ü·‹ÿvóßþÛ˽ü×Çûøo?ÿà¿~^Z•ö”š¹õ@>{8 Ü#IðŽàM‚÷þ¼—GòŽqHy ýyz‡ô?rÞôÏW!òÙ‚÷™úXìH4êWŸ­¿e¹¾z“Xi“ióZL$ÀC=Iòñ6)ôbNÄ`<œ¸\«[äj'½K‹w‚,oõ_^V2¢)Ýú§á"©Ì8©[îoŠL€Â$Gx=ABAVòœU§T㇂4©]¤i©„SnK`_ÁU³(v|펀2µ™ÃµH¶^]Å{ѽøR¯p—úïM—¥¨ÂƒnÌÈÐMí@ºÕô~sÛÒ/·ØÌr{F=`Ð’6ÀN‡ôc‡X0Y¶6ê,1¯"mDêJMH6d¦wÈ= £ÝK‘ð¢`æÖ{=¥ñ(G8A6KijŰ¼g‘%5©Í¶.ùFñ¶ gZ½"4;ŽöÈ1¯Äu´ñ"ƒÛufìv›ôÎKÛA7]è `ÌA®þ¶“ÄXÆe(mƒªmÕ6\ +ÖÖ‘µ=.jVüÞ•}áŠå‘/»ºnØüLèn¤º‡þÙdmØkÛÖºÕ¶¶SlkäyÒõtS?ƒ!½+Èr~¡Öô¤@Ó¯7þ­’“sŒ J×TëÉp¾<›§«P†cdúkjûlÉ.’I%*$[n’ÑU²ô“ìñ”\13¾&Å?Án…ePþk4l¿•Vºuÿ±ÐC„Áeøg¼c›ÌZ®k¯–ç— pã+»Èç„w5ÿºÖÖglÝ2Çð¸ôcêõq,ãQŠ&UàGÊ(\[EÅn(ã…¹ùðW} oÔ¨*œ–¤94|ÝÚ·De•V#Iš'z¼´^¶œjm¿™vÑg òÆ1V;¢¨MaŸ‡f2j#O²AÞ>_¾ÖµD8À 7Ñê‹Y…°4WNÆ­)nŽ~ÃJÛÊFl˜M·ori?òÕNÌópÖ–­Å˜ÓÛë‚·²x€l6aÊf“ é$c4>#óp¹gQ:²ðm"%e@uøh€Pxó„BcÚº¥èêo‹?îå¶ùÚíë¾:a}=Z'tbB—™€-ì\éfôF#]jéÛRˆ<ï?àÚšM†VY½hÏ–Mqÿñw³`PnÚNp¶`ôV˜B)ZÂIùmÆÍ*%ÑÇ¢“0ùˆm˜²ÿîÈø +Ù Ù7úÑvaênü»‡Ðöö¨úÄIþçö: ·—ôq·úd`ì“ý<°_ðÀèçþ´2ò ãÔ#1ÔáÊè¾àè}ÁÑûƒ£G÷ÛÑX­C¼Z‡dóÀa8ÂGdà(5j(¸„ÃÁÑG‚£ÚÑœä÷hÂ'Å@H®:Ì»G=B`p¯_GzŒCzÍ)EÇ©Iœ;Àd»÷9)÷>j|Ò=Á'H’t©LäMæ“ò\“tïWÆ(_%ЛV/+Pæ­ÖáŒ_¡ü@ÆŸ’neøü³QLâÓË-8ŸAÒœ5œRñ8„•H'ř윮û 6ô¡MW¶oHܧæ0Ga(H²È¡ƒØçM}µÄ<#5ÞI÷‚ögÒc&’GqÞè.ŸÊ… öÛ°ÙoXÌaeš¦‘#kôsóàoÈódÅW·ååæ^ì :RI'Âi9Æo­G… öÇCŽã^Âw[Ü´,é¨éç +ÝãÉXØ´àÉñ’×÷`¨éT'éê‹u;½Uº_¶í²¶.‘h¯-c¡qB?h¨ó¯P÷º–¬²-ê|Õ¶ŽáU¿Ènï§Ç“ r…šüÞòò²{•¼¡FÝG¤ôGfž3ùH–Žã®b7w´XÇGÓ†íÑ£nÓ˜õž÷U¬êRHñ¨ƒ&nŠgyY\›Ž‰fâIq@x\~LÓþ&Šcy”W^G[Ëã$¯‹¹OÀ¾ˆ»,>‡âÞàsÅsŸÔ…Ó˜û”û4æJ‹\Ÿ ¢×oj_{ã¶.‡|dýÑ2ï‰OjD†Læ<`ð?N®@Àl0åÚž’¾©ì%¿ÁŽ6½Ûl‚Äû³+]£e¿G^Ëz¸ =áá/Dô¤gÏÑ9±š j¹J9¨D»±Ò§›À"$ÂC¯"·5µÖÒ­DìBøÃH^úÕÙØ~ +)ø-$eÛ¬ ’®¸þ“3 žgsìãϾSvú¸‚6íøôˆL“@òÜ”gré¡BQä!•QA"R6a{1Ÿ±ùšWÙÅ°”O¹tEÖÁ§KCä‘›Ràð’ÍŠVf÷¦†q¾‚†`áMƒý9¸FW8M²Õ< +ÕËÔâ*¾®Œc©p÷ÌþõÆòø~«Z‡iÑiDëFŒHùt¨òÖ)¶|Ty¾µ™ÁƒãÓ.|½´ ï$&’×â_-›®»”^‹q‚ÒÜG'Ûp—½±AÞ%ØhƤøV&ì4L­Çf<ÄUx‹a{¬ÊâÝ(VdoYÛ|em“em,Ë« Å#´än•‘‘v÷¬ë³“x<Ôv‚£L#»ü~yœ°Ãßí•&8‘“š{ô¡  š +ŒTH€õ&ûÃçéZÆ˽(§y{ð3a÷¦…·@§É³3#Q6%ïQ/FëÉ ^@qzÙ[˜Ákj‹u›ÜòÑiT&E©‰CÌèÿ(Ðû.û(fôQŸþgêE'èQ»FŠg´/Äè)µÏ쥓̜K»…âÇ#0òtÀ·…kd‘ß~)¯á‚†Ý‘罕8@²ŸˆÛŸ$ê8(x¸:ÄÛXÐF^>E)Ø9!ŽÊõìˆqˆkaÖ¬kT­½‡ÎÆŽº³—®÷^÷˜ð…æ™R‚³<®,¬ï vÙxÂ=)pòV»ò½ø@<"¾vÃW 2»x“f°ðÚxZQfP€ûU‚ijžN¯$å;ì©28›ñørL!9ÏI¡â Çí`“‡tòÕjç/½s“>öº„+ìýú1ï¦ï­¼[ÿgü¡ŽE¿ÿm½Ø{•Dbƒù±u³å\\”ªÈÕN.¢{à¥Ñ»€üW\A4<h/•ü\>[ˈ|P‰àP¾˜]40ЃçÊCU2Ý"Ë_g!¥6æ½@f=/´œQÓ ÍrF–‹ék©W„·­²½8àU~«°ëÕBn´PâÜåŒþT±ÂɃ'hxŠ ?YᯢÈãÇxeG&yðj%ÏÙh%R‹åj>çI§Hx¤:|4ŸRér.Þç“l¾’· +²¢ (OACž6Wž›ŸSDEÒ'9AODP¼è¤všðx«0ýkðÃâDžUOÏsF¼0y¥–Ÿã ·á¬CÜ~…S±ù–OÓO†×ËÆŠ®)|‡Uß9â*z ™›§gÏVòYöïÈò ÙüLAnxAüHš…!’Ïù1‚eñ/QíQ¸Tü¨ºYÌOÓp.;—­°³“¼z9N;r7ÂÖQ¬Zæç]1¼VöIAßWËsâë鸯ÃÓžü47œcèqd¦Ì;›÷¯])—­ŒfËóRKþX>m(»(¹0è“j6$ôôž,t1ž…)þ¸ý`5þ?_²µJaá*,]å|±ñ›a|EÈæ +|5™Èó +C€wƾæ Ï N LÀÏSµó ò*cªÇÏTˆ‚ñ©Ÿpp;åÄ–¢Ò›k@âëØYÕk§Ë<ݲ?¯®Ë$©w_$ïʃ¤2Câ{5út>Ÿë’ïxÛ;¤Ïgma(¸Åw4Âb4% /Ñͦ¶ ‡ hMîÐ)mÉÿQ·»"zºuõÉ_]þèLþÁòŸI„.U~wòOþäO$Ì3°1ù›:«žä?èvlr7‹è-ÉŽÖK˜­É£ã +aOÙ'ÛE3{‡¢ÂNå+{WrjjJv›=É¿üË¿”½hd'°{Ý>ñµÏÝ/¾¸ýâë {H|vô£ÉÛºE÷ˆR¤²ªc^±ê ÜãW,ë_Ùñ÷™}s"ù­o}Ë¢‘ïɵæˆ}ÿ]a?àž²°îªM'øø·²M§“7n”eàLò¯ÿú¯eàlòÛßþ58gâ &ïÜù^@öXO;䜞0A5‡—`Θ³fàœ5™‡°Aç%?í0÷¨ÔÓ1†×D ²¢‹©FE€Õ+ æ^”**w8m|d­eˆl´°º+ìQ÷’…þ¾°Çî²æ—-ì‡ïÛ䙻ľba_½«~Ý’üú׿(ûÕK„Gîž„øµÎ}ÔÊǧ®Z¥AÙƒ'’ïþлeà‰äz\½Ö¡> ôW °â¿§eÙÊ×÷%òxA­ŠŽßíNˆù=¢®Fn>íÒŠ¹­KÖÉõ<ÆW®ì˜ì Ú;Œ|'î¾[D õf §ÂK˜¼Ë1äkzî.›Þ +¦‡TQˆEòK÷1VÇÖ÷2gÅYâ‹Ï°h…%'™›-ÎÍdY;?a³uÓ‚e­ÈþU9Os[=Þ25"\F`žÓÀ¹´ ï ZD fxu HZOz|B: Pðp–QÀ¸ˆá¸2¢:Qhì:.Y£ù‘t¬é¸7åD­$cìa·ÛºÎÒši‰×J—ÿSS~šoÚS <® «Ðnøšô_s‹î¬–h5ÕCß”œ&·,.T6€¬vΉ£b½Rßè´'.üéNŸ|%ó©ÐEú /¤^W¸ƒ@žuneD¼—ÒÎœz§ÕI9I·‚–þ<œH]VbÍNÜÊÌÇ`Hµà +[‡ž ã%¶Ý”FhâãŸøóÓ¿yÿ S õdh%¢ßöG§ÿ—ºƒÑ BÌÆN«G´“0=Z\ϬsÆiÔ0*$Ó,|ñ¬ã‚o`Fëƒby6&kù~ZŽyG×ОÆa§!¬ TwùŠ›¬5ºX±ëÝüªëÍë[o¼L¥jÜ8l×µaØW.¾lŠ-_¾vðšÕ½šš‰üTïP´qØ36,_ßʶJÙ¦•ÇÐJãÔ;LAû¢²Å|ñ>Â,¾Ôd饤7ãß· ~hu3‰¤iIÙ¼ÕàBó+™7Dá±TØ´ÞV/ñMÒ0ãE{‹‘òî—Û$ßæ©éÝÙa¼]ÉŽ÷bå[{ÃeÇZá¾Ü´¥ oíÞ¿²ðXãL€€¦Pš>W^ŸÔ&ñžgf´Ù¼Œ€Æ÷ÒžÌQ=Tã1˜,‚èÆU@¤¥9¶ÄHJqLWXqM·’G›q?/ x>>ž6¶†h7-²Þ˜%«*‚Ž¥ È5ž‰[`>q¶†É¦µ¯ÅUÅÇÙ ¨žÏ¬ÃÍ«›‚âDÿE¶`\•P‚}ŸxJ¦Xb'ÕîÿOHžvÔëeÂJšÃnPœ›ÖјԟÑJ’Tþïxöté ÌÈL×%’Õ3œ iî:¤Þ4Ÿh0UϾ¥U+ïš–61Çûu7X ùÓD–%Áè†ö·qÒ•7ó_‹ÏÇŸWUÛ©ùVrÉñ÷12¼lwБ0œæ)­–Û¨;Ò`õ¡>ͱ6äò:}!­yy==¬y½‰ ¶Ù‰£GÿôQþ_sØɉ´ -QŒÇÄ5Ë,øÌ.ÒâFÅ[ÛõàYÄŸíT ý1à½Î;½¤¬ô6ì#ýªÈ>dMúU‘×ù5éWE^o"¯BzAÔ¨&jTïFFÅ1ìDb—5ý¢Å-;ýO?FÝý^/û3µC,…x@¶Cµµß×Ö~_[û¡;V ~£ê¤¯áûÆ¥íÏ!ŸWIò% *8CegôP¬óvÌ›œ9¹t¯©~JS%Ó(ð˜¶Ì<ª÷gŠ¸ÇˆgRa³ÑNüáƒ,ín 'J:œ©Sè]éÇŒLº<‡Îã«:·fBŒ¬(oeju×VþuútyR.{±2§›à”á!ût)Ï=ýÖ¹g¹é—7æ­·EO/ƒKú2ºáv^ß8·Pg*y~ºZö¥dè\Þëö4Xd\ÏŠpØ3óSS"PU‡²s‹xs|bž—C™£ÃUÏɨZ®Ô.Ì—èr€:ÏÕòUxȵš¯\Ïç¬Zëûó²îׄ÷{~^,kœppœ-ó fÐxÇãã9s\ýÈ®?×å[&¤‰jäÿAIqyŒŸ%“°ÓÊbF»hæà‹Wí)tAGWžèz'‚Î&=Ñ h0ê‹n„s¥?º‰G7ù£á@Ùœ“v¡nR§¦˜´ŒlAv†ÜÕR«Ô­P¿@Ãj«4­ÐfÝÒJ/þÂMý,‹L°û½ T›—hËL ÓsÁòÀèåë/ídÐ ²œìˆ0Sr‰»x==&7pG›4‹¼Ö-í…Ûñ>ó9e³½2—̳(\ýgW+]ƒ’¿O Áæúôqؼ„ ôNLOÃ烂ÇôuáSͱ0’ÝBD|S8M‡f´áî2ŠCµ˜0íDÚ¸Ô'‰T,”`·üï‹LîkE&w2Á• =@¦º^–Òc)‰DÂו4º*8}ãÏVq ¤Ç0ѲçE³ºÀO”êxפ®0¸›n¢{®ÿú°9m<,°…@Õ˜'ÆÅíJ/Ç H§éÎWQf¨£îVj Úî÷à÷å1Ô#¥¤¶e›¸;ÍÙ긾ºœ(ØÒ´Rq­yjÌ„6¤+m8šsàÅ%÷9²Ü¥^Ù æ`ýÿû!âîøaöCJ?d©IÿU¯¤—ŽRÍCèØÏ&Ao¼–3hƒ²c(`‰õ½#‘1yªÛ•WªC!EÛIT ì8©ÝvÉÆÚe¤T­eK|áPÞ;ÓòlHµ“—šÌæ:°ÛIY lq5bžÑ0J¼ž£-ƒDž=2œ°ÅnwzZˆ?WæÝéU°‘hÛÐbÕ; Êóè­Ôi¡8G»l‡ÑP$==ð{¢ké¤Ñõ4ùVíÄZz 1­{ ¡:Øô–cR¤-þø½èŸÜ1VŸ³Ã'åÖßòô¼ÂÃ’øãeâüS„ £—¥– Ûº÷r*±FÎQWçéhYg'a§A§Ûÿˆ“¦ø—kÊÄŠƒ2Aƒ2Ù©ffØ LŠA™ò Ê””|³j ò Ï`|2-–p±¡6(«*ÜŠlk‹}goj·áÌÚÛ@ã5)Çë~Ä?·LÈVóÆéÚŠ„8ùɈ¶#¦zqnê·b û½{çAkŸWi%oú‹Ë¡}ÇOG*98{36F°dm]/Æ\'(ZÕqQÊ’ò±¨aEˆ(Ìñ;Ø$òq§GéÌ'æ¢kÈ‚]ÅzýInëN§éqx`»7B„¦¹1â1Ø^ }½Jú~…ÑÌGßCk¥oýÅQ"G§Ma,¬Û p½MàµQëø²Rµã ¯õ}¬N3lc5ùŽ_ûÃ1ƒœ“oHã =,â01w"~“x÷=)ç„KlX³u{DÎVW8ÌuÓz½2ßâ82"ßzwè%¬QZ.0œ9»š×¿iw\Š˜þ ~‚Q&ÛI4Ö€Ÿ’Z6±¶Ý«®¤¿œ¤TÇy1-"H‹;¾¥Sf÷-¨®üÝï7ØÁ³‰Åé»ò°åi®%nëþþïHXωÌŸ0¯ü<ûôÊî¶WBèõÑ :°¬é¤Zÿ÷,¬õâÄðïþ»ný½¾Öçô( åúi´¬vhx\F"`‚k–"%ˆ™Òë9+±ŽhqÂ×ß ÍçFc× _BMÅg5“›ó„tsþËÌÏGÄåå´à¦j#}2\t¯y8D­ápÀ|,RxièFfq?g„JÙkÈ>Æ„§‚Žäòr³ô»°;ù=Ø“Œü +\ÞÀÀÞä åža}2ÏT 39¥’¿¥›“ßÒ®äoëÀáä·“Ϧ½|л¨{Œzì8&ß—:Ä!:Ä++ê ÛÒ¥ýëÃl¤ö¯/Lûg¹ÁZnzK`Þú׉¬¤ý³|OMkSLáàKÜ›¾<_9‡w¸Yp\5 ò³s3Y°Å»ðF:/ãRvïÛ#¥\~AéÁj2Ât5 ~£j +xª\™•Õ,™ •|±< ÞÅ®,VkùYåL¼›nðúR¼×_Jyã«3ýO«ÇÑSiõJŒéSŠשÏøÞçj€/í¿+Š0öißÕoq7R¡É^/³?ôÚX*QqÅq‹§üŒâ)I,w¦ô· ¹Bz@t^pŠÍ÷¸MÇ`yZX¸‰8­g¡…ÿµý^÷‚š Yhaq ݳ!Ç©|µ#•ŒôýT˜Œ5jňÄkw!ÝšÑNíLj ºƒE#fi3½:µ]1Etú&˜itŠÅ9Ý*î7"QÚ986 +3MÒÅ‘—À›ÖÝà˜ùo‹çzµHÚj( ‘\Mh€·Í‰Xá–¸ÆbQØ& [0·íJO‰DØ!} îôǯL¾ Ò`±M? ç‡Ú%¡v£)i³·-{0z¯,¼7c>,Ô‡ÙíËtû¿ßZX8Am£JK#”ŠVebËJ‰•û­«øÚlšÂ~˜ñæqñ g”?oú´<¤šT‡Ç!Èå:ªÏ¥¨šª÷‹‚Ž¼Ç@D¾'­ï%º÷êÇÒŽ©æ£UÖéþ:Ýg×i…ë3'|ÝŸ"LSÛzjÕ!ªÿ€Z#81ÿËçúíuÃ#á ±"m3θÊ¡á«pDÃ)²%„¥ZÅÜpgؤÜ~Ávg8@6K@¶2‹•ÀE'8…Ï9Žlâ°gæìfkXa.ª¡3hÞ$›Ä®ŠD¥±¾Ë¢æ¢2ˆZ‡QÀ Öìu3ßD°¾­gP|RŒYxê“ý3U „ù¬(nĦOÄ ›îmÅ°µ23tÚò+ú=^ãÏÅÄF¹…›év ªºmÔòŠ{‚n4£dÍ}P¯ÀDšÓ™ rìéy"ꑈ§=ûñn/ý‚—‰>ºt ìè{™;ÇdW}”Kå +ÖP,—¯Íϱ:ÙËbeæPí£ºö`ŽÊâFí70È2ƒÂ(HLýYÌì9fžŠ1E)'Îúg?mòœçMú/9Ôy×€· +8•‘?ƒ¸%Ü‘‚Þøˆa-áø !«(—‰+êªÁ+rʱ^íw`LÜâðæ47§NÝrm}ÖØQM8˜ïå1ñbàe¾8^æ3øÄ8çq>˜M¶0&ßÆÄn1#–oÃbð‘{Æô\1f¾=þtL|£§•ç¼*†7"»tÅVÑì® ®©‘1êÓƒ^•›±:·‘¹Õ ézÕ#êÚsÏ­¹óØóI™¬èu…yœÄà.K‚o}‹°îÃ3”cI«Ú”kR¬ÂIs"õ§M£iSÙ\]“˜}dó)B|añ(Í°Òð½OÞí]@iµd‹V”X`+Õ>¿+î-à E:Kp¬H˪ÁìùÐb¾|øðûÎ÷Ìýmѳ¿‹SæÑ´uÿG­Þbû¡÷cŸtZ¡.­µ´Í!…r9}ÕÌÞœwo2œ¤8 T·æªž½:ã ¬3iäûUgÓJ÷%Q~¼Ó7õ¥_K’ß áËB6 ÿ-g„˜ögœ˜ø:Ç7$A÷ç…Z© èþ»LòAŠ¬õ¶ oÎø EýóØÐDà#«ç½rè·dÄó«CÞ”·fÆTÇòž‹×ú…´ÕÉ£^4¢´åüKjž¾Í³ølëYZ/ ‹AKÃÛMßDyÑu5læÎsÝ]QÇq5kR‡WˆÞ!´æϱ? +1Ô}'M_ +Jvxr€ÂÑAóLqq,Š ï’*Þmz×ñeyÿÞòYÿÞÄ¢nÂ> -q·ù+ g橺ޭ^èzOð ]ïu\Œß%U·( Xüz£z4â°âîÞ©„ƒï³æÿûñïÒÒ„Dð.ŽßÊuóCžGµÚ1ùÃ:yjPÆ«û07i¼ºÏ÷@m©V)«ýW +³sż°Znº²0oõ%¿øJ-!1 iãU´é„'Sókö :_̓¡šð c¸º;°B.6h•ü}€¯VìjKçØnÁå>ç½ìJV/¥Y½ûÕÃÖÀ¬Õ+οN¹àªC†§1ȃ4qUMɾk¥ŽÒg"vPâçè”Ác[”˜!Vç-HhÕ BŽƒµ)½R;¶¾Ãº²ké Öñßzy*è\ º‹ÿº%«¹7çèY™ß þÀ’qô _ÿûAÖIvÓÒaÊå<‡í¾i#Ú3v­P ´æÂw“ÏÖdo$q=[Á2ã@MPS­k~1²¢³ñ=ØCÿÊε§Ÿˆx¹ú°Ø1·w8 w #m€ÐiÑÄ€±`J> + ë#ywÚèçM– Æ–&íúmb·;˜a‚ëÅÄŠ; $À2èÕçÄ_JDŽÌ~åƒõg,àqx@Y¨ ~3ú‚s™¼tŽ7V[djZô;uiÔ´*?˜Qkö4¡A.õbxÂßCdÆ«¼m|’ÄO—¥©ºì‡Õxؼ´ÅxÝàdš%ÍÁ‡£Gyâ9–a¶„Ÿ£CÃA¼‚½ÖØIÇ‘§Ãͦ)åé(9°Wò¯£ñÄ1!ïqÈ"îuÐí¡@9Fó¼èÈ!—Þ°6 +?:»ì1¦Qc,ÿºòKåŽåèªc9JcY˜:B·­<–×BD™“1Þ-ÁÁ挱ÄÔ®Ðæµm¾5j›‚FI1&èpmáO‡_N;ZŸè¯“(“VÀHÒE.Iáw1U–±ò¬4¤Ú\{6×/zåÝ;´¤3âÞoØÙíBïÈÈÙ´èuø˜á&;âž2'Þ1É2X±»XÞ¬#í´L;€ÄýXÙ„ÓK-Ò[v™N”Ÿb +Z²$r¤Ày%À™¼+PΤæRigt¸,c8lCº^ú_nÄ^3Î9ø,›ÐèG•ï!w•0fHñ ”ëG¡Î¿¯M‘ƒ‡›Á ¥ÇîØlÁy¹í^X Ø‚a b.ÊUb„²§Àƒü÷ Œòß%HS.ã¿Ë2ð0ÿe0ÿÿy5¾¦ÍækõkIn-e$Îa0ç¾QBT2°±–eî5õH¦WÇû,[c!’sZk3ªS|Ý.ø†¿àž‚÷­X°©ã^8%é¹èÉã^z¾IÓóù1U_ÅŸl +nÅôöã³Á2x™‹6{\]ªQ÷æ æ‰æ¼ÅÓœãLVþ­¡ƒá…ò{ѳ]ÒŒ h‰=Þª>'4µw0m…Ñ(JyÉ_Jh'¼õî;!DS©«ö|xÕÞŠDPôR³¨_·Ð-ʵá]´6ÀIÖ†?V`Æ)‚³ŽmRàvK.ý¦œIݸ_q¶vŒ|D‘ïô_&¤ +ÜFkzÍqÜ3ùÛn! ŠºïÆ»¾ ¤“¼]·pußc¦!7p@ð R¸cq®¢Íïõ­•{=~\¬•‚‘Ñz/4ÄçUMTñ€ûfK-ä g› ¡ Ã#]R4Ñ{IjaüÙmö‹¯-Ë-?.{Ê¢‡ŸÛyŸ/æ½z·{¿y¤êgà ý·2Íòùf¡@ÿà«A_TèZj“ÂÏR^ø–ô +@?dŸ[ôÒ°âtÁÄ+ õG‚5Ô·ÝŸšçŸP|åþ:I3HW3®4ÖÕ×^õuŸºsþQÃŒ=0½,rÁÀÇð˜"¯à¼ë’#îOáO Ýª|2™Ôuú”ûiñõÓîgÄW;ÈUðë³*õs*õó*uP}}A¥~QÅ}I}uª¯ŸQ__V__Q_Ô×WÕö~u»__ëÝO‰¯ÇÜ/‰¯GÜŸ_WÜvñuÕí_»?#¾u?+¾†Ý/‹¯!÷sâë²ûñõûyñuÞ_Ý âë’ûñ•q¿*¾Ö…¾esEܳ |€‡@®J‘PõäÁPy¡Ï yT‚¤CAº%ÈX(ÈcäáPÇ%È8²ôÂW §ÖENãaÞWyßus:žç”â½r…÷àz ž»Ý ÐÛÜOºŸpÊý¸ûŠû1÷e÷£¸ÞCGçQ·•·q'ÅŽyûÄö¹ŸÒ¼ÔOÓ†ÛN†/Ÿ%&ísï~g‡;ˆóÂýÎ÷‹÷K„ÛI¸?C¸_&ܯîÂý*âbÍån!ŒJÞ‹J”Ÿ•rÁ¯eÄáB$Ï`òÏy“³"y“¿îMžÉyLþy#ym&)¿ LRöcSO7Á«J +ñ§f» [núO. ÞêŒÞ·’C5K¥  ʸéœ'zæ*CuóÐ|s ÂÈÇ—éùëJgËÆÎzýŒùû£2¯æ½¤;>ëub†×,h?a´éÉrÚq4b°ô×åJaú1Œ€¯‹ÉÉ2]bWÙ96Ê2lô*»Êÿžc™sL9r[`‹ÚãR^< °#B0Ûë L‰ôÁyà%Ÿ?šËFPC™þM‘¾KÞÛðÖ#(Sq)ÃÝ=":>$O)O„=ÁlIP {ÂÞm}­Ì܃GC¯ÖKì 0|Aêµï¦„eÃÇm] +MߊíÒ{œäŠé›ÀÞ;hÜî'9Ê·_ÈQ‚,)§ƒjˆ¢¥òÅpO\ÂCkà‚cÓnûj™l Ïd@œ°’êTtØ8‘² ’P&wTrÏ™1Ót—7ù¤{¥|âØZù¤ãŠO: ø¤È'ã“À«˜›Ëç+”råUÎ+}« Ðo%£ûWâ•ü˜†ïL~òÚß—=•±U_ Þ½ÝÇú(BÓ<0€ +f|‚'ÛºÐähLÂëØ™¦Ùr.[¤6 &C˜ ++sdéjR=¡X+‹áò0Rø} ÜØj‘†÷V/‡oB°jÕ¹baRZËú;Édb­Î1ü=¾Þx£ wÏy¶ÐwúVD䌀­á;ç£ÈPàʼSnÝ +‹!ÖË×$üÙ:ð4cPQ—%ëÐ@·±Î:äÁ•S¬(Þ›‹¸ôV³!ÕmÔëÔ© ^ùFt¬€›ÐWqšN‘¡GTªüàÍjumñ×öVmÇÙª¹µf|JUÿ&¥Ú(ÉÞv +ˆ¼s-ÙËʶSÇ×=':~(P +_[]ûÖ¿ ;Äëb–‡'y3w`†Ú¸å¯é”»t¿½ÕÇ…'…Ù6ý:=?¼ +ðMã17W!/R“C”_ !7f¥üÄ#«·õIogd"ä’1PÔíAuK‘Éû[~ÝKTYi©'äîàL¸2eƒa¶®ŠŽu»,¹¿~ ÇɬÞ}JÉ;â`›ý{·Ä'V×~Ç` ¦mUƒk›qâÚDO{` ¬íÖý! FG“+® ´›VÅ;VW†{‘Ë7…ˆ÷ùÞ¨Ò]Ž·»ïà•ét5~å{wßuzðí4úLÇaýºËò/¸‰¼wSÞÎæ¿_©eþÁ²ÒùÊêDŽnj«-j]†5Fy“TÇÖˆ=òÞ±Õ?CË‚{‰³ûÇyV/q„"Êê eÑxK>ØÜÜܲ6ù·‹”‚}RùßmaÀÛ€·‡oÞ¼#xGðÎàaÀ»€wƒ€ ʽÊ<¶Ïƒ»â3,ÆqxŸ:÷ã$9Ýt˜Ádë÷Ýd­äûó µ~ãâ©áè~¹éÙ8dqëó‘­WZá%ô‘„­ÅFä~çø!L?+¡ÞÅ0¾PkÏšxžh0_cÐϘW¾Ìû´+àÃÎŒxý«Ê¯À¹î˜hf¾tµ0›ç ö[4ÁxÉ­7⌨™™í«Ùëø̺“$ó<œµåAsú>FF$œæ8©lCþ.d5%¥§kl­Ê_u<nÅ"›ê¡EþÖ©²:Ìí‘tu°ÙyÈ +ŒzÊEñ˜Í9qªlÄ +1õü”ÍK6ákdÍimí©®9µÔPЮ ‚<–£¾¼|K}[Z—"|¸)Ü–ùeŒÊz™ÿ]è½Þ–Ý®@ˆv“[P!®’9n\I°I£!™X=žú‹èMž¢DôfO+V[¢£Ö{Y[ÔB}P,Ô»p¡>èY¨i%ê7W¢å¦ÇZíÖÕè¡€Å9`íÒ òxUÆá_¹|Á’,"æøê^,WX¡šÎ¦éyÄ[,ãÅüõ|ñ¸‘¯pFJÚÕ@¡©„Ú _1LYÒåþ™l±|.„ÂÇ0j)ák¬yŠ»£|# Ý¥Ÿ9Â"&³“3¼S¾ Çò27‘eRT +ݨ{ÞUA:ãÞ²|«ÚËbØq@ãA‰-1ã:’Ÿ/“;\ãS§é7 åT +w‰+æi îDYù€Pï»åw,–’”nâ7Ê“‚NðgÜ„B©ßŽü *„-nƨáw í1+I[Äúy3èqv¤]SÝ ”ë'®ä?üã¿ s8ÇI$uùwdÀM–ÿí2ó"Æ1ÎÿùŸÿ‚—X°üg2à&¿þ×ˤuvœ¨ÖöÆ)P‡÷4SÊk©Ê¥0ºÎ]‡—Sn‡¼<¸Žž|©s×›1àú *‡}L.ÿÔß](RIŒ´n’Ð4±ÎD׆×bƒ2Ôl\jaÓè×Ø=Ô'ãirûÎOzžõŽ8q[ºz[½1òFa=ÚƒqÂúS"r“1ÿ6ë8^ÇÍ'; ;i?¼¼Åós#Ù{ób„.Ë÷—»–zA²ŸêeñêL>_Ã<6©7-W-¿¹Ç6'Úý³çqÛyœÙî#f»ÔÆkÞ—¶¢‡Ï8ú.t™ôì)½û£$˜T í?Åš™—DÜFÖÉd_ð’õì‹ò(eÒn‡vI*W¿c‚{}S¶û1;3ƒ)З×ËW³y¾;3âAf³F&ô6<]€Ý¥ìòmú E¡·ïÈ—Ë­!Ð ö1'.­íºô0HÀ08÷=1 6,íÎcz8zÌ'õÖ£ n¿f‚ò¼±ß 3GÁ·­Ñ/ü½þ¢ˆì}b=?Ði:lѱ‚LÆ@ +Š‡V›KŽcÍ%=µvÓ¤r<M¢C]AÑ š¢q èßIŠ®£¸©7b1¦È˜rÔñÔ*b×*bÔJ_|OÉj…î‡Å¨±iš‹fè>Zï»^¯‰hì‡ÎÚ÷úÕ÷ÃÔêûa½o?Là†pêô~˜pRz?L8õÁûa“Qí‡IŽ¨öÃ$GTûa‚î¡7`7$)Ј#«ÁÜøbã½Ñ¸û5øöÃF{?!ŒUiÖò*Arü«Â©ô÷³ÅƬW³hê³ 32¡Å‘à[PÄ ÎbÒ,…6쪨š½a¿ÖcÏ[••æÀžŒ±G8n'fôéÓÛí”=·²Ôs¢#TWÆï@›hZÇÄ2­”¿.½aW^§Å ¡’Öó_ºSV^h<ÔFz{%O/½$O‰÷EÐ%«ð1WªÀCµÔZ‰ûä‰;Öˆ1z£ûÕFh”.è’ <°Ag´IÓMÎx‰êƒ­–Œî +ŽÞ½ÎŽæ< è “è–ŒY[”N iFÿJÒŒ^)Ç8è!ÇZ…ÇûA&Ñô,ÿäÝ¿•1[Nì{ µçö6ôJ*Îu)èá÷<ìšR.rf¸š¦J‘9q”NïÚrKsnpoä¦À=·70K"¼¦ÚÛÙ­2_ÑfBžYØØã•r¹f­ÝÍ;Ä·=r t”ãFI?Çf\ÊM¥•LчlH&¼ñhpK~]ÞJÈN¥¦8Îðàÿ ,åÂôÿþÿÿþÿÿþÿÿþÿautoSizeÿþÿleftÿþÿcenterÿþÿrightÿþÿnoneÿþÿautoSize%µLÂOÙH——ΊSfÿþÿÿþÿhtmlÿþÿfalseÿþÿhtml¹l>z*VGE£1's¶‡kÿþÿÿþÿtextÿþÿLabelÿþÿtext qf¼éO›FN"@ SðÿþÿÿþÿvisibleÿþÿtrueÿþÿvisibleÄŠüó9ŽD”ìz$hí±ÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeightü!«Ä%«B¶ÞÂeaþdÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth]Yœ+þkîF€Å á¨Ãp!ÿþÿSizeÿþÿÿ <?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="Label" class="mx.controls.Label" implementation="Label.swf" iconFile="Label.png" src="mx.controls.Label.asi" modified="1059524076"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="UIObject"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.Label"/> +<class id="mx.controls.Label" > + <TagName param1="Label" /> + <IconFile param1="Label.png" /> + <method id="autoSize" returnType="String"> + <Inspectable enumeration="left,center,right,none" defaultValue="none" /> + </method> + <method id="html" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="text" returnType="String"> + <Inspectable defaultValue="Label" /> + <Bindable param1="writeonly" /> + </method> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.controls.Label" src="mx.controls.Label.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.events.EventDispatcher" /> + <include id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +</component> +</componentPackage> +M 1 1212170147ÿþÿBitmap 1ÿþÿ Label.png£?@H£?@Hÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hx¸µ’‹ ƒ0 D™X¡+°BW`V`…ÎÒݨŸ”“Ž*ä­%Ë ±Ï/Ãð›¢~×öÀÇBKÔ¾“Îñ*¯¤ÃúÞË%–gÔÂ"Í^&ꨇZö½L΂wY“÷ler̓ØÃ$Õäb “XæèŸsé–ÞN,¼‘æË}Ü[æ$–R¯Úœ¾YÈ?³3&4tobí]=—Ì{RË\5?‹ÏãL¹DïË™û¡0³ñ\Ö¿´™=WÿþÿLabelиÿþÿLabelÿþÿ Label.swf‚ŽdEÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ Label.swfwÒÛ>ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ Label.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ Label.swf-[„@ÿþÿ FocusRectÿþÿ Label.swfÿþÿÿþÿÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ Label.swf3cí>ÿþÿ BoundingBoxÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ Label.swfì:?ÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ Label.swfÊ:?ÿþÿ,__Packages.mx.core.e ýÿÿÿ      +                   ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~  € xt.UIComponentExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ Label.swf ;?ÿþÿDefaultsÿþÿ Label.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ Label.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Labelÿþÿ__Packages.mx.controls.Labelÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.Labelÿþÿÿ-import mx.core.UIObject; + +[TagName("Label")] +[IconFile("Label.png")] +intrinsic class mx.controls.Label extends mx.core.UIObject +{ + public function Label(); + public var __autoSize:String; + public var _color; + public function adjustForAutoSize(); + [Inspectable(enumeration="left,center,right,none",defaultValue="none")] function get autoSize():String; + function set autoSize(v:String):Void; + public var className:String; + public var clipParameters:Object; + public function draw(Void):Void; + public function getHtml():Boolean; + public function getText():String; + [Inspectable(defaultValue=false)] function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var labelField:TextField; + static var mergedClipParameters:Boolean; + public function setColor(col:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + function get styleSheet():TextField.StyleSheet; + function set styleSheet(v:TextField.StyleSheet):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabChildren:Boolean; + public var tabEnabled:Boolean; + [Inspectable(defaultValue="Label")] [Bindable("writeonly")] function get text():String; + function set text(t:String):Void; + public var useHandCursor:Boolean; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ Label.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ Label.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ Label.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ Label.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ Label.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ Label.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ Label.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:S‚ ýÿÿÿƒ „ … † ‡ ˆ ‰ Š ‹ Œ Ž ‘ ’ “ ” • – — ˜ ™ š › œ ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ +tring; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Labelÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.Labelÿþÿÿ-import mx.core.UIObject; + +[TagName("Label")] +[IconFile("Label.png")] +intrinsic class mx.controls.Label extends mx.core.UIObject +{ + public function Label(); + public var __autoSize:String; + public var _color; + public function adjustForAutoSize(); + [Inspectable(enumeration="left,center,right,none",defaultValue="none")] function get autoSize():String; + function set autoSize(v:String):Void; + public var className:String; + public var clipParameters:Object; + public function draw(Void):Void; + public function getHtml():Boolean; + public function getText():String; + [Inspectable(defaultValue=false)] function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var labelField:TextField; + static var mergedClipParameters:Boolean; + public function setColor(col:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + function get styleSheet():TextField.StyleSheet; + function set styleSheet(v:TextField.StyleSheet):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabChildren:Boolean; + public var tabEnabled:Boolean; + [Inspectable(defaultValue="Label")] [Bindable("writeonly")] function get text():String; + function set text(t:String):Void; + public var useHandCursor:Boolean; + static var version:String; +}; +€M 3 1212170191ÿþÿ TextInputÿþÿ‚ŽdE¥?@Hbÿþÿ TextInputÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPclvkp1p0i7..swflCWSyxœì½ t\×u øªêWÕǾ‘A‚û +.à&Q%®Hd*R›%*  +@‰…*¨ª@’mI¶d2¶ÃxeBÛrì8‹íÄÎâÄ™îô‰“t:¸9éd:3É$Ïtw’“I§3é8=IwŒywyÛÿ¿P¶uÏ計ÿ–û–û¶ûî½ïÞçıWDÛ/‰Ö˜Š/,,|UBÄĹØ7Äuù÷Î;¢³õ_Ån-üë÷¿ôÆïn}nä7ûn}°|`˹ŽOþñ­?ÿÏ£Oÿùãb¡©SÆ%È{S©˜ü#NÈðñö,..NÍÕë•òÈD¥,¾*ËÈ„¬ãƒâ ä\¢³­õÝw²¯~ۥׇ·|ÿ7Kw¶ýƇþo¯Ä~­úÌ—¿ðÑÓ¿óñ¹ïóûþRVó‚„õ$ÔñÄÓòëv·õéÂLa¨RªTá»Xý·›D:.SÅÌuH Q»R,×Dæö +!0c!IÆœ.IÀr]ÆËVÖ +uLºTŸ/D¶—ú‘PýX‰ýðD6—/V.ëro’cØ›•û¿v±µüÙÛÿçß(¼ñ­ÿø{ågÇÆþó‡Ÿýغ_;Q˜øûÍ#~Vü:÷&õÖ›¤Û›T°7do¶É¤´¸(~V¤¾¡zóð“~ôÿø­]_yûýßû{;âM»>½#Ã÷ÿÁŸV_÷Å¥zaÖm{¿Li +ŽDúFuÓ/tþÁõò?ã&7ÿƒ5¹ÉÅw³š.L\±Û|<ñ¹nnöÇG„¬£ž+OF†Å\9_˜,– yÙÇÜTALŠSÓuq­˜¯O ¹„ê²Þš¨Œ?õ^*¾XµzuD]‡11«ž¬‹²þ6Yi©Pž’pÅÚ¥ÙÜ„Ì:7.3ËS¢\¸^’y¡ƒ³˜XÏŠÙ\µV³sµi±G¼S‘ “N +±C<#^¢ôÑñç uñ4…NV«¹yú¼DEËg¸Ä-bÿuž+ˆÉ\I–¬ú©?žÀn©Ð9êëX©xµp±Z¸Z,\»«]ÕB®^8=3[Ÿ¿P‘±C¥â,tŸKÙñÂT±|¦X*‰™ÊÕÂåŠ(IÊ?…rcÇ®kÅq9>c×ÅؼàÄ÷õ‰i!1>&òs³¥â„¬ÇT1YÊÕ¦K…º”Bm"7[•òc³y™G\˜+Õ‹"W*N•ÅåóBæ*ÉòQ®\‚oÙŽš2ÁHËåóç1¢PcS¥Êx®$ç¼é¯,8[¨Á°ŽU+•º¸Õ.cÎWryØaŸ§ÅmOx1_d†oÇ…é~#.ö øŽ÷ÿ‰Œùö2rãtö“‘ÂÄt¶÷mf±á}˜ïéänÂÜÍÙc·zôÔ‘ù.“È:ÌMh9/ën½luƒmn°}äØ­•öÌûé.¯‰ß·åN{Cž½ü‘è•‹0%ø?JIÉ2¼¸ß‘9ý•-h‘ØVÛœÕ ï<Ú ’âN\tB¯¼ØE,A†ÿÉ4 +¡Jd ]Í€Ý#dA^‹j`ñ +ðŸŸ_¸Ý&adk┹Kb­Û^Uw¿ÕÍÓ;¿û¨]´,¹°ëËÿú/®“ÅÿëY˜µÎ í›ÂÆÐ)ÕSjÏÑP-rzŒðD]áù;E˜tM”K"–p·íÕnp…ì l¶ñ‹X— o¶¨Õü…ç24ß‹¯“™n¼Ú_hl9uS½ ¹ƒÃ,’Ä™Àl·W +F mÅ ÆCm7«=;Fq;¬8q ·™‡a¢WÊ@YÑÙ.‹z^tÄådñwâÉË…ÆùTõ°8€_æáQ +í‚„ò"³ÍàJºÌ‡dÏ„fÿ +kë¹_¡|MÖ.'j¯¸Ý.Òž^äq:õâ|¦Åe}XlfTn#¯/P,4Ö<ÌH˜Ö^:²ö¬Ó'…6YJÌNЫ÷²c‰pÇpød´(`tš0¬·ÇÂ~îûº–JÀÖzN?úu?R¸'%¼”¤RXíï.8s?á?”í½Õin5rÕ(¤CtV?®ÀZ¬SœªTóòæN@]a NÑùñ_Q@ÄþìYYF4à«b“Œêc3üG¿×¬+™a ­ëпúäçjþ«ê¿=!³m• =Ál ‡ºîžï |™áûÅWý£2m´/Ñ ½VÌ«Jl½ÝaFRñ¼ZåWnü\®œ/É6f{eÿ í+‘W†5A‡ˆ=¸J<lãc½’ŠÅÄääd×½ß÷é¿Û0¼ºþË7†þ´þ‹¯0C¸W1„W)VX'v¾W¢q®œ——ˆS•ë2ï,ˆ˜øj +XeÛ!ƒ79Æf&¼ÁW‹3•‰¹`5z@³2ªÏ›¯¦º¨ÜØÏ¡Ül}®Z€¦%deÙ@ Çå‚“gµXýùW;c0ž ˜¯ªñìªú¨ú ¹rn +§Ì×5z¾®ÁLkd{†*3³•r¡ìNÙdúÚð”íÝ?¡)›”U¬øûW¾&YÔªNÇ ®µ‹—…ËØ~§ÇíÔãVÑþ™¥Üx¡ÄÝÄʺÄê_z°Êëc­Xõ×?æ ¸_\.\¯”gç ô߇ÝÇçëòëG!ù¸æñ÷SòÏÍQÑ, +ù¢Äp© ¯HµÚ59çE]$ÄLî:ðšj¢Zþ£¦Bòå#NÌËÌý“_Ä„­N’êëào,)瀛q÷¬}\F'!ZþMqö4ü m÷~“ +=­S„+¥Ù« ˜s=f:Þ¾‘²^Œ]ÌM\‘Ã^œ¹>ˆœáÁ¦ðB{o€o~VbZ1ùf®+ q”#àf«•z¥>?[ÐeÊÁìÙS"/©M16QS…:±›+åÓ²ÍÕ3ÕÜ pU¯æJE8É)ÑåLϯCÍ'/]*Ô/V+³gJ¹©ž7ûÑ«U”<™bfןíµóÒy‚ëB.±@ýgHŬÊûD’€á^Êtr2c]îS·ZP"3 pÀÉ›k"AdÊf¼ßÒ•ÝOŸÐ,«„"(|8à°”¦[í(ŸâñJ1/öðñÙl®H1¿%kRòN"³31Ê…´ +iD·Ê_Sf”[ß~«Jb—ˆÍŠø„“Ïš:%ýv³@v§ßìÅGé+åbÿíÈЙÍYÚfiSYšf‘í´¸zá>ÊCC~u˜AuJºÌ¨"‰tRëG{yemà•µWÖ†ÀÊš+cÐlèí_Þ7ÿiúŠXNÙìþrË fn¢Îa³¦ WlL®ž±1’¨¨?ÇÂý—bK…É:Ê (¨?ê•Y%pHT v6W…Uí”?^©×+3J¦#£.èmoÌì€5'ž g¬ˆšAÅО9¦wÏš«ËPáš–¡Ç•xDmȈ´éb¾ ÷쫉ò|±6›«OLŸ¾ +Ýâ"µT…J4ALEiÈ“uø¡2©X+ÏSáµrù¼ž›%=T‚·sÞ±áL¼.æßrTfemˆÊ$¾I¢„`­6G8b['³½D‹ËÀv¤L;ˆâdÚÐgÎÌ€hb2¯)sŒÓšCi-:­5”Ö¦ÓÚIë¥uê´®EÒºuÚ.NëÁޭȨèð³g[ðÊÀ«2ªšp³Ü žUÛVë¶õ©ŸñiM¯–¤1§¯ÑÕw‹@E½YUÈZ»-Â!vûBƒ½&{L]ú´onßzSô5ݾu¦}·¯_·o£]H }ëCíÛ`Ú·éÖ +¸W$%àuá•+D›=+”ds3K á†möhnzIæêÄ[ö/N¶¡|¾¶ÇZ1d]¶ëëӎЌڬ±²ÓtèºØOB—Xµ)Ô¥¦K¡bwébwÛÅ®ã>í‚>¤L¦¸=¡âöêâMq󺸽áâö˜âöÝê„Ë›g(Є$AŸâr÷›+Ü +A7¦ýfc8pY½AÀ$/£ñZ÷ãš¹'ËRÄ{Qö£æÐaš…žš…?É5Þ{„¥b÷eH>h÷ýJj¶Ÿ…QB9è›?Å"wèÇ{2ƒ#È’§ÎBÎ" P;È,úC™,È‚¿ºÀýx0°šÖYýˆhC=€êåºOK¾\l ä¡å!=…ï‡ÑŒÁòñÆO–®åækâSB¡ôÆH-Œ$‘8(l&´ŒŸÅ”C1E‹Ì"­²úŸŒ©þßGá"'õ ÔÚ¤jío’ÊM<÷0®º‡ñÃöalÖµl·’ï'cTâ¨îÅÏ*´òÇhÞç4-‘uÝg×¥ ãSÎRð=öÐøE ÍP/<Âïâ£j˜„ 8wEÞlçÌhõ±÷B4Rç”þØÕ vÝÙЯ9:7ëºB>7뽤YM8Ãḟû˜c½\g¼_r´nª•‚JzžÿŽŒ®ÉS5ÉŽ}HaíŸ@2ž˜JzQ¼ëV7ì“-°LŠ´¤ïJbW’Út ×ïËÒõ‘ö¹F ]oØÿü÷UwÀÇô€ÓY‘>úˆ ©_L4{HÄè”J| ã# ·•bb’z–Óª¿Œ¿ÙVýt<ÔªOÅ gïæl´™Kœ%ͨ±.LÚ\ŽÓ•â=¤´Ù¡”E_³º[÷âê~†:€z½Ôëg¨÷ ÞÛ꽤¬#¨¨›  n"Ôm†úžÔû@½¡žc¨÷ >`A­¶ >@XØ­ û½Ø[ `oY°*öû°lÐÚbk†¡>€úp¨#Ô;ê#¨6hçG­vž`Ø`?Ö ÆaÍzÓNÁNÿ{(0y¿‡w,ÌÓ&œ§M\L×jªFݦ¨u´ë%còGj¥ÉWV•zÌÙš¬m ‚Y™dá\„nÓCÁø:dhÆÆ5ü¸E6‡ŠQí¹šaµ.ÅlÓíêgF‹§ˆžÈö¬7ÿûCÁñÞƒ"¬-Ô¼¦0Ï)âÇ•±;'}#kÕôÍ»Mp µ5_fæTÌÿ8žL¤¸(ÿêÔþdVßãþ{á„}mxC ÜÚWíéà¶s?µÓž½AFÆÙcw¬…¾.8²„pcê‰[öI Ûåq#£š’’ˆUqsÜøëSðË\d²Ã³ªbî•Œ;fu)…]JqžKØДݥ>¤3™?¯U}6biÇÛA}5&CQJt®öÜÇêæ—@Ûµö\´ÚœQÊþ]%Gq ¨¹¢%§ ÙA…µV+u°NÇ[MÄY +Ò±ðcèrEœ±Ä¢ͤ©5eš1?}«6¤XY“ ÃQ;¯´ð” ÉKÐå3\A“1‡ËWd@Íhãh&þ<ð}Ô°([‹±µò6 ÜZ䬊§à­Ýdî0™¯4PeîÔ™»0óò4Úºõ4ßÄÓ|NóMÁiŽÊƒC—.ën,´: €7b£f:åraÌdÏåóV<¨[Xê A][tzåJ¹`+OÐå9¨°V¡iaÜê?i5åèc¼ÕÙL†fôâÚª1?e8¶‘']—’¶,ó>&ZÒa{Ú4ÎW,vzÝÔ$'ª–nv˜P£èo¿YíÛ-Ù^»º#w]]Jø­°ÔFL§[MQMHøÞA¦¹“C˘۴Œ¹ÛÙnµó¶âWÄ·¡ŽÆê u4ÀЛª®³quT]×w²ºîÆÕuSu=ßÉñ_!ËYÑpüW,9þ+¢Æ¶såw-«£e¡¥÷;YÝêÆÕ­¦êú¾“Õ­i\ݪníwrÐûA ¦á ÷/9èýQƒÞí\÷DËúÆhYOhYoU·Üã}ƒ>Þ7óñ¾÷Í ÷ZåBû¯'üæŸÂ¯Eù¤9êƒ +˜cËÒÀ´•ñÌ!…` Ø†”–|€ºpi +7k!ïf.Ì€&˜xëéú=¿Ë3^” ´ = @ZBiÁÒ2¦d¯;%¡’_¶ôcµù|;õز!`¹„˜ò.0òœ9rEq³ ŽØ3\&„˜,Š)Ï&Ã0Mãbr!w-|hª»GiÅVÕͺÁ–1”‰pã[Αs!H2/Ç •ÆY›ÉXÃÅÖÓ†ÿ¶#µ€ ŽE¨ù‘U +.’–»téÍ` oÛq3ؽ8 t¡ý3i€»ùZâ‘Æ»€b–¿º¼†´†Ýp-B±Xß{z±y|TsõŽ¼´W¨/Sé3òˆ|±*û»V”º·¹-X7s9±®ã¹*«2W%FésŸÎò7Z¤oЭ?WÈé4g+¥ÒèUã(gOK%úš– (A#øyÝDU‚]65Ö +¥lxÃð(€b¦sùÊ5þ®W+WT<>”8%!§ªðb5:vØiG0õbµP«¹‰ö· lY¬«Wò¹y‰7°YV©:íÌÍ:¨SÁIx¸Ê)%Y¿¸6]¬ÃÀçÅTµP(Ëع‚¼¯MÁc1_(•*×ÄÄ|®,¦s¥ÊYÌ_§ |ŒVså©BôñƒwI¼ïYWDû^ÈWI¼Žæl}s-´îú๛E•w­Ã®/öE3p¡|«PI¼¹[$a3Ï{6FñWä¿iR¾Vœ”˜ïGAok |fVP{uÓÝ4 9Ø€–»i@sdZomàG”q½3‰~>žƒ)Ù¨1mÄWòbæ9¦nŒ)©QcÚTcððUéˆ*bÃEHà<¶ýNyÚuÉ_·üõÈß +ù[)«ä¯7K);4z»¹›ýÕ2¶OþÖÈßZùè~ù['ëåoƒüm”¿Mò·Yþ¶ÈßVùÛ&Ûåo‡ü픿ùÛ%»åoüí•¿AYÛjªímÈ5ó÷™‰¼lu ÿ@ìøÓ`ÊÁ?”ƒþ=òŒ¼WFÊ?‡eNy_úÂÂ+`ãã›ßÜ-üÒâWDº…Š¿Š?â?(+}ˆ;q4)ücòw\~Ÿ¿“òwJþ†dÜpRC>§9+²›…ˆ;#gåï#sDþ†e·Z zyÇûÃúxßÊÇû<Þ·F?Nµžß·wµÐÍTâLã÷©&¿9Øõ«U÷Ejô“Tý’мÕäGHCÓ° ç!E=ÿ±^/Z/Ä$e+‹DópÆÑÇ%<ìð˜JS™)2iÔ»ÖJùy À•ÂüpåZ™ßï¡Æ¯¶r)Ó›¥×¤XÎè\=ð”?R9•ò%ÕyqËAàyF ëìð ð Eë·{˜Í¼’´žDéÜðæ ä,œÃTpUâ$W+P X»H=Æà _ê­êÑ*Ö +$˜c0|Í©^‰]ƒÎê^ãfŃF¸jÅP ÑkÌðC°+—êÕmP­È“–lŽ0©gW‡øÞ,?ˆã hó’i¦¾ÕN×WÓ¡møÛ„؉©KÖ+¯tè…‰¯Õ5›BiÍ:­…ÞîxkPl¡廃 +æ-Z²õÖFPoåÐþ”t{ñrá}Ýç>j ia¶+Q =üï<Ò{ÛVŸh#y 脪©Rl×íé"’åÈáwLõ°¡¿‡àOw?\€'娴 + +÷ƒMI¼«jWh,­°­7P9+t}üÒLöÿ¼V@tu:ö±ÔrUHÀGÞ~ôU%[ñÏl ÕÀ ݉PZû¨ë,;ݧFc )îËcØŽS—þºÐsõh5©ÃtW6šºä0òŽ¬kS¨®Mª®Í‘u¹µm'nQª4ړѺ5íÙJ 8 f* ¯„sd[XýDƱšÄvKy”4:bÇllî0,½Šø  PR¦Gà +Ç*^¶ß®§[Gð‚°óîÌ°Ò†Š3èÙšU k¢’wh+cf1ðC4o@¼Ó¶7Ì™At+CeªpS‡…5þqÀ÷]ŽQ£]zúŸŒhOuÑãn‹´þœ«Öd–Ôn{”Ž{-mL4‡ÌfÚðuÖPU¯íÔ-†Ã{‡}±—‚Ø‹sY6s0MªìØÇÔtÞ/û€q£î¨pP-ˆCj?;hiŒu +gÕµéÞÞs«ƒuÙâtÈnÀ­«ß¿×?Ì"éÀ’b–Ñ}ZsæþhÍ™ü#ÜÓ7{´ +ÌCðD ¿¶ÃW'|õ!5M+˜•gŽ»‹\â ÷ÀQÔªü÷x&ú’¡S£fTÀÉl@¥¦ ÑyJ±Æ‡ÚiL6Éˤ¥OkZz–v¼þÆd(HK—ëÕJ©6h™›jÿü*»ù{É[‘Ô4AXª ="µCDdàC4|`Z"GË0+ÿ|²6Q,ÝZAÒË%ZH—[ÑÐH’Å-sϵÉL›"uiU¶è¡o®i‹6Ž"Ám"ZQ’•2š±îA’“´=xaÖ˜J XÉ æXgcöeUÛ¹³m…8&FŒ©Ü\½‚ÌAÔDPwúL pþ²bÆÕ8Ne¤© dñ„ãýEyõyŒ8@c ?(/YhqoWÖÌqa›=Ð¥ °[V³ €©6PŸ¼.óòwMþ¦IyȺiËhùùrn¦8!“—X”à0úf¾´1=)ø²¥§à¸¼Þˆ9²ûZÉËég]ö*déÏv>`ÈŽ¹Y˜Üh[Ì3ÙV1œÊ®Y3`h9v`óí‰jnVÓ€Õue†HƒÓÊ‘ ³Ý%4ÑÔu%eAN0´ë±½X©qšO‹WO)`ZtNÇÉ€ÉÉÓZ ŒéÚØþàŒV˜Xnœ‘(àFêM³©Íƒüú¡i$‚NKî»aÛx]‹¦O»ÖY[±mY0ÞÆ1±èMp¯òÛý¦Ð½/‚º\c—äa&ù» }~Ëá»"žýv±ÆMÌ„S £‚Õ¸ðVÏïcõ|? +{=‡¦Gü•^ŒÉ¡UIõÕ›TäájÌÇÑ}þ×à¿kÕ+¹¤‹ »¶:ˆéu”± ,Ûexflß­ b}bƒ†Ø`CHm„kFÐfÝÄ5BçÒöò±ƒ›³Æø‡ûØá òÖÐ ¯Sƒèö¶l(“m߃^ýõñ«¿×ƒü5X;Í ¹Û°’/'C¶µY§œéXÉ.û]ônkÌMkvbÆ=î|Øë*LíklWe¿~t{€þ„&ø¶U†0²Ï˜úØÒ'¡1>¤98ƒÅïÔ†WTV}§³zqÈh£nkÜ‹{t/î5“ªìÁáˆ1=fî;ªôQmÕ¾Ì߯.óªµæªívù7ãÃÆg\KX•t°bíý¤pDhi]jÄ›ÒZcƒGÈljy*m&(›I«ùoìvðùp âhÖr‰@3ìXL>d’]^q“ŸBO3ô$&O5‚®bò‚Ð×ú*&_ &ÏpòL.“_âäyL~1˜|/'oÃä#Vòò¸Üß«¹ÜÛ±'ÇÛÁ¬yL†¢Þ8*×!í›ãpóƒ‹8à¼!Î6gBsîáõÔs¬  'Ž-ÙÐ~«±eüïÆÆEØ2diM#;¾–ÿ4éí¥9j{‰û-%9­Ö3hŒhóÛié8q÷vòwðÄ"U¤‘Ër/³Ðþ™$Ýü/±Á†“ËÊo&GÜ"ÎBä#C]æ9åpÊ+““µä` 뜘èÌ@äµCáÜ0Íÿ~LÏq£ ÛÊÅVZHé—ê³”€]bLh[ªÊT²¥º<î* Sz@‰ØE…Ãdµ=B¿ÕÖðÆ°fë[R÷f‰µokÝ,aNÔÈ—Û ‰p½¶o§a–I¨£àÍ1<çó{@:/É@i m¡$™Ô¥ ýNýÐ÷Â+¬pØ^s„jÊ´*ÊÌ\ÐÕI~•ÆDЮstV²å¬÷Ö¾hÒm¿–wÙ~Mº­ó×ó×#mò7ó×+mó·ó×g¤9‰uìïÊF‰Æw7J&Ñø“¼Ì½}¯ÞÛwòÞ>€{ûÎÀÞŽ’‚Ú J^-_ í²;2óÍí±õ;³r³³¥yIÍTå !”“²H è•<|€×ôô ñ½Ðö¶´ªÿ´c¹K$^@¤Ñ¸Š¤’Ýt\½ÈR¤43cÊsÈ:”îyhÅ“r&¼˜Åõ’Ê£p§âQ)Wº¾áY.Õ¿¸ ßtjý1Ö?j¬Ú¯¶¿ýQY$v›<ãºÄBK£h³´6ÌÒº˜Ç¤fÖÖWf#fi×›ö[ý Üów‰Ž˜ãpÁ×ö°-:d¾NåvÕC#±a”Z¤Aá¹€Nç†Ë¶ÊcO½vи޳ʾrLÕÔnINQ VbËêýP•-Ïðóc¶)D~†ìY˵$껕»jY}dÈ,?a j÷°™CœÈ¤ê¥­±ÈÕlá?(<¾[›`_åÊF¼]´¾QòaÖœ½½™)þZº¡ôÓRd%‹Ú˽²ôécm€5rš7}¬=6>ØþC3ß<¿·ñÁ†3G[ÄQõHažu¼®æÕÑAÚ\Fc+|ÈaÚc³¨ fëÌÐYg + hà@Vyäpb¥ p­[ƃîGóõBír¥ž+éä72ìçŠK4¥X‡qè苈Åÿ“ßî!͇-¢U¡M½ñ˜¨äù ¨ü›C%9­-‡Î´kÅå­WK¤7  Û" :Gçóa§T¹v^Žq‰»TÂb´Ê=%ƒ¬·Ú]¨Çÿ‡» q&b°î"×?hì©ý«ŠûWÜòŠ)ûÇ̨:]b,ªlÒ¾ƒ :fé$\ä°mч­j„µaÞv­ÑAÍfÒAË×B¢Ë…ø(Ct›Ž¾Ê‚‘î†-ëVïi˜¥'dI¯Ê“Wf⨺¨Ãf•nk¯ÛÖnÕVå¹£çˆÊ¹ÚÍóÂTÛ–¢ŸZ– Ÿ‚÷,Óå5 ++kféSYúféWYÖ5̲NeYß0ËzMb­‹  +žçÙ½!LlS±ÄMg•åë€f´Š¯Ñ ë-Í(÷vÿ2ú Øèoö·„Ó\Ý +Åߌޞ½Ý.üipâkOí?î +Ç'Yî`IÉÈìº ƒ"Ô®]ÿÈíê¨') ÝJœ +ƒ¶õ…6Ê‹tHgIÙ¬ßmìÁõŠTÐ{£ f P`Ùƒ¨”" ¾‚äjʘË]› Yã 9hçtèòšëï> ê¡ÜDZ8z„o^IÇçŽ1«Á¯ŸÂEÅ‘X~YËýÔ1_w,­:æœÝßGtl +)Ã4R¢©hʘãûµß pš‡+ì'Ü3æõŒƒž—ÞzNñ»“¤Ö^aä7DM0;¢éÚ›2=È¥ü]iÛ”)¦âyÇH¥¡Žã „ìðÓw +%_~¯ßÅÁ¤Î‹¤tKb¹tò=šNÞ…x=Þ>(`JïŠze\¸^Œò{ßþ/:þfÙ+4zp zî ŽùÀ³…ÊLL`Z\ú×æ7»üÿ׸äW9ÇuÜ㢋\å7à!·jÄr-ˆr'«‚ê¯Õ±qüRZKÉ–B^",*;Â/w¤!F×T’ã²ôreiÙ÷­jˆB/#–ò« mC¡Ü`¤ûIa½4+„ŠS¯0\¢7ÏŽ]’ù,þ"Àz;À/4È¼È ð²Õ(§Ô?…v^°‡pjß›V’2KðÎyÑul uÓ—vΨ1–¡lœcõƒÛyæ%c&äA4Ê°Wȇ«cŽ.pìX]ªË}ÃÊ4¿r–¸=û-ë\ÖT¶bÙò +-+íýBµUD$Ë2¼å•A{1–ôžæè£,Á›MÙ¼Ù4p:ɉœŒ±¹"¸ZHŠ8]Yä1Ѥx@Íè,Z0¡5œÐ–q¬_š2ùÜN {ÌÝá„×̳IXéšÅ6 ½˜°ÚNÀö±j)YÄ^k¥3>X¾³{)|Áµ”]Ö)BÏ~?Ú(¿$XÖ%Ã×ßõL ÜpŸlÀè&± ¹h)¯)üôÑnRš¦l:b¦lÆ·dC•l…âÛÂ`Û0Ÿ'£&<ÐÅýº=Iâÿù^Ê Ï=I— ìRÝ2°[öÈÀØ+{U`P3šÉ( LÒˆ$ü}²V½+:zwtôžèè½Ñуn46k¿lÖ~ÕÆ2p@ÊÀA8$‡¬Öï®á@tôÁèèCn´Dù=ñižé%'‚ms²Ÿ÷†õÐËœAAò½dRò>jF×Ùþý^“?u>í? $íÖ…( ÖGÔ½&í?¨ó|žk8‚ú¯ŸÐYE°Y²a­ç‡²nø¨r'zL®ßc¼y·Hnå¸÷¢æ¤åŒHÆa^t„ïd§LÛ‡Ì#:tUÿ†ÙŽ¶Ìs¦‚B‹š:}ÚŒÂU yB©e§ý3!ܟȵrŒÓÖp…¤Îg²8ngíqÃj øÑeåsˆ‹‘eú7yøDx4Ô} +Š’»Ûˆ–Åß‹#AW*å<öG+ÀmõyVŒÆñxÄóü xágTM‡lŸ(èýÄ=‚Y oŽ‚>§ +²ÚÎTÒ¾1¨º5ؤUß.âµ ÔÎ*°G—–uÀ$¢¶´´.ÑðúE‘®‰Ém¾ìÚ¸”M?'nïh. ý§‰(˜éo-,,ø—É fµí¢Àc¢œÉJ½á2Ó pCŠm|Ü~»ñ¸ß>j]Àܲ©)&Åãª&øM²È‹l.;ÁÝÄ›"a'^îo ;VFùut´W¢>3‘¡Œî(~ý4˜Rª!+-8ÒʵëRø}d üýجÈ4h€CÞR5“‰ß$›ˆuç-ì£âÖ»§Gèë¡‘ž +úxë”t”˜b5¹ù4ùÍ‹l>Ø‚’ÓÁ¨båöæGVuQ‘­`;4Î*cttUVï.pz®AsÛÌ>u4*‹l|^ó#`Sæ=eûQÜž¨¼q³Ó'½»v†[û!§µcbÉÒº²! yøÒ}Thï> +HÞºœâUcYí¡ùyøázà[sä® ªØc§Ú÷,Ö²’‰!.MD…[FÖ6W›q{Wˆ +§Œ}D¶iÑ<ÎÇG—ÈLĵ-DU0‹ÂK¡û¯6@7¥]• ©·ªïA´§=_TêGŸ±%añ•¶íܬËjí¸"lŽïÆÍvŽ™lK€cÛ.*êop˜ŒD³fÛ5) áˆlëÃg·‚'R×nN“bmèɵɺqmŠÂ§;±j³õ`ƒ cE2rF–§L-íñɈ·zÞi¾Ô÷4Έé>OæCà&rf†ï$"CwBä–HìËÞ÷E q†06£¶P§S»„7)¦¢u ÓCóÀœy}þË«±—¥Xv’‹öÙ] ëŠö“ý %ëæàbÛù‚=„œ?‚Ï ˆ{6TÎÄ¢{Äká_–LnY"¿Vm2Ï^¾o¡ñËäi°Psé»ßŒ_úÖÝ™|[í«þÑ@½Ê×mÙFJXé@ÙÛÙ,®æ¿]¬gáɲØùÒÒH…¥/sÖ—Úô¾áÅ*­gy»óªa'vD¾ŽV¯£ve÷_ð³ˆ"üƒ¬¬VÍ·TÔu0Ìø¡ÌQZÚ­2wFdŽà?Qæ(êžF™7EdÞÔ(óæˆÌ›eŽR%^ß(ó–ˆÌ[eÞ‘yk£ÌÛ#2o^•’êÒ¼+»\ ÂÝú:¼ÉñvxH“¡×aç&µÐþÎ]yó_¦>¶ØMؽ–5¶°Ìlë|a27Wª_”÷·SøÎ]DÇÕe&»ª3³Ó¹^ãd+]Öq!wý²6’ÊÚO¶9Um–x +TÑ®×uf¼ßr3Ëv‚fÊ»÷y—?/®“.ŠK,ÛÍ_àä(|,W’=poÄÓÅ|ÄÛjájAb>x†ŽäfësÕsוˆ±àl cJ¹ZD4AuAu‹×7o|ÚÄ<’¡±ñL¡W~OÌMlëÊ¡gSÓüXɺÈ^BÊ¡j¡v)sr¢>—+©²Gçªô u_RÎh&rå‰Béd©4Lu8.a´9cež—ÿË ÆÄ5”zºœ§‘†À©ÂT±LÁšÕ:ó>+‚í°Ï=#*ý¥+—åÌpè· …Eè,Æ|ÎÕk0è•òp57þnøë*J”:õ)Ó-ÍÌZ!W˜†áƒf_¦—XнY2Ba FM«µzÞa)u§øH-ƒö±á“±(X7rÚQDY³ìÀUp]#‡ÆÇЧ;f‚'ŽX~A9ð +0UËyR ­VfôÄL~%fç +úrýð¨wf–~EFx§8k°Œ®\hsQ V=Y«ÊùáP&äÓÑW*N\ 0ð`ÿµ×ŸÓcÅC†ÚIÍ‹ð7ä°ÇŒÉvx hæçTÁLÝ ·¶¬ÒåÊYÚ¸ SÍy;=¶0ZÌ6“L»zD;íÈÏ3ÛÕÔ´ì ñø",¸ß½ù•°ºÅ–k §>"l9§³ÃñøÊÉÛ³%D·}W­¢š´if[¥mLÛ¢mÊè‡'¶_ ’{¶dCOþZáËø !¯ìAÓHÚ8[UšÉŠø½  ISö)ò1ë<ùý<„¤sI/e³lÚ‘V'›s¬Ôa݆7™8x˜3ÅúL§9[ü(œïY{‚.’,¦A¶=„3 XºÂqWÀ²Éóúм>"ëÛx?Up=µÒº²Æ’û¾éñÆr›•øï*ÛJm¯¾Ù·PÄj+¼q볞Fµ“ÍSfäüZÐ÷59ÖjáO?¨Ü`™7ôÃQNZLp¸JÚhq&]ítÐÖÂ)Ü™tÃkµ­ïnŒãÒ6ëGýú¢†ñ[Ãñ‹£oÒGëªع¶©\Û‘yÕìˌީ*p®É»°8°q²=®´²…+ÝDnJËi/¶;K\‘¨ xo\Â_X'+\Š·}í Ìò—lþÀ~Ý¥fzèDÒsDËAk©>ÈŠ¸Ë’ïÉ_Eþ½æýåaÝûx¶ª6}(ܦûÝ6¦¨½æˆPŸ=ÂŒZÛÚôƒY6ü€ÍHï‘Á¢qи´1LmyUºÆ;Ò&âQ¸Úð–^éˆÉ§ÑFùÄ1½òÚˆpÉÔ®]2}ÞuÉt ÐG´UD¢ O×M,u¼{Ș´4Jw°EnG ´^Cj™°FÕCUÚ’9aJ á׸ú‡p +œ+Ûnw2œ4¦µU”2°í6½AùCĦÜÕ¯‚ØËÆ¿§àˆV虬Sñ~S±Ü‡N‚æ€>¡uy)|ÊóTÏVÎv±Œ朞:C¶#¶ ª ÕjÐÔۛʊëŽqCFÓ'Bå =Cºâ#†_¿&¬ICÄÄ1?ÊÕXÓô鈸³¶‹>ž¶Nao8îÞ °¥b-[ü# ¬ð£ŽpGÛ©A7W‚w<û=@ü·Ü[6;0¡æ8Ñ~Ęh?Ò¯ÎãíAüEo# +üü­Ã ŽÜ6 üY‘*"¹ê™«\S¾X­¥JåÊܬhÆK^)Äg[°³¶®É'ß!Ÿ¾Ü¬È§ÖMj “O> :Ç¢u{Pžs£èßZjv[[®þY7Rå}CE+­rËÊuÜÏDEŽFE^ŒŠ|4*2yÉŠlV‘—û/C+MÁÇx},ÃÓLX}‹àÃøQE3?Î4óŽ8>aÆ•Øpb@·á KH…_ü–n‡›óI…B•sû·Ö…⇭â¨NZþ&;ñîOdFÜ’ßfѺèŽÚk¶O°§è¤Ç£±™æÓÈçÄrê~fñº¡£ÊÎù3TÒyº¸];[|Tw;C8µ¨ghM}LÏ5¹ãÃá-§ß¹LNª>O`Ÿ;2 +jê<íèáÁ[á‚X)}Aüª´†^t†ÆJã‚hhV¹Ézh0qoÔ\\Ý°cö¤š ¡<CÌuG¢¥P+uã¨ÔpniÔ/‰ºñhÔ/‚ºñÅQ7~ר uÌFݸ¦‡ò!œÄˆ=,'ù%q’ÆI~œäÇIþ.qÑ1'y“Â"8)0è2–XaIœ¢qRX'…ÅqRxÓ8ѳqRÐûvg†TèÔ#¢Iœfð}Ó>’¢JE5IO~´VñÏÅ"(½T·§ƒÒá˜}ÎˈÿU4¦Þÿ7.…€Þn¶åŠ>d”ž¶4ÝkÛèÜÇF_âÊ×xi&Ë!‘è×{¦–1i¦Úž.ö k#úiºÁ½;p§´6¾‘2Ùañ£‹àá=ßtñðfFîø7©'SÜ Ö +Eü4i†CcôñøöÅç /ļ_8È·+ob´2j°÷»E˜I«ì.¶›éqœ„–ÑÛ­rŒ¸G>3Y¸_ÓúÞ4}kPÈ6 ¯¢hü¤¡ñ} ñÓmÿº2óïUs Át‹¾Ù÷id\£/Áª™¼˜kwoÊD D€Ü^ Ên ‰Ä$ŽJJðƒRÕúIj}z@$*£ÖÇMëSÐú¤Õú5ŠL&á…u†Š,Ú7ØS¾;îã±YM:Žïæçºg>`æêÇ=¼+ÉÐk¼•%»šÄÜQŒÞ¤&'iÌÅ,ój —}H&Fzù/ó©<ºÖ«©ýÆ$ +oÖPsúöЧöÖç¬ÀøÂ!Bµ‹Åç2dM6‰‡,:1)éD\0g-3^Ä+eyû¶”=»gÔ¬k 9£güñ”ú˜RϨ·«¼ú(¨ õ1žU¯c“´_Ü`{Tr]%d«ŸÈ88{Cñï!&äå‹ Çšh¯#/¸»_84m·=Pš?Ö&Ô©­b ‡ sàÆCpû’¾S˾xpøâ<|H^ Ì™eΉE +µ¶ ~ñÃçÊýîéôû™P¿ŸÒ1Ã}ø *ÜÄ’¸$œ2*èí¡ÝK1‚p²ÌøÉ0T†ÔÃí²ÕNÕ†V+n·Ž£%m¤YÐ4¿¬}{•é€˜”'DZŸ­|Zâ3§tŸJ©'Õ\œY"6í‹Êe¾;¤¥FÖZfƒ"†\ºäŠƒhuW]O¯ûÂ^LœÁm~-Š»^ °ºÈclÝŸKMëµbC¯jÈk¤J<úæáÜw(ׄuwLq«Ò¼ §í…4˜9ßý†6\ |*—ªkg>€=F.Âì ‡Fé€Fž}ʈÍuäV+²hQŽdì¢ÖÃç7˜çTM‘1ÿK ,b/&§v°9ý¾ñ-û|›œoc|ËÀ²^¤&s¥>\c|êm%(/VTÜä\Íä‘]Ñɘœ+ .ÙLP™­ƒ–(3ÂÇã94 ˆ™!Êœ@ÝQŒ*ËWγ›ÈNíä).³#$þsµX¸FåÕ«T¥¥|wÚ|ÖsSr³¢X;_¼Z¥B 'û^”ÿ HÅâjó–€29Ód53OäJh}Ò¸!ã1€ò±µéÊ5«ܾzqÂÒ Y_4¹Œ‰L¥\«ìE +€.ˆ”&XëÝ4Bq s³€Ì““2‘j7ú¾UúKMV‹•ÕGêïܬêI¤.pPc8B9Xö‡LÈ¢Õš +ÙÆeÃæ_ms¥Ž‰‚½l‚Ê÷Æ%SÐ<¬ã‚¼:TÊK¬¾ý&´CqÁÊ”aeá(ËÄ¿dñFm‰§(,4™þ`>µð(FåâòhK³»ŠPâHÙ­‹Ö,Ö§?5 ]íãT%mÚª+d/i*Têœv¡a­«—¯SZ‡oµ—î?¸&D€}÷½z&ú˜Ê}>ø×W¤^“!õÔXkÑ”3[rÃ/Ið´Ùª­Z³Œ|E%…ºQt®Ò'bn…PãÑ-ÃcO}˜šÉèû$t™æãO -WêÁÞ¯ÛiWò‚•<äVž(–ʽڋïkdwî€ ‰€í—Š+…ÃãèGºþñÝl“v±†UÙâ’æ j$ňûºKæÖYǧƒºbo xð¥ðž …kÜ(o–+TûHg¦àæ³ÖèÄ=&ÕiÓ 1ˆõª¡ry0[²ÿ¤__¬¶.Òž'E¸ Ûi‚Ê´ìÊ·Ûø ±ÔÕ¹ =€5E]õøå¥gù>†VñŸÿyç K!o'Þ#ðÄNøg#F×RÒ††#Í]Œ˜ 6çrae»ˆßmûîXç0b\nÒnlÛ:q{…°TpƒØp˜XÇ^³àšØJÑŽ)iG“3ó§"4àqz@]( ~Ø‹ÆÙB£‰®Ñ:UjÆ8ü„Á´µÊ÷eõÞ°)C`PJ OOøw?©ñ^T,×Ïûé¢ ÕBfdÕ|Xk ²ñú„“1mOÆ$\=À+MV¸2&0ÒK[ÁÐ*²±à©ÛázF/¼ÐÎ6eiN©Åy(ÀžXà òd9²|î^Œf+¬¦õ㈴šÂØRx¡´çršÖŒ™cZ`·æò¿ }B3és9¾ä\ŽÓ\fUG¶Åçòr¨J²æ»Ã8XŸµvƒ„>º³¶;”¢gí}6cçS„„ó$c<ÜOGø³ ˜/¸F„qˆŽ [LiGqâýÄ…ß&t]ÖΊ29õáz p¸~!ÈïÞb81ÿAKÏnœ[þCj5mG%z>Œç˜Ò±:j/¼ÃŠdpb·[±²[ÇF¬´ã*m/RbSTŽ“³L„®t£ü!¡s+’DÍX"ÄR¶æÒ”J"ȉŒÕ]ªí$¬šŒŽ‰Ã;oc´Gùì¨ pÊC£Ä@[@{Ñ枉ñäëÇ¡Í¿cT‘£§·E gFï¸dÁiuìžY +È‚³<ÄœS»ÄO‡=²lŒóòwA2T +F=0fÌG=0Q åÿÏKÑ5Ý.]èÒ¥%)n—Ò té²Ý¥Uv—³»ô¸Ý¥>»KOØ]zR»÷R¶ãþSÁñ¼G¿[ËB•Íî“©þÐk°·éCäé¥ü>›óæ™@Ö‡Ók2¼›h:ÔÞ½žÕ/„öš°[ÅÓºŠ-*š45«·³Ï<°$.ïþƒJDï™cÖÒéòþŸÒõ<× ž1]Oέg‹‹Ñ·‡0:nÞ×7~8öœ¦l'-?*¿`Ê/4.R—?u—åO›ò§—S~Þ-ÿ¢F ¾p˜ÚžÂz¯ž.oÉòÚŒ>?ãÖnü”¥ï|=iæB‘Úàõ‰´á>a!ÊI/-…„®Y +Ϫƒ½¿¢×õ…­û£ÅÈ’?¿–ÕÑRAälaÝ€Yÿ•£š…ƒ­¦,‹Õªµ”ñ>'–Y‰ÂŬ‘ÚÌíU_u+¾®øZ âÝ‹Vl˸¯Uøœ”ñ• >_4ø|iT·WÓ'ë¢û@qG‚ãø\–I† qÑíΫ¨G5zðÞÕ=îÎ;ݹO¨Æ¿«ádxy‘ò^ ìA !DÂA°©Ï³¤öN\»Àˆž\Ë«áZ»î~H*MÓ^jÜ´÷4ŠB(½êàöõ±lQí 諒nê°7üÎfÝ"$éØ­ø~Ÿ¢Òo8nu€¬…3¾SØ‘¯‡Rn²ÒšÙs<ÿ{lú¶Tqÿ}å“QÑv”Ö&ÓÞo§!5°—éÅÜq(WîóB{åNïå½’ñ‹®wBGÜ믺àBYxÁ}M¸\ uÃÙ¤BÈèpW˜«“!|ßRRçÈ<áâ6Ÿ \‹¯,¨Y=¿O”ƒ0µó}¡˜˜Óîƒö•j€ï†Büo†ä ­Bÿð›Ÿ×àaO©}B” l[b(Èýˆ{o1[âË?ª%Ô‹–Pßö¿Ÿ%Ï?YÁ¼–ý|pàâ•óŒi‰õZýµSݯߜÜR£€‡þ'¸ |¯)x×>ejŽù?ˆ €ŸF½U|&6mú!ÿ³üõÃþðWðUðëGuêéÔÏéÔ!ýõyú÷ãú«Wý„þú¢þú’þ:£¿~RáøàWŸÿþZåÿ=áÿ8=æÿ0]ò{øë²ßË_Oú?Á_û?Ê_gý/ò×°ÿcüuÑÿ=⎿NûCüuÎ?Ã_üÏóWÖÿIþZ­ + ÿ½ÄïìüÕ ³\VYFfY¥²<Ü0‹zÐçŸo˜åq•%Ó0KŸÊ2Ú0Ë*Ë£ ³<©²¬+Ë|uJl“8>+Çã²»>‰ÇÓÓÃrT.É\…lÁS£·û ÷&ÿ3þ§ýô?å¿áÒÿ„ÿqÜïdj¤vÉ>®”¨Á9/c_…Ø]þZê‡éÀí!Å—%"íÇ0¿ÿ9\þ® ÿó¸"ü/Ø'Ø^‚ý ‚ý"Á~‰`ÏìO",¶|H¬Tò¢ü”â þt–/œ<É?LÎqò8&9˜<ÁÉLþY+yy*)?§URöaW•JʾFöÔs9 í¿¸ o¾;~d1{jñj)§S;¨OrÒ5ÁcGÕØ÷åŠþ<9Îþ:1tªP;ÞÅrì@¼š+–@–ÈÐÓs““¨isÞ§æѵçøœ¬‡ +GSYb­R­Ÿ™+“å,m ¼¶@‹¦zµo`8Hµý +kÎ\¹\©”êòcv¦" ˜®”òL˜uœ¥*ȱ ÀÁPe®Œ¶Ç@è{åy‹£â2½Q-O´X‡ã„UY‘«]ËÍ26ãG‡ú»<73^¨ŽNžœ«OKg +çsó0®r2u¦Xf§,hÀ°¤t|feojÓÅɺ¸’©¨fùz…›àÏä®k„Š±j¥â8ˆ5ÓléYóê]Ôû3«ˆz±ÿÍ[&•ÜV’¦iyö¦ÉŒ¢ /~üpt“GšÖèf„³¡èÜn†¢A”ÛŽnóP¬Œn÷ÈèL ºÃ‹¡²=‰~Ú¤*î¼ÜÛñÒFü¥24-•¡y© -Keh]*CÛRÚ—ÊÐÑ Ã®T»È2 ˜œÈ‰Ø8Há]Jµ; D»³SüfˆÙpÇà,S2qbgÂë#\àÄÂgÀ +Ògna+wŒE.kå­ Kî £¯âa±—fsW¦¿RºbdÜõÞ#%&«2“o(‘GTz/¦g€Ãÿa&ÿÙP³[ÞC†ã=¦Wàßtö¿£Ê4,hÍÝ„ÏöPHZ{k—B’-1üïMþw +Mþ"hŠûé[;MÍò2mæR‘„¯¯pt™•Eú(¨K°é-ë䮋[šÖV°²JÚé¯ÓzöéH+¹êñ¨ l¸aÙß'Ù~îÑš‡³YKK“ÈL¡Ö³;Z¹Îfx¹÷7ROçÐßGÏ;£ IG¸§3‹ƒ%¢PÁFrYH]TAÒóD[¶aGVëŽÀƒJ3»;ðÔ(ø·Ô(Ø“õÿ›þCCÓ­f§yõ?äklŲ:¸'§q£=@iíY-܃jˆÆÍq»S@Ë^Ìjïâû^lÛÍkÜ õ¨x3I«/l³æV6ßZ­:SGk­#åZìØòëQ£Gœ·P[{ï¨óuaãîš6uûpbù} ùšVóuN⟠9 !DvÙ’†½tµú°GOÇŒ¦˜²‡›Ø`X m0xvîsÎ cÄÿùù…†}#ŒGª9ºx;6AyÑe“×"·Üé°ÔqDŠ§óžS¼†´Pù¬'‹Û²ÆÖE‹çOÙªœòœZýÍÄŒ€Gï3ÖÞvoVíëoà 'Ý¡„ÐDÓ ©ÍÇ  ¡èâ“¡­m•üÖ·ˆ\!4±‰Õ!2ˆšNžSÛYZFiQ­û/±F#Ç7˜?áQùYñ]•·Ýí¨4ÀS<„'ì豃'Ýû¿zÏ7†ÿí¿ëÞßê}ÞÌ’†Tÿ9¥Þ±è¥áMP©ˆnHŠ&FfSæ†1°IáqS¡ñN:7»!øRzh:«#`ÇøE˜ŽHZ> C=¸¡{à<³PªéËqg:ìšÎ×–¦ûP=,¦ŒÐÖÌ$“ÇX¾"½°Ð¡¤âÛÓß2éØ/-,p`gú嘞¯J„ô¦'M`Mú7L`}úk&°:ý¯Là@úëB{î‹äÓ‚öÓa±ûØÎ7û~ ø"Œ/-êM)e¤Zú·‹9Þ~@ÀÐî=H¯ ×ëƒÖûqË_ÅBûsI(âæçb#_¦ƒCtum¤€Vä8~ç yË;Œvocû¯Ñþq,ïDO+¶SãuÄ~¹i?‹_Är#¼øŠ³&†.¼žŠRÖì\ùrq¦ \—RÑ>J‚èÞ[q–ß»0+:Ô²·°à­""Y–á-¯ ø7I%ýû[HNŽð(ìH`ÒZÅëoø¦#Ý?s[?ÿÓfçåWÁlu£Éz¥Ù¬ëZa›'oÁ,Íp­´’2èæUJì“êsßÚ°ABï{.õÜŽÇ`GÆ(më׊uET´-ª¢€x¨¬ã¼îŒ©…ÝçÙ™Ûf©cØu…~„ ÿ]éÜbKG‰ÌÑc‰,ÖhÅ._{p_Û`GµfC:ËPýösôº@U½>Ћ¥Þ¹õ½QàznÔ5íDƒöN´ÐþD'€Ý¼ß±9Gì]fC«©8üWm_°%sĬÜÝK•ª(Ö2¹ y™’A”+Œ• +W ¥ýlXCÃŒ”Åæ¦êÓrÄ0I6:¦s¥Ê)x× gÑ)|V¡L~.‚Ó­­²Ž6V5°)¦R«-Æ•+õâä<æ"'tV^­;¡½•a¹‰iÙÉÝe“Ð2ÁB«"Ú\CQg©G(xŒà‘òt¡Z¬K¨G ŠÖ†äéY¯ÎÉ‘5Š0¸AC óÀœ²n)òŠ€¶Î•ôƒd¾-´/îJ>î§n­Ãûü€HàÀ,¿0Ö«Â@ÙÚÇ<½8ÖÔç‹ü¨· O‰K¶oÕæ£ÝÄD[ÌÝjKè9cØ>`“bZø­ߦ ™„pÁí¨Êÿ¯bßa;0êlÿÅÌé»ÑØŸz'R;K»h·Ø"Cš%äyéôßý×Btµ'¯8¿¼ð›*à§+ÿfAŒ“˜”€ÿ÷ÿ åËv¿»ðïTÀOù/è –çÅ3úÊ•¤@3 + ›Fn‰É&ŒnF7£¯IÞ3XŠ·’<75Ë[„ã ÜÁ9¦¶ïÕÈ|•gZÝ…ÚEïwch·b–A´‘3å,£_÷„5îõï3~rÌÔ¬µ.p/ð¥®ãØÂ3¹ÎZëMœlãú#½VÐKq9~À6z¶!«ñ<¸>ª«IbÞ4 ’µéB¡ŽxbÂZ¾Þ4~'vÏ KdŽè÷Ol@Æ\v¿_‰ÙýNQ¯”mÄ»lïȾPÒkå¤æ©OJó=±0Æ:DEÜD 6#Ü«Ž÷&mÎÆ’œ[»ßa¦y,ðß&׊ ›î~›‡fO=UîÖ,síX…P‚Þ±oÓÏk\ü Fa´ƒ’oš ð’JYkµ™)˜§¾ÅÓ` ©Bù0Ñõ4ðÌœO›£gAÒuûç΂ÿpûsÝþÙ³àëÎìg³Í?Ï‘½<&Ž‘ÞH/"½F“5Q4š,µ–<ÏYKfim§Eå0šF»ØŒÑ5£IÀèß(Œ®¤¸} f¡1¡ÑØäéhUÌmUÌj•±_ѤšÕð<,Å­CÓÞ4ž£-!+‰Öyè-ÿѲNð6­ý>¹"M:šUò†ŠYþ*ù[Ú˜Tk´)ÔŠ¦çðñS’»bhY™MÅ&ã´'µ)'q·ºq§„¿Rža)² ©hSÕ2°ZÖÈÀ˜•2Э4‰Ú9*zutôšèè•n´là^ÓA‰D2aÍP­e^äf .ÆÍP|Œ}t,Å™PäàÍ“8È<‰íÈ“8äI\)–kƒpkdÏÓÀ1þÖJ€»ù%_‹bJ^ô…1\ °äÌT 2”éHu£ÎçJ—«¹r ïíòÒ:Y,Ÿlp^ÑŸ@CôM€¾Vmƒ‹“•rýLn¦Xšc5YF éÎwÂeJÌÕ +ÚÚ¡á= ; ×4ŠžãË|E^Çu`¼R͘>-¢aAâ8€Ee¢rHÇdVAŒ[ÙÕ³Õbþ|± ¼ó©c)Ót XÈåU‰àU£\§–Mâ#—QÙX´ëžäÏè(N*Ujl÷ϤS¤ò‹}¾›ÔÀÕ:Y-Ö&d¶¹jÁ©`؉¶r*$ÀÛ•¹YÔºœCó;©&.MÀ€BÑ|—%ÈU¢±¡ï¡ÊÌxåTåºÈÌͪ`µ0;[ 18Y*N•ÅD_ûde §ir;¦sùÊ5Æxqjº.¤Ü¬S« +†,WªÅ©SfÖ7h¤<;Wǯ“ÕBNDA ¸†AÎ3þ 2°9.ÇKäsõÌN>Y*Të"‡ÿÖФ,þS–-’ú›«£§rUqrB6//qw'‘8pÀD‰Z¥TÌóô:GÎäªSÅòù¤úÌZÑ𚊾ø­”œèõâD®t67+†ñeYE¶ Ùºr>W=Ÿ›¯È^W±Œ' +…+Ã9âŠË0è“Zà€)eaˆaœÔ›¦q‰õ’¨Ëÿåþ“«W‹×/£YW9Ü׿¸&¯QrGÈå‹r7/Èž…€Œ3rÏ{ʼn LÀ°|¹‚ñòÏÄ\ƒ²É˜`ü5ð*o}ªÔ»eö-êÌ^%þBèt¼£‘±L¡“$\ +>ÅøœŒ/Ä›Ò^QÏśӯ½û5z÷[,½{¼Sµj;çmð…íizŽ¶«nLí„ÇB*ЕÞbRºÓÓ÷ø+8zeºÕäYe®òJÉ×zȬëïKÿáþ¡Ê³Æ¬Mÿº)ª?ýw¦ëüõ½!ýС•gcúИØ$Sv«ÀfîBoÑXØšT¶¥'''U`»Ø‘þ³?û3Ø™î2­ðwñ×níõùkŸ~~À?Èà‡Ò·MîáZpDïÅIu8H}Ý‹3ä¾K†àµþ~{lHík_sðc•{d¹åFB?xWÐùGècwÕ§äø7ªOÇÓ×®UŒ!„¿ø‹¿P“é¯ýWUà” 3”¾sçCÂÆOž¯¬AÆš'k°'ìÀI;pÊ q@/æaìÐi%€“Ã3Àšru$ g—…Œ]÷ôãwTäÅã}Iè³á#Ë­ƒ‹}Ø~ä® ÏûèÌ·=z—-¿è@?z—Ðî$ÏÞ%ô%úò]ë†ô—¿ü5®A$Û{4ïø¶ñxû¼ãCyǨ™ˆ,–…ö íxsgüÁÅ™Çf™® “Ü™œ.‘b.úÊ域«ÕM‰ l†š®×&rPÒ<ýE÷:6P8A†›ãrŒg:WΗ +äg›0W.Ury0…õÐKFä>!†žÑrVªj“‚ž“*¬¸–ðPm§É²Eä`r­]£Ld‰)—Ï»X¬y­ðÆ'üÏ‹ë– +šfì‡ØS*Åa;EiHÿËyÚÒb¶ '™m õ‰ó®[™xBIQi'Ik£ÒÆâP +͇5ÙÏÍ©£GZÖ² ÍÑ;M‹í—¦Õv‹ÚZÛ´JQ;è$AÓ»&HŸ¦r" Ouåô•$`ƒ¨_æØw·Ð®¬åé i¬¿MÈ®ÇC~lâ}êó]ÆÕgkayß +ø-xE˜DvË^^¿å¯²áyêСß9~Hþ×JtùÐë•HÚDª^f&’™éÌÕ$O–¹ð@m¡w•ôÙCÕÐ?Vþ€AWVl³P[êñylõK¯Ô/ ¼2lP¿$ð*x Ô3Rã©q…T(€þ±úæQž½wÂðì½ †gï] °eôÛŸx²à3êˆ`DCç Zo%›AäßàW¢]AW6ûYIÉoo%-ÑŒˆn õ0håšÔ õ8ô¬ùn§ì·Ý[­ƒgÙ~EXÊr~¿c©&M–jžu²¬SwlWA4ƒÚ,ß'Zip„©„|‚nÔžþ›õ + u…üÍøo3þ»…ÜMÅh¤Ä$)ó›X"sÛÌÈŽØiößœN*qN¿ãí¤'ò’`Ì:+FöéO„¥Úû¨õ<•^î$E<û“®m¡]–÷k·¦Ð’Œ¿ÞO6ë&Æp§ãgFò´ŒcÜß´e·'k2Ѐ{U?t_C} õu_"5B~›¤ŸF'8û”žÔ~î¤ÁQÚÖœ%²³F(Ñ{{…àGÁvwàŽ3û,Á´"šx‚'üvE‰2ç3EÜcE¨;i¹°g÷öso$ò·4žd™Pæ¶ÆHÉ4&ê4x”…âÃV!«—Îû–¾tnT—Îû#ËæÄí^Æí²ÙÜ.èÛå=ØeÔöžÆ·KKÇb¡ýWzòæÖÄ#‹_/- sqD·Ê¤qE5­3!¯>”ûB¡^-NÔû?²vP³X_‘HebllÜ*®C]Þͪ¬qš på㶰‚Š±´giPØÕJ ÄÌHüb†¥b‚™\5‚3)v]¬kBNNmzE~X•kc ð…îÏüJÊÒ_Bèå¡<÷³2W‡T[ï˹X³z)aÐM„öô¯3t‹1Ð¥µÚ6—ÚX¯ #¶Pu¨¿;™ZÝd[¯‰ÌÑŽõ··áM]ÞÓqOî"ÅÖn +õà<‡¸²ŽÌ±@›µƒ¤ÔÁ•1êàï6é[®Êðë1y’§¨Ã=æ"g½ÙTt£o'ž½¡”´f +µ’ÍwÈh,`ÅÈÔªæ#˜[aÕèð‘btò{5D¯÷0q¸6Tr;–Ü,y-–ÜÎ êµý¿­ËnÔ0p6Év³Ýí¶ Á–mèZTÊ«ïò~S( ¥Põ\+õ„@*zEB‰+Ê¿àXñ|B¯\9#ŽØ3NÆNÖE6q6ž§?Æã±îƒÏ`Q¬üöSwøXS÷èg°ã1ûþWä 8Ö@°Fl<Ž?p ¯nlPß8Ç`ÝXm—ÈÕÓjZOj¯„9Äœ°D‘∫æ¿'ÅÀ¬*“tÈ)Äê÷ý5•tƒ|LŠß©ÐƒV0$&6Í ‹}Ùøû›‚œ.‡°MÜZa@¾W­t;˜¨1§ e ·“£€+Þµ­­-5Ä ðÖG&ø˜äh`g„¤]1¾çŒ/¸L*Z9Z;If‡¸âÌM¾¢™^±NX并¿¿Ÿ_€•˜}Âì1fš¶s™u삪t3†Ý¡5‰*†ä2; ®ž’ú¨zžÂú&°Ü·PiÐî’ï•dQS[x–N€8G·óÜܳÿ=µt4ÿýO%4# D88a‡’ìKroï+ ›–N¶Э/õ•ö¢V^‚G„<'B(×qŸÊuËõ$cÎÕ~ ªD~wwЯ¨sæBgˆôIÌàÖcÚÓó@ ¶…ÊöÿFƒ»Î‚f+P°ÅŸ÷Hàyø“½Yq¨|#zT)dÈZ±‚œ” ŽÀ&#0¿‹9ô-o_ë˜õ,m^œ5®:Záébi5ч‚ÑË(˜Ï@³ÀÝÎ;3–æ"Š/¹²0£Ö¹—6ÚzÌò*¡å6»Áå6wQíx=ÄHž^è1'‰|Ï*;åz£Ð guŽ¸m%žÎ>!…Ãpñóö Ö[„ÞT{ËôV`Ósïì½6…ú6õèõÓ£2t’úô¶ª¿ +ózjªaÎ?c3*Á[q“–#²kžÎš{=i¤&­Þ±ÕÙ™¿ €ÕÖ^µNòk˜¥J!¢Ðr¦ž«ªÔh|y3¼¥¼ÂÇÃÛ*Õ ï¬'Ñï=¼ËÌÞãä*'ïsò6'ïp}DgµõdUâ Ãçy@¸)ê…§éÖ¢žj–žæé¶@š ×úWRÃàC«žæ_òHZ[ÏD²É€î`¨‰’`3à  ©á/¢ÀÚlR+Ά¤²&² ËÓ/3*ÙöšH|ê¼ÙÆ ÛªÈ2"]!3P*U$&  ÒN¨b‘e $3Æ>"‘è¶ §'œÛ"KÄXú‡Œ’)(‰ùçDë‰È2 +¢k†2O (ÍÉÇ ë¦Èr ¤ðú±fFx¾HôøfÀ>g}G ‹uóêíÎë—o.ð^:ä–q,ÙI‹U,{rÂùSd9ïAMšµÉž­™²S;7%u_¨_úœ7«y|¶­Ýò’¾Ùqj¼T1Ž§ Ô:Éú =;I<.ø9_à”8sw2ŠX¡0¡éô±m=Ÿá#e™V +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="TextInput" class="mx.controls.TextInput" implementation="TextInput.swf" iconFile="TextInput.png" src="mx.controls.TextInput.asi" modified="1059523437"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="RectBorder"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.TextInput"/> +<class id="mx.controls.TextInput" > + <Event param1="change" /> + <Event param1="enter" /> + <TagName param1="TextInput" /> + <IconFile param1="TextInput.png" /> + <DataBindingInfo param1="editEvents" param2="&quot;focusIn;focusOut&quot;" /> + <method id="editable" returnType="Boolean"> + <Inspectable defaultValue="true" /> + </method> + <method id="maxChars" returnType="Number"> + <Inspectable defaultValue="null" verbose="1" category="Limits" /> + </method> + <method id="password" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="restrict" returnType="String"> + <Inspectable defaultValue="" verbose="1" category="Limits" /> + </method> + <method id="text" returnType="String"> + <Inspectable defaultValue="" /> + <Bindable /> + <ChangeEvent param1="focusOut" param2="enter" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.TextInput" src="mx.controls.TextInput.asi" modified="1164217983"> + <include id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.managers.SystemManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1164217986"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +</component> +</componentPackage> +M 1 1212170149ÿþÿBitmap 1ÿþÿ TextInput.png¥?@H¥?@Haÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hx†Ý”Á À EÙ¤.ÇvíÁ=¸tר7*¶$Øô@µ'I~¾šøI˜3˜ˆ~"òˆÂj-ÂH)uëÉagä|psíA®x9ØdðpbÜK.¬’µ„îÅ×Øñ¹u­~ÝÇ!Ž0¾pl_Z‡¸ÊÛWó ÷Fk±Þ3¯7¶=Ó¹‹jÎ_àôÐtÿþÿ TextInputиÿþÿ TextInputÿþÿ TextInput.swf‚ŽdE!ÿþÿBorderÿþÿBorderÿþÿ TextInput.swfèCP?ÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ TextInput.swfwÒÛ>ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ TextInput.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ TextInput.swf-[„@ÿþÿ FocusRectÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ TextInput.swf3cí>ÿþÿ BoundingBoxÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ TextInput.swf÷CP?ÿþÿBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ TextInput.swfì:?ÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ TextInput.swfÊ:?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ TextInput.swf ;?ÿþÿDefaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ TextInput.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boo +ýÿÿÿ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +! +" +# +$ +% +& +' +( +) +* ++ +, +- +. +/ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +: +; +< += +> +? +@ +A +B +C +D +E +F +G +H +I +J +K +L +M +N +O +P +Q +R +S +T +U +V +W +X +Y +Z +[ +\ +] +^ +_ +` +a +b +c +d +e +f +g +h +i +j +k +l +m +n +o +p +q +r +s +t +u +v +w +x +y +z +{ +| +} +~ + +€ +lean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ __Packages.mx.controls.TextInputÿþÿ __Packages.mx.controls.TextInputÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ TextInput.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ TextInput.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swf‚ŽdEÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ TextInput.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ TextInput.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ TextInput.swf‚ŽdEÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ TextInput.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ +RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +à.”hhhhhôôôÿÀÀÀÿx´ÿþÿlegacyLineSpacingÿþÿ0ÿþÿPropSheet::ActiveTabÿþÿ1085¢ÿþÿ!PublishGifProperties::PaletteNameÿþÿÿþÿ PublishRNWKProperties::speed256Kÿþÿ0ÿþÿVector::AS3 Package Pathsÿþÿÿþÿ"PublishHtmlProperties::StartPausedÿþÿ0ÿþÿ%PublishFormatProperties::htmlFileNameÿþÿmultipleUpload.htmlÿþÿ PublishQTProperties::LayerOptionÿþÿÿþÿ PublishQTProperties::AlphaOptionÿþÿÿþÿ"PublishQTProperties::MatchMovieDimÿþÿ1ÿþÿVector::UseNetworkÿþÿ0ÿþÿVector::Debugging Permittedÿþÿ0ÿþÿPublishProfileProperties::nameÿþÿDefaultÿþÿPublishHtmlProperties::Loopÿþÿ1ÿþÿPublishFormatProperties::jpegÿþÿ0ÿþÿVector::DocumentClassÿþÿÿþÿPublishQTProperties::Widthÿþÿ600ÿþÿ$PublishPNGProperties::OptimizeColorsÿþÿ1ÿþÿ&PublishRNWKProperties::speedSingleISDNÿþÿ0ÿþÿ&PublishRNWKProperties::singleRateAudioÿþÿ0ÿþÿVector::External Playerÿþÿÿþÿ%PublishHtmlProperties::showTagWarnMsgÿþÿ1ÿþÿPublishHtmlProperties::Unitsÿþÿ0ÿþÿ4PublishHtmlProperties::UsingDefaultAlternateFilenameÿþÿ1ÿþÿVector::ScriptStuckDelayÿþÿ15ÿþÿPublishGifProperties::Smoothÿþÿ1ÿþÿ%PublishRNWKProperties::mediaCopyrightÿþÿ(c) 2000ÿþÿ#PublishRNWKProperties::flashBitRateÿþÿ1200ÿþÿVector::Compress Movieÿþÿ1ÿþÿVector::Package Pathsÿþÿÿþÿ&PublishFormatProperties::flashFileNameÿþÿmultipleUpload.swfÿþÿ'PublishFormatProperties::gifDefaultNameÿþÿ1ÿþÿ%PublishFormatProperties::projectorMacÿþÿ0ÿþÿVector::AS3ExportFrameÿþÿ1ÿþÿVector::Invisible Layerÿþÿ1ÿþÿ"PublishGifProperties::DitherOptionÿþÿÿþÿ!PublishRNWKProperties::exportSMILÿþÿ1ÿþÿ PublishRNWKProperties::speed384Kÿþÿ0ÿþÿ"PublishRNWKProperties::exportAudioÿþÿ1ÿþÿVector::FireFoxÿþÿ0ÿþÿPublishHtmlProperties::Qualityÿþÿ4ÿþÿ(PublishHtmlProperties::VerticalAlignmentÿþÿ1ÿþÿ$PublishFormatProperties::pngFileNameÿþÿmultipleUpload.pngÿþÿPublishFormatProperties::htmlÿþÿ0ÿþÿ"PublishPNGProperties::FilterOptionÿþÿÿþÿ'PublishRNWKProperties::mediaDescriptionÿþÿÿþÿVector::Override Soundsÿþÿ0ÿþÿ!PublishHtmlProperties::DeviceFontÿþÿ0ÿþÿ-PublishFormatProperties::generatorDefaultNameÿþÿ1ÿþÿPublishQTProperties::Flattenÿþÿ1ÿþÿPublishPNGProperties::BitDepthÿþÿ24-bit with AlphaÿþÿPublishPNGProperties::Smoothÿþÿ1ÿþÿ"PublishGifProperties::DitherSolidsÿþÿ0ÿþÿPublishGifProperties::Interlaceÿþÿ0ÿþÿPublishJpegProperties::DPIÿþÿ4718592ÿþÿVector::Qualityÿþÿ80ÿþÿVector::Protectÿþÿ0ÿþÿ"PublishHtmlProperties::DisplayMenuÿþÿ1ÿþÿ*PublishHtmlProperties::HorizontalAlignmentÿþÿ1ÿþÿ2PublishHtmlProperties::VersionDetectionIfAvailableÿþÿ0ÿþÿVector::Templateÿþÿ0ÿþÿ*PublishFormatProperties::generatorFileNameÿþÿmultipleUpload.swtÿþÿ(PublishFormatProperties::rnwkDefaultNameÿþÿ1ÿþÿ(PublishFormatProperties::jpegDefaultNameÿþÿ1ÿþÿPublishFormatProperties::gifÿþÿ0ÿþÿVector::AS3Optimizeÿþÿ1ÿþÿPublishGifProperties::Loopÿþÿ1ÿþÿPublishGifProperties::Widthÿþÿ600ÿþÿ$PublishRNWKProperties::mediaKeywordsÿþÿÿþÿ!PublishRNWKProperties::mediaTitleÿþÿÿþÿPublishRNWKProperties::speed28Kÿþÿ1ÿþÿ#PublishFormatProperties::qtFileNameÿþÿmultipleUpload.movÿþÿ"PublishPNGProperties::DitherOptionÿþÿÿþÿ#PublishGifProperties::PaletteOptionÿþÿÿþÿ#PublishGifProperties::MatchMovieDimÿþÿ1ÿþÿ$PublishRNWKProperties::speedDualISDNÿþÿ0ÿþÿ$PublishRNWKProperties::realVideoRateÿþÿ100000ÿþÿPublishJpegProperties::Qualityÿþÿ80ÿþÿPublishFormatProperties::flashÿþÿ1ÿþÿ#PublishPNGProperties::PaletteOptionÿþÿÿþÿ#PublishPNGProperties::MatchMovieDimÿþÿ1ÿþÿ$PublishJpegProperties::MatchMovieDimÿþÿ1ÿþÿVector::Package Export Frameÿþÿ1ÿþÿ!PublishProfileProperties::versionÿþÿ1ÿþÿPublishHtmlProperties::Alignÿþÿ0ÿþÿ-PublishFormatProperties::projectorWinFileNameÿþÿmultipleUpload.exeÿþÿ'PublishFormatProperties::pngDefaultNameÿþÿ1ÿþÿ0PublishFormatProperties::projectorMacDefaultNameÿþÿ1ÿþÿVector::Export Swcÿþÿ0ÿþÿ#PublishQTProperties::PlayEveryFrameÿþÿ0ÿþÿ"PublishPNGProperties::DitherSolidsÿþÿ0ÿþÿ"PublishJpegProperties::Progressiveÿþÿ0ÿþÿVector::Debugging PasswordÿþÿÿþÿVector::Omit Trace Actionsÿþÿ0ÿþÿPublishHtmlProperties::Heightÿþÿ225ÿþÿPublishHtmlProperties::Widthÿþÿ600ÿþÿ%PublishFormatProperties::jpegFileNameÿþÿmultipleUpload.jpgÿþÿ)PublishFormatProperties::flashDefaultNameÿþÿ1ÿþÿVector::UseAS3Namespaceÿþÿ1ÿþÿVector::AS3Coachÿþÿ1ÿþÿVector::AS3AutoDeclareÿþÿ0ÿþÿPublishPNGProperties::Interlaceÿþÿ0ÿþÿPublishGifProperties::Heightÿþÿ225ÿþÿPublishJpegProperties::Sizeÿþÿ0ÿþÿVector::DeviceSoundÿþÿ0ÿþÿVector::TopDownÿþÿ0ÿþÿ'PublishHtmlProperties::TemplateFileNameÿþÿ{C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\HTML\Default.htmlÿþÿ!PublishHtmlProperties::WindowModeÿþÿ0ÿþÿ2PublishHtmlProperties::UsingDefaultContentFilenameÿþÿ1ÿþÿ-PublishFormatProperties::projectorMacFileNameÿþÿmultipleUpload.appÿþÿ(PublishFormatProperties::htmlDefaultNameÿþÿ1ÿþÿPublishFormatProperties::rnwkÿþÿ0ÿþÿPublishFormatProperties::pngÿþÿ0ÿþÿPublishQTProperties::Heightÿþÿ225ÿþÿ%PublishPNGProperties::RemoveGradientsÿþÿ0ÿþÿPublishGifProperties::MaxColorsÿþÿ255ÿþÿ'PublishGifProperties::TransparentOptionÿþÿÿþÿPublishGifProperties::LoopCountÿþÿÿþÿPublishRNWKProperties::speed56Kÿþÿ1ÿþÿVector::Reportÿþÿ0ÿþÿ+PublishHtmlProperties::OwnAlternateFilenameÿþÿÿþÿ(PublishHtmlProperties::AlternateFilenameÿþÿÿþÿ&PublishHtmlProperties::ContentFilenameÿþÿÿþÿ"PublishFormatProperties::generatorÿþÿ0ÿþÿVector::AS3Strictÿþÿ0ÿþÿ$PublishGifProperties::OptimizeColorsÿþÿ1ÿþÿ"PublishRNWKProperties::audioFormatÿþÿ0ÿþÿVector::Versionÿþÿ8ÿþÿVector::Event Formatÿþÿ0ÿþÿVector::Stream Compressÿþÿ7ÿþÿPublishFormatProperties::qtÿþÿ0ÿþÿPublishPNGProperties::Heightÿþÿ225ÿþÿPublishPNGProperties::Widthÿþÿ600ÿþÿ%PublishGifProperties::RemoveGradientsÿþÿ0ÿþÿ PublishRNWKProperties::speed512Kÿþÿ0ÿþÿPublishJpegProperties::Heightÿþÿ225ÿþÿVector::EventUse8kSampleRateÿþÿ0ÿþÿVector::StreamUse8kSampleRateÿþÿ0ÿþÿVector::ActionScriptVersionÿþÿ2ÿþÿVector::Event Compressÿþÿ7ÿþÿPublishHtmlProperties::Scaleÿþÿ0ÿþÿ0PublishFormatProperties::projectorWinDefaultNameÿþÿ1ÿþÿPublishQTProperties::Loopingÿþÿ0ÿþÿ*PublishQTProperties::UseQTSoundCompressionÿþÿ0ÿþÿ!PublishPNGProperties::PaletteNameÿþÿÿþÿ!PublishPNGProperties::Transparentÿþÿ0ÿþÿ&PublishGifProperties::TransparentAlphaÿþÿ128ÿþÿPublishGifProperties::Animatedÿþÿ0ÿþÿ"PublishRNWKProperties::mediaAuthorÿþÿÿþÿ(PublishRNWKProperties::speedCorporateLANÿþÿ0ÿþÿ&PublishRNWKProperties::showBitrateDlogÿþÿ1ÿþÿ"PublishRNWKProperties::exportFlashÿþÿ1ÿþÿPublishJpegProperties::Widthÿþÿ600ÿþÿVector::Stream Formatÿþÿ0ÿþÿ"PublishHtmlProperties::VersionInfoÿþÿÿþÿ$PublishFormatProperties::gifFileNameÿþÿmultipleUpload.gifÿþÿ&PublishFormatProperties::qtDefaultNameÿþÿ1ÿþÿ"PublishQTProperties::PausedAtStartÿþÿ0ÿþÿ%PublishQTProperties::ControllerOptionÿþÿ0ÿþÿPublishPNGProperties::MaxColorsÿþÿ255ÿþÿ,PublishHtmlProperties::UsingOwnAlternateFileÿþÿ0ÿþÿ%PublishFormatProperties::rnwkFileNameÿþÿmultipleUpload.smilÿþÿ%PublishFormatProperties::projectorWinÿþÿ0ÿþÿ%PublishFormatProperties::defaultNamesÿþÿ1ÿÿÿÿÿþÿÿþÿüÿÿ CColorDefÿ €ÿ €ÿ €ÿ €3ÿPï €fÿPï0 €™ÿPïH €ÌÿPï` €ÿÿPïx €3ÿï €33ÿ(ï €3fÿ<ï0 €3™ÿCïH €3ÌÿFï` €3ÿÿHïx €fÿï0 €f3ÿï0 €ffÿ(ï0 €f™ÿ5ïH €fÌÿ<ï` €fÿÿ@ïx €ÿ €333ÿ0 €ÿ €3ÿ ï €33ÿxï €f3ÿdï0 €™3ÿ]ïH €Ì3ÿZï` €ÿ3ÿXïx €33ÿÈï €333ÿ0 €3f3ÿPPH €3™3ÿPx` €3Ì3ÿPx €3ÿ3ÿPï €f3ÿÜï0 €f33ÿPH €ff3ÿ(PH €f™3ÿ<x` €fÌ3ÿCx €fÿ3ÿFï €ÿ €fffÿ` €ÿ €fÿ ï0 €3fÿŒï0 €ffÿxï0 €™fÿkïH €Ìfÿdï` €ÿfÿ`ïx €3fÿ´ï0 €33fÿ PH €3ffÿxPH €3™fÿdx` €3Ìfÿ]x €3ÿfÿZï €ffÿÈï0 €f3fÿÈPH €fffÿ` €f™fÿP0x €fÌfÿPx €fÿfÿPï¨ €ÿ €™™™ÿ €ÿ €™ÿ ïH €3™ÿ“ïH €f™ÿ…ïH €™™ÿxïH €Ì™ÿnï` €ÿ™ÿhïx €3™ÿ­ïH €33™ÿ x` €3f™ÿŒx` €3™™ÿxx` €3Ì™ÿkx €3ÿ™ÿdï €f™ÿ»ïH €f3™ÿ´x` €ff™ÿ 0x €f™™ÿx0x €fÌ™ÿdx €fÿ™ÿ]ï¨ €ÿ €ÌÌÌÿÀ €ÿ €Ìÿ ï` €3Ìÿ–ï` €fÌÿŒï` €™Ìÿ‚ï` €ÌÌÿxï` €ÿÌÿpïx €3Ìÿªï` €33Ìÿ x €3fÌÿ“x €3™Ìÿ…x €3ÌÌÿxx €3ÿÌÿnï €fÌÿ´ï` €f3Ìÿ­x €ffÌÿ x €f™ÌÿŒx €fÌÌÿxx €fÿÌÿkï¨ €ÿ €ÿÿÿÿð €ÿ €ÿÿ ïx €3ÿÿ˜ïx €fÿÿïx €™ÿÿˆïx €Ìÿÿ€ïx €ÿÿÿxïx €3ÿÿ¨ïx €33ÿÿ ï €3fÿÿ–ï €3™ÿÿŒï €3Ìÿÿ‚ï €3ÿÿÿxï €fÿÿ°ïx €f3ÿÿªï €ffÿÿ ï¨ €f™ÿÿ“ï¨ €fÌÿÿ…ï¨ €fÿÿÿxï¨ €ÿ €ÿÿïx €ÿ €™ÿïH €™3ÿ ïH €™fÿïH €™™ÿ(ïH €™Ìÿ2ï` €™ÿÿ8ïx €Ìÿï` €Ì3ÿ +ï` €Ìfÿï` €Ì™ÿï` €ÌÌÿ(ï` €Ìÿÿ0ïx €ÿÿïx €ÿ3ÿïx €ÿfÿïx €ÿ™ÿïx €ÿÌÿ ïx €ÿÿÿ(ïx €ÿ €ÿÿPïx €ÿ €™3ÿãïH €™33ÿx` €™f3ÿx` €™™3ÿ(x` €™Ì3ÿ5x €™ÿ3ÿ<ï €Ì3ÿæï` €Ì33ÿx €Ìf3ÿ x €Ì™3ÿx €ÌÌ3ÿ(x €Ìÿ3ÿ2ï €ÿ3ÿèïx €ÿ33ÿï €ÿf3ÿ +public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ __Packages.mx.controls.TextInputÿþÿ __Packages.mx.controls.TextInputÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +ÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ!__Packages.mx.controls.VScrollBarÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.VScrollBarÿþÿÿ~import mx.controls.scrollClasses.ScrollBar; + +[IconFile("VScrollBar.png")] +intrinsic class mx.controls.VScrollBar extends mx.controls.scrollClasses.ScrollBar +{ + public function VScrollBar(); + [Bindable] [ChangeEvent("scroll")] public var _inherited_scrollPosition:Number; + public var className:String; + public function init(Void):Void; + public function isScrollBarKey(k:Number):Boolean; + public var maxMode:String; + public var minMode:String; + public var minusMode:String; + public var plusMode:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&mx.controls.gridclasses.DataGridColumnÿþÿÿÚimport mx.styles.CSSStyleDeclaration; + +intrinsic class mx.controls.gridclasses.DataGridColumn extends mx.styles.CSSStyleDeclaration +{ + public function DataGridColumn(colName:String); + public var __cellRenderer; + public function __getTextFormat(tf:TextFormat, bAll:Boolean, fieldInst):Boolean; + public var __header:String; + public var __headerRenderer; + public var __labelFunction:Function; + public var __width:Number; + function set cellRenderer(cR); + function get cellRenderer():String; + public var colNum:Number; + public var columnName:String; + public var editable:Boolean; + public function getStyle(prop:String); + public var headerCell:Object; + function set headerRenderer(hS); + function get headerRenderer():String; + public var headerStyle:mx.styles.CSSStyleDeclaration; + function set headerText(h:String); + function get headerText(); + function set labelFunction(f:Function); + function get labelFunction():Function; + public var parentGrid:mx.controls.DataGrid; + public var resizable:Boolean; + public var sortOnHeaderRelease:Boolean; + public var sortable:Boolean; + public var styleName; + function get width():Number; + function set width(w:Number); +}; +ÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ.__Packages.mx.controls.gridclasses.DataGridRowÿþÿ DataGrid.swfk=àBÿþÿ1__Packages.mx.controls.gridclasses.DataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#mx.controls.gridclasses.DataGridRowÿþÿÿ¦import mx.controls.listclasses.SelectableRow; +import mx.controls.gridclasses.DataGridColumn; + +intrinsic class mx.controls.gridclasses.DataGridRow extends mx.controls.listclasses.SelectableRow +{ + public function DataGridRow(); + public function bGOnPress(Void):Void; + public function cellGetPreferredHeight(); + public var cells:Array; + public function clearCells(); + public var colBG:MovieClip; + public var columnIndex:Number; + public function createCells(Void):Void; + public function createChildren(Void):Void; + public function drawCell(cellNum, xPos, w, bgCol); + public function getCellIndex(Void):Object; + public function getDataLabel():String; + public function init(Void):Void; + public var listOwner:Object; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var owner:Object; + public function setState(newState:String, transition:Boolean):Void; + public function setValue(itmObj, state, transition); + public function size(Void):Void; + public function startEditCell(); + public var text:String; + public var textHeight:Number; + public var wasPressed:Boolean; +}; +ÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swf\tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$mx.controls.listclasses.DataProviderÿþÿÿuimport mx.events.EventDispatcher; + +intrinsic class mx.controls.listclasses.DataProvider extends Object +{ + public function DataProvider(obj); + static function Initialize(obj:Object):Boolean; + public var addEventListener:Function; + public function addItem(value):Void; + public function addItemAt(index:Number, value):Void; + public function addItemsAt(index:Number, newItems:Array):Void; + public var dispatchEvent:Function; + public function editField(index:Number, fieldName:String, newData):Void; + static var evtDipatcher; + public function getEditingData(index:Number, fieldName:String); + public function getItemAt(index:Number); + public function getItemID(index:Number):Number; + public var length:Number; + static var mixinProps:Array; + static var mixins:mx.controls.listclasses.DataProvider; + public function removeAll(Void):Void; + public function removeItemAt(index:Number); + public function removeItemsAt(index:Number, len:Number):Void; + public function replaceItemAt(index:Number, itemObj):Void; + public var reverse:Function; + public var slice:Function; + public var sort:Function; + public function sortItems(compareFunc, optionFlags):Void; + public function sortItemsBy(fieldName, order):Void; + public var sortOn:Function; + public var splice:Function; + public function updateViews(event, first, last):Void; +}; +ÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swf\tÕBÿþÿ$mx.controls.listclasses.DataSelectorÿþÿÿß +intrinsic class mx.controls.listclasses.DataSelector extends Object +{ + static function Initialize(obj):Boolean; + public var __dataProvider:Object; + public var __rowCount:Number; + public var __vPosition:Number; + public var __width:Number; + public var _getTextFormat:Function; + public function addItem(label, data):Void; + public function addItemAt(index:Number, label, data):Void; + public function clearSelected(transition:Boolean):Void; + public var createLabel:Function; + public function createProp(obj:Object, propName:String, setter:Boolean):Void; + public var enabled:Boolean; + public function getDataProvider(Void):Object; + public function getItemAt(index:Number):Object; + public function getLength(Void):Number; + public function getSelectedIndex(Void):Number; + public function getSelectedIndices(Void):Array; + public function getSelectedItem(Void):Object; + public function getSelectedItems(Void):Array; + public function getValue(Void):Object; + public var invUpdateControl:Boolean; + public var invalidate:Function; + public var isDragScrolling:Boolean; + public function isSelected(index):Boolean; + public var labelField:String; + public var labelFunction:Function; + public var lastSelID:Number; + public var lastSelected; + static var mixinProps:Array; + static var mixins:mx.controls.listclasses.DataSelector; + public function modelChanged(eventObj:Object); + public var multipleSelection:Boolean; + public function removeAll(Void):Void; + public function removeItemAt(index:Number):Object; + public function replaceItemAt(index:Number, newLabel, newData):Void; + public var rows:Object; + public function selectItem(index:Number, selectedFlag:Boolean):Void; + public var selected:Object; + public var selectionDeleted:Boolean; + public function setDataProvider(dP:Object):Void; + public function setSelectedIndex(index:Number):Void; + public function setSelectedIndices(indexArray:Array):Void; + public var setVPosition:Function; + public function sortItems(compareFunc, order):Void; + public function sortItemsBy(fieldName, order):Void; + public var tempLabel:Object; + public var updateControl:Function; + public var vPosition:Number; +}; +ÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ3__Packages.mx.controls.listclasses.ScrollSelectListÿþÿ DataGrid.swf\tÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ/__Packages.mx.controls.listclasses.DataSelectorÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ/__Packages.mx.controls.listclasses.DataProviderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(mx.controls.listclasses.ScrollSelectListÿþÿÿÞimport mx.core.ScrollView; +import mx.controls.listclasses.DataSelector; +import mx.controls.listclasses.DataProvider; + +[Event("change")] +[Event("itemRollOver")] +[Event("itemRollOut")] +intrinsic class mx.controls.listclasses.ScrollSelectList extends mx.core.ScrollView +{ + public var CONTENTDEPTH:Number; + public function ScrollSelectList(); + public var __cellRenderer; + public var __dataProvider:Object; + public var __hPosition:Number; + public var __iconField:String; + public var __iconFunction:Function; + public var __labelField:String; + public var __labelFunction:Function; + public function __onMouseUp(Void):Void; + public var __rowCount:Number; + public var __rowHeight:Number; + public var __rowRenderer:String; + public var __width:Number; + public var addItem:Function; + public var addItemAt:Function; + public var baseRowZ:Number; + public var calcPreferredWidth:Function; + function set cellRenderer(cR); + function get cellRenderer(); + public var changeFlag:Boolean; + public var className:String; + public var clearSelected:Function; + public function createChildren(Void):Void; + public var createLabel:Function; + public var dataProvider:Object; + public var dragEnabled:Boolean; + public function dragScroll(Void):Void; + public var dragScrolling; + public function draw(Void):Void; + public var dropEnabled:Boolean; + public var enabled:Boolean; + public function findInputText(Void):Boolean; + public function findString(str:String):Void; + public var getDataProvider:Function; + public var getItemAt:Function; + public var getLength:Function; + public function getPropertiesAt(index:Number):Object; + public function getPropertiesOf(obj:Object):Object; + public function getRowCount(Void):Number; + public function getRowHeight(Void):Number; + public var getSelectedIndex:Function; + public var getSelectedIndices:Function; + public var getSelectedItem:Function; + public var getSelectedItems:Function; + public function getStateAt(index:Number):String; + public function getStyle(styleProp:String); + public var getValue:Function; + function set iconField(field):Void; + function get iconField():String; + function set iconFunction(func):Void; + function get iconFunction():Function; + public function init(Void):Void; + public var invLayoutContent:Boolean; + public var invRowHeight:Boolean; + public var invUpdateControl:Boolean; + public function invalidateStyle(propName:String):Void; + public var isPressed:Boolean; + public var isRowStyle:Object; + public var isSelected:Function; + public function keyDown(e:Object):Void; + function set labelField(field):Void; + function get labelField():String; + function set labelFunction(func):Void; + function get labelFunction():Function; + public var lastPosition:Number; + public var lastSelID:Number; + public var lastSelected:Number; + public function layoutContent(x:Number, y:Number, w:Number, h:Number):Void; + public var layoutX:Number; + public var layoutY:Number; + public var length:Number; + public var listContent:MovieClip; + public var minScrollInterval; + static var mixIt1:Boolean; + static var mixIt2:Boolean; + public var modelChanged:Function; + public function moveSelBy(incr:Number):Void; + [Inspectable(defaultValue=false)] public var multipleSelection:Boolean; + public var onMouseUp:Function; + public function onRowDragOut(rowIndex:Number):Void; + public function onRowDragOver(rowIndex:Number):Void; + public function onRowPress(rowIndex:Number):Void; + public function onRowRelease(rowIndex:Number):Void; + public function onRowRollOut(rowIndex:Number):Void; + public function onRowRollOver(rowIndex:Number):Void; + public var propertyTable:Object; + public var removeAll:Function; + public var removeItemAt:Function; + public var replaceItemAt:Function; + public var roundUp; + function get rowCount():Number; + function set rowCount(w):Void; + [Inspectable(defaultValue=20)] function get rowHeight():Number; + function set rowHeight(w):Void; + public var rows:Array; + public var scrollInterval:Number; + public var selectHolder:Number; + public var selectItem:Function; + public function selectRow(rowIndex:Number, transition:Boolean, allowChangeEvent:Boolean):Void; + public var selectable:Boolean; + public var selected:Object; + public var selectedIndex:Number; + public var selectedIndices:Array; + public var selectedItem; + public var selectedItems:Array; + public var selectionDeleted:Boolean; + public function setCellRenderer(cR):Void; + public var setDataProvider:Function; + public function setEnabled(v:Boolean):Void; + public function setIconField(field:String):Void; + public function setIconFunction(func:Function):Void; + public function setLabelField(field:String):Void; + public function setLabelFunction(func:Function):Void; + public function setPropertiesAt(index:Number, obj:Object):Void; + public function setRowCount(v:Number):Void; + public function setRowHeight(v:Number):Void; + public var setSelectedIndex:Function; + public var setSelectedIndices:Function; + public function setVPosition(pos:Number):Void; + public var sortItems:Function; + public var sortItemsBy:Function; + public var tH:Number; + public var tW:Number; + public var tempLabel:Object; + public var topRowZ:Number; + public function updateControl(Void):Void; + public var value:Object; + public var wasKeySelected:Boolean; +}; +ÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ0__Packages.mx.controls.listclasses.SelectableRowÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ%mx.controls.listclasses.SelectableRowÿþÿÿvimport mx.effects.Tween; +import mx.core.UIComponent; + +intrinsic class mx.controls.listclasses.SelectableRow extends mx.core.UIComponent +{ + static var LOWEST_DEPTH:Number; + public function SelectableRow(); + public var bGCol:Object; + public function bGOnDragOut(Void):Void; + public function bGOnDragOver(Void):Void; + public function bGOnPress(Void):Void; + public function bGOnRelease(Void):Void; + public function bGOnRollOut(Void):Void; + public function bGOnRollOver(Void):Void; + public var bGTween:Object; + public var backGround:MovieClip; + public var cell:Object; + public var clr:Number; + public function createChildren(Void):Void; + public var disabledColor:Number; + public function drawRow(itmObj:Object, state:String, transition:Boolean):Void; + public function drawRowFill(mc:MovieClip, newClr:Number):Void; + public function getCellIndex(Void):Object; + public function getDataLabel():String; + public function getNormalColor(Void):Number; + public var grandOwner:Object; + public var highlight:MovieClip; + public var highlightColor:Number; + public var icon_mc:MovieClip; + public function i ýÿÿÿ      +                   ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~  € nit(Void):Void; + public function invalidateStyle(propName:String):Void; + public var isChangedToSelected:Boolean; + public var item:Object; + public function itemToString(itmObj:Object):String; + public var listOwner:Object; + public var normalColor:Number; + public function onTweenEnd(val:Number):Void; + public function onTweenUpdate(val:Number):Void; + public var owner:Object; + public var rowIndex:Number; + public function setCellRenderer(forceSizing:Boolean):Void; + public function setState(newState:String, transition:Boolean):Void; + public function setValue(itmObj:Object, state:String):Void; + public function setupBG(Void):Void; + public function size(Void):Void; + public var state:String; +}; +ÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swf\tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#mx.controls.scrollClasses.ScrollBarÿþÿÿŸ import mx.controls.scrollClasses.ScrollThumb; +import mx.core.UIObject; +import mx.skins.SkinElement; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.controls.scrollClasses.ScrollBar extends mx.core.UIComponent +{ + public function ScrollBar(); + public var _scrollPosition:Number; + public var boundingBox_mc:MovieClip; + public var className:String; + public var clipParameters:Object; + public function createButton(linkageName:String, id:String, skinID:Number, o:Object):Object; + public function createChildren(Void):Void; + public function createThumb(Void):Void; + public function dispatchScrollChangedEvent(Void):Void; + public function dispatchScrollEvent(detail:String):Void; + public var downArrowDownName:String; + public var downArrowName:String; + public var downArrowOverName:String; + public var downArrowUpName:String; + public var downArrow_mc:mx.controls.SimpleButton; + public function draw(Void):Void; + public var idNames:Array; + public function init(Void):Void; + public var initializing:Boolean; + public function isScrollBarKey(k:Number):Boolean; + public var isScrolling:Boolean; + public var largeScroll:Number; + function set lineScrollSize(sScroll:Number); + function get lineScrollSize():Number; + public var maxMode:String; + public var maxPos:Number; + static var mergedClipParameters:Boolean; + public var minMode:String; + public var minPos:Number; + public var minusMode:String; + public function onDownArrow(Void):Void; + public function onScrollChanged(Void):Void; + public function onUpArrow(Void):Void; + function get pageScrollSize():Number; + function set pageScrollSize(lScroll:Number); + public var pageSize:Number; + public var plusMode:String; + public function releaseScrolling(Void):Void; + public var scrollHandler:Function; + public function scrollInterval(inc:String, mode:Number):Void; + public function scrollIt(inc:String, mode:Number):Void; + function get scrollPosition():Number; + function set scrollPosition(pos:Number); + public var scrollThumb_mc:mx.controls.scrollClasses.ScrollThumb; + public var scrollTrackDownName:String; + public var scrollTrackName:String; + public var scrollTrackOverName:String; + public var scrollTrack_mc:mx.skins.SkinElement; + public var scrolling; + public function setEnabled(enabledFlag:Boolean):Void; + public function setScrollProperties(pSize:Number, mnPos:Number, mxPos:Number, ls:Number):Void; + public function size(Void):Void; + static var skinIDDownArrow:Number; + static var skinIDThumb:Number; + static var skinIDTrack:Number; + static var skinIDTrackDown:Number; + static var skinIDTrackOver:Number; + static var skinIDUpArrow:Number; + public var smallScroll:Number; + public function startTrackScroller(Void):Void; + public function stopScrolling(Void):Void; + static var symbolOwner:Object; + public var thumbBottomName:String; + public var thumbGripName:String; + public var thumbMiddleName:String; + public var thumbTopName:String; + public function trackOut(Void):Void; + public function trackOver(Void):Void; + public function trackScroller(Void):Void; + public var upArrowDownName:String; + public var upArrowName:String; + public var upArrowOverName:String; + public var upArrowUpName:String; + public var upArrow_mc:mx.controls.SimpleButton; + function get virtualHeight():Number; +}; +ÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ0__Packages.mx.controls.scrollClasses.ScrollThumbÿþÿ DataGrid.swf]tÕBÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ%mx.controls.scrollClasses.ScrollThumbÿþÿÿËimport mx.skins.CustomBorder; + +intrinsic class mx.controls.scrollClasses.ScrollThumb extends mx.skins.CustomBorder +{ + public function ScrollThumb(); + public var btnOffset:Number; + public var className:String; + public function createChildren(Void):Void; + public var datamax:Number; + public var datamin:Number; + public function dragThumb(Void):Void; + public function draw(); + public var gripSkin:String; + public var grip_mc:MovieClip; + public var horizontal; + public var idNames; + public var lastY:Number; + public function onPress(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public var scrollMove:Number; + public function setRange(_ymin:Number, _ymax:Number, _datamin:Number, _datamax:Number):Void; + public function size(); + public function stopDragThumb(Void):Void; + static var symbolOwner; + public var ymax:Number; + public var ymin:Number; +}; +ÿþÿ"__Packages.mx.core.ExternalContentÿþÿ"__Packages.mx.core.ExternalContentÿþÿ DataGrid.swfŸÃÜBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ExternalContentÿþÿÿÊimport mx.core.UIObject; +import mx.core.View; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ExternalContent +{ + static var ViewDependency; + public function checkLoadProgress():Void; + public var childLoaded:Function; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function contentLoaded():Void; + public function convertToUIObject(obj:MovieClip):Void; + public var createObject:Function; + public var dispatchEvent:Function; + public var doLater:Function; + static function enableExternalContent():Void; + public function loadExternal(url:String, placeholderClassName:String, instanceName:String, depth:Number, initProps:Object):MovieClip; + public var loadList:Object; + public var loadedList:Object; + public var numChildren:Number; + public var prepList:Object; + public function prepareToLoadMovie(obj:MovieClip):Void; + public function waitForUnload():Void; +}; +ÿþÿ__Packages.mx.core.ScrollViewÿþÿ__Packages.mx.core.ScrollViewÿþÿ DataGrid.swf_tÕBÿþÿ.__Packages.mx.controls.scrollClasses.ScrollBarÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ScrollViewÿþÿÿ— import mx.core.View; +import mx.controls.scrollClasses.ScrollBar; + +[Event("scroll")] +intrinsic class mx.core.ScrollView extends mx.core.View +{ + public var MASK_DEPTH:Number; + public function ScrollView(); + public var __hPosition:Number; + public var __hScrollPolicy:String; + public var __maxHPosition:Number; + public function __onMouseWheel(delta:Number, scrollTarget:MovieClip):Void; + public var __vPosition:Number; + public var __vScrollPolicy:String; + public var __viewMetrics:Object; + public function childLoaded(obj:MovieClip):Void; + public var className:String; + public var columnWidth:Number; + public function createChild(id, name:String, props:Object):MovieClip; + public function createChildren(Void):Void; + public function doLayout(Void):Void; + public function draw(Void):Void; + public function getHPosition(Void):Number; + public function getHScrollPolicy(Void); + public function getMaxHPosition(Void):Number; + public function getVPosition(Void):Number; + public function getVScrollPolicy(Void); + public function getViewMetrics(Void):Object; + function get hPosition():Number; + function set hPosition(pos:Number); + function get hScrollPolicy():String; + function set hScrollPolicy(policy:String); + public var hScroller:mx.controls.scrollClasses.ScrollBar; + public var heightPadding:Number; + public function init(Void):Void; + public var invLayout:Boolean; + public function invalidate(Void):Void; + public var mask_mc:MovieClip; + function get maxHPosition():Number; + function set maxHPosition(pos:Number); + function get maxVPosition():Number; + public var numberOfCols:Number; + public var oldRndUp:Number; + public function onScroll(docObj:Object):Void; + public var owner:MovieClip; + public var propsInited:Boolean; + public var rowC:Number; + public var rowH:Number; + public var scrollAreaChanged:Boolean; + public function scrollProxy(docObj:Object):Void; + public function setEnabled(v:Boolean):Void; + public function setHPosition(pos:Number):Void; + public function setHScrollPolicy(policy):Void; + public function setMaxHPosition(pos:Number):Void; + public function setScrollProperties(colCount:Number, colWidth:Number, rwCount:Number, rwHeight:Number, hPadding:Number, wPadding:Number):Void; + public function setVPosition(pos:Number):Void; + public function setVScrollPolicy(policy):Void; + public function size(Void):Void; + public var specialHScrollCase:Boolean; + static var symbolName:String; + static var symbolOwner:Object; + function get vPosition():Number; + function set vPosition(pos:Number); + function get vScrollPolicy():String; + function set vScrollPolicy(policy:Object); + public var vScroller:mx.controls.scrollClasses.ScrollBar; + static var version:String; + public var viewableColumns:Number; + public var viewableRows:Number; + public var widthPadding:Number; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swf_tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ__Packages.mx.core.Viewÿþÿ__Packages.mx.core.Viewÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.core.ExternalContentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ mx.core.Viewÿþÿÿ±import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.managers.DepthManager; +import mx.events.UIEventDispatcher; +import mx.core.UIComponent; + +intrinsic class mx.core.View extends mx.core.UIComponent +{ + public function View(); + public var __tabIndex:Number; + private var _loadExternalClass:String; + public function addLayoutObject(object:Object):Void; + public var border_mc:mx.skins.RectBorder; + public var boundingBox_mc:MovieClip; + public function childLoaded(obj:MovieClip):Void; + static var childNameBase:String; + public var className:String; + public function convertToUIObject(obj:MovieClip):Void; + public function createChild(className, instanceName:String, initProps:Object):MovieClip; + public function createChildren():Void; + public var createClassChildAtDepth:Function; + public var depth:Number; + public function destroyChildAt(childIndex:Number):Void; + public function doLayout():Void; + public function draw():Void; + static function extension(); + public function getChildAt(childIndex:Number):mx.core.UIObject; + private var hasBeenLayedOut:Boolean; + public function init():Void; + public function initLayout():Void; + public var loadExternal:Function; + function get numChildren():Number; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + static var version:String; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ DataGrid.swf_tÕBÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swf_tÕBÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ__Packages.mx.effects.Tweenÿþÿ__Packages.mx.effects.Tweenÿþÿ DataGrid.swf`tÕBÿþÿmx.effects.Tweenÿþÿÿz +intrinsic class mx.effects.Tween extends Object +{ + static var ActiveTweens:Array; + static function AddTween(tween:mx.effects.Tween):Void; + static function DispatchTweens(Void):Void; + static var Dispatcher:Object; + public var ID:Number; + static var Interval:Number; + static var IntervalToken:Number; + static function RemoveTweenAt(index:Number):Void; + public function Tween(listenerObj, init, end, dur); + public var arrayMode:Boolean; + public function doInterval(); + public var duration:Number; + public function easingEquation(t, b, c, d); + public var endFunc:Function; + public function endTween(); + public var endVal; + public function getCurVal(curTime); + public var initVal; + public var listener:Object; + public function setTweenHandlers(update, end); + public var startTime:Number; + public var updateFunc:Function; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swf]>ÛBÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ DataGrid.swf`tÕBÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ DataGrid.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouse‚ ýÿÿÿƒ „ … † ‡ ˆ ‰ Š ‹ Œ Ž ‘ ’ “ ” • – — ˜ ™ š › œ ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ Down; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ DataGrid.swf`tÕBÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ __Packages.mx.skins.CustomBorderÿþÿ __Packages.mx.skins.CustomBorderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.CustomBorderÿþÿÿ™import mx.skins.Border; +import mx.skins.SkinElement; + +intrinsic class mx.skins.CustomBorder extends mx.skins.Border +{ + public function CustomBorder(); + public var className:String; + public function createChildren(Void):Void; + public function draw(Void):Void; + function get height():Number; + public var horizontal:Boolean; + public var idNames; + public function init(Void):Void; + public var l_mc:MovieClip; + public var leftSkin:String; + public var m_mc:MovieClip; + public var middleSkin:String; + public var minHeight:Number; + public var minWidth:Number; + public var r_mc:MovieClip; + public var rightSkin:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var tagL:Number; + static var tagM:Number; + static var tagR:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.Borderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfatÕBÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ#__Packages.mx.skins.halo.ButtonSkinÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.ButtonSkinÿþÿÿimport mx.skins.RectBorder; +import mx.core.ext.UIObjectExtensions; +import mx.skins.SkinElement; + +intrinsic class mx.skins.halo.ButtonSkin extends mx.skins.RectBorder +{ + public function ButtonSkin(); + static var UIObjectExtensionsDependency; + public var backgroundColorName; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var className; + public function drawHaloRect(w:Number, h:Number):Void; + public var drawRoundRect:Function; + public function init():Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swf`tÕBÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ DataGrid.swf`tÕBÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ DataGrid.swf`tÕBÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ DataGrid.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ DataGrid.swfatÕBÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ DataGrid.swfatÕBÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ DataGrid.swfatÕBÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ cursorStretchÿþÿ cursorStretchÿþÿ DataGrid.swf©?ÿþÿÿþÿÿþÿ BoundingBoxÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataGridAssetsÿþÿ DataGrid.swfÿþÿÿþÿÿþÿDataGridColumnÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ DataGridRowÿþÿ DataGrid.swfÿþÿÿþÿÿþÿListÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ TextInputÿþÿ DataGrid.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.DataGridÿþÿ DataGrid.swfÿþÿÿþÿÿþÿmx.controls.DataGridÿþÿÿ~import mx.controls.gridclasses.DataGridRow; +import mx.controls.List; +import mx.effects.Tween; +import mx.controls.gridclasses.DataGridColumn; + +[RequiresDataBinding(true)] +[IconFile("DataGrid.png")] +[InspectableList("multipleSelection","editable", "rowHeight")] +[DataBindingInfo("acceptedTypes","{dataProvider: &quot;String&quot;}")] +[Event("cellPress")] +[Event("cellEdit")] +[Event("cellFocusIn")] +[Event("cellFocusOut")] +[Event("columnStretch")] +[Event("headerRelease")] +intrinsic class mx.controls.DataGrid extends mx.controls.List +{ + public var DISABLEDHEADERDEPTH:Number; + public function DataGrid(); + public var EDITORDEPTH:Number; + public var HEADERCELLDEPTH:Number; + public var HEADERDEPTH:Number; + public var HEADEROVERLAYDEPTH:Number; + public var LINEDEPTH:Number; + public var SEPARATORDEPTH:Number; + public var SORTARROWDEPTH:Number; + public var STRETCHERDEPTH:Number; + public var __focusedCell:Object; + public var __headerHeight:Number; + public var __rowRenderer:String; + public var __showHeaders:Boolean; + public var __tabHandlerCache:Function; + [Bindable(param1="writeonly",type="DataProvider")] public var _inherited_dataProvider:Array; + [Bindable] [ChangeEvent("change")] public var _inherited_selectedIndex:Number; + [Bindable("readonly")] [ChangeEvent("change")] public var _inherited_selectedItem:Object; + public var activeGrid:Object; + public function addColumn(newCol):mx.controls.gridclasses.DataGridColumn; + public function addColumnAt(index:Number, newCol):mx.controls.gridclasses.DataGridColumn; + public var asc:Boolean; + public var autoHScrollAble:Boolean; + public var cell:Object; + public var cellEditor:MovieClip; + public var className:String; + public var col:Object; + public var colX:Number; + public var column:mx.controls.gridclasses.DataGridColumn; + function get columnCount():Number; + function get columnNames():Array; + function set columnNames(w:Array); + public var columns:Array; + public function configureScrolling(Void):Void; + public function disposeEditor(Void):Void; + public var dontEdit:Boolean; + public function draw(); + public function drawColumns(Void):Void; + public function drawHeaderBG(Void):Void; + public function editCell(); + public function editField(index:Number, colName:String, data):Void; + public var editTween:mx.effects.Tween; + [Inspectable(defaultValue=false)] public var editable:Boolean; + public function editorKeyDown(Void):Void; + public var editorMask:MovieClip; + public function enableHeader(v:Boolean):Void; + public function findNextCell(index:Number, colIndex:Number):Void; + public function findNextEnterCell(Void):Void; + function set focusedCell(obj:Object); + function get focusedCell():Object; + public function generateCols(Void):Void; + public function getColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public function getColumnIndex(name:String):Number; + public function getColumnNames(Void):Array; + public function getHeaderHeight(Void):Number; + public function getShowHeaders():Boolean; + public var hasDrawn:Boolean; + public var headerCells:Array; + function get headerHeight():Number; + function set headerHeight(w:Number); + public function headerPress(Void):Void; + public function headerRelease(Void):Void; + public function headerRollOut(Void):Void; + public function headerRollOver(Void):Void; + public function headerUp(Void):Void; + public var header_mc:MovieClip; + public function hideStretcher(Void):Void; + public function init(); + public function initHeaders(Void):Void; + public function initRows(Void):Void; + public var invCheckCols:Boolean; + public var invColChange:Boolean; + public var invDrawCols:Boolean; + public var invInitHeaders:Boolean; + public var invSpaceColsEqually:Boolean; + public function invalidateHeaderStyle(Void):Void; + public function invalidateStyle(propName:String):Void; + public function isStretchable(col:Number):Boolean; + public function layoutContent(x:Number, y:Number, tW:Number, tH:Number, dW:Number, dH:Number):Void; + public var lines_mc:MovieClip; + public var listOwner:Object; + public var minColWidth:Number; + public var minScrollInterval; + public function modelChanged(eventObj:Object):Void; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var oldWidth:Number; + public var oldX:Number; + public function onMouseDown(Void):Void; + public function onRowPress(rowIndex:Number):Void; + public function onSetFocus(Void):Void; + public function onTweenEnd(val); + public function onTweenUpdate(val); + public function placeSortArrow(Void):Void; + public function removeAllColumns(Void):Void; + public function removeColumnAt(index:Number):mx.controls.gridclasses.DataGridColumn; + public var resizableColumns:Boolean; + public function resizeColumn(col:Number, w:Number):Void; + public var selectable:Boolean; + public function setColumnNames(tmpArray:Array):Void; + public function setEnabled(v:Boolean):Void; + public function setFocusedCell(coord:Object, broadCast):Void; + public function setHScrollPolicy(policy:String):Void; + public function setHeaderHeight(h:Number):Void; + public function setRowCount(rC:Number):Void; + public function setRowHeight(rH:Number):Void; + public function setShowHeaders(b:Boolean):Void; + public function setVPosition(pos:Number):Void; + function get showHeaders():Boolean; + function set showHeaders(w:Boolean); + public function showStretcher(Void):Void; + public function size(Void):Void; + public var sortArrow:MovieClip; + public var sortDirection:String; + public var sortIndex:Number; + public var sortableColumns:Boolean; + public function spaceColumnsEqually(Void):Void; + public function startSizing(Void):Void; + public function stopSizing(Void):Void; + public var stretchBar:MovieClip; + public var stretcher:MovieClip; + static var symbolName:String; + static var symbolOwner:Object; + public function tabHandler(Void):Void; + public var totColW:Number; + static var version:String; +}; +€M 5 1212170716ÿþÿLabelÿþÿ‚ŽdE£?@HÿþÿLabelÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿmx.controls.Labelÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPcx4l41p0ws..swfóaCWSzPxœí½ xœ×q øºûïî¿q_$¼O€$xI¤H‰à $°A5©Ë: º´Ø膻$`Ù–ä‹ŒíÀ7Z–ã#¾c;Žgg²_œì$™ÄqöË$;ÙI6™x73™|ÙL&›g7—±¯ªÞù(˶æÛÕ§ÿ÷^Õ;ê]õªêÕ{– ¼È…5DØ`tyyù›ì(c,Â.F¾Ãø¿wîÜa- ¿YZþ7ö[¿òÊì|väwº—Þ_:¼ãbóÇþ|é¯þëØã…õåßú[NµpÄ(GyW"áÿ°3<|º©³‹²sóµZ¹42Y.±o²c<2ÆËx?;ËŒµ46¼íNæ¥co¸òΡ?ñÝâ]¿õÁ_üûk‘ߨ6ñ\~²Æž¤ÐÙJ%»HŸW(kþwV七Zàáù<›Êyβêã1l– ]¤¶Ž ×ó—+ùë…üKÙê56YÉgkùó³sµÅKe;X,ÌAó)±˜ç͘ÈOJ +Å"›-_Ï_-³"§!ÿ'_ÊaìøõBµ0Áûg|/2âô^˜œaœâã,7?W,LòrtSÅlu¦˜¯ñNÉW'³syV.=2—ã0êãÒ|±V`ÙbaºÄ®Ž2Uääò¬T¾ß¼UÞeL-›ËbD¾ÂƧ‹å‰l‘wΨn/Ï8“¯B·ŽWÊå[jâ1£ålVØçØyvÛaNÄeé¡ÛQæFFÚ^‰²C ¾£=ð7–ÖßNš`În#˜˜Ìt¾Ü¨c]ˆïÂxOF:…Ðu™¥v5tøBÞÇ"œXÇDêGFyÙ)ÖIÁ;Øh›F–Ö™#ƒ¯§},Ze¿Çnó•ö&ß5:ÅG¬“OÂÿQJ‚çáDÝæôEh/¯A=ÀºòغŒªxË©6ˆ³;QÖ­r"—1þËPÈ„ +áYÄT1Ó€vã91̪V‚• À?¿¸|»‘ãðÚD ¸•S­ÍœU wŸÑÌzÝ:·í”™5Ϲ¨ëòÿz.oâÙÿ›ež™1Ïí»Ì¤Ð9Ùkû)_)¼?;p°´b·¡)<å'ÙŠ™¬;Å Š"Ý¢D™˜»>³ZÁÔdT¾§;ÄhêÑ„õ€<³LõäƒÑ\øæÙÇ +“ƒ¼´øjÄ[ã­ˆa…8Nâ4:º‰WDú[?‘hÛMsfφ 5= #•sWË#ª}_m¦gà´ŽãßuÅøÞäï„Nˆ¸ã8±±55ÖhY ù£+‘ßY& +Hò‹Užsq}ìÿ•c#•¢¸"HŸ ·ãLPÊ{3#úÐŒó.?ðwÖúAñNTAªåÊ"Þ°ÑÚ°HyÇœ¹-£Áý„ dˆ,5Š]§âïEÖ>þ7cS6˜CË„Ýrj€à¶® ·MÂõ¬ ·ýÔщš"Æï4QÒ&4U’O‰HÌ^¶»ì`‡ìñ,¶ÑËX¿O,¶¤UݼCŒe¨¾ÝÄ2Uy¹¾ÐØ92 +µQ¹1¾‚Ã(âÌà +la·×1wF "-Å1Ñ1µ[Ïöxd€âöql—™a —KÀYÑÞγzŽ5Gù`q÷âÎ+2Š]Õ‰¥‰Â.Ф~éÇ(Ô?!1ø~ŒtëM´!Û™¬1‘З¦iñɈ KÉ—r`¾}Ö>“à{b#Fm÷¹¬gX!EÜý™1‰dllxVšê”̳ìçñ, <‡î’¨ qClÔ‰!P‡<ù{ZB@‡3+´ÖÓVÚá5ÕépH›dpUºGã‘1¢å= +JDÜ«#p U²7ä áÌÙÛź~,-™4êÎkL `Áøx?gcVv¢˜Ì)Û±ô°†·R˜J‰ˆ±v cÇ8›eó¦üXôëöŒß¤1~“i,ûXÀVÊŽ÷<¿‰Žp°YœéÀ—¹ì¸Ñèï0–žû$É7dÌÕðYó‹xÏ‚%2‹?E»‹‡†7TÙ8vœøkFC{)jƱYÏ[Ô¬¾Zjâ°pbV‹v«9v%x§rþËq°ß^¶r3‡å4,ù‰ŒÈ÷ô˜qÏÂÂâžÓ˜ƒg€ÍpÏé³å†(—óˆwæƒåÙ¹r)_²Ñ žÞíDͬíkiDq^DÇ?¿ø ¤xVë?<±(ØmfÏ3ᱬ·S‹XÓ'ϳùâ…B¾˜m•%ž(Ê»YÇ_¿¼UR‡…l`£€È³ÿ(oÄz/ÿú,$¡H§!þæø?·yݲóµ2J Y‰×¯zœ83µÙ"çw7ñµ‡Õò ü(MùÂ’(%cœGÞBÏÙBIH匕³ãIv§£™—‰fjìF¦%–Ë)€ìA ÓMû°A=l|ürvòï·jÿìB? +[ûä¬ËM1@¾õi˜pBn6» ¥j$¤ À›«”kåÚâ\^ i +‚™ás,Ç86>‰QÓùIpË¥ó¼Î• •ì,*¯g‹Ø)ÑöΠä³W®äk—+å¹ Åìt\†ëg„X«.Åûˆ^H£gÆ:MXZ¢c³• àÅVãE±ÿžˆ±æ;/Ç Žz‚õŒ§órb©•½,6 {? Æb´óoÇ##‚Ýä%ŠÉ=Ú…=sI-5¡Ê§—±GË…Û/v¤:}ꈸõ#à[凱1‘I£'“FF nÿ¥Òc¢öMK0Ðc},2Ç¢“ºO>­Ëä[:îu %ˆn£¯„MüÛœ¦mP€4†‚4JT(¯§!(ó·yŒ¯úü«Ywª•Óàé<PD·nd€[NuŠ™µI̬­8³6yfÖ$ŸýzEnúúÀ¸õ/“ÿCÀt`½|ó\­Uæ'k"¬ç””óÙ3>NJ +ùÅ ý…ú—b‹ù©Šâ)¨>jå9Ï‹ú¨î\¶³ÚÊ¢\«•g¥š„G]R+Ö¸^¼ªV”¡üd‘gŒ5š„X¢àt‰¯–ÁPUÊp|—ÌñqÍ„àDÅW®Ìfk|ü3Ä–<¬NÂh¨-χCMqv +ÿ\ÈΊ‹ø‰Óƒ†.,«—²•iÞ!³øÏ(¬³¸zZÑœ"…§ç$åÓУ9DjMÿgñ ´Á¼|ˆ¡OÐVW`ja$o|Y´=?;‘Ï](ç'4ÎH æi¸ñ™/ÁÎÁ¢ˆƒ6W&?ê20È%°˜ª#%¾.j²yŒÉ¦å+ÓyÏ@¹Îÿ@Eôê?ÒøÈq\!h/*žŸN΋zÉ…Xïj±ŸÍ.ȨìEÍUòSù +_E‚ +S²Øµ²¹œ›EÕUL,çbņ=q-¾î¸ÌòF—I¢ˆX7è•L!kÌ' Žg:‰õæõHèzÇ)xCW;zYJ°y©ô€H«ó¥Õ«´_Z£JkZ!­Ù—Ö¢ÒZWHkSi}"­[ב–%xÈáf†ë%òºäõiYŒ¹Î@îôpϲn]ªnÝÄêÇzYtF±Æ]œ5éTñmÌSPgFf²ÑÌd³˜Ýn_goÈ È#BOHý6©úmÖYßPõÛ¤ë·%¼~=ª~[ÍL<õÛì«ß]¿mKp®ˆsÄæ”ÊÄ›=ͤ²p»ê?$*¶Ý¡±éÄ… ô*äv8Q:x€þ +UŽðµ „ØP‹Aã8°[ŸöøFÔvE•½ºA l4<Múm¾&íÑMêõeÛ§²Ýgf»I´©ÚäQÜèìöû²; ²ë×Ù-ªìø³Û¯³;¸Ô +ç'Ï(p 1΂>!ò=¤pŒNL‡ôÂpø JO€Î†F£²Â9sOF(æîEuŠCÇh:r~U”xïI¡h:ž&•£§Þ÷IEÔ!¡GªªO¤Méö´Ðb“Ž<ÚéßD)75 ·2ŽêˆzMg@½úÍeÑŽû=³i“ÑŽ€ª ¬èÍLgâlñFv±Ê>Î$IGQÙJ: hæ;T¹lL“Ò–þ€ÃG½} ªgìíÓH__ö€ðhPåïpO¯0ùN¿\5Ç2&"Ï€”!ÆÜ^–\`‰E— ³j«P*fX˜•Â‡§8I!&hq˜]\.|=j…êœqÏòÎ?çDñ0\­A]ƒ,1£kP5Jd;ŸVö!í8Ú’AüLFkXµ1£ÇŽû,ž•£5qRN‰ìR£Ü¨kÙi²ùâ9OˆÅT6lriÍœˆ`1säÄ¡›Çx7—ÙsˆÓcúÓÜ}é7ôSÔ›ÀÿNgpÛÓ6G.;Ù µNõ¹¬Û 5DÖP·ƒÌ  IâC'Ê5á I ÝÄBкÿœg…ëñöP!#Ùk|ÏHqÒGQ‹š"qd<™Íú¦ñs¾˜’/¦,y‘9äUÖAûãÙþûp+\a§~#Õ6.kû;dEÏÞŒ+öfü ¹›Œu5Ó&Uæñe„4ª9ÑaIö1ñqª÷ùeÅ ¤Y`YÇͲTfb—3”âœë?(äI2H³ÔÊX¯èá·Š­jˆ” 8gE±ØÎëÞêôRïÁD—&Y×ÓØtkA¿a-è¢Z ’ø¢Zï"ce¢VcÑßƬ Ñ›¼ó¬WLÀç­eîi¤ Ý›ã¾9­JrdI¼aT{ËËÈÆ“PIMŠ·.µÁ:Y‹ÁKrþ®ÈúâT§8_H“ù ¯´+jð¦íºÕb€Õq_Ä¿/Ù>®:œöŠä(šø…"S»Óì K  Cª#°Ópy4 Œ-ß–¶~qa#³–ZýMôÕÖêkQ_­>%š½M€ÑbÎi×½&ÌKâPçR”Žo';Èfiù££ÛTK!°îXRÏõ<#p?âÁýHH‰ÁëÔ¢€• úÏa`L¬:§)§)‘M çj +­nSÔ&Zõâ¾#·’rßš‘¹X«QʨÐN/šÄ3Y¨:=à] +W§écgYçËFÖçzZXJIa›ªW´8’h¬ÏfõÂ(ŽŸôÈ$›`,¡ú‚‚¾¡°¬°îœ‘ü /Uñ7o•<Á 4€|A§"îGqg"+»ÍÀ)¸/Ë]ûcufŒºï‚;æ±á¹ŠÚ¾d»ž‡¨žæpèô +2^É Ü1Zä#ø&oÏÁ MpO¢f¶o7|;ªJ- [ÕÛ P‡_ú²`;£(!½âqF“ؤ„€¹‚M˜MêF>S°§ I=^»=ÖèFæ?ÙiÀ&¥=(áãq<'2) 1û$¯nx&ÆhþOhµAElQ?•Å-³sE¨O C÷15@};É›âtkºšý»Å¤žì]MÃvACœ=fSeÄ牻/ÔhAˆW°JLƒOÂhŽâݳ2Ž#¾+Ä€VŒ!X&ûðÈ>D„\åQ×_yŽ‰"úSî§ÇnwÂ×e÷]Dešw$®”Áµ ÷§1Q˜›Æ°?G¸ÏÜIøª¸Ÿ£Ü>Oÿ|þù"ýó%úçgèŸ/SI,PÚ¡Ö¥a%øŠ\³¾š±“ë0y}Xr&ÿ¬N¦èâô½“?ïMÞ*’·`òÂ2oÃä¯y±÷ ì^Lþ9or¿HÞÉ_˼“Þ‹½W`ïÁäÏ…a»˜Ü–Ü„É¿–ÜŠÉß0Ê^ÁÔ'¡M}~Q™úlÆÜN7ýi„‡‚Œèlë¹/EëÖWø ³ž 6›Ó†^Ý¿mÄ`x-W”æ,;èþ­²êF¦ãõ¦â¬ú é„òckµUœ‘ØŠ +͸.5¡š7¹ÔM R$Š¢É˜–¨J+<©Hrbtøô’ª !ár%¢­eu$Ÿ¹ì©b«×*¶±L‚´49LÊ´cbakÒÀÍøh%p‹nEàµY´µ©a¾E ó=8Ì·x‡9Wô^¹6Âvc¹éI@¼ÕÙ4Ò ÊÆу=›Ëñ`na˜'xm!LÕ=ÚM }­aÆ*ÙÒt>xûÁ³$ž÷Œ#¢y.GI<ŽfM‹}},4Îjã¹”C“weîæAÓs |½íPŠ½ºS$ù5Ó×{¶ÉWøß$_KIJÄuƒ°w…cƒœY˜ȵ:u7¨óV þn*PX†¥-âeT­L,‚ŸfaH†U¦‘äJND_ÇT•Ñ9…U¦QV7_Y™æ ,¶¬’GîÅmÛmá»]+ÿµñ_;ÿuðß:þ[ÏñHXÙÁ±Û€®s»xl7ÿmà¿üØ=ü·‰ÿ6óßþÛÊÛøo;ÿíà¿ü·‹ÿvóßþÛ˽ü×Çûøo?ÿà¿~^Z•ö”š¹õ@>{8 Ü#IðŽàM‚÷þ¼—GòŽqHy ýyz‡ô?rÞôÏW!òÙ‚÷™úXìH4êWŸ­¿e¹¾z“Xi“ióZL$ÀC=Iòñ6)ôbNÄ`<œ¸\«[äj'½K‹w‚,oõ_^V2¢)Ýú§á"©Ì8©[îoŠL€Â$Gx=ABAVòœU§T㇂4©]¤i©„SnK`_ÁU³(v|펀2µ™ÃµH¶^]Å{ѽøR¯p—úïM—¥¨ÂƒnÌÈÐMí@ºÕô~sÛÒ/·ØÌr{F=`Ð’6ÀN‡ôc‡X0Y¶6ê,1¯"mDêJMH6d¦wÈ= £ÝK‘ð¢`æÖ{=¥ñ(G8A6KijŰ¼g‘%5©Í¶.ùFñ¶ gZ½"4;ŽöÈ1¯Äu´ñ"ƒÛufìv›ôÎKÛA7]è `ÌA®þ¶“ÄXÆe(mƒªmÕ6\ +ÖÖ‘µ=.jVüÞ•}áŠå‘/»ºnØüLèn¤º‡þÙdmØkÛÖºÕ¶¶SlkäyÒõtS?ƒ!½+Èr~¡Öô¤@Ó¯7þ­’“sŒ J×TëÉp¾<›§«P†cdúkjûlÉ.’I%*$[n’ÑU²ô“ìñ”\13¾&Å?Án…ePþk4l¿•Vºuÿ±ÐC„Áeøg¼c›ÌZ®k¯–ç— pã+»Èç„w5ÿºÖÖglÝ2Çð¸ôcêõq,ãQŠ&UàGÊ(\[EÅn(ã…¹ùðW} oÔ¨*œ–¤94|ÝÚ·De•V#Iš'z¼´^¶œjm¿™vÑg òÆ1V;¢¨MaŸ‡f2j#O²AÞ>_¾ÖµD8À 7Ñê‹Y…°4WNÆ­)nŽ~ÃJÛÊFl˜M·ori?òÕNÌópÖ–­Å˜ÓÛë‚·²x€l6aÊf“ é$c4>#óp¹gQ:²ðm"%e@uøh€Pxó„BcÚº¥èêo‹?îå¶ùÚíë¾:a}=Z'tbB—™€-ì\éfôF#]jéÛRˆ<ï?àÚšM†VY½hÏ–Mqÿñw³`PnÚNp¶`ôV˜B)ZÂIùmÆÍ*%ÑÇ¢“0ùˆm˜²ÿîÈø +Ù Ù7úÑvaênü»‡Ðöö¨úÄIþçö: ·—ôq·úd`ì“ý<°_ðÀèçþ´2ò ãÔ#1ÔáÊè¾àè}ÁÑûƒ£G÷ÛÑX­C¼Z‡dóÀa8ÂGdà(5j(¸„ÃÁÑG‚£ÚÑœä÷hÂ'Å@H®:Ì»G=B`p¯_GzŒCzÍ)EÇ©Iœ;Àd»÷9)÷>j|Ò=Á'H’t©LäMæ“ò\“tïWÆ(_%ЛV/+Pæ­ÖáŒ_¡ü@ÆŸ’neøü³QLâÓË-8ŸAÒœ5œRñ8„•H'ř윮û 6ô¡MW¶oHܧæ0Ga(H²È¡ƒØçM}µÄ<#5ÞI÷‚ögÒc&’GqÞè.ŸÊ… öÛ°ÙoXÌaeš¦‘#kôsóàoÈódÅW·ååæ^ì :RI'Âi9Æo­G… öÇCŽã^Âw[Ü´,é¨éç +ÝãÉXØ´àÉñ’×÷`¨éT'éê‹u;½Uº_¶í²¶.‘h¯-c¡qB?h¨ó¯P÷º–¬²-ê|Õ¶ŽáU¿Ènï§Ç“ r…šüÞòò²{•¼¡FÝG¤ôGfž3ùH–Žã®b7w´XÇGÓ†íÑ£nÓ˜õž÷U¬êRHñ¨ƒ&nŠgyY\›Ž‰fâIq@x\~LÓþ&Šcy”W^G[Ëã$¯‹¹OÀ¾ˆ»,>‡âÞàsÅsŸÔ…Ó˜û”û4æJ‹\Ÿ ¢×oj_{ã¶.‡|dýÑ2ï‰OjD†Læ<`ð?N®@Àl0åÚž’¾©ì%¿ÁŽ6½Ûl‚Äû³+]£e¿G^Ëz¸ =áá/Dô¤gÏÑ9±š j¹J9¨D»±Ò§›À"$ÂC¯"·5µÖÒ­DìBøÃH^úÕÙØ~ +)ø-$eÛ¬ ’®¸þ“3 žgsìãϾSvú¸‚6íøôˆL“@òÜ”gré¡BQä!•QA"R6a{1Ÿ±ùšWÙÅ°”O¹tEÖÁ§KCä‘›Ràð’ÍŠVf÷¦†q¾‚†`áMƒý9¸FW8M²Õ< +ÕËÔâ*¾®Œc©p÷ÌþõÆòø~«Z‡iÑiDëFŒHùt¨òÖ)¶|Ty¾µ™ÁƒãÓ.|½´ ï$&’×â_-›®»”^‹q‚ÒÜG'Ûp—½±AÞ%ØhƤøV&ì4L­Çf<ÄUx‹a{¬ÊâÝ(VdoYÛ|em“em,Ë« Å#´än•‘‘v÷¬ë³“x<Ôv‚£L#»ü~yœ°Ãßí•&8‘“š{ô¡  š +ŒTH€õ&ûÃçéZÆ˽(§y{ð3a÷¦…·@§É³3#Q6%ïQ/FëÉ ^@qzÙ[˜Ákj‹u›ÜòÑiT&E©‰CÌèÿ(Ðû.û(fôQŸþgêE'èQ»FŠg´/Äè)µÏ쥓̜K»…âÇ#0òtÀ·…kd‘ß~)¯á‚†Ý‘罕8@²ŸˆÛŸ$ê8(x¸:ÄÛXÐF^>E)Ø9!ŽÊõìˆqˆkaÖ¬kT­½‡ÎÆŽº³—®÷^÷˜ð…æ™R‚³<®,¬ï vÙxÂ=)pòV»ò½ø@<"¾vÃW 2»x“f°ðÚxZQfP€ûU‚ijžN¯$å;ì©28›ñørL!9ÏI¡â Çí`“‡tòÕjç/½s“>öº„+ìýú1ï¦ï­¼[ÿgü¡ŽE¿ÿm½Ø{•Dbƒù±u³å\\”ªÈÕN.¢{à¥Ñ»€üW\A4<h/•ü\>[ˈ|P‰àP¾˜]40ЃçÊCU2Ý"Ë_g!¥6æ½@f=/´œQÓ ÍrF–‹ék©W„·­²½8àU~«°ëÕBn´PâÜåŒþT±ÂɃ'hxŠ ?YᯢÈãÇxeG&yðj%ÏÙh%R‹åj>çI§Hx¤:|4ŸRér.Þç“l¾’· +²¢ (OACž6Wž›ŸSDEÒ'9AODP¼è¤všðx«0ýkðÃâDžUOÏsF¼0y¥–Ÿã ·á¬CÜ~…S±ù–OÓO†×ËÆŠ®)|‡Uß9â*z ™›§gÏVòYöïÈò ÙüLAnxAüHš…!’Ïù1‚eñ/QíQ¸Tü¨ºYÌOÓp.;—­°³“¼z9N;r7ÂÖQ¬Zæç]1¼VöIAßWËsâë鸯ÃÓžü47œcèqd¦Ì;›÷¯])—­ŒfËóRKþX>m(»(¹0è“j6$ôôž,t1ž…)þ¸ý`5þ?_²µJaá*,]å|±ñ›a|EÈæ +|5™Èó +C€wƾæ Ï N LÀÏSµó ò*cªÇÏTˆ‚ñ©Ÿpp;åÄ–¢Ò›k@âëØYÕk§Ë<ݲ?¯®Ë$©w_$ïʃ¤2Câ{5út>Ÿë’ïxÛ;¤Ïgma(¸Åw4Âb4% /Ñͦ¶ ‡ hMîÐ)mÉÿQ·»"zºuõÉ_]þèLþÁòŸI„.U~wòOþäO$Ì3°1ù›:«žä?èvlr7‹è-ÉŽÖK˜­É£ã +aOÙ'ÛE3{‡¢ÂNå+{WrjjJv›=É¿üË¿”½hd'°{Ý>ñµÏÝ/¾¸ýâë {H|vô£ÉÛºE÷ˆR¤²ªc^±ê ÜãW,ë_Ùñ÷™}s"ù­o}Ë¢‘ïɵæˆ}ÿ]a?àž²°îªM'øø·²M§“7n”eàLò¯ÿú¯eàlòÛßþ58gâ &ïÜù^@öXO;䜞0A5‡—`Θ³fàœ5™‡°Aç%?í0÷¨ÔÓ1†×D ²¢‹©FE€Õ+ æ^”**w8m|d­eˆl´°º+ìQ÷’…þ¾°Çî²æ—-ì‡ïÛ䙻ľba_½«~Ý’üú׿(ûÕK„Gîž„øµÎ}ÔÊǧ®Z¥AÙƒ'’ïþлeà‰äz\½Ö¡> ôW °â¿§eÙÊ×÷%òxA­ŠŽßíNˆù=¢®Fn>íÒŠ¹­KÖÉõ<ÆW®ì˜ì Ú;Œ|'î¾[D õf §ÂK˜¼Ë1äkzî.›Þ +¦‡TQˆEòK÷1VÇÖ÷2gÅYâ‹Ï°h…%'™›-ÎÍdY;?a³uÓ‚e­ÈþU9Os[=Þ25"\F`žÓÀ¹´ ï ZD fxu HZOz|B: Pðp–QÀ¸ˆá¸2¢:Qhì:.Y£ù‘t¬é¸7åD­$cìa·ÛºÎÒši‰×J—ÿSS~šoÚS <® «Ðnøšô_s‹î¬–h5ÕCß”œ&·,.T6€¬vΉ£b½Rßè´'.üéNŸ|%ó©ÐEú /¤^W¸ƒ@žuneD¼—ÒÎœz§ÕI9I·‚–þ<œH]VbÍNÜÊÌÇ`Hµà +[‡ž ã%¶Ý”FhâãŸøóÓ¿yÿ S õdh%¢ßöG§ÿ—ºƒÑ BÌÆN«G´“0=Z\ϬsÆiÔ0*$Ó,|ñ¬ã‚o`Fëƒby6&kù~ZŽyG×ОÆa§!¬ TwùŠ›¬5ºX±ëÝüªëÍë[o¼L¥jÜ8l×µaØW.¾lŠ-_¾vðšÕ½šš‰üTïP´qØ36,_ßʶJÙ¦•ÇÐJãÔ;LAû¢²Å|ñ>Â,¾Ôd饤7ãß· ~hu3‰¤iIÙ¼ÕàBó+™7Dá±TØ´ÞV/ñMÒ0ãE{‹‘òî—Û$ßæ©éÝÙa¼]ÉŽ÷bå[{ÃeÇZá¾Ü´¥ oíÞ¿²ðXãL€€¦Pš>W^ŸÔ&ñžgf´Ù¼Œ€Æ÷ÒžÌQ=Tã1˜,‚èÆU@¤¥9¶ÄHJqLWXqM·’G›q?/ x>>ž6¶†h7-²Þ˜%«*‚Ž¥ È5ž‰[`>q¶†É¦µ¯ÅUÅÇÙ ¨žÏ¬ÃÍ«›‚âDÿE¶`\•P‚}ŸxJ¦Xb'ÕîÿOHžvÔëeÂJšÃnPœ›ÖјԟÑJ’Tþïxöté ÌÈL×%’Õ3œ iî:¤Þ4Ÿh0UϾ¥U+ïš–61Çûu7X ùÓD–%Áè†ö·qÒ•7ó_‹ÏÇŸWUÛ©ùVrÉñ÷12¼lwБ0œæ)­–Û¨;Ò`õ¡>ͱ6äò:}!­yy==¬y½‰ ¶Ù‰£GÿôQþ_sØɉ´ -QŒÇÄ5Ë,øÌ.ÒâFÅ[ÛõàYÄŸíT ý1à½Î;½¤¬ô6ì#ýªÈ>dMúU‘×ù5éWE^o"¯BzAÔ¨&jTïFFÅ1ìDb—5ý¢Å-;ýO?FÝý^/û3µC,…x@¶Cµµß×Ö~_[û¡;V ~£ê¤¯áûÆ¥íÏ!ŸWIò% *8CegôP¬óvÌ›œ9¹t¯©~JS%Ó(ð˜¶Ì<ª÷gŠ¸ÇˆgRa³ÑNüáƒ,ín 'J:œ©Sè]éÇŒLº<‡Îã«:·fBŒ¬(oeju×VþuútyR.{±2§›à”á!ût)Ï=ýÖ¹g¹é—7æ­·EO/ƒKú2ºáv^ß8·Pg*y~ºZö¥dè\Þëö4Xd\ÏŠpØ3óSS"PU‡²s‹xs|bž—C™£ÃUÏɨZ®Ô.Ì—èr€:ÏÕòUxȵš¯\Ïç¬Zëûó²îׄ÷{~^,kœppœ-ó fÐxÇãã9s\ýÈ®?×å[&¤‰jäÿAIqyŒŸ%“°ÓÊbF»hæà‹Wí)tAGWžèz'‚Î&=Ñ h0ê‹n„s¥?º‰G7ù£á@Ùœ“v¡nR§¦˜´ŒlAv†ÜÕR«Ô­P¿@Ãj«4­ÐfÝÒJ/þÂMý,‹L°û½ T›—hËL ÓsÁòÀèåë/ídÐ ²œìˆ0Sr‰»x==&7pG›4‹¼Ö-í…Ûñ>ó9e³½2—̳(\ýgW+]ƒ’¿O Áæúôqؼ„ ôNLOÃ烂ÇôuáSͱ0’ÝBD|S8M‡f´áî2ŠCµ˜0íDÚ¸Ô'‰T,”`·üï‹LîkE&w2Á• =@¦º^–Òc)‰DÂו4º*8}ãÏVq ¤Ç0ѲçE³ºÀO”êxפ®0¸›n¢{®ÿú°9m<,°…@Õ˜'ÆÅíJ/Ç H§éÎWQf¨£îVj Úî÷à÷å1Ô#¥¤¶e›¸;ÍÙ긾ºœ(ØÒ´Rq­yjÌ„6¤+m8šsàÅ%÷9²Ü¥^Ù æ`ýÿû!âîøaöCJ?d©IÿU¯¤—ŽRÍCèØÏ&Ao¼–3hƒ²c(`‰õ½#‘1yªÛ•WªC!EÛIT ì8©ÝvÉÆÚe¤T­eK|áPÞ;ÓòlHµ“—šÌæ:°ÛIY lq5bžÑ0J¼ž£-ƒDž=2œ°ÅnwzZˆ?WæÝéU°‘hÛÐbÕ; Êóè­Ôi¡8G»l‡ÑP$==ð{¢ké¤Ñõ4ùVíÄZz 1­{ ¡:Øô–cR¤-þø½èŸÜ1VŸ³Ã'åÖßòô¼ÂÃ’øãeâüS„ £—¥– Ûº÷r*±FÎQWçéhYg'a§A§Ûÿˆ“¦ø—kÊÄŠƒ2Aƒ2Ù©ffØ LŠA™ò Ê””|³j ò Ï`|2-–p±¡6(«*ÜŠlk‹}goj·áÌÚÛ@ã5)Çë~Ä?·LÈVóÆéÚŠ„8ùɈ¶#¦zqnê·b û½{çAkŸWi%oú‹Ë¡}ÇOG*98{36F°dm]/Æ\'(ZÕqQÊ’ò±¨aEˆ(Ìñ;Ø$òq§GéÌ'æ¢kÈ‚]ÅzýInëN§éqx`»7B„¦¹1â1Ø^ }½Jú~…ÑÌGßCk¥oýÅQ"G§Ma,¬Û p½MàµQëø²Rµã ¯õ}¬N3lc5ùŽ_ûÃ1ƒœ“oHã =,â01w"~“x÷=)ç„KlX³u{DÎVW8ÌuÓz½2ßâ82"ßzwè%¬QZ.0œ9»š×¿iw\Š˜þ ~‚Q&ÛI4Ö€Ÿ’Z6±¶Ý«®¤¿œ¤TÇy1-"H‹;¾¥Sf÷-¨®üÝï7ØÁ³‰Åé»ò°åi®%nëþþïHXωÌŸ0¯ü<ûôÊî¶WBèõÑ :°¬é¤Zÿ÷,¬õâÄðïþ»ný½¾Öçô( åúi´¬vhx\F"`‚k–"%ˆ™Òë9+±ŽhqÂ×ß ÍçFc× _BMÅg5“›ó„tsþËÌÏGÄåå´à¦j#}2\t¯y8D­ápÀ|,RxièFfq?g„JÙkÈ>Æ„§‚Žäòr³ô»°;ù=Ø“Œü +\ÞÀÀÞä åža}2ÏT 39¥’¿¥›“ßÒ®äoëÀáä·“Ϧ½|л¨{Œzì8&ß—:Ä!:Ä++ê ÛÒ¥ýëÃl¤ö¯/Lûg¹ÁZnzK`Þú׉¬¤ý³|OMkSLáàKÜ›¾<_9‡w¸Yp\5 ò³s3Y°Å»ðF:/ãRvïÛ#¥\~AéÁj2Ât5 ~£j +xª\™•Õ,™ •|±< ÞÅ®,VkùYåL¼›nðúR¼×_Jyã«3ýO«ÇÑSiõJŒéSŠשÏøÞçj€/í¿+Š0öißÕoq7R¡É^/³?ôÚX*QqÅq‹§üŒâ)I,w¦ô· ¹Bz@t^pŠÍ÷¸MÇ`yZX¸‰8­g¡…ÿµý^÷‚š Yhaq ݳ!Ç©|µ#•ŒôýT˜Œ5jňÄkw!ÝšÑNíLj ºƒE#fi3½:µ]1Etú&˜itŠÅ9Ý*î7"QÚ986 +3MÒÅ‘—À›ÖÝà˜ùo‹çzµHÚj( ‘\Mh€·Í‰Xá–¸ÆbQØ& [0·íJO‰DØ!} îôǯL¾ Ò`±M? ç‡Ú%¡v£)i³·-{0z¯,¼7c>,Ô‡ÙíËtû¿ßZX8Am£JK#”ŠVebËJ‰•û­«øÚlšÂ~˜ñæqñ g”?oú´<¤šT‡Ç!Èå:ªÏ¥¨šª÷‹‚Ž¼Ç@D¾'­ï%º÷êÇÒŽ©æ£UÖéþ:Ýg×i…ë3'|ÝŸ"LSÛzjÕ!ªÿ€Z#81ÿËçúíuÃ#á ±"m3θÊ¡á«pDÃ)²%„¥ZÅÜpgؤÜ~Ávg8@6K@¶2‹•ÀE'8…Ï9Žlâ°gæìfkXa.ª¡3hÞ$›Ä®ŠD¥±¾Ë¢æ¢2ˆZ‡QÀ Öìu3ßD°¾­gP|RŒYxê“ý3U „ù¬(nĦOÄ ›îmÅ°µ23tÚò+ú=^ãÏÅÄF¹…›év ªºmÔòŠ{‚n4£dÍ}P¯ÀDšÓ™ rìéy"ꑈ§=ûñn/ý‚—‰>ºt ìè{™;ÇdW}”Kå +ÖP,—¯Íϱ:ÙËbeæPí£ºö`ŽÊâFí70È2ƒÂ(HLýYÌì9fžŠ1E)'Îúg?mòœçMú/9Ôy×€· +8•‘?ƒ¸%Ü‘‚Þøˆa-áø !«(—‰+êªÁ+rʱ^íw`LÜâðæ47§NÝrm}ÖØQM8˜ïå1ñbàe¾8^æ3øÄ8çq>˜M¶0&ßÆÄn1#–oÃbð‘{Æô\1f¾=þtL|£§•ç¼*†7"»tÅVÑì® ®©‘1êÓƒ^•›±:·‘¹Õ ézÕ#êÚsÏ­¹óØóI™¬èu…yœÄà.K‚o}‹°îÃ3”cI«Ú”kR¬ÂIs"õ§M£iSÙ\]“˜}dó)B|añ(Í°Òð½OÞí]@iµd‹V”X`+Õ>¿+î-à E:Kp¬H˪ÁìùÐb¾|øðûÎ÷Ìýmѳ¿‹SæÑ´uÿG­Þbû¡÷cŸtZ¡.­µ´Í!…r9}ÕÌÞœwo2œ¤8 T·æªž½:ã ¬3iäûUgÓJ÷%Q~¼Ó7õ¥_K’ß áËB6 ÿ-g„˜ögœ˜ø:Ç7$A÷ç…Z© èþ»LòAŠ¬õ¶ oÎø EýóØÐDà#«ç½rè·dÄó«CÞ”·fÆTÇòž‹×ú…´ÕÉ£^4¢´åüKjž¾Í³ølëYZ/ ‹AKÃÛMßDyÑu5læÎsÝ]QÇq5kR‡WˆÞ!´æϱ? +1Ô}'M_ +Jvxr€ÂÑAóLqq,Š ï’*Þmz×ñeyÿÞòYÿÞÄ¢nÂ> -q·ù+ g橺ޭ^èzOð ]ïu\Œß%U·( Xüz£z4â°âîÞ©„ƒï³æÿûñïÒÒ„Dð.ŽßÊuóCžGµÚ1ùÃ:yjPÆ«û07i¼ºÏ÷@m©V)«ýW +³sż°Znº²0oõ%¿øJ-!1 iãU´é„'Sókö :_̓¡šð c¸º;°B.6h•ü}€¯VìjKçØnÁå>ç½ìJV/¥Y½ûÕÃÖÀ¬Õ+οN¹àªC†§1ȃ4qUMɾk¥ŽÒg"vPâçè”Ác[”˜!Vç-HhÕ BŽƒµ)½R;¶¾Ãº²ké Öñßzy*è\ º‹ÿº%«¹7çèY™ß þÀ’qô _ÿûAÖIvÓÒaÊå<‡í¾i#Ú3v­P ´æÂw“ÏÖdo$q=[Á2ã@MPS­k~1²¢³ñ=ØCÿÊε§Ÿˆx¹ú°Ø1·w8 w #m€ÐiÑÄ€±`J> + ë#ywÚèçM– Æ–&íúmb·;˜a‚ëÅÄŠ; $À2èÕçÄ_JDŽÌ~åƒõg,àqx@Y¨ ~3ú‚s™¼tŽ7V[djZô;uiÔ´*?˜Qkö4¡A.õbxÂßCdÆ«¼m|’ÄO—¥©ºì‡Õxؼ´ÅxÝàdš%ÍÁ‡£Gyâ9–a¶„Ÿ£CÃA¼‚½ÖØIÇ‘§Ãͦ)åé(9°Wò¯£ñÄ1!ïqÈ"îuÐí¡@9Fó¼èÈ!—Þ°6 +?:»ì1¦Qc,ÿºòKåŽåèªc9JcY˜:B·­<–×BD™“1Þ-ÁÁ挱ÄÔ®Ðæµm¾5j›‚FI1&èpmáO‡_N;ZŸè¯“(“VÀHÒE.Iáw1U–±ò¬4¤Ú\{6×/zåÝ;´¤3âÞoØÙíBïÈÈÙ´èuø˜á&;âž2'Þ1É2X±»XÞ¬#í´L;€ÄýXÙ„ÓK-Ò[v™N”Ÿb +Z²$r¤Ày%À™¼+PΤæRigt¸,c8lCº^ú_nÄ^3Î9ø,›ÐèG•ï!w•0fHñ ”ëG¡Î¿¯M‘ƒ‡›Á ¥ÇîØlÁy¹í^X Ø‚a b.ÊUb„²§Àƒü÷ Œòß%HS.ã¿Ë2ð0ÿe0ÿÿy5¾¦ÍækõkIn-e$Îa0ç¾QBT2°±–eî5õH¦WÇû,[c!’sZk3ªS|Ý.ø†¿àž‚÷­X°©ã^8%é¹èÉã^z¾IÓóù1U_ÅŸl +nÅôöã³Á2x™‹6{\]ªQ÷æ æ‰æ¼ÅÓœãLVþ­¡ƒá…ò{ѳ]ÒŒ h‰=Þª>'4µw0m…Ñ(JyÉ_Jh'¼õî;!DS©«ö|xÕÞŠDPôR³¨_·Ð-ʵá]´6ÀIÖ†?V`Æ)‚³ŽmRàvK.ý¦œIݸ_q¶vŒ|D‘ïô_&¤ +ÜFkzÍqÜ3ùÛn! ŠºïÆ»¾ ¤“¼]·pußc¦!7p@ð R¸cq®¢Íïõ­•{=~\¬•‚‘Ñz/4ÄçUMTñ€ûfK-ä g› ¡ Ã#]R4Ñ{IjaüÙmö‹¯-Ë-?.{Ê¢‡ŸÛyŸ/æ½z·{¿y¤êgà ý·2Íòùf¡@ÿà«A_TèZj“ÂÏR^ø–ô +@?dŸ[ôÒ°âtÁÄ+ õG‚5Ô·ÝŸšçŸP|åþ:I3HW3®4ÖÕ×^õuŸºsþQÃŒ=0½,rÁÀÇð˜"¯à¼ë’#îOáO Ýª|2™Ôuú”ûiñõÓîgÄW;ÈUðë³*õs*õó*uP}}A¥~QÅ}I}uª¯ŸQ__V__Q_Ô×WÕö~u»__ëÝO‰¯ÇÜ/‰¯GÜŸ_WÜvñuÕí_»?#¾u?+¾†Ý/‹¯!÷sâë²ûñõûyñuÞ_Ý âë’ûñ•q¿*¾Ö…¾esEܳ |€‡@®J‘PõäÁPy¡Ï yT‚¤CAº%ÈX(ÈcäáPÇ%È8²ôÂW §ÖENãaÞWyßus:žç”â½r…÷àz ž»Ý ÐÛÜOºŸpÊý¸ûŠû1÷e÷£¸ÞCGçQ·•·q'ÅŽyûÄö¹ŸÒ¼ÔOÓ†ÛN†/Ÿ%&ísï~g‡;ˆóÂýÎ÷‹÷K„ÛI¸?C¸_&ܯîÂý*âbÍån!ŒJÞ‹J”Ÿ•rÁ¯eÄáB$Ï`òÏy“³"y“¿îMžÉyLþy#ym&)¿ LRöcSO7Á«J +ñ§f» [núO. ÞêŒÞ·’C5K¥  ʸéœ'zæ*CuóÐ|s ÂÈÇ—éùëJgËÆÎzýŒùû£2¯æ½¤;>ëub†×,h?a´éÉrÚq4b°ô×åJaú1Œ€¯‹ÉÉ2]bWÙ96Ê2lô*»Êÿžc™sL9r[`‹ÚãR^< °#B0Ûë L‰ôÁyà%Ÿ?šËFPC™þM‘¾KÞÛðÖ#(Sq)ÃÝ=":>$O)O„=ÁlIP {ÂÞm}­Ì܃GC¯ÖKì 0|Aêµï¦„eÃÇm] +MߊíÒ{œäŠé›ÀÞ;hÜî'9Ê·_ÈQ‚,)§ƒjˆ¢¥òÅpO\ÂCkà‚cÓnûj™l Ïd@œ°’êTtØ8‘² ’P&wTrÏ™1Ót—7ù¤{¥|âØZù¤ãŠO: ø¤È'ã“À«˜›Ëç+”råUÎ+}« Ðo%£ûWâ•ü˜†ïL~òÚß—=•±U_ Þ½ÝÇú(BÓ<0€ +f|‚'ÛºÐähLÂëØ™¦Ùr.[¤6 &C˜ ++sdéjR=¡X+‹áò0Rø} ÜØj‘†÷V/‡oB°jÕ¹baRZËú;Édb­Î1ü=¾Þx£ wÏy¶ÐwúVD䌀­á;ç£ÈPàʼSnÝ +‹!ÖË×$üÙ:ð4cPQ—%ëÐ@·±Î:äÁ•S¬(Þ›‹¸ôV³!ÕmÔëÔ© ^ùFt¬€›ÐWqšN‘¡GTªüàÍjumñ×öVmÇÙª¹µf|JUÿ&¥Ú(ÉÞv +ˆ¼s-ÙËʶSÇ×=':~(P +_[]ûÖ¿ ;Äëb–‡'y3w`†Ú¸å¯é”»t¿½ÕÇ…'…Ù6ý:=?¼ +ðMã17W!/R“C”_ !7f¥üÄ#«·õIogd"ä’1PÔíAuK‘Éû[~ÝKTYi©'äîàL¸2eƒa¶®ŠŽu»,¹¿~ ÇɬÞ}JÉ;â`›ý{·Ä'V×~Ç` ¦mUƒk›qâÚDO{` ¬íÖý! FG“+® ´›VÅ;VW†{‘Ë7…ˆ÷ùÞ¨Ò]Ž·»ïà•ét5~å{wßuzðí4úLÇaýºËò/¸‰¼wSÞÎæ¿_©eþÁ²ÒùÊêDŽnj«-j]†5Fy“TÇÖˆ=òÞ±Õ?CË‚{‰³ûÇyV/q„"Êê eÑxK>ØÜÜܲ6ù·‹”‚}RùßmaÀÛ€·‡oÞ¼#xGðÎàaÀ»€wƒ€ ʽÊ<¶Ïƒ»â3,ÆqxŸ:÷ã$9Ýt˜Ádë÷Ýd­äûó µ~ãâ©áè~¹éÙ8dqëó‘­WZá%ô‘„­ÅFä~çø!L?+¡ÞÅ0¾PkÏšxžh0_cÐϘW¾Ìû´+àÃÎŒxý«Ê¯À¹î˜hf¾tµ0›ç ö[4ÁxÉ­7⌨™™í«Ùëø̺“$ó<œµåAsú>FF$œæ8©lCþ.d5%¥§kl­Ê_u<nÅ"›ê¡EþÖ©²:Ìí‘tu°ÙyÈ +ŒzÊEñ˜Í9qªlÄ +1õü”ÍK6ákdÍimí©®9µÔPЮ ‚<–£¾¼|K}[Z—"|¸)Ü–ùeŒÊz™ÿ]è½Þ–Ý®@ˆv“[P!®’9n\I°I£!™X=žú‹èMž¢DôfO+V[¢£Ö{Y[ÔB}P,Ô»p¡>èY¨i%ê7W¢å¦ÇZíÖÕè¡€Å9`íÒ òxUÆá_¹|Á’,"æøê^,WX¡šÎ¦éyÄ[,ãÅüõ|ñ¸‘¯pFJÚÕ@¡©„Ú _1LYÒåþ™l±|.„ÂÇ0j)ák¬yŠ»£|# Ý¥Ÿ9Â"&³“3¼S¾ Çò27‘eRT +ݨ{ÞUA:ãÞ²|«ÚËbØq@ãA‰-1ã:’Ÿ/“;\ãS§é7 åT +w‰+æi îDYù€Pï»åw,–’”nâ7Ê“‚NðgÜ„B©ßŽü *„-nƨáw í1+I[Äúy3èqv¤]SÝ ”ë'®ä?üã¿ s8ÇI$uùwdÀM–ÿí2ó"Æ1ÎÿùŸÿ‚—X°üg2à&¿þ×ˤuvœ¨ÖöÆ)P‡÷4SÊk©Ê¥0ºÎ]‡—Sn‡¼<¸Žž|©s×›1àú *‡}L.ÿÔß](RIŒ´n’Ð4±ÎD׆×bƒ2Ôl\jaÓè×Ø=Ô'ãirûÎOzžõŽ8q[ºz[½1òFa=ÚƒqÂúS"r“1ÿ6ë8^ÇÍ'; ;i?¼¼Åós#Ù{ób„.Ë÷—»–zA²ŸêeñêL>_Ã<6©7-W-¿¹Ç6'Úý³çqÛyœÙî#f»ÔÆkÞ—¶¢‡Ï8ú.t™ôì)½û£$˜T í?Åš™—DÜFÖÉd_ð’õì‹ò(eÒn‡vI*W¿c‚{}S¶û1;3ƒ)З×ËW³y¾;3âAf³F&ô6<]€Ý¥ìòmú E¡·ïÈ—Ë­!Ð ö1'.­íºô0HÀ08÷=1 6,íÎcz8zÌ'õÖ£ n¿f‚ò¼±ß 3GÁ·­Ñ/ü½þ¢ˆì}b=?Ði:lѱ‚LÆ@ +Š‡V›KŽcÍ%=µvÓ¤r<M¢C]AÑ š¢q èßIŠ®£¸©7b1¦È˜rÔñÔ*b×*bÔJ_|OÉj…î‡Å¨±iš‹fè>Zï»^¯‰hì‡ÎÚ÷úÕ÷ÃÔêûa½o?Là†pêô~˜pRz?L8õÁûa“Qí‡IŽ¨öÃ$GTûa‚î¡7`7$)Ј#«ÁÜøbã½Ñ¸û5øöÃF{?!ŒUiÖò*Arü«Â©ô÷³ÅƬW³hê³ 32¡Å‘à[PÄ ÎbÒ,…6쪨š½a¿ÖcÏ[••æÀžŒ±G8n'fôéÓÛí”=·²Ôs¢#TWÆï@›hZÇÄ2­”¿.½aW^§Å ¡’Öó_ºSV^h<ÔFz{%O/½$O‰÷EÐ%«ð1WªÀCµÔZ‰ûä‰;Öˆ1z£ûÕFh”.è’ <°Ag´IÓMÎx‰êƒ­–Œî +ŽÞ½ÎŽæ< è “è–ŒY[”N iFÿJÒŒ^)Ç8è!ÇZ…ÇûA&Ñô,ÿäÝ¿•1[Nì{ µçö6ôJ*Îu)èá÷<ìšR.rf¸š¦J‘9q”NïÚrKsnpoä¦À=·70K"¼¦ÚÛÙ­2_ÑfBžYØØã•r¹f­ÝÍ;Ä·=r t”ãFI?Çf\ÊM¥•LчlH&¼ñhpK~]ÞJÈN¥¦8Îðàÿ ,åÂôÿþÿÿþÿÿþÿÿþÿautoSizeÿþÿleftÿþÿcenterÿþÿrightÿþÿnoneÿþÿautoSize%µLÂOÙH——ΊSfÿþÿÿþÿhtmlÿþÿfalseÿþÿhtml¹l>z*VGE£1's¶‡kÿþÿÿþÿtextÿþÿLabelÿþÿtext qf¼éO›FN"@ SðÿþÿÿþÿvisibleÿþÿtrueÿþÿvisibleÄŠüó9ŽD”ìz$hí±ÿþÿOtherÿþÿ minHeightÿþÿ0ÿþÿ minHeightü!«Ä%«B¶ÞÂeaþdÿþÿSizeÿþÿminWidthÿþÿ0ÿþÿminWidth]Yœ+þkîF€Å á¨Ãp!ÿþÿSizeÿþÿÿ <?xml version="1.0" encoding ="utf-8"?> +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="Label" class="mx.controls.Label" implementation="Label.swf" iconFile="Label.png" src="mx.controls.Label.asi" modified="1059524076"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="UIObject"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.Label"/> +<class id="mx.controls.Label" > + <TagName param1="Label" /> + <IconFile param1="Label.png" /> + <method id="autoSize" returnType="String"> + <Inspectable enumeration="left,center,right,none" defaultValue="none" /> + </method> + <method id="html" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="text" returnType="String"> + <Inspectable defaultValue="Label" /> + <Bindable param1="writeonly" /> + </method> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Ev ýÿÿÿ      +                   ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~  € ent param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.controls.Label" src="mx.controls.Label.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.SystemManager" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.events.EventDispatcher" /> + <include id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +</component> +</componentPackage> +M 1 1212170147ÿþÿBitmap 1ÿþÿ Label.png£?@H£?@Hÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hx¸µ’‹ ƒ0 D™X¡+°BW`V`…ÎÒݨŸ”“Ž*ä­%Ë ±Ï/Ãð›¢~×öÀÇBKÔ¾“Îñ*¯¤ÃúÞË%–gÔÂ"Í^&ꨇZö½L΂wY“÷ler̓ØÃ$Õäb “XæèŸsé–ÞN,¼‘æË}Ü[æ$–R¯Úœ¾YÈ?³3&4tobí]=—Ì{RË\5?‹ÏãL¹DïË™û¡0³ñ\Ö¿´™=WÿþÿLabelиÿþÿLabelÿþÿ Label.swf‚ŽdEÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ Label.swfwÒÛ>ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ Label.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ Label.swf-[„@ÿþÿ FocusRectÿþÿ Label.swfÿþÿÿþÿÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ Label.swf3cí>ÿþÿ BoundingBoxÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ Label.swfì:?ÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ Label.swfÊ:?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ Label.swf ;?ÿþÿDefaultsÿþÿ Label.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ Label.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿÿþÿÿþÿ__Packages.mx.controls.Labelÿþÿ__Packages.mx.controls.Labelÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.Labelÿþÿÿ-import mx.core.UIObject; + +[TagName("Label")] +[IconFile("Label.png")] +intrinsic class mx.controls.Label extends mx.core.UIObject +{ + public function Label(); + public var __autoSize:String; + public var _color; + public function adjustForAutoSize(); + [Inspectable(enumeration="left,center,right,none",defaultValue="none")] function get autoSize():String; + function set autoSize(v:String):Void; + public var className:String; + public var clipParameters:Object; + public function draw(Void):Void; + public function getHtml():Boolean; + public function getText():String; + [Inspectable(defaultValue=false)] function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var labelField:TextField; + static var mergedClipParameters:Boolean; + public function setColor(col:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + function get styleSheet():TextField.StyleSheet; + function set styleSheet(v:TextField.StyleSheet):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabChildren:Boolean; + public var tabEnabled:Boolean; + [Inspectable(defaultValue="Label")] [Bindable("writeonly")] function get text():String; + function set text(t:String):Void; + public var useHandCursor:Boolean; + static var version:String; +}; +ÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ Label.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ Label.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ Label.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ Label.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ Label.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; ‚ ýÿÿÿƒ „ … † ‡ ˆ ‰ Š ‹ Œ Ž ‘ ’ “ ” • – — ˜ ™ š › œ ž Ÿ   ¡ ¢ £ ¤ ¥ ¦ § ¨ © ª « ¬ ­ ® ¯ ° ± ² ³ ´ µ ¶ · ¸ ¹ º » ¼ ½ ¾ ¿ À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß à á â ã ä å æ ç è é ê ë ì í î ï ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ Label.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ Label.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ Label.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ Label.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ Label.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ Label.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ Label.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ Label.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ Label.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿUIObjectÿþÿ Label.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ Label.swfÿþÿÿþÿÿþÿ__Packages.mx.controls.Labelÿþÿ Label.swfÿþÿÿþÿÿþÿmx.controls.Labelÿþÿÿ-import mx.core.UIObject; + +[TagName("Label")] +[IconFile("Label.png")] +intrinsic class mx.controls.Label extends mx.core.UIObject +{ + public function Label(); + public var __autoSize:String; + public var _color; + public function adjustForAutoSize(); + [Inspectable(enumeration="left,center,right,none",defaultValue="none")] function get autoSize():String; + function set autoSize(v:String):Void; + public var className:String; + public var clipParameters:Object; + public function draw(Void):Void; + public function getHtml():Boolean; + public function getText():String; + [Inspectable(defaultValue=false)] function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var labelField:TextField; + static var mergedClipParameters:Boolean; + public function setColor(col:Number):Void; + public function setEnabled(enable:Boolean):Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + function get styleSheet():TextField.StyleSheet; + function set styleSheet(v:TextField.StyleSheet):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabChildren:Boolean; + public var tabEnabled:Boolean; + [Inspectable(defaultValue="Label")] [Bindable("writeonly")] function get text():String; + function set text(t:String):Void; + public var useHandCursor:Boolean; + static var version:String; +}; +€M 3 1212170191ÿþÿ TextInputÿþÿ‚ŽdE¥?@Hbÿþÿ TextInputÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿ|C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\TMPclvkp1p0i7..swflCWSyxœì½ t\×u øªêWÕǾ‘A‚û +.à&Q%®Hd*R›%*  +@‰…*¨ª@’mI¶d2¶ÃxeBÛrì8‹íÄÎâÄ™îô‰“t:¸9éd:3É$Ïtw’“I§3é8=IwŒywyÛÿ¿P¶uÏ計ÿ–û–û¶ûî½ïÞçıWDÛ/‰Ö˜Š/,,|UBÄĹØ7Äuù÷Î;¢³õ_Ån-üë÷¿ôÆïn}nä7ûn}°|`˹ŽOþñ­?ÿÏ£Oÿùãb¡©SÆ%È{S©˜ü#NÈðñö,..NÍÕë•òÈD¥,¾*ËÈ„¬ãƒâ ä\¢³­õÝw²¯~ۥׇ·|ÿ7Kw¶ýƇþo¯Ä~­úÌ—¿ðÑÓ¿óñ¹ïóûþRVó‚„õ$ÔñÄÓòëv·õéÂLa¨RªTá»Xý·›D:.SÅÌuH Q»R,×Dæö +!0c!IÆœ.IÀr]ÆËVÖ +uLºTŸ/D¶—ú‘PýX‰ýðD6—/V.ëro’cØ›•û¿v±µüÙÛÿçß(¼ñ­ÿø{ågÇÆþó‡Ÿýغ_;Q˜øûÍ#~Vü:÷&õÖ›¤Û›T°7do¶É¤´¸(~V¤¾¡zóð“~ôÿø­]_yûýßû{;âM»>½#Ã÷ÿÁŸV_÷Å¥zaÖm{¿Li +ŽDúFuÓ/tþÁõò?ã&7ÿƒ5¹ÉÅw³š.L\±Û|<ñ¹nnöÇG„¬£ž+OF†Å\9_˜,– yÙÇÜTALŠSÓuq­˜¯O ¹„ê²Þš¨Œ?õ^*¾XµzuD]‡11«ž¬‹²þ6Yi©Pž’pÅÚ¥ÙÜ„Ì:7.3ËS¢\¸^’y¡ƒ³˜XÏŠÙ\µV³sµi±G¼S‘ “N +±C<#^¢ôÑñç uñ4…NV«¹yú¼DEËg¸Ä-bÿuž+ˆÉ\I–¬ú©?žÀn©Ð9êëX©xµp±Z¸Z,\»«]ÕB®^8=3[Ÿ¿P‘±C¥â,tŸKÙñÂT±|¦X*‰™ÊÕÂåŠ(IÊ?…rcÇ®kÅq9>c×ÅؼàÄ÷õ‰i!1>&òs³¥â„¬ÇT1YÊÕ¦K…º”Bm"7[•òc³y™G\˜+Õ‹"W*N•ÅåóBæ*ÉòQ®\‚oÙŽš2ÁHËåóç1¢PcS¥Êx®$ç¼é¯,8[¨Á°ŽU+•º¸Õ.cÎWryØaŸ§ÅmOx1_d†oÇ…é~#.ö øŽ÷ÿ‰Œùö2rãtö“‘ÂÄt¶÷mf±á}˜ïéänÂÜÍÙc·zôÔ‘ù.“È:ÌMh9/ën½luƒmn°}äØ­•öÌûé.¯‰ß·åN{Cž½ü‘è•‹0%ø?JIÉ2¼¸ß‘9ý•-h‘ØVÛœÕ ï<Ú ’âN\tB¯¼ØE,A†ÿÉ4 +¡Jd ]Í€Ý#dA^‹j`ñ +ðŸŸ_¸Ý&adk┹Kb­Û^Uw¿ÕÍÓ;¿û¨]´,¹°ëËÿú/®“ÅÿëY˜µÎ í›ÂÆÐ)ÕSjÏÑP-rzŒðD]áù;E˜tM”K"–p·íÕnp…ì l¶ñ‹X— o¶¨Õü…ç24ß‹¯“™n¼Ú_hl9uS½ ¹ƒÃ,’Ä™Àl·W +F mÅ ÆCm7«=;Fq;¬8q ·™‡a¢WÊ@YÑÙ.‹z^tÄådñwâÉË…ÆùTõ°8€_æáQ +í‚„ò"³ÍàJºÌ‡dÏ„fÿ +kë¹_¡|MÖ.'j¯¸Ý.Òž^äq:õâ|¦Åe}XlfTn#¯/P,4Ö<ÌH˜Ö^:²ö¬Ó'…6YJÌNЫ÷²c‰pÇpød´(`tš0¬·ÇÂ~îûº–JÀÖzN?úu?R¸'%¼”¤RXíï.8s?á?”í½Õin5rÕ(¤CtV?®ÀZ¬SœªTóòæN@]a NÑùñ_Q@ÄþìYYF4à«b“Œêc3üG¿×¬+™a ­ëпúäçjþ«ê¿=!³m• =Ál ‡ºîžï |™áûÅWý£2m´/Ñ ½VÌ«Jl½ÝaFRñ¼ZåWnü\®œ/É6f{eÿ í+‘W†5A‡ˆ=¸J<lãc½’ŠÅÄääd×½ß÷é¿Û0¼ºþË7†þ´þ‹¯0C¸W1„W)VX'v¾W¢q®œ——ˆS•ë2ï,ˆ˜øj +XeÛ!ƒ79Æf&¼ÁW‹3•‰¹`5z@³2ªÏ›¯¦º¨ÜØÏ¡Ül}®Z€¦%deÙ@ Çå‚“gµXýùW;c0ž ˜¯ªñìªú¨ú ¹rn +§Ì×5z¾®ÁLkd{†*3³•r¡ìNÙdúÚð”íÝ?¡)›”U¬øûW¾&YÔªNÇ ®µ‹—…ËØ~§ÇíÔãVÑþ™¥Üx¡ÄÝÄʺÄê_z°Êëc­Xõ×?æ ¸_\.\¯”gç ô߇ÝÇçëòëG!ù¸æñ÷SòÏÍQÑ, +ù¢Äp© ¯HµÚ59çE]$ÄLî:ðšj¢Zþ£¦Bòå#NÌËÌý“_Ä„­N’êëào,)瀛q÷¬}\F'!ZþMqö4ü m÷~“ +=­S„+¥Ù« ˜s=f:Þ¾‘²^Œ]ÌM\‘Ã^œ¹>ˆœáÁ¦ðB{o€o~VbZ1ùf®+ q”#àf«•z¥>?[ÐeÊÁìÙS"/©M16QS…:±›+åÓ²ÍÕ3ÕÜ pU¯æJE8É)ÑåLϯCÍ'/]*Ô/V+³gJ¹©ž7ûÑ«U”<™bfןíµóÒy‚ëB.±@ýgHŬÊûD’€á^Êtr2c]îS·ZP"3 pÀÉ›k"AdÊf¼ßÒ•ÝOŸÐ,«„"(|8à°”¦[í(ŸâñJ1/öðñÙl®H1¿%kRòN"³31Ê…´ +iD·Ê_Sf”[ß~«Jb—ˆÍŠø„“Ïš:%ýv³@v§ßìÅGé+åbÿíÈЙÍYÚfiSYšf‘í´¸zá>ÊCC~u˜AuJºÌ¨"‰tRëG{yemà•µWÖ†ÀÊš+cÐlèí_Þ7ÿiúŠXNÙìþrË fn¢Îa³¦ WlL®ž±1’¨¨?ÇÂý—bK…É:Ê (¨?ê•Y%pHT v6W…Uí”?^©×+3J¦#£.èmoÌì€5'ž g¬ˆšAÅО9¦wÏš«ËPáš–¡Ç•xDmȈ´éb¾ ÷쫉ò|±6›«OLŸ¾ +Ýâ"µT…J4ALEiÈ“uø¡2©X+ÏSáµrù¼ž›%=T‚·sÞ±áL¼.æßrTfemˆÊ$¾I¢„`­6G8b['³½D‹ËÀv¤L;ˆâdÚÐgÎÌ€hb2¯)sŒÓšCi-:­5”Ö¦ÓÚIë¥uê´®EÒºuÚ.NëÁޭȨèð³g[ðÊÀ«2ªšp³Ü žUÛVë¶õ©ŸñiM¯–¤1§¯ÑÕw‹@E½YUÈZ»-Â!vûBƒ½&{L]ú´onßzSô5ݾu¦}·¯_·o£]H }ëCíÛ`Ú·éÖ +¸W$%àuá•+D›=+”ds3K á†möhnzIæêÄ[ö/N¶¡|¾¶ÇZ1d]¶ëëӎЌڬ±²ÓtèºØOB—Xµ)Ô¥¦K¡bwébwÛÅ®ã>í‚>¤L¦¸=¡âöêâMq󺸽áâö˜âöÝê„Ë›g(Є$AŸâr÷›+Ü +A7¦ýfc8pY½AÀ$/£ñZ÷ãš¹'ËRÄ{Qö£æÐaš…žš…?É5Þ{„¥b÷eH>h÷ýJj¶Ÿ…QB9è›?Å"wèÇ{2ƒ#È’§ÎBÎ" P;È,úC™,È‚¿ºÀýx0°šÖYýˆhC=€êåºOK¾\l ä¡å!=…ï‡ÑŒÁòñÆO–®åækâSB¡ôÆH-Œ$‘8(l&´ŒŸÅ”C1E‹Ì"­²úŸŒ©þßGá"'õ ÔÚ¤jío’ÊM<÷0®º‡ñÃöalÖµl·’ï'cTâ¨îÅÏ*´òÇhÞç4-‘uÝg×¥ ãSÎRð=öÐøE ÍP/<Âïâ£j˜„ 8wEÞlçÌhõ±÷B4Rç”þØÕ vÝÙЯ9:7ëºB>7뽤YM8Ãḟû˜c½\g¼_r´nª•‚JzžÿŽŒ®ÉS5ÉŽ}HaíŸ@2ž˜JzQ¼ëV7ì“-°LŠ´¤ïJbW’Út ×ïËÒõ‘ö¹F ]oØÿü÷UwÀÇô€ÓY‘>úˆ ©_L4{HÄè”J| ã# ·•bb’z–Óª¿Œ¿ÙVýt<ÔªOÅ gïæl´™Kœ%ͨ±.LÚ\ŽÓ•â=¤´Ù¡”E_³º[÷âê~†:€z½Ôëg¨÷ ÞÛ꽤¬#¨¨›  n"Ôm†úžÔû@½¡žc¨÷ >`A­¶ >@XØ­ û½Ø[ `oY°*öû°lÐÚbk†¡>€úp¨#Ô;ê#¨6hçG­vž`Ø`?Ö ÆaÍzÓNÁNÿ{(0y¿‡w,ÌÓ&œ§M\L×jªFݦ¨u´ë%còGj¥ÉWV•zÌÙš¬m ‚Y™dá\„nÓCÁø:dhÆÆ5ü¸E6‡ŠQí¹šaµ.ÅlÓíêgF‹§ˆžÈö¬7ÿûCÁñÞƒ"¬-Ô¼¦0Ï)âÇ•±;'}#kÕôÍ»Mp µ5_fæTÌÿ8žL¤¸(ÿêÔþdVßãþ{á„}mxC ÜÚWíéà¶s?µÓž½AFÆÙcw¬…¾.8²„pcê‰[öI Ûåq#£š’’ˆUqsÜøëSðË\d²Ã³ªbî•Œ;fu)…]JqžKØДݥ>¤3™?¯U}6biÇÛA}5&CQJt®öÜÇêæ—@Ûµö\´ÚœQÊþ]%Gq ¨¹¢%§ ÙA…µV+u°NÇ[MÄY +Ò±ðcèrEœ±Ä¢ͤ©5eš1?}«6¤XY“ ÃQ;¯´ð” ÉKÐå3\A“1‡ËWd@Íhãh&þ<ð}Ô°([‹±µò6 ÜZ䬊§à­Ýdî0™¯4PeîÔ™»0óò4Úºõ4ßÄÓ|NóMÁiŽÊƒC—.ën,´: €7b£f:åraÌdÏåóV<¨[Xê A][tzåJ¹`+OÐå9¨°V¡iaÜê?i5åèc¼ÕÙL†fôâÚª1?e8¶‘']—’¶,ó>&ZÒa{Ú4ÎW,vzÝÔ$'ª–nv˜P£èo¿YíÛ-Ù^»º#w]]Jø­°ÔFL§[MQMHøÞA¦¹“C˘۴Œ¹ÛÙnµó¶âWÄ·¡ŽÆê u4ÀЛª®³quT]×w²ºîÆÕuSu=ßÉñ_!ËYÑpüW,9þ+¢Æ¶såw-«£e¡¥÷;YÝêÆÕ­¦êú¾“Õ­i\ݪníwrÐûA ¦á ÷/9èýQƒÞí\÷DËúÆhYOhYoU·Üã}ƒ>Þ7óñ¾÷Í ÷ZåBû¯'üæŸÂ¯Eù¤9êƒ +˜cËÒÀ´•ñÌ!…` Ø†”–|€ºpi +7k!ïf.Ì€&˜xëéú=¿Ë3^” ´ = @ZBiÁÒ2¦d¯;%¡’_¶ôcµù|;õز!`¹„˜ò.0òœ9rEq³ ŽØ3\&„˜,Š)Ï&Ã0Mãbr!w-|hª»GiÅVÕͺÁ–1”‰pã[Αs!H2/Ç •ÆY›ÉXÃÅÖÓ†ÿ¶#µ€ ŽE¨ù‘U +.’–»téÍ` oÛq3ؽ8 t¡ý3i€»ùZâ‘Æ»€b–¿º¼†´†Ýp-B±Xß{z±y|TsõŽ¼´W¨/Sé3òˆ|±*û»V”º·¹-X7s9±®ã¹*«2W%FésŸÎò7Z¤oЭ?WÈé4g+¥ÒèUã(gOK%úš– (A#øyÝDU‚]65Ö +¥lxÃð(€b¦sùÊ5þ®W+WT<>”8%!§ªðb5:vØiG0õbµP«¹‰ö· lY¬«Wò¹y‰7°YV©:íÌÍ:¨SÁIx¸Ê)%Y¿¸6]¬ÃÀçÅTµP(Ëع‚¼¯MÁc1_(•*×ÄÄ|®,¦s¥ÊYÌ_§ |ŒVså©BôñƒwI¼ïYWDû^ÈWI¼Žæl}s-´îú๛E•w­Ã®/öE3p¡|«PI¼¹[$a3Ï{6FñWä¿iR¾Vœ”˜ïGAok |fVP{uÓÝ4 9Ø€–»i@sdZomàG”q½3‰~>žƒ)Ù¨1mÄWòbæ9¦nŒ)©QcÚTcððUéˆ*bÃEHà<¶ýNyÚuÉ_·üõÈß +ù[)«ä¯7K);4z»¹›ýÕ2¶OþÖÈßZùè~ù['ëåoƒüm”¿Mò·Yþ¶ÈßVùÛ&Ûåo‡ü픿ùÛ%»åoüí•¿AYÛjªímÈ5ó÷™‰¼lu ÿ@ìøÓ`ÊÁ?”ƒþ=òŒ¼WFÊ?‡eNy_úÂÂ+`ãã›ßÜ-üÒâWDº…Š¿Š?â?(+}ˆ;q4)ücòw\~Ÿ¿“òwJþ†dÜpRC>§9+²›…ˆ;#gåï#sDþ†e·Z zyÇûÃúxßÊÇû<Þ·F?Nµžß·wµÐÍTâLã÷©&¿9Øõ«U÷Ejô“Tý’мÕäGHCÓ° ç!E=ÿ±^/Z/Ä$e+‹DópÆÑÇ%<ìð˜JS™)2iÔ»ÖJùy À•ÂüpåZ™ßï¡Æ¯¶r)Ó›¥×¤XÎè\=ð”?R9•ò%ÕyqËAàyF ëìð ð Eë·{˜Í¼’´žDéÜðæ ä,œÃTpUâ$W+P X»H=Æà _ê­êÑ*Ö +$˜c0|Í©^‰]ƒÎê^ãfŃF¸jÅP ÑkÌðC°+—êÕmP­È“–lŽ0©gW‡øÞ,?ˆã hó’i¦¾ÕN×WÓ¡møÛ„؉©KÖ+¯tè…‰¯Õ5›BiÍ:­…ÞîxkPl¡廃 +æ-Z²õÖFPoåÐþ”t{ñrá}Ýç>j ia¶+Q =üï<Ò{ÛVŸh#y 脪©Rl×íé"’åÈáwLõ°¡¿‡àOw?\€'娴 + +÷ƒMI¼«jWh,­°­7P9+t}üÒLöÿ¼V@tu:ö±ÔrUHÀGÞ~ôU%[ñÏl ÕÀ ݉PZû¨ë,;ݧFc )îËcØŽS—þºÐsõh5©ÃtW6šºä0òŽ¬kS¨®Mª®Í‘u¹µm'nQª4ړѺ5íÙJ 8 f* ¯„sd[XýDƱšÄvKy”4:bÇllî0,½Šø  PR¦Gà +Ç*^¶ß®§[Gð‚°óîÌ°Ò†Š3èÙšU k¢’wh+cf1ðC4o@¼Ó¶7Ì™At+CeªpS‡…5þqÀ÷]ŽQ£]zúŸŒhOuÑãn‹´þœ«Öd–Ôn{”Ž{-mL4‡ÌfÚðuÖPU¯íÔ-†Ã{‡}±—‚Ø‹sY6s0MªìØÇÔtÞ/û€q£î¨pP-ˆCj?;hiŒu +gÕµéÞÞs«ƒuÙâtÈnÀ­«ß¿×?Ì"éÀ’b–Ñ}ZsæþhÍ™ü#ÜÓ7{´ +ÌCðD ¿¶ÃW'|õ!5M+˜•gŽ»‹\â ÷ÀQÔªü÷x&ú’¡S£fTÀÉl@¥¦ ÑyJ±Æ‡ÚiL6Éˤ¥OkZz–v¼þÆd(HK—ëÕJ©6h™›jÿü*»ù{É[‘Ô4AXª ="µCDdàC4|`Z"GË0+ÿ|²6Q,ÝZAÒË%ZH—[ÑÐH’Å-sϵÉL›"uiU¶è¡o®i‹6Ž"Ám"ZQ’•2š±îA’“´=xaÖ˜J XÉ æXgcöeUÛ¹³m…8&FŒ©Ü\½‚ÌAÔDPwúL pþ²bÆÕ8Ne¤© dñ„ãýEyõyŒ8@c ?(/YhqoWÖÌqa›=Ð¥ °[V³ €©6PŸ¼.óòwMþ¦IyȺiËhùùrn¦8!“—X”à0úf¾´1=)ø²¥§à¸¼Þˆ9²ûZÉËég]ö*déÏv>`ÈŽ¹Y˜Üh[Ì3ÙV1œÊ®Y3`h9v`óí‰jnVÓ€Õue†HƒÓÊ‘ ³Ý%4ÑÔu%eAN0´ë±½X©qšO‹WO)`ZtNÇÉ€ÉÉÓZ ŒéÚØþàŒV˜Xnœ‘(àFêM³©Íƒüú¡i$‚NKî»aÛx]‹¦O»ÖY[±mY0ÞÆ1±èMp¯òÛý¦Ð½/‚º\c—äa&ù» }~Ëá»"žýv±ÆMÌ„S £‚Õ¸ðVÏïcõ|? +{=‡¦Gü•^ŒÉ¡UIõÕ›TäájÌÇÑ}þ×à¿kÕ+¹¤‹ »¶:ˆéu”± ,Ûexflß­ b}bƒ†Ø`CHm„kFÐfÝÄ5BçÒöò±ƒ›³Æø‡ûØá òÖÐ ¯Sƒèö¶l(“m߃^ýõñ«¿×ƒü5X;Í ¹Û°’/'C¶µY§œéXÉ.û]ônkÌMkvbÆ=î|Øë*LíklWe¿~t{€þ„&ø¶U†0²Ï˜úØÒ'¡1>¤98ƒÅïÔ†WTV}§³zqÈh£nkÜ‹{t/î5“ªìÁáˆ1=fî;ªôQmÕ¾Ì߯.óªµæªívù7ãÃÆg\KX•t°bíý¤pDhi]jÄ›ÒZcƒGÈljy*m&(›I«ùoìvðùp âhÖr‰@3ìXL>d’]^q“ŸBO3ô$&O5‚®bò‚Ð×ú*&_ &ÏpòL.“_âäyL~1˜|/'oÃä#Vòò¸Üß«¹ÜÛ±'ÇÛÁ¬yL†¢Þ8*×!í›ãpóƒ‹8à¼!Î6gBsîáõÔs¬  'Ž-ÙÐ~«±eüïÆÆEØ2diM#;¾–ÿ4éí¥9j{‰û-%9­Ö3hŒhóÛié8q÷vòwðÄ"U¤‘Ër/³Ðþ™$Ýü/±Á†“ËÊo&GÜ"ÎBä#C]æ9åpÊ+““µä` 뜘èÌ@äµCáÜ0Íÿ~LÏq£ ÛÊÅVZHé—ê³”€]bLh[ªÊT²¥º<î* Sz@‰ØE…Ãdµ=B¿ÕÖðÆ°fë[R÷f‰µokÝ,aNÔÈ—Û ‰p½¶o§a–I¨£àÍ1<çó{@:/É@i m¡$™Ô¥ ýNýÐ÷Â+¬pØ^s„jÊ´*ÊÌ\ÐÕI~•ÆDЮstV²å¬÷Ö¾hÒm¿–wÙ~Mº­ó×ó×#mò7ó×+mó·ó×g¤9‰uìïÊF‰Æw7J&Ñø“¼Ì½}¯ÞÛwòÞ>€{ûÎÀÞŽ’‚Ú J^-_ í²;2óÍí±õ;³r³³¥yIÍTå !”“²H è•<|€×ôô ñ½Ðö¶´ªÿ´c¹K$^@¤Ñ¸Š¤’Ýt\½ÈR¤43cÊsÈ:”îyhÅ“r&¼˜Åõ’Ê£p§âQ)Wº¾áY.Õ¿¸ ßtjý1Ö?j¬Ú¯¶¿ýQY$v›<ãºÄBK£h³´6ÌÒº˜Ç¤fÖÖWf#fi×›ö[ý Üów‰Ž˜ãpÁ×ö°-:d¾NåvÕC#±a”Z¤Aá¹€Nç†Ë¶ÊcO½vи޳ʾrLÕÔnINQ VbËêýP•-Ïðóc¶)D~†ìY˵$껕»jY}dÈ,?a j÷°™CœÈ¤ê¥­±ÈÕlá?(<¾[›`_åÊF¼]´¾QòaÖœ½½™)þZº¡ôÓRd%‹Ú˽²ôécm€5rš7}¬=6>ØþC3ß<¿·ñÁ†3G[ÄQõHažu¼®æÕÑAÚ\Fc+|ÈaÚc³¨ fëÌÐYg + hà@Vyäpb¥ p­[ƃîGóõBír¥ž+éä72ìçŠK4¥X‡qè苈Åÿ“ßî!͇-¢U¡M½ñ˜¨äù ¨ü›C%9­-‡Î´kÅå­WK¤7  Û" :Gçóa§T¹v^Žq‰»TÂb´Ê=%ƒ¬·Ú]¨Çÿ‡» q&b°î"×?hì©ý«ŠûWÜòŠ)ûÇ̨:]b,ªlÒ¾ƒ :fé$\ä°mч­j„µaÞv­ÑAÍfÒAË×B¢Ë…ø(Ct›Ž¾Ê‚‘î†-ëVïi˜¥'dI¯Ê“Wf⨺¨Ãf•nk¯ÛÖnÕVå¹£çˆÊ¹ÚÍóÂTÛ–¢ŸZ– Ÿ‚÷,Óå5 ++kféSYúféWYÖ5̲NeYß0ËzMb­‹  +žçÙ½!LlS±ÄMg•åë€f´Š¯Ñ ë-Í(÷vÿ2ú Øèoö·„Ó\Ý +Åߌޞ½Ý.üipâkOí?î +Ç'Yî`IÉÈìº ƒ"Ô®]ÿÈíê¨') ÝJœ +ƒ¶õ…6Ê‹tHgIÙ¬ßmìÁõŠTÐ{£ f P`Ùƒ¨”" ¾‚äjʘË]› Yã 9hçtèòšëï> ê¡ÜDZ8z„o^IÇçŽ1«Á¯ŸÂEÅ‘X~YËýÔ1_w,­:æœÝßGtl +)Ã4R¢©hʘãûµß pš‡+ì'Ü3æõŒƒž—ÞzNñ»“¤Ö^aä7DM0;¢éÚ›2=È¥ü]iÛ”)¦âyÇH¥¡Žã „ìðÓw +%_~¯ßÅÁ¤Î‹¤tKb¹tò=šNÞ…x=Þ>(`JïŠze\¸^Œò{ßþ/:þfÙ+4zp zî ŽùÀ³…ÊLL`Z\ú×æ7»üÿ׸äW9ÇuÜ㢋\å7à!·jÄr-ˆr'«‚ê¯Õ±qüRZKÉ–B^",*;Â/w¤!F×T’ã²ôreiÙ÷­jˆB/#–ò« mC¡Ü`¤ûIa½4+„ŠS¯0\¢7ÏŽ]’ù,þ"Àz;À/4È¼È ð²Õ(§Ô?…v^°‡pjß›V’2KðÎyÑul uÓ—vΨ1–¡lœcõƒÛyæ%c&äA4Ê°Wȇ«cŽ.pìX]ªË}ÃÊ4¿r–¸=û-ë\ÖT¶bÙò +-+íýBµUD$Ë2¼å•A{1–ôžæè£,Á›MÙ¼Ù4p:ɉœŒ±¹"¸ZHŠ8]Yä1Ѥx@Íè,Z0¡5œÐ–q¬_š2ùÜN {ÌÝá„×̳IXéšÅ6 ½˜°ÚNÀö±j)YÄ^k¥3>X¾³{)|Áµ”]Ö)BÏ~?Ú(¿$XÖ%Ã×ßõL ÜpŸlÀè&± ¹h)¯)üôÑnRš¦l:b¦lÆ·dC•l…âÛÂ`Û0Ÿ'£&<ÐÅýº=Iâÿù^Ê Ï=I— ìRÝ2°[öÈÀØ+{U`P3šÉ( LÒˆ$ü}²V½+:zwtôžèè½Ñуn46k¿lÖ~ÕÆ2p@ÊÀA8$‡¬Öï®á@tôÁèèCn´Dù=ñižé%'‚ms²Ÿ÷†õÐËœAAò½dRò>jF×Ùþý^“?u>í? $íÖ…( ÖGÔ½&í?¨ó|žk8‚ú¯ŸÐYE°Y²a­ç‡²nø¨r'zL®ßc¼y·Hnå¸÷¢æ¤åŒHÆa^t„ïd§LÛ‡Ì#:tUÿ†ÙŽ¶Ìs¦‚B‹š:}ÚŒÂU yB©e§ý3!ܟȵrŒÓÖp…¤Îg²8ngíqÃj øÑeåsˆ‹‘eú7yøDx4Ô} +Š’»Ûˆ–Åß‹#AW*å<öG+ÀmõyVŒÆñxÄóü xágTM‡lŸ(èýÄ=‚Y oŽ‚>§ +²ÚÎTÒ¾1¨º5ؤUß.âµ ÔÎ*°G—–uÀ$¢¶´´.ÑðúE‘®‰Ém¾ìÚ¸”M?'nïh. ý§‰(˜éo-,,ø—É fµí¢Àc¢œÉJ½á2Ó pCŠm|Ü~»ñ¸ß>j]Àܲ©)&Åãª&øM²È‹l.;ÁÝÄ›"a'^îo ;VFùut´W¢>3‘¡Œî(~ý4˜Rª!+-8ÒʵëRø}d üýجÈ4h€CÞR5“‰ß$›ˆuç-ì£âÖ»§Gèë¡‘ž +úxë”t”˜b5¹ù4ùÍ‹l>Ø‚’ÓÁ¨båöæGVuQ‘­`;4Î*cttUVï.pz®AsÛÌ>u4*‹l|^ó#`Sæ=eûQÜž¨¼q³Ó'½»v†[û!§µcbÉÒº²! yøÒ}Thï> +HÞºœâUcYí¡ùyøázà[sä® ªØc§Ú÷,Ö²’‰!.MD…[FÖ6W›q{Wˆ +§Œ}D¶iÑ<ÎÇG—ÈLĵ-DU0‹ÂK¡û¯6@7¥]• ©·ªïA´§=_TêGŸ±%añ•¶íܬËjí¸"lŽïÆÍvŽ™lK€cÛ.*êop˜ŒD³fÛ5) áˆlëÃg·‚'R×nN“bmèɵɺqmŠÂ§;±j³õ`ƒ cE2rF–§L-íñɈ·zÞi¾Ô÷4Έé>OæCà&rf†ï$"CwBä–HìËÞ÷E q†06£¶P§S»„7)¦¢u ÓCóÀœy}þË«±—¥Xv’‹öÙ] ëŠö“ý %ëæàbÛù‚=„œ?‚Ï ˆ{6TÎÄ¢{Äká_–LnY"¿Vm2Ï^¾o¡ñËäi°Psé»ßŒ_úÖÝ™|[í«þÑ@½Ê×mÙFJXé@ÙÛÙ,®æ¿]¬gáɲØùÒÒH…¥/sÖ—Úô¾áÅ*­gy»óªa'vD¾ŽV¯£ve÷_ð³ˆ"üƒ¬¬VÍ·TÔu0Ìø¡ÌQZÚ­2wFdŽà?Qæ(êžF™7EdÞÔ(óæˆÌ›eŽR%^ß(ó–ˆÌ[eÞ‘yk£ÌÛ#2o^•’êÒ¼+»\ ÂÝú:¼ÉñvxH“¡×aç&µÐþÎ]yó_¦>¶ØMؽ–5¶°Ìlë|a27Wª_”÷·SøÎ]DÇÕe&»ª3³Ó¹^ãd+]Öq!wý²6’ÊÚO¶9Um–x +TÑ®×uf¼ßr3Ëv‚fÊ»÷y—?/®“.ŠK,ÛÍ_àä(|,W’=poÄÓÅ|ÄÛjájAb>x†ŽäfësÕsוˆ±àl cJ¹ZD4AuAu‹×7o|ÚÄ<’¡±ñL¡W~OÌMlëÊ¡gSÓüXɺÈ^BÊ¡j¡v)sr¢>—+©²Gçªô u_RÎh&rå‰Béd©4Lu8.a´9cež—ÿË ÆÄ5”zºœ§‘†À©ÂT±LÁšÕ:ó>+‚í°Ï=#*ý¥+—åÌpè· …Eè,Æ|ÎÕk0è•òp57þnøë*J”:õ)Ó-ÍÌZ!W˜†áƒf_¦—XнY2Ba FM«µzÞa)u§øH-ƒö±á“±(X7rÚQDY³ìÀUp]#‡ÆÇЧ;f‚'ŽX~A9ð +0UËyR ­VfôÄL~%fç +úrýð¨wf–~EFx§8k°Œ®\hsQ V=Y«ÊùáP&äÓÑW*N\ 0ð`ÿµ×ŸÓcÅC†ÚIÍ‹ð7ä°ÇŒÉvx hæçTÁLÝ ·¶¬ÒåÊYÚ¸ SÍy;=¶0ZÌ6“L»zD;íÈÏ3ÛÕÔ´ì ñø",¸ß½ù•°ºÅ–k §>"l9§³ÃñøÊÉÛ³%D·}W­¢š´if[¥mLÛ¢mÊè‡'¶_ ’{¶dCOþZáËø !¯ìAÓHÚ8[UšÉŠø½  ISö)ò1ë<ùý<„¤sI/e³lÚ‘V'›s¬Ôa݆7™8x˜3ÅúL§9[ü(œïY{‚.’,¦A¶=„3 XºÂqWÀ²Éóúм>"ëÛx?Up=µÒº²Æ’û¾éñÆr›•øï*ÛJm¯¾Ù·PÄj+¼q볞Fµ“ÍSfäüZÐ÷59ÖjáO?¨Ü`™7ôÃQNZLp¸JÚhq&]ítÐÖÂ)Ü™tÃkµ­ïnŒãÒ6ëGýú¢†ñ[Ãñ‹£oÒGëªع¶©\Û‘yÕìˌީ*p®É»°8°q²=®´²…+ÝDnJËi/¶;K\‘¨ xo\Â_X'+\Š·}í Ìò—lþÀ~Ý¥fzèDÒsDËAk©>ÈŠ¸Ë’ïÉ_Eþ½æýåaÝûx¶ª6}(ܦûÝ6¦¨½æˆPŸ=ÂŒZÛÚôƒY6ü€ÍHï‘Á¢qи´1LmyUºÆ;Ò&âQ¸Úð–^éˆÉ§ÑFùÄ1½òÚˆpÉÔ®]2}ÞuÉt ÐG´UD¢ O×M,u¼{Ș´4Jw°EnG ´^Cj™°FÕCUÚ’9aJ á׸ú‡p +œ+Ûnw2œ4¦µU”2°í6½AùCĦÜÕ¯‚ØËÆ¿§àˆV虬Sñ~S±Ü‡N‚æ€>¡uy)|ÊóTÏVÎv±Œ朞:C¶#¶ ª ÕjÐÔۛʊëŽqCFÓ'Bå =Cºâ#†_¿&¬ICÄÄ1?ÊÕXÓô鈸³¶‹>ž¶Nao8îÞ °¥b-[ü# ¬ð£ŽpGÛ©A7W‚w<û=@ü·Ü[6;0¡æ8Ñ~Ęh?Ò¯ÎãíAüEo# +üü­Ã ŽÜ6 üY‘*"¹ê™«\S¾X­¥JåÊܬhÆK^)Äg[°³¶®É'ß!Ÿ¾Ü¬È§ÖMj “O> :Ç¢u{Pžs£èßZjv[[®þY7Rå}CE+­rËÊuÜÏDEŽFE^ŒŠ|4*2yÉŠlV‘—û/C+MÁÇx},ÃÓLX}‹àÃøQE3?Î4óŽ8>aÆ•Øpb@·á KH…_ü–n‡›óI…B•sû·Ö…⇭â¨NZþ&;ñîOdFÜ’ßfѺèŽÚk¶O°§è¤Ç£±™æÓÈçÄrê~fñº¡£ÊÎù3TÒyº¸];[|Tw;C8µ¨ghM}LÏ5¹ãÃá-§ß¹LNª>O`Ÿ;2 +jê<íèáÁ[á‚X)}Aüª´†^t†ÆJã‚hhV¹Ézh0qoÔ\\Ý°cö¤š ¡<CÌuG¢¥P+uã¨ÔpniÔ/‰ºñhÔ/‚ºñÅQ7~ר uÌFݸ¦‡ò!œÄˆ=,'ù%q’ÆI~œäÇIþ.qÑ1'y“Â"8)0è2–XaIœ¢qRX'…ÅqRxÓ8ѳqRÐûvg†TèÔ#¢Iœfð}Ó>’¢JE5IO~´VñÏÅ"(½T·§ƒÒá˜}ÎˈÿU4¦Þÿ7.…€Þn¶åŠ>d”ž¶4ÝkÛèÜÇF_âÊ×xi&Ë!‘è×{¦–1i¦Úž.ö k#úiºÁ½;p§´6¾‘2Ùañ£‹àá=ßtñðfFîø7©'SÜ Ö +Eü4i†CcôñøöÅç /ļ_8È·+ob´2j°÷»E˜I«ì.¶›éqœ„–ÑÛ­rŒ¸G>3Y¸_ÓúÞ4}kPÈ6 ¯¢hü¤¡ñ} ñÓmÿº2óïUs Át‹¾Ù÷id\£/Áª™¼˜kwoÊD D€Ü^ Ên ‰Ä$ŽJJðƒRÕúIj}z@$*£ÖÇMëSÐú¤Õú5ŠL&á…u†Š,Ú7ØS¾;îã±YM:Žïæçºg>`æêÇ=¼+ÉÐk¼•%»šÄÜQŒÞ¤&'iÌÅ,ój —}H&Fzù/ó©<ºÖ«©ýÆ$ +oÖPsúöЧöÖç¬ÀøÂ!Bµ‹Åç2dM6‰‡,:1)éD\0g-3^Ä+eyû¶”=»gÔ¬k 9£güñ”ú˜RϨ·«¼ú(¨ õ1žU¯c“´_Ü`{Tr]%d«ŸÈ88{Cñï!&äå‹ Çšh¯#/¸»_84m·=Pš?Ö&Ô©­b ‡ sàÆCpû’¾S˾xpøâ<|H^ Ì™eΉE +µ¶ ~ñÃçÊýîéôû™P¿ŸÒ1Ã}ø *ÜÄ’¸$œ2*èí¡ÝK1‚p²ÌøÉ0T†ÔÃí²ÕNÕ†V+n·Ž£%m¤YÐ4¿¬}{•é€˜”'DZŸ­|Zâ3§tŸJ©'Õ\œY"6í‹Êe¾;¤¥FÖZfƒ"†\ºäŠƒhuW]O¯ûÂ^LœÁm~-Š»^ °ºÈclÝŸKMëµbC¯jÈk¤J<úæáÜw(ׄuwLq«Ò¼ §í…4˜9ßý†6\ |*—ªkg>€=F.Âì ‡Fé€Fž}ʈÍuäV+²hQŽdì¢ÖÃç7˜çTM‘1ÿK ,b/&§v°9ý¾ñ-û|›œoc|ËÀ²^¤&s¥>\c|êm%(/VTÜä\Íä‘]Ñɘœ+ .ÙLP™­ƒ–(3ÂÇã94 ˆ™!Êœ@ÝQŒ*ËWγ›ÈNíä).³#$þsµX¸FåÕ«T¥¥|wÚ|ÖsSr³¢X;_¼Z¥B 'û^”ÿ HÅâjó–€29Ód53OäJh}Ò¸!ã1€ò±µéÊ5«ܾzqÂÒ Y_4¹Œ‰L¥\«ìE +€.ˆ”&XëÝ4Bq s³€Ì““2‘j7ú¾UúKMV‹•ÕGêïܬêI¤.pPc8B9Xö‡LÈ¢Õš +ÙÆeÃæ_ms¥Ž‰‚½l‚Ê÷Æ%SÐ<¬ã‚¼:TÊK¬¾ý&´CqÁÊ”aeá(ËÄ¿dñFm‰§(,4™þ`>µð(FåâòhK³»ŠPâHÙ­‹Ö,Ö§?5 ]íãT%mÚª+d/i*Têœv¡a­«—¯SZ‡oµ—î?¸&D€}÷½z&ú˜Ê}>ø×W¤^“!õÔXkÑ”3[rÃ/Ið´Ùª­Z³Œ|E%…ºQt®Ò'bn…PãÑ-ÃcO}˜šÉèû$t™æãO -WêÁÞ¯ÛiWò‚•<äVž(–ʽڋïkdwî€ ‰€í—Š+…ÃãèGºþñÝl“v±†UÙâ’æ j$ňûºKæÖYǧƒºbo xð¥ðž …kÜ(o–+TûHg¦àæ³ÖèÄ=&ÕiÓ 1ˆõª¡ry0[²ÿ¤__¬¶.Òž'E¸ Ûi‚Ê´ìÊ·Ûø ±ÔÕ¹ =€5E]õøå¥gù>†VñŸÿyç K!o'Þ#ðÄNøg#F×RÒ††#Í]Œ˜ 6çrae»ˆßmûîXç0b\nÒnlÛ:q{…°TpƒØp˜XÇ^³àšØJÑŽ)iG“3ó§"4àqz@]( ~Ø‹ÆÙB£‰®Ñ:UjÆ8ü„Á´µÊ÷eõÞ°)C`PJ OOøw?©ñ^T,×Ïûé¢ ÕBfdÕ|Xk ²ñú„“1mOÆ$\=À+MV¸2&0ÒK[ÁÐ*²±à©ÛázF/¼ÐÎ6eiN©Åy(ÀžXà òd9²|î^Œf+¬¦õ㈴šÂØRx¡´çršÖŒ™cZ`·æò¿ }B3és9¾ä\ŽÓ\fUG¶Åçòr¨J²æ»Ã8XŸµvƒ„>º³¶;”¢gí}6cçS„„ó$c<ÜOGø³ ˜/¸F„qˆŽ [LiGqâýÄ…ß&t]ÖΊ29õáz p¸~!ÈïÞb81ÿAKÏnœ[þCj5mG%z>Œç˜Ò±:j/¼ÃŠdpb·[±²[ÇF¬´ã*m/RbSTŽ“³L„®t£ü!¡s+’DÍX"ÄR¶æÒ”J"ȉŒÕ]ªí$¬šŒŽ‰Ã;oc´Gùì¨ pÊC£Ä@[@{Ñ枉ñäëÇ¡Í¿cT‘£§·E gFï¸dÁiuìžY +È‚³<ÄœS»ÄO‡=²lŒóòwA2T +F=0fÌG=0Q åÿÏKÑ5Ý.]èÒ¥%)n—Ò té²Ý¥Uv—³»ô¸Ý¥>»KOØ]zR»÷R¶ãþSÁñ¼G¿[ËB•Íî“©þÐk°·éCäé¥ü>›óæ™@Ö‡Ók2¼›h:ÔÞ½žÕ/„öš°[ÅÓºŠ-*š45«·³Ï<°$.ïþƒJDï™cÖÒéòþŸÒõ<× ž1]Oέg‹‹Ñ·‡0:nÞ×7~8öœ¦l'-?*¿`Ê/4.R—?u—åO›ò§—S~Þ-ÿ¢F ¾p˜ÚžÂz¯ž.oÉòÚŒ>?ãÖnü”¥ï|=iæB‘Úàõ‰´á>a!ÊI/-…„®Y +Ϫƒ½¿¢×õ…­û£ÅÈ’?¿–ÕÑRAälaÝ€Yÿ•£š…ƒ­¦,‹Õªµ”ñ>'–Y‰ÂŬ‘ÚÌíU_u+¾®øZ âÝ‹Vl˸¯Uøœ”ñ• >_4ø|iT·WÓ'ë¢û@qG‚ãø\–I† qÑíΫ¨G5zðÞÕ=îÎ;ݹO¨Æ¿«ádxy‘ò^ ìA !DÂA°©Ï³¤öN\»Àˆž\Ë«áZ»î~H*MÓ^jÜ´÷4ŠB(½êàöõ±lQí 諒nê°7üÎfÝ"$éØ­ø~Ÿ¢Òo8nu€¬…3¾SØ‘¯‡Rn²ÒšÙs<ÿ{lú¶Tqÿ}å“QÑv”Ö&ÓÞo§!5°—éÅÜq(WîóB{åNïå½’ñ‹®wBGÜ믺àBYxÁ}M¸\ uÃÙ¤BÈèpW˜«“!|ßRRçÈ<áâ6Ÿ \‹¯,¨Y=¿O”ƒ0µó}¡˜˜Óîƒö•j€ï†Büo†ä ­Bÿð›Ÿ×àaO©}B” l[b(Èýˆ{o1[âË?ª%Ô‹–Pßö¿Ÿ%Ï?YÁ¼–ý|pàâ•óŒi‰õZýµSݯߜÜR£€‡þ'¸ |¯)x×>ejŽù?ˆ €ŸF½U|&6mú!ÿ³üõÃþðWðUðëGuêéÔÏéÔ!ýõyú÷ãú«Wý„þú¢þú’þ:£¿~RáøàWŸÿþZåÿ=áÿ8=æÿ0]ò{øë²ßË_Oú?Á_û?Ê_gý/ò×°ÿcüuÑÿ=⎿NûCüuÎ?Ã_üÏóWÖÿIþZ­ + ÿ½ÄïìüÕ ³\VYFfY¥²<Ü0‹zÐçŸo˜åq•%Ó0KŸÊ2Ú0Ë*Ë£ ³<©²¬+Ë|uJl“8>+Çã²»>‰ÇÓÓÃrT.É\…lÁS£·û ÷&ÿ3þ§ýô?å¿áÒÿ„ÿqÜïdj¤vÉ>®”¨Á9/c_…Ø]þZê‡éÀí!Å—%"íÇ0¿ÿ9\þ® ÿó¸"ü/Ø'Ø^‚ý ‚ý"Á~‰`ÏìO",¶|H¬Tò¢ü”â þt–/œ<É?LÎqò8&9˜<ÁÉLþY+yy*)?§URöaW•JʾFöÔs9 í¿¸ o¾;~d1{jñj)§S;¨OrÒ5ÁcGÕØ÷åŠþ<9Îþ:1tªP;ÞÅrì@¼š+–@–ÈÐÓs““¨isÞ§æѵçøœ¬‡ +GSYb­R­Ÿ™+“å,m ¼¶@‹¦zµo`8Hµý +kÎ\¹\©”êòcv¦" ˜®”òL˜uœ¥*ȱ ÀÁPe®Œ¶Ç@è{åy‹£â2½Q-O´X‡ã„UY‘«]ËÍ26ãG‡ú»<73^¨ŽNžœ«OKg +çsó0®r2u¦Xf§,hÀ°¤t|feojÓÅɺ¸’©¨fùz…›àÏä®k„Š±j¥â8ˆ5ÓléYóê]Ôû3«ˆz±ÿÍ[&•ÜV’¦iyö¦ÉŒ¢ /~üpt“GšÖèf„³¡èÜn†¢A”ÛŽnóP¬Œn÷ÈèL ºÃ‹¡²=‰~Ú¤*î¼ÜÛñÒFü¥24-•¡y© -Keh]*CÛRÚ—ÊÐÑ Ã®T»È2 ˜œÈ‰Ø8Há]Jµ; D»³SüfˆÙpÇà,S2qbgÂë#\àÄÂgÀ +Ògna+wŒE.kå­ Kî £¯âa±—fsW¦¿RºbdÜõÞ#%&«2“o(‘GTz/¦g€Ãÿa&ÿÙP³[ÞC†ã=¦Wàßtö¿£Ê4,hÍÝ„ÏöPHZ{k—B’-1üïMþw +Mþ"hŠûé[;MÍò2mæR‘„¯¯pt™•Eú(¨K°é-ë䮋[šÖV°²JÚé¯ÓzöéH+¹êñ¨ l¸aÙß'Ù~îÑš‡³YKK“ÈL¡Ö³;Z¹Îfx¹÷7ROçÐßGÏ;£ IG¸§3‹ƒ%¢PÁFrYH]TAÒóD[¶aGVëŽÀƒJ3»;ðÔ(ø·Ô(Ø“õÿ›þCCÓ­f§yõ?äklŲ:¸'§q£=@iíY-܃jˆÆÍq»S@Ë^Ìjïâû^lÛÍkÜ õ¨x3I«/l³æV6ßZ­:SGk­#åZìØòëQ£Gœ·P[{ï¨óuaãîš6uûpbù} ùšVóuN⟠9 !DvÙ’†½tµú°GOÇŒ¦˜²‡›Ø`X m0xvîsÎ cÄÿùù…†}#ŒGª9ºx;6AyÑe“×"·Üé°ÔqDŠ§óžS¼†´Pù¬'‹Û²ÆÖE‹çOÙªœòœZýÍÄŒ€Gï3ÖÞvoVíëoà 'Ý¡„ÐDÓ ©ÍÇ  ¡èâ“¡­m•üÖ·ˆ\!4±‰Õ!2ˆšNžSÛYZFiQ­û/±F#Ç7˜?áQùYñ]•·Ýí¨4ÀS<„'ì豃'Ýû¿zÏ7†ÿí¿ëÞßê}ÞÌ’†Tÿ9¥Þ±è¥áMP©ˆnHŠ&FfSæ†1°IáqS¡ñN:7»!øRzh:«#`ÇøE˜ŽHZ> C=¸¡{à<³PªéËqg:ìšÎ×–¦ûP=,¦ŒÐÖÌ$“ÇX¾"½°Ð¡¤âÛÓß2éØ/-,p`gú嘞¯J„ô¦'M`Mú7L`}úk&°:ý¯Là@úëB{î‹äÓ‚öÓa±ûØÎ7û~ ø"Œ/-êM)e¤Zú·‹9Þ~@ÀÐî=H¯ ×ëƒÖûqË_ÅBûsI(âæçb#_¦ƒCtum¤€Vä8~ç yË;Œvocû¯Ñþq,ïDO+¶SãuÄ~¹i?‹_Är#¼øŠ³&†.¼žŠRÖì\ùrq¦ \—RÑ>J‚èÞ[q–ß»0+:Ô²·°à­""Y–á-¯ ø7I%ýû[HNŽð(ìH`ÒZÅëoø¦#Ý?s[?ÿÓfçåWÁlu£Éz¥Ù¬ëZa›'oÁ,Íp­´’2èæUJì“êsßÚ°ABï{.õÜŽÇ`GÆ(më׊uET´-ª¢€x¨¬ã¼îŒ©…ÝçÙ™Ûf©cØu…~„ ÿ]éÜbKG‰ÌÑc‰,ÖhÅ._{p_Û`GµfC:ËPýösôº@U½>Ћ¥Þ¹õ½QàznÔ5íDƒöN´ÐþD'€Ý¼ß±9Gì]fC«©8üWm_°%sĬÜÝK•ª(Ö2¹ y™’A”+Œ• +W ¥ýlXCÃŒ”Åæ¦êÓrÄ0I6:¦s¥Ê)x× gÑ)|V¡L~.‚Ó­­²Ž6V5°)¦R«-Æ•+õâä<æ"'tV^­;¡½•a¹‰iÙÉÝe“Ð2ÁB«"Ú\CQg©G(xŒà‘òt¡Z¬K¨G ŠÖ†äéY¯ÎÉ‘5Š0¸AC óÀœ²n)òŠ€¶Î•ôƒd¾-´/îJ>î§n­Ãûü€HàÀ,¿0Ö«Â@ÙÚÇ<½8ÖÔç‹ü¨· O‰K¶oÕæ£ÝÄD[ÌÝjKè9cØ>`“bZø­ߦ ™„pÁí¨Êÿ¯bßa;0êlÿÅÌé»ÑØŸz'R;K»h·Ø"Cš%äyéôßý×Btµ'¯8¿¼ð›*à§+ÿfAŒ“˜”€ÿ÷ÿ åËv¿»ðïTÀOù/è –çÅ3úÊ•¤@3 + ›Fn‰É&ŒnF7£¯IÞ3XŠ·’<75Ë[„ã ÜÁ9¦¶ïÕÈ|•gZÝ…ÚEïwch·b–A´‘3å,£_÷„5îõï3~rÌÔ¬µ.p/ð¥®ãØÂ3¹ÎZëMœlãú#½VÐKq9~À6z¶!«ñ<¸>ª«IbÞ4 ’µéB¡ŽxbÂZ¾Þ4~'vÏ KdŽè÷Ol@Æ\v¿_‰ÙýNQ¯”mÄ»lïȾPÒkå¤æ©OJó=±0Æ:DEÜD 6#Ü«Ž÷&mÎÆ’œ[»ßa¦y,ðß&׊ ›î~›‡fO=UîÖ,síX…P‚Þ±oÓÏk\ü Fa´ƒ’oš ð’JYkµ™)˜§¾ÅÓ` ©Bù0Ñõ4ðÌœO›£gAÒuûç΂ÿpûsÝþÙ³àëÎìg³Í?Ï‘½<&Ž‘ÞH/"½F“5Q4š,µ–<ÏYKfim§Eå0šF»ØŒÑ5£IÀèß(Œ®¤¸} f¡1¡ÑØäéhUÌmUÌj•±_ѤšÕð<,Å­CÓÞ4ž£-!+‰Öyè-ÿѲNð6­ý>¹"M:šUò†ŠYþ*ù[Ú˜Tk´)ÔŠ¦çðñS’»bhY™MÅ&ã´'µ)'q·ºq§„¿Rža)² ©hSÕ2°ZÖÈÀ˜•2Э4‰Ú9*zutôšèè•n´là^ÓA‰D2aÍP­e^äf .ÆÍP|Œ}t,Å™PäàÍ“8È<‰íÈ“8äI\)–kƒpkdÏÓÀ1þÖJ€»ù%_‹bJ^ô…1\ °äÌT 2”éHu£ÎçJ—«¹r ïíòÒ:Y,Ÿlp^ÑŸ@CôM€¾Vmƒ‹“•rýLn¦Xšc5YF éÎwÂeJÌÕ +ÚÚ¡á= ; ×4ŠžãË|E^Çu`¼R͘>-¢aAâ8€Ee¢rHÇdVAŒ[ÙÕ³Õbþ|± ¼ó©c)Ót XÈåU‰àU£\§–Mâ#—QÙX´ëžäÏè(N*Ujl÷ϤS¤ò‹}¾›ÔÀÕ:Y-Ö&d¶¹jÁ©`؉¶r*$ÀÛ•¹YÔºœCó;©&.MÀ€BÑ|—%ÈU¢±¡ï¡ÊÌxåTåºÈÌͪ`µ0;[ 18Y*N•ÅD_ûde §ir;¦sùÊ5Æxqjº.¤Ü¬S« +†,WªÅ©SfÖ7h¤<;Wǯ“ÕBNDA ¸†AÎ3þ 2°9.ÇKäsõÌN>Y*Të"‡ÿÖФ,þS–-’ú›«£§rUqrB6//qw'‘8pÀD‰Z¥TÌóô:GÎäªSÅòù¤úÌZÑ𚊾ø­”œèõâD®t67+†ñeYE¶ Ùºr>W=Ÿ›¯È^W±Œ' +…+Ã9âŠË0è“Zà€)eaˆaœÔ›¦q‰õ’¨Ëÿåþ“«W‹×/£YW9Ü׿¸&¯QrGÈå‹r7/Èž…€Œ3rÏ{ʼn LÀ°|¹‚ñòÏÄ\ƒ²É˜`ü5ð*o}ªÔ»eö-êÌ^%þBèt¼£‘±L¡“$\ +>ÅøœŒ/Ä›Ò^QÏśӯ½û5z÷[,½{¼Sµj;çmð…íizŽ¶«nLí„ÇB*ЕÞbRºÓÓ÷ø+8zeºÕäYe®òJÉ×zȬëïKÿáþ¡Ê³Æ¬Mÿº)ª?ýw¦ëüõ½!ýС•gcúИØ$Sv«ÀfîBoÑXØšT¶¥'''U`»Ø‘þ³?û3Ø™î2­ðwñ×níõùkŸ~~À?Èà‡Ò·MîáZpDïÅIu8H}Ý‹3ä¾K†àµþ~{lHík_sðc•{d¹åFB?xWÐùGècwÕ§äø7ªOÇÓ×®UŒ!„¿ø‹¿P“é¯ýWUà” 3”¾sçCÂÆOž¯¬AÆš'k°'ìÀI;pÊ q@/æaìÐi%€“Ã3Àšru$ g—…Œ]÷ôãwTäÅã}Iè³á#Ë­ƒ‹}Ø~ä® ÏûèÌ·=z—-¿è@?z—Ðî$ÏÞ%ô%úò]ë†ô—¿ü5®A$Û{4ïø¶ñxû¼ãCyǨ™ˆ,–…ö íxsgüÁÅ™Çf™® “Ü™œ.‘b.úÊ域«ÕM‰ l†š®×&rPÒ<ýE÷:6P8A†›ãrŒg:WΗ +äg›0W.Ury0…õÐKFä>!†žÑrVªj“‚ž“*¬¸–ðPm§É²Eä`r­]£Ld‰)—Ï»X¬y­ðÆ'üÏ‹ë– +šfì‡ØS*Åa;EiHÿËyÚÒb¶ '™m õ‰ó®[™xBIQi'Ik£ÒÆâP +͇5ÙÏÍ©£GZÖ² ÍÑ;M‹í—¦Õv‹ÚZÛ´JQ;è$AÓ»&HŸ¦r" Ouåô•$`ƒ¨_æØw·Ð®¬åé i¬¿MÈ®ÇC~lâ}êó]ÆÕgkayß +ø-xE˜DvË^^¿å¯²áyêСß9~Hþ×JtùÐë•HÚDª^f&’™éÌÕ$O–¹ð@m¡w•ôÙCÕÐ?Vþ€AWVl³P[êñylõK¯Ô/ ¼2lP¿$ð*x Ô3Rã©q…T(€þ±úæQž½wÂðì½ †gï] °eôÛŸx²à3êˆ`DCç Zo%›AäßàW¢]AW6ûYIÉoo%-ÑŒˆn õ0håšÔ õ8ô¬ùn§ì·Ý[­ƒgÙ~EXÊr~¿c©&M–jžu²¬SwlWA4ƒÚ,ß'Zip„©„|‚nÔžþ›õ + u…üÍøo3þ»…ÜMÅh¤Ä$)ó›X"sÛÌÈŽØiößœN*qN¿ãí¤'ò’`Ì:+FöéO„¥Úû¨õ<•^î$E<û“®m¡]–÷k·¦Ð’Œ¿ÞO6ë&Æp§ãgFò´ŒcÜß´e·'k2Ѐ{U?t_C} õu_"5B~›¤ŸF'8û”žÔ~î¤ÁQÚÖœ%²³F(Ñ{{…àGÁvwàŽ3û,Á´"šx‚'üvE‰2ç3EÜcE¨;i¹°g÷öso$ò·4žd™Pæ¶ÆHÉ4&ê4x”…âÃV!«—Îû–¾tnT—Îû#ËæÄí^Æí²ÙÜ.èÛå=ØeÔöžÆ·KKÇb¡ýWzòæÖÄ#‹_/- sqD·Ê¤qE5­3!¯>”ûB¡^-NÔû?²vP³X_‘HebllÜ*®C]Þͪ¬qš på㶰‚Š±´giPØÕJ ÄÌHüb†¥b‚™\5‚3)v]¬kBNNmzE~X•kc ð…îÏüJÊÒ_Bèå¡<÷³2W‡T[ï˹X³z)aÐM„öô¯3t‹1Ð¥µÚ6—ÚX¯ #¶Pu¨¿;™ZÝd[¯‰ÌÑŽõ··áM]ÞÓqOî"ÅÖn +õà<‡¸²ŽÌ±@›µƒ¤ÔÁ•1êàï6é[®Êðë1y’§¨Ã=æ"g½ÙTt£o'ž½¡”´f +µ’ÍwÈh,`ÅÈÔªæ#˜[aÕèð‘btò{5D¯÷0q¸6Tr;–Ü,y-–ÜÎ êµý¿­ËnÔ0p6Év³Ýí¶ Á–mèZTÊ«ïò~S( ¥Põ\+õ„@*zEB‰+Ê¿àXñ|B¯\9#ŽØ3NÆNÖE6q6ž§?Æã±îƒÏ`Q¬üöSwøXS÷èg°ã1ûþWä 8Ö@°Fl<Ž?p ¯nlPß8Ç`ÝXm—ÈÕÓjZOj¯„9Äœ°D‘∫æ¿'ÅÀ¬*“tÈ)Äê÷ý5•tƒ|LŠß©ÐƒV0$&6Í ‹}Ùøû›‚œ.‡°MÜZa@¾W­t;˜¨1§ e ·“£€+Þµ­­-5Ä ðÖG&ø˜äh`g„¤]1¾çŒ/¸L*Z9Z;If‡¸âÌM¾¢™^±NX并¿¿Ÿ_€•˜}Âì1fš¶s™u삪t3†Ý¡5‰*†ä2; ®ž’ú¨zžÂú&°Ü·PiÐî’ï•dQS[x–N€8G·óÜܳÿ=µt4ÿýO%4# D88a‡’ìKroï+ ›–N¶Э/õ•ö¢V^‚G„<'B(×qŸÊuËõ$cÎÕ~ ªD~wwЯ¨sæBgˆôIÌàÖcÚÓó@ ¶…ÊöÿFƒ»Î‚f+P°ÅŸ÷Hàyø“½Yq¨|#zT)dÈZ±‚œ” ŽÀ&#0¿‹9ô-o_ë˜õ,m^œ5®:Záébi5ч‚ÑË(˜Ï@³ÀÝÎ;3–æ"Š/¹²0£Ö¹—6ÚzÌò*¡å6»Áå6wQíx=ÄHž^è1'‰|Ï*;åz£Ð guŽ¸m%žÎ>!…Ãpñóö Ö[„ÞT{ËôV`Ósïì½6…ú6õèõÓ£2t’úô¶ª¿ +ózjªaÎ?c3*Á[q“–#²kžÎš{=i¤&­Þ±ÕÙ™¿ €ÕÖ^µNòk˜¥J!¢Ðr¦ž«ªÔh|y3¼¥¼ÂÇÃÛ*Õ ï¬'Ñï=¼ËÌÞãä*'ïsò6'ïp}DgµõdUâ Ãçy@¸)ê…§éÖ¢žj–žæé¶@š ×úWRÃàC«žæ_òHZ[ÏD²É€î`¨‰’`3à  ©á/¢ÀÚlR+Ά¤²&² ËÓ/3*ÙöšH|ê¼ÙÆ ÛªÈ2"]!3P*U$&  ÒN¨b‘e $3Æ>"‘è¶ §'œÛ"KÄXú‡Œ’)(‰ùçDë‰È2 +¢k†2O (ÍÉÇ ë¦Èr ¤ðú±fFx¾HôøfÀ>g}G ‹uóêíÎë—o.ð^:ä–q,ÙI‹U,{rÂùSd9ïAMšµÉž­™²S;7%u_¨_úœ7«y|¶­Ýò’¾Ùqj¼T1Ž§ Ô:Éú =;I<.ø9_à”8sw2ŠX¡0¡éô±m=Ÿá#e™V +<componentPackage xmlns="http://www.macromedia.com/flash/swccatalog/7"> +<component id="TextInput" class="mx.controls.TextInput" implementation="TextInput.swf" iconFile="TextInput.png" src="mx.controls.TextInput.asi" modified="1059523437"> +<movieBounds xmin="0" xmax="2000" ymin="0" ymax="440" /> + <include id="RectBorder"/> + <include id="UIComponent"/> + <exportAfter id="__Packages.mx.controls.TextInput"/> +<class id="mx.controls.TextInput" > + <Event param1="change" /> + <Event param1="enter" /> + <TagName param1="TextInput" /> + <IconFile param1="TextInput.png" /> + <DataBindingInfo param1="editEvents" param2="&quot;focusIn;focusOut&quot;" /> + <method id="editable" returnType="Boolean"> + <Inspectable defaultValue="true" /> + </method> + <method id="maxChars" returnType="Number"> + <Inspectable defaultValue="null" verbose="1" category="Limits" /> + </method> + <method id="password" returnType="Boolean"> + <Inspectable defaultValue="false" /> + </method> + <method id="restrict" returnType="String"> + <Inspectable defaultValue="" verbose="1" category="Limits" /> + </method> + <method id="text" returnType="String"> + <Inspectable defaultValue="" /> + <Bindable /> + <ChangeEvent param1="focusOut" param2="enter" /> + </method> +</class> +<class id="mx.core.UIComponent" > + <Event param1="focusIn" /> + <Event param1="focusOut" /> + <Event param1="keyDown" /> + <Event param1="keyUp" /> + <property id="enabled" type="Boolean" > + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </property> +</class> +<class id="mx.core.UIObject" > + <Event param1="resize" /> + <Event param1="move" /> + <Event param1="draw" /> + <Event param1="load" /> + <Event param1="unload" /> + <method id="minHeight" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="minWidth" returnType="Number"> + <Inspectable defaultValue="0" verbose="1" category="Size" /> + </method> + <method id="visible" returnType="Boolean"> + <Inspectable defaultValue="true" verbose="1" category="Other" /> + </method> +</class> +<class id="MovieClip" > +</class> +<asset id="UIObjectExtensions" modified="1058814702"> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions"/> +</asset> +<asset id="Defaults" modified="1055737279"> + <exportAfter id="__Packages.mx.skins.halo.Defaults"/> +</asset> +<asset id="UIObject" modified="1058814731"> + <include id="Defaults"/> + <include id="UIObjectExtensions"/> + <exportAfter id="__Packages.mx.core.UIObject"/> +</asset> +<asset id="Border" modified="1062224872"> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.skins.Border"/> +</asset> +<asset id="RectBorder" modified="1062224887"> + <include id="Border"/> + <exportAfter id="__Packages.mx.skins.halo.RectBorder"/> +</asset> +<asset id="UIComponentExtensions" modified="1058814666"> + <exportAfter id="__Packages.mx.core.ext.UIComponentExtensions"/> +</asset> +<asset id="BoundingBox" modified="1054593655"> +</asset> +<asset id="FocusRect" modified="1055744819"> + <include id="BoundingBox"/> + <exportAfter id="__Packages.mx.skins.halo.FocusRect"/> +</asset> +<asset id="FocusManager" modified="1082415917"> + <include id="FocusRect"/> + <include id="UIObject"/> + <exportAfter id="__Packages.mx.managers.FocusManager"/> +</asset> +<asset id="UIComponent" modified="1058814700"> + <include id="UIObject"/> + <include id="FocusManager"/> + <include id="UIComponentExtensions"/> + <exportAfter id="__Packages.mx.core.UIComponent"/> +</asset> +<asset id="__Packages.mx.skins.ColoredSkinElement" src="mx.skins.ColoredSkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIObject" src="mx.core.UIObject.asi" modified="1164217985"> + <include id="__Packages.mx.skins.SkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <include id="__Packages.mx.styles.StyleManager" /> +</asset> +<asset id="__Packages.mx.skins.SkinElement" src="mx.skins.SkinElement.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSTextStyles" src="mx.styles.CSSTextStyles.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.styles.CSSStyleDeclaration" src="mx.styles.CSSStyleDeclaration.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> +</asset> +<asset id="__Packages.mx.styles.StyleManager" src="mx.styles.StyleManager.asi" modified="1164217986"> +</asset> +<asset id="__Packages.mx.core.UIComponent" src="mx.core.UIComponent.asi" modified="1164217985"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.controls.TextInput" src="mx.controls.TextInput.asi" modified="1164217983"> + <include id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.Border" src="mx.skins.Border.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__Packages.mx.skins.RectBorder" src="mx.skins.RectBorder.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.skins.Border" /> +</asset> +<asset id="__Packages.mx.events.EventDispatcher" src="mx.events.EventDispatcher.asi" modified="1164217985"> +</asset> +<asset id="__Packages.mx.events.UIEventDispatcher" src="mx.events.UIEventDispatcher.asi" modified="1164217986"> + <exportAfter id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.core.ext.UIObjectExtensions" src="mx.core.ext.UIObjectExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.skins.ColoredSkinElement" /> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.styles.CSSTextStyles" /> + <exportAfter id="__Packages.mx.events.UIEventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.SystemManager" src="mx.managers.SystemManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <include id="__Packages.mx.events.EventDispatcher" /> +</asset> +<asset id="__Packages.mx.managers.OverlappedWindows" src="mx.managers.OverlappedWindows.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.SystemManager" /> +</asset> +<asset id="__Packages.mx.managers.FocusManager" src="mx.managers.FocusManager.asi" modified="1164217986"> + <include id="__Packages.mx.managers.SystemManager" /> + <include id="__Packages.mx.controls.SimpleButton" /> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.controls.SimpleButton" src="mx.controls.SimpleButton.asi" modified="1164217983"> + <exportAfter id="__Packages.mx.core.UIComponent" /> +</asset> +<asset id="__Packages.mx.managers.DepthManager" src="mx.managers.DepthManager.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIObject" /> +</asset> +<asset id="__P ýÿÿÿ      +                   ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ \ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~  € ackages.mx.core.ext.UIComponentExtensions" src="mx.core.ext.UIComponentExtensions.asi" modified="1164217985"> + <include id="__Packages.mx.styles.CSSSetStyle" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.managers.OverlappedWindows" /> + <exportAfter id="__Packages.mx.managers.FocusManager" /> +</asset> +<asset id="__Packages.mx.styles.CSSSetStyle" src="mx.styles.CSSSetStyle.asi" modified="1164217986"> + <include id="__Packages.mx.styles.StyleManager" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> +</asset> +<asset id="__Packages.mx.skins.halo.Defaults" src="mx.skins.halo.Defaults.asi" modified="1164217986"> + <include id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.core.UIObject" /> + <exportAfter id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +<asset id="__Packages.mx.skins.halo.FocusRect" src="mx.skins.halo.FocusRect.asi" modified="1164217986"> + <include id="__Packages.mx.managers.DepthManager" /> + <exportAfter id="__Packages.mx.core.UIComponent" /> + <exportAfter id="__Packages.mx.skins.SkinElement" /> + <exportAfter id="__Packages.mx.skins.halo.Defaults" /> +</asset> +<asset id="__Packages.mx.skins.halo.RectBorder" src="mx.skins.halo.RectBorder.asi" modified="1164217986"> + <include id="__Packages.mx.styles.CSSStyleDeclaration" /> + <exportAfter id="__Packages.mx.skins.RectBorder" /> + <exportAfter id="__Packages.mx.core.ext.UIObjectExtensions" /> +</asset> +</component> +</componentPackage> +M 1 1212170149ÿþÿBitmap 1ÿþÿ TextInput.png¥?@H¥?@Haÿþÿÿþÿÿþÿÿþÿÿþÿÿÿÿÿÿþÿ2Hx†Ý”Á À EÙ¤.ÇvíÁ=¸tר7*¶$Øô@µ'I~¾šøI˜3˜ˆ~"òˆÂj-ÂH)uëÉagä|psíA®x9ØdðpbÜK.¬’µ„îÅ×Øñ¹u­~ÝÇ!Ž0¾pl_Z‡¸ÊÛWó ÷Fk±Þ3¯7¶=Ó¹‹jÎ_àôÐtÿþÿ TextInputиÿþÿ TextInputÿþÿ TextInput.swf‚ŽdE!ÿþÿBorderÿþÿBorderÿþÿ TextInput.swfèCP?ÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ BoundingBoxÿþÿ BoundingBoxÿþÿ TextInput.swfwÒÛ>ÿþÿÿþÿÿþÿDefaultsÿþÿDefaultsÿþÿ TextInput.swf¿Eí>ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusManagerÿþÿ FocusManagerÿþÿ TextInput.swf-[„@ÿþÿ FocusRectÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ FocusRectÿþÿ FocusRectÿþÿ TextInput.swf3cí>ÿþÿ BoundingBoxÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ +RectBorderÿþÿ +RectBorderÿþÿ TextInput.swf÷CP?ÿþÿBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ UIComponentÿþÿ UIComponentÿþÿ TextInput.swfì:?ÿþÿUIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIComponentExtensionsÿþÿUIComponentExtensionsÿþÿ TextInput.swfÊ:?ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectÿþÿUIObjectÿþÿ TextInput.swf ;?ÿþÿDefaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿUIObjectExtensionsÿþÿUIObjectExtensionsÿþÿ TextInput.swfî:?ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.SimpleButtonÿþÿÿaimport mx.core.UIComponent; + +[Event("click")] +[TagName("SimpleButton")] +intrinsic class mx.controls.SimpleButton extends mx.core.UIComponent +{ + public function SimpleButton(); + public var __emphasized:Boolean; + public var __emphatic:Boolean; + public var __emphaticStyleName:String; + public var __state:Boolean; + public var __toggle:Boolean; + public var autoRepeat:Boolean; + public var boundingBox_mc:MovieClip; + public var btnOffset:Number; + public var buttonDownHandler:Function; + public function calcSize(Void):Void; + public function changeIcon(tag:Number, linkageName:String):Void; + public function changeSkin(tag:Number, linkageName:String):Void; + public var className:String; + public var clickHandler:Function; + public function createChildren(Void):Void; + public var detail:Number; + public var dfi; + public var dfs; + public var disabledIcon:Object; + public var disabledSkin:Object; + public var downIcon:Object; + public var downSkin:Object; + public function draw(Void):Void; + public var dti; + public var dts; + function get emphasized():Boolean; + function set emphasized(val:Boolean); + static var emphasizedStyleDeclaration; + static var falseDisabled:Number; + public var falseDisabledIcon:String; + public var falseDisabledIconEmphasized:String; + public var falseDisabledSkin:String; + public var falseDisabledSkinEmphasized:String; + static var falseDown:Number; + public var falseDownIcon:String; + public var falseDownIconEmphasized:String; + public var falseDownSkin:String; + public var falseDownSkinEmphasized:String; + static var falseOver:Number; + public var falseOverIcon:String; + public var falseOverIconEmphasized:String; + public var falseOverSkin:String; + public var falseOverSkinEmphasized:String; + static var falseUp:Number; + public var falseUpIcon:String; + public var falseUpIconEmphasized:String; + public var falseUpSkin:String; + public var falseUpSkinEmphasized:String; + public var fdi; + public var fds; + public var fri; + public var frs; + public var fui; + public var fus; + public function getLabel(Void):String; + public function getSelected():Boolean; + public function getState(Void):Boolean; + public function getToggle(Void):Boolean; + public var iconName:Object; + public var idNames; + public function init(Void):Void; + public var initializing:Boolean; + public var interval; + public function keyDown(e:Object):Void; + public function keyUp(e:Object):Void; + public var linkLength:Number; + public function onDragOut(Void):Void; + public function onDragOver(Void):Void; + public function onKillFocus(newFocus:Object):Void; + public function onPress(Void):Void; + public function onPressDelay(Void):Void; + public function onPressRepeat(Void):Void; + public function onRelease(Void):Void; + public function onReleaseOutside(Void):Void; + public function onRollOut(Void):Void; + public function onRollOver(Void):Void; + public var phase:String; + public var preset:Boolean; + public var refNames; + public function refresh(Void):Void; + public function removeIcons(); + public var rolloverIcon:Object; + public var rolloverSkin:Object; + function set selected(val:Boolean); + [Inspectable(defaultValue=false)] function get selected():Boolean; + public function setEnabled(val:Boolean):Void; + public function setIcon(tag:Number, linkageName:String):Object; + public function setLabel(val:String):Void; + public function setSelected(val:Boolean); + public function setSkin(tag:Number, linkageName:String, initobj:Object):MovieClip; + public function setState(state:Boolean):Void; + public function setStateVar(state:Boolean):Void; + public function setToggle(val:Boolean); + public function setView(offset:Boolean):Void; + public function showEmphasized(e:Boolean):Void; + public function size(Void):Void; + public var skinName:Object; + public var stateNames; + public var style3dInset:Number; + static var symbolName:String; + static var symbolOwner:Object; + public var tagMap; + public var tdi; + public var tds; + function set toggle(val:Boolean); + [Inspectable(defaultValue=false)] function get toggle():Boolean; + public var tri; + public var trs; + static var trueDisabled:Number; + public var trueDisabledIcon:String; + public var trueDisabledIconEmphasized:String; + public var trueDisabledSkin:String; + public var trueDisabledSkinEmphasized:String; + static var trueDown:Number; + public var trueDownIcon:String; + public var trueDownIconEmphasized:String; + public var trueDownSkin:String; + public var trueDownSkinEmphasized:String; + static var trueOver:Number; + public var trueOverIcon:String; + public var trueOverIconEmphasized:String; + public var trueOverSkin:String; + public var trueOverSkinEmphasized:String; + static var trueUp:Number; + public var trueUpIcon:String; + public var trueUpIconEmphasized:String; + public var trueUpSkin:String; + public var trueUpSkinEmphasized:String; + public var tui; + public var tus; + public var upIcon:Object; + public var upSkin:Object; + function set value(val:Boolean); + function get value():Boolean; + static var version:String; + public function viewIcon(varName:String):Void; + public function viewSkin(varName:String, initObj:Object):Void; +}; +ÿþÿ __Packages.mx.controls.TextInputÿþÿ __Packages.mx.controls.TextInputÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +ÿþÿ__Packages.mx.core.UIComponentÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.UIComponentÿþÿÿþimport mx.core.UIObject; +import mx.skins.SkinElement; + +[Event("focusIn")] +[Event("focusOut")] +[Event("keyDown")] +[Event("keyUp")] +intrinsic class mx.core.UIComponent extends mx.core.UIObject +{ + public function UIComponent(); + public var clipParameters:Object; + public function dispatchValueChangedEvent(value):Void; + public var drawFocus:Function; + [Inspectable(defaultValue=true, verbose=1, category="Other")] public var enabled:Boolean; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public function findFocusFromObject(o:Object):Object; + public function findFocusInChildren(o:Object):Object; + public var focusEnabled:Boolean; + public var focusManager:MovieClip; + public var focusTextField:Object; + public function getFocus():Object; + public function getFocusManager():Object; + public var groupName:String; + function get height():Number; + public function init():Void; + public function isParent(o:Object):Boolean; + static var kStretch:Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onSetFocus(oldFocus:Object):Void; + public var origBorderStyles:Object; + public var origBorderValues:Object; + public var popUp:Boolean; + public function pressFocus():Void; + public function releaseFocus():Void; + public function setEnabled(enabled:Boolean):Void; + public function setFocus():Void; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size():Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var tabIndex:Number; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.core.UIObjectÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfŽdEÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.UIObjectÿþÿÿúimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; + +[Event("resize")] +[Event("move")] +[Event("draw")] +[Event("load")] +[Event("unload")] +intrinsic class mx.core.UIObject extends MovieClip +{ + public function UIObject(); + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var __height:Number; + private var __onUnload:Function; + public var __width:Number; + public var _color; + public function _createChildren(Void):Void; + private var _endInit:Function; + public function _getTextFormat(Void):TextFormat; + private var _id:String; + private var _maxHeight:Number; + private var _maxWidth:Number; + private var _minHeight:Number; + private var _minWidth:Number; + private var _preferredHeight:Number; + private var _preferredWidth:Number; + private var _tf:TextFormat; + public var _topmost:Boolean; + public var addEventListener:Function; + function get bottom():Number; + public var buildDepthTable:Function; + public function cancelAllDoLaters(Void):Void; + public var changeColorStyleInChildren:Function; + public var changeTextStyleInChildren:Function; + public var childrenCreated:Boolean; + public var className:String; + public var clipParameters:Object; + public var color:Number; + public function constructObject(Void):Void; + public var createAccessibilityImplementation:Function; + public var createChildAtDepth:Function; + public function createChildren(Void):Void; + public var createClassChildAtDepth:Function; + public function createClassObject(className:Function, id:String, depth:Number, initobj:Object):mx.core.UIObject; + public function createEmptyObject(id:String, depth:Number):mx.core.UIObject; + public var createEvent:Function; + public function createLabel(name:String, depth:Number, text):TextField; + public function createObject(linkageName:String, id:String, depth:Number, initobj:Object):MovieClip; + public function createSkin(tag:Number):mx.core.UIObject; + public function destroyObject(id:String):Void; + public var dispatchEvent:Function; + public function doLater(obj:Object, fn:String):Void; + public function doLaterDispatcher(Void):Void; + public function draw(Void):Void; + public function drawRect(x1:Number, y1:Number, x2:Number, y2:Number):Void; + public var embedFonts:Boolean; + public var findNextAvailableDepth:Function; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getClassStyleDeclaration(Void):mx.styles.CSSStyleDeclaration; + public function getMinHeight(Void):Number; + public function getMinWidth(Void):Number; + public function getSkinIDName(tag:Number):String; + public function getStyle(styleProp:String); + public function getStyleName(Void):String; + public var handleEvent:Function; + function get height():Number; + public var idNames:Array; + public var ignoreClassStyleDeclaration:Object; + public function init(Void):Void; + public function initFromClipParameters(Void):Void; + public var initProperties:Function; + public function invalidate(Void):Void; + private var invalidateFlag:Boolean; + public function invalidateStyle(Void):Void; + function get left():Number; + private var lineColor:Number; + private var lineWidth:Number; + public var marginLeft:Number; + public var marginRight:Number; + static function mergeClipParameters(o, p):Boolean; + public var methodTable:Array; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minHeight():Number; + function set minHeight(h:Number):Void; + [Inspectable(defaultValue=0, verbose=1, category="Size")] function get minWidth():Number; + function set minWidth(w:Number):Void; + public function move(x:Number, y:Number, noEvent:Boolean):Void; + public var notifyStyleChangeInChildren:Function; + public function redraw(bAlways:Boolean):Void; + public var removeEventListener:Function; + function get right():Number; + function get scaleX():Number; + function set scaleX(x:Number):Void; + function get scaleY():Number; + function set scaleY(y:Number):Void; + public function setColor(color:Number):Void; + public function setMinHeight(h:Number):Void; + public function setMinWidth(w:Number):Void; + public function setSize(w:Number, h:Number, noEvent:Boolean):Void; + public function setSkin(tag:Number, linkageName:String, initObj:Object):MovieClip; + public var setStyle:Function; + public function setVisible(x:Boolean, noEvent:Boolean):Void; + public function size(Void):Void; + public var styleName:String; + public var stylecache:Object; + static var symbolName:String; + static var symbolOwner:Object; + public var tabEnabled:Boolean; + public var textAlign:String; + static var textColorList; + public var textDecoration:String; + public var textIndent:Number; + private var tfList:Object; + function get top():Number; + public var validateNow:Boolean; + static var version:String; + [Inspectable(defaultValue=true, verbose=1, category="Other")] function get visible():Boolean; + function set visible(x:Boolean):Void; + function get width():Number; + function get x():Number; + function get y():Number; +}; +ÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ,__Packages.mx.core.ext.UIComponentExtensionsÿþÿ TextInput.swfŽdEÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!mx.core.ext.UIComponentExtensionsÿþÿÿ:import mx.core.UIComponent; + +intrinsic class mx.core.ext.UIComponentExtensions +{ + static function Extensions():Boolean; + static var FocusManagerDependency; + static var OverlappedWindowsDependency; + static var UIComponentDependency; + static var UIComponentExtended; + static var bExtended; +}; +ÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfŽdEÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swfÿþÿÿþÿÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.core.ext.UIObjectExtensionsÿþÿÿûimport mx.core.UIObject; +import mx.styles.CSSStyleDeclaration; +import mx.skins.SkinElement; +import mx.events.UIEventDispatcher; + +intrinsic class mx.core.ext.UIObjectExtensions +{ + static var CSSTextStylesDependency; + static function Extensions():Boolean; + static var SkinElementDependency; + static var UIEventDispatcherDependency; + static var UIObjectDependency; + static var UIObjectExtended; + static function addGeometry(tf:Object, ui:Object):Void; + static var bExtended; +}; +ÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfŽdEÿþÿmx.events.EventDispatcherÿþÿÿ$ +intrinsic class mx.events.EventDispatcher +{ + static var _fEventDispatcher:mx.events.EventDispatcher; + static function _removeEventListener(queue:Object, event:String, handler):Void; + public function addEventListener(event:String, handler):Void; + public function dispatchEvent(eventObj:Object):Void; + public function dispatchQueue(queueObj:Object, eventObj:Object):Void; + static var exceptions:Object; + static function initialize(object:Object):Void; + public function removeEventListener(event:String, handler):Void; +}; +ÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ&__Packages.mx.events.UIEventDispatcherÿþÿ TextInput.swf‚ŽdEÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.events.UIEventDispatcherÿþÿÿimport mx.core.UIObject; +import mx.events.EventDispatcher; + +intrinsic class mx.events.UIEventDispatcher extends mx.events.EventDispatcher +{ + public function __addEventListener(event:String, handler):Void; + public var __origAddEventListener:Function; + public var __sentLoadEvent; + static var _fEventDispatcher:mx.events.UIEventDispatcher; + static function addKeyEvents(obj:Object):Void; + static function addLoadEvents(obj:Object):Void; + public function dispatchEvent(eventObj:Object):Void; + static function initialize(obj:Object):Void; + static var keyEvents:Object; + static var loadEvents:Object; + static var lowLevelEvents:Object; + public function onKeyDown(Void):Void; + public function onKeyUp(Void):Void; + public function onLoad(Void):Void; + public function onUnload(Void):Void; + public var owner:Object; + public function removeEventListener(event:String, handler):Void; + static function removeKeyEvents(obj:Object):Void; + static function removeLoadEvents(obj:Object):Void; +}; +ÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.DepthManagerÿþÿÿoimport mx.core.UIObject; + +intrinsic class mx.managers.DepthManager +{ + public function DepthManager(); + static var __depthManager:mx.managers.DepthManager; + public var _childCounter:Number; + public var _parent:MovieClip; + public var _topmost:Boolean; + public function buildDepthTable(Void):Array; + public function createChildAtDepth(linkageName:String, depthFlag:Number, initObj:Object):MovieClip; + public function createClassChildAtDepth(className:Function, depthFlag:Number, initObj:Object):mx.core.UIObject; + public var createClassObject:Function; + static function createClassObjectAtDepth(className:Object, depthSpace:Number, initObj:Object):mx.core.UIObject; + public var createObject:Function; + static function createObjectAtDepth(linkageName:String, depthSpace:Number, initObj:Object):MovieClip; + public function findNextAvailableDepth(targetDepth:Number, depthTable:Array, direction:String):Number; + public var getDepth:Function; + public function getDepthByFlag(depthFlag:Number, depthTable:Array):Number; + static var highestDepth:Number; + static private var holder:MovieClip; + static var kBottom:Number; + static var kCursor:Number; + static var kNotopmost:Number; + static var kTooltip:Number; + static var kTop:Number; + static var kTopmost:Number; + static var lowestDepth:Number; + static var numberOfAuthortimeLayers:Number; + static var reservedDepth:Number; + public function setDepthAbove(targetInstance:MovieClip):Void; + public function setDepthBelow(targetInstance:MovieClip):Void; + public function setDepthTo(depthFlag:Number):Void; + public function shuffleDepths(subject:MovieClip, targetDepth:Number, depthTable:Array, direction:String):Void; + static function sortFunction(a:MovieClip, b:MovieClip):Number; + public var swapDepths:Function; + static function test(depth:Number):Boolean; +}; +ÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ#__Packages.mx.managers.FocusManagerÿþÿ TextInput.swf‚ŽdEÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.controls.SimpleButtonÿþÿ TextInput.swfÿþÿÿþÿÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.FocusManagerÿþÿÿ• import mx.core.UIObject; +import mx.managers.SystemManager; +import mx.controls.SimpleButton; +import mx.core.UIComponent; + +intrinsic class mx.managers.FocusManager extends mx.core.UIComponent +{ + public function FocusManager(); + static var UIObjectExtensionsDependency; + public var __defaultPushButton:mx.controls.SimpleButton; + private var _firstNode:Object; + private var _firstObj:Object; + private var _foundList:Object; + private var _lastNode:Object; + private var _lastObj:Object; + private var _lastTarget:Object; + private var _lastx:Object; + private var _needPrev:Boolean; + private var _nextIsNext:Boolean; + private var _nextNode:Object; + private var _nextObj:Object; + public function _onMouseDown(Void):Void; + private var _prevNode:Object; + private var _prevObj:Object; + private var _searchKey:Number; + public function activate(Void):Void; + private var activated:Boolean; + public var bDrawFocus:Boolean; + public var bNeedFocus:Boolean; + public var className:String; + public function deactivate(Void):Void; + public var defPushButton:mx.controls.SimpleButton; + function get defaultPushButton():mx.controls.SimpleButton; + function set defaultPushButton(x:mx.controls.SimpleButton); + public var defaultPushButtonEnabled:Boolean; + static function enableFocusManagement():Void; + public function enabledChanged(id:String, oldValue:Boolean, newValue:Boolean):Boolean; + public var form; + public function getActualFocus(o:Object):Object; + public function getFocus(Void):Object; + public function getFocusManagerFromObject(o:Object):Object; + public function getMaxTabIndex(o:mx.core.UIComponent):Number; + public function getMousedComponentFromChildren(x:Number, y:Number, o:Object):Object; + public function getNextTabIndex(Void):Number; + public function getSelectionFocus():Object; + public function getTabCandidate(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function getTabCandidateFromChildren(o:MovieClip, index:Number, groupName:String, dir:Boolean, firstChild:Boolean):Void; + public function handleEvent(e:Object); + public function init(Void):Void; + static var initialized:Boolean; + public function isOurFocus(o:Object):Boolean; + public var lastFocus:Object; + public var lastMouse:Object; + public var lastSelFocus:Object; + public var lastTabFocus:Object; + public function mouseActivate(Void):Void; + function get nextTabIndex():Number; + public function onKeyDown(Void):Void; + public function onMouseUp(Void):Void; + public function onSetFocus(o:Object, n:Object):Void; + public function onUnload(Void):Void; + public function relocate(Void):Void; + public function restoreFocus(Void):Void; + public function sendDefaultPushButtonEvent(Void):Void; + public function setFocus(o:Object):Void; + static var symbolName:String; + static var symbolOwner:Object; + private var tabCapture:MovieClip; + public function tabHandler(Void):Void; + static var version:String; + public function walkTree(p:MovieClip, index:Number, groupName:String, dir:Boolean, lookup:Boolean, firstChild:Boolean):Void; +}; +ÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ(__Packages.mx.managers.OverlappedWindowsÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.OverlappedWindowsÿþÿÿ(import mx.managers.SystemManager; +import mx.core.UIComponent; + +intrinsic class mx.managers.OverlappedWindows +{ + static var SystemManagerDependency; + static function __addEventListener(e:String, o:Object, l:Function):Void; + static function __removeEventListener(e:String, o:Object, l:Function):Void; + static function activate(f:MovieClip):Void; + static function addFocusManager(f:mx.core.UIComponent):Void; + static function checkIdle(Void):Void; + static function deactivate(f:MovieClip):Void; + static function enableOverlappedWindows():Void; + static var initialized:Boolean; + static function onMouseDown(Void):Void; + static function onMouseMove(Void):Void; + static function onMouseUp(Void):Void; + static function removeFocusManager(f:mx.core.UIComponent):Void; +}; +ÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ$__Packages.mx.managers.SystemManagerÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ$__Packages.mx.events.EventDispatcherÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.managers.SystemManagerÿþÿÿimport mx.events.EventDispatcher; +import mx.core.UIComponent; + +[Event("idle")] +[Event("resize")] +intrinsic class mx.managers.SystemManager +{ + static var __addEventListener:Function; + static var __removeEventListener:Function; + static var __screen:Object; + static private var _initialized:Boolean; + static var _xAddEventListener:Function; + static var _xRemoveEventListener:Function; + static var activate:Function; + static var addEventListener:Function; + static function addFocusManager(f:mx.core.UIComponent):Void; + static var checkIdle:Function; + static var deactivate:Function; + static var dispatchEvent:Function; + static var form:MovieClip; + static var forms:Array; + static var idleFrames:Number; + static function init(Void):Void; + static var interval:Number; + static var isMouseDown; + static function onMouseDown(Void):Void; + static var onMouseMove:Function; + static var onMouseUp:Function; + static function onResize(Void):Void; + static var removeEventListener:Function; + static function removeFocusManager(f:mx.core.UIComponent):Void; + static function get screen():Object; +}; +ÿþÿ__Packages.mx.skins.Borderÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.Borderÿþÿÿhimport mx.core.UIObject; + +intrinsic class mx.skins.Border extends mx.core.UIObject +{ + public function Border(); + public var borderStyle:String; + public var className:String; + public var idNames:Array; + public function init(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + public var tagBorder:Number; +}; +ÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ&__Packages.mx.skins.ColoredSkinElementÿþÿ TextInput.swf‚ŽdEÿþÿmx.skins.ColoredSkinElementÿþÿÿ +intrinsic class mx.skins.ColoredSkinElement +{ + public var _color; + public function draw(Void):Void; + public var getStyle:Function; + public function invalidateStyle(Void):Void; + static var mixins:mx.skins.ColoredSkinElement; + public var onEnterFrame:Function; + public function setColor(c:Number):Void; + static function setColorStyle(p:Object, colorStyle:String):Void; +}; +ÿþÿ__Packages.mx.skins.RectBorderÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.skins.Borderÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.RectBorderÿþÿÿÅimport mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.RectBorder extends mx.skins.Border +{ + public function RectBorder(); + public var __borderMetrics:Object; + public var backgroundColorName:String; + public var borderColorName:String; + function get borderMetrics():Object; + public var borderStyleName:String; + public var buttonColorName:String; + public var className:String; + public function draw(Void):Void; + public function drawBorder(Void):Void; + public function getBorderMetrics(Void):Object; + function get height():Number; + public var highlightColorName:String; + public function init(Void):Void; + public var offset:Number; + public function setColor(Void):Void; + public var shadowColorName:String; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; + function get width():Number; +}; +ÿþÿ__Packages.mx.skins.SkinElementÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swf‚ŽdEÿþÿmx.skins.SkinElementÿþÿÿ¥ +intrinsic class mx.skins.SkinElement extends MovieClip +{ + public function __set__visible(visible:Boolean):Void; + public var height:Number; + public function move(x:Number, y:Number):Void; + static function registerElement(name:String, className:Function):Void; + public function setSize(w:Number, h:Number):Void; + public var top:Number; + public var visible:Boolean; + public var width:Number; +}; +ÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swf‚ŽdEÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIObjectÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.Defaultsÿþÿÿ·import mx.core.UIObject; +import mx.core.ext.UIObjectExtensions; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.Defaults +{ + static var CSSStyleDeclarationDependency; + static var UIObjectDependency; + static var UIObjectExtensionsDependency; + public var beginFill:Function; + public var beginGradientFill:Function; + static function classConstruct():Boolean; + static var classConstructed; + public var curveTo:Function; + public function drawRoundRect(x, y, w, h, r, c, alpha, rot, gradient, ratios); + public var endFill:Function; + public var lineTo:Function; + public var moveTo:Function; + static function setThemeDefaults():Void; +}; +ÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ"__Packages.mx.skins.halo.FocusRectÿþÿ TextInput.swf‚ŽdEÿþÿ#__Packages.mx.managers.DepthManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.core.UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.SkinElementÿþÿ TextInput.swfÿþÿÿþÿÿþÿ!__Packages.mx.skins.halo.Defaultsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.FocusRectÿþÿÿÎimport mx.core.UIObject; +import mx.skins.halo.Defaults; +import mx.managers.DepthManager; +import mx.skins.SkinElement; +import mx.core.UIComponent; + +intrinsic class mx.skins.halo.FocusRect extends mx.skins.SkinElement +{ + static var DefaultsDependency:mx.skins.halo.Defaults; + public function FocusRect(); + static var UIComponentDependency:mx.core.UIComponent; + public var boundingBox_mc:MovieClip; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public function draw(o:Object):Void; + public var drawRoundRect:Function; + public function handleEvent(e:Object):Void; + public function setSize(w:Number, h:Number, r, a:Number, rectCol:Number):Void; +}; +ÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ#__Packages.mx.skins.halo.RectBorderÿþÿ TextInput.swf‚ŽdEÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿ__Packages.mx.skins.RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ)__Packages.mx.core.ext.UIObjectExtensionsÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.skins.halo.RectBorderÿþÿÿoimport mx.core.ext.UIObjectExtensions; +import mx.skins.Border; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.skins.halo.RectBorder extends mx.skins.RectBorder +{ + public function RectBorder(); + static var UIObjectExtensionsDependency; + public var borderCapColorName:String; + private var borderWidths:Object; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + private var colorList:Object; + public function draw3dBorder(c1:Number, c2:Number, c3:Number, c4:Number, c5:Number, c6:Number):Void; + public function drawBorder(Void):Void; + public var drawRoundRect:Function; + public function getBorderMetrics(Void):Object; + public function init(Void):Void; + public var shadowCapColorName:String; + static var symbolName:String; + static var symbolOwner:Object; + static var version:String; +}; +ÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ __Packages.mx.styles.CSSSetStyleÿþÿ TextInput.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.styles.CSSSetStyleÿþÿÿbimport mx.styles.StyleManager; +import mx.styles.CSSStyleDeclaration; + +intrinsic class mx.styles.CSSSetStyle +{ + static var CSSStyleDeclarationDependency; + public var _color:Number; + public function _setStyle(styleProp:String, newValue):Void; + public function changeColorStyleInChildren(sheetName:String, colorStyle:String, newValue):Void; + public function changeTextStyleInChildren(styleProp:String):Void; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + static function enableRunTimeCSS():Void; + public var invalidateStyle:Function; + public function notifyStyleChangeInChildren(sheetName:String, styleProp:String, newValue):Void; + public var setColor:Function; + public function setStyle(styleProp:String, newValue):Void; + public var styleName:String; + public var stylecache:Object; +}; +ÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ(__Packages.mx.styles.CSSStyleDeclarationÿþÿ TextInput.swf‚ŽdEÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swfÿþÿÿþÿÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.styles.CSSStyleDeclarationÿþÿÿ%import mx.styles.StyleManager; +import mx.styles.CSSTextStyles; + +intrinsic class mx.styles.CSSStyleDeclaration +{ + static var CSSTextStylesDependency; + public function __getTextFormat(tf:TextFormat, bAll:Boolean):Boolean; + public var _tf:TextFormat; + static function classConstruct():Boolean; + static var classConstructed:Boolean; + public var color:Number; + public var embedFonts:Boolean; + public var fontFamily:String; + public var fontSize:Number; + public var fontStyle:String; + public var fontWeight:String; + public function getStyle(styleProp:String); + public var marginLeft:Number; + public var marginRight:Number; + public var styleName:String; + public var textAlign:String; + public var textDecoration:String; + public var textIndent:Number; +}; +ÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ"__Packages.mx.styles.CSSTextStylesÿþÿ TextInput.swf‚ŽdEÿþÿmx.styles.CSSTextStylesÿþÿt +intrinsic class mx.styles.CSSTextStyles +{ + static function addTextStyles(o:Object, bColor:Boolean):Void; +}; +ÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ!__Packages.mx.styles.StyleManagerÿþÿ TextInput.swf‚ŽdEÿþÿmx.styles.StyleManagerÿþÿÿµ +intrinsic class mx.styles.StyleManager +{ + static var TextFormatStyleProps:Object; + static var TextStyleMap:Object; + static var colorNames:Object; + static var colorStyles:Object; + static function getColorName(colorName:String):Number; + static var inheritingStyles:Object; + static function isColorName(colorName:String):Boolean; + static function isColorStyle(styleName:String):Boolean; + static function isInheritingStyle(styleName:String):Boolean; + static function registerColorName(colorName:String, colorValue:Number):Void; + static function registerColorStyle(styleName:String):Void; + static function registerInheritingStyle(styleName:String):Void; +}; +ÿþÿ +RectBorderÿþÿ TextInput.swfÿþÿÿþÿÿþÿ UIComponentÿþÿ TextInput.swfÿþÿÿþÿÿþÿ __Packages.mx.controls.TextInputÿþÿ TextInput.swfÿþÿÿþÿÿþÿmx.controls.TextInputÿþÿÿ¶ import mx.core.UIObject; +import mx.skins.RectBorder; +import mx.core.UIComponent; + +[Event("change")] +[Event("enter")] +[TagName("TextInput")] +[IconFile("TextInput.png")] +[DataBindingInfo("editEvents","&quot;focusIn;focusOut&quot;")] +intrinsic class mx.controls.TextInput extends mx.core.UIComponent +{ + public function TextInput(); + public var __editable:Boolean; + function set _accProps(val:Object); + function get _accProps():Object; + public var _maxWidth:Number; + public function addEnterEvents():Void; + public function addEventListener(event:String, handler):Void; + public var bind:Boolean; + public var borderStyle:String; + public var border_mc:mx.skins.RectBorder; + public var changeHandler:Function; + public var className:String; + public var clipParameters:Object; + public function createChildren(Void):Void; + public function draw(Void):Void; + [Inspectable(defaultValue=true)] function get editable():Boolean; + function set editable(w:Boolean):Void; + public var enterHandler:Function; + public var enterListener:Object; + public function enterOnKeyDown():Void; + public function getHtml():Boolean; + public function getText():String; + function get hPosition():Number; + function set hPosition(w:Number):Void; + function get html():Boolean; + function set html(value:Boolean):Void; + public function init(Void):Void; + public var initText:String; + public var initializing:Boolean; + public var label:TextField; + function get length():Number; + [Inspectable(defaultValue=null, verbose=1, category="Limits")] function get maxChars():Number; + function set maxChars(w:Number):Void; + function get maxHPosition():Number; + static var mergedClipParameters:Boolean; + public function onKillFocus(newFocus:Object):Void; + public function onLabelChanged(Void):Void; + public function onSetFocus(oldFocus:Object):Void; + public var owner:MovieClip; + [Inspectable(defaultValue=false)] function get password():Boolean; + function set password(w:Boolean):Void; + [Inspectable(defaultValue="", verbose=1, category="Limits")] function get restrict():String; + function set restrict(w:String):Void; + public function setColor(col:Number):Void; + public function setEditable(s:Boolean):Void; + public function setEnabled(enable:Boolean):Void; + public function setFocus():Void; + public function setHtml(value:Boolean):Void; + public function setText(t:String):Void; + public function size(Void):Void; + static var symbolName:String; + static var symbolOwner:Object; + function get tabIndex():Number; + function set tabIndex(w:Number):Void; + [Inspectable(defaultValue="")] [Bindable] [ChangeEvent("focusOut","enter")] function get text():String; + function set text(t:String):Void; + public var tfh:Number; + public var tfw:Number; + public var tfx:Number; + public var tfy:Number; + public var updateModel:Function; + static var version:String; +}; +à.”hhhhhôôôÿÀÀÀÿx´ÿþÿlegacyLineSpacingÿþÿ0ÿþÿPropSheet::ActiveTabÿþÿ1085¢ÿþÿ%PublishFormatProperties::htmlFileNameÿþÿmultipleUpload.htmlÿþÿ"PublishHtmlProperties::StartPausedÿþÿ0ÿþÿVector::AS3 Package Pathsÿþÿÿþÿ PublishRNWKProperties::speed256Kÿþÿ0ÿþÿ!PublishGifProperties::PaletteNameÿþÿÿþÿPublishFormatProperties::jpegÿþÿ0ÿþÿPublishHtmlProperties::Loopÿþÿ1ÿþÿPublishProfileProperties::nameÿþÿDefaultÿþÿVector::Debugging Permittedÿþÿ0ÿþÿVector::UseNetworkÿþÿ0ÿþÿ"PublishQTProperties::MatchMovieDimÿþÿ1ÿþÿ PublishQTProperties::AlphaOptionÿþÿÿþÿ PublishQTProperties::LayerOptionÿþÿÿþÿ4PublishHtmlProperties::UsingDefaultAlternateFilenameÿþÿ1ÿþÿPublishHtmlProperties::Unitsÿþÿ0ÿþÿ%PublishHtmlProperties::showTagWarnMsgÿþÿ1ÿþÿVector::External Playerÿþÿÿþÿ&PublishRNWKProperties::singleRateAudioÿþÿ0ÿþÿ&PublishRNWKProperties::speedSingleISDNÿþÿ0ÿþÿ$PublishPNGProperties::OptimizeColorsÿþÿ1ÿþÿPublishQTProperties::Widthÿþÿ600ÿþÿVector::DocumentClassÿþÿÿþÿ%PublishFormatProperties::projectorMacÿþÿ0ÿþÿ'PublishFormatProperties::gifDefaultNameÿþÿ1ÿþÿ&PublishFormatProperties::flashFileNameÿþÿmultipleUpload.swfÿþÿVector::Package PathsÿþÿÿþÿVector::Compress Movieÿþÿ1ÿþÿ#PublishRNWKProperties::flashBitRateÿþÿ1200ÿþÿ%PublishRNWKProperties::mediaCopyrightÿþÿ(c) 2000ÿþÿPublishGifProperties::Smoothÿþÿ1ÿþÿVector::ScriptStuckDelayÿþÿ15ÿþÿPublishFormatProperties::htmlÿþÿ0ÿþÿ$PublishFormatProperties::pngFileNameÿþÿmultipleUpload.pngÿþÿ(PublishHtmlProperties::VerticalAlignmentÿþÿ1ÿþÿPublishHtmlProperties::Qualityÿþÿ4ÿþÿVector::FireFoxÿþÿ0ÿþÿ"PublishRNWKProperties::exportAudioÿþÿ1ÿþÿ PublishRNWKProperties::speed384Kÿþÿ0ÿþÿ!PublishRNWKProperties::exportSMILÿþÿ1ÿþÿ"PublishGifProperties::DitherOptionÿþÿÿþÿVector::Invisible Layerÿþÿ1ÿþÿVector::AS3ExportFrameÿþÿ1ÿþÿ-PublishFormatProperties::generatorDefaultNameÿþÿ1ÿþÿ!PublishHtmlProperties::DeviceFontÿþÿ0ÿþÿVector::Override Soundsÿþÿ0ÿþÿ'PublishRNWKProperties::mediaDescriptionÿþÿÿþÿ"PublishPNGProperties::FilterOptionÿþÿÿþÿPublishFormatProperties::gifÿþÿ0ÿþÿ(PublishFormatProperties::jpegDefaultNameÿþÿ1ÿþÿ(PublishFormatProperties::rnwkDefaultNameÿþÿ1ÿþÿ*PublishFormatProperties::generatorFileNameÿþÿmultipleUpload.swtÿþÿVector::Templateÿþÿ0ÿþÿ2PublishHtmlProperties::VersionDetectionIfAvailableÿþÿ0ÿþÿ*PublishHtmlProperties::HorizontalAlignmentÿþÿ1ÿþÿ"PublishHtmlProperties::DisplayMenuÿþÿ1ÿþÿVector::Protectÿþÿ0ÿþÿVector::Qualityÿþÿ80ÿþÿPublishJpegProperties::DPIÿþÿ4718592ÿþÿPublishGifProperties::Interlaceÿþÿ0ÿþÿ"PublishGifProperties::DitherSolidsÿþÿ0ÿþÿPublishPNGProperties::Smoothÿþÿ1ÿþÿPublishPNGProperties::BitDepthÿþÿ24-bit with AlphaÿþÿPublishQTProperties::Flattenÿþÿ1ÿþÿ#PublishFormatProperties::qtFileNameÿþÿmultipleUpload.movÿþÿPublishRNWKProperties::speed28Kÿþÿ1ÿþÿ!PublishRNWKProperties::mediaTitleÿþÿÿþÿ$PublishRNWKProperties::mediaKeywordsÿþÿÿþÿPublishGifProperties::Widthÿþÿ600ÿþÿPublishGifProperties::Loopÿþÿ1ÿþÿVector::AS3Optimizeÿþÿ1ÿþÿPublishFormatProperties::flashÿþÿ1ÿþÿPublishJpegProperties::Qualityÿþÿ80ÿþÿ$PublishRNWKProperties::realVideoRateÿþÿ100000ÿþÿ$PublishRNWKProperties::speedDualISDNÿþÿ0ÿþÿ#PublishGifProperties::MatchMovieDimÿþÿ1ÿþÿ#PublishGifProperties::PaletteOptionÿþÿÿþÿ"PublishPNGProperties::DitherOptionÿþÿÿþÿ0PublishFormatProperties::projectorMacDefaultNameÿþÿ1ÿþÿ'PublishFormatProperties::pngDefaultNameÿþÿ1ÿþÿ-PublishFormatProperties::projectorWinFileNameÿþÿmultipleUpload.exeÿþÿPublishHtmlProperties::Alignÿþÿ0ÿþÿ!PublishProfileProperties::versionÿþÿ1ÿþÿVector::Package Export Frameÿþÿ1ÿþÿ$PublishJpegProperties::MatchMovieDimÿþÿ1ÿþÿ#PublishPNGProperties::MatchMovieDimÿþÿ1ÿþÿ#PublishPNGProperties::PaletteOptionÿþÿÿþÿ)PublishFormatProperties::flashDefaultNameÿþÿ1ÿþÿ%PublishFormatProperties::jpegFileNameÿþÿmultipleUpload.jpgÿþÿPublishHtmlProperties::Widthÿþÿ600ÿþÿPublishHtmlProperties::Heightÿþÿ225ÿþÿVector::Omit Trace Actionsÿþÿ0ÿþÿVector::Debugging Passwordÿþÿÿþÿ"PublishJpegProperties::Progressiveÿþÿ0ÿþÿ"PublishPNGProperties::DitherSolidsÿþÿ0ÿþÿ#PublishQTProperties::PlayEveryFrameÿþÿ0ÿþÿVector::Export Swcÿþÿ0ÿþÿPublishFormatProperties::pngÿþÿ0ÿþÿPublishFormatProperties::rnwkÿþÿ0ÿþÿ(PublishFormatProperties::htmlDefaultNameÿþÿ1ÿþÿ-PublishFormatProperties::projectorMacFileNameÿþÿmultipleUpload.appÿþÿ2PublishHtmlProperties::UsingDefaultContentFilenameÿþÿ1ÿþÿ!PublishHtmlProperties::WindowModeÿþÿ0ÿþÿ'PublishHtmlProperties::TemplateFileNameÿþÿ{C:\Dokumente und Einstellungen\andi\Lokale Einstellungen\Anwendungsdaten\Adobe\Flash CS3\en\Configuration\HTML\Default.htmlÿþÿVector::TopDownÿþÿ0ÿþÿVector::DeviceSoundÿþÿ0ÿþÿPublishJpegProperties::Sizeÿþÿ0ÿþÿPublishGifProperties::Heightÿþÿ225ÿþÿPublishPNGProperties::Interlaceÿþÿ0ÿþÿVector::AS3AutoDeclareÿþÿ0ÿþÿVector::AS3Coachÿþÿ1ÿþÿVector::UseAS3Namespaceÿþÿ1ÿþÿ"PublishFormatProperties::generatorÿþÿ0ÿþÿ&PublishHtmlProperties::ContentFilenameÿþÿÿþÿ(PublishHtmlProperties::AlternateFilenameÿþÿÿþÿ+PublishHtmlProperties::OwnAlternateFilenameÿþÿÿþÿVector::Reportÿþÿ0ÿþÿPublishRNWKProperties::speed56Kÿþÿ1ÿþÿPublishGifProperties::LoopCountÿþÿÿþÿ'PublishGifProperties::TransparentOptionÿþÿÿþÿPublishGifProperties::MaxColorsÿþÿ255ÿþÿ%PublishPNGProperties::RemoveGradientsÿþÿ0ÿþÿPublishQTProperties::Heightÿþÿ225ÿþÿPublishFormatProperties::qtÿþÿ0ÿþÿVector::Stream Compressÿþÿ7ÿþÿVector::Event Formatÿþÿ0ÿþÿVector::Versionÿþÿ8ÿþÿ"PublishRNWKProperties::audioFormatÿþÿ0ÿþÿ$PublishGifProperties::OptimizeColorsÿþÿ1ÿþÿVector::AS3Strictÿþÿ0ÿþÿ0PublishFormatProperties::projectorWinDefaultNameÿþÿ1ÿþÿPublishHtmlProperties::Scaleÿþÿ0ÿþÿVector::Event Compressÿþÿ7ÿþÿVector::ActionScriptVersionÿþÿ2ÿþÿVector::StreamUse8kSampleRateÿþÿ0ÿþÿVector::EventUse8kSampleRateÿþÿ0ÿþÿPublishJpegProperties::Heightÿþÿ225ÿþÿ PublishRNWKProperties::speed512Kÿþÿ0ÿþÿ%PublishGifProperties::RemoveGradientsÿþÿ0ÿþÿPublishPNGProperties::Widthÿþÿ600ÿþÿPublishPNGProperties::Heightÿþÿ225ÿþÿ&PublishFormatProperties::qtDefaultNameÿþÿ1ÿþÿ$PublishFormatProperties::gifFileNameÿþÿmultipleUpload.gifÿþÿ"PublishHtmlProperties::VersionInfoÿþÿÿþÿVector::Stream Formatÿþÿ0ÿþÿPublishJpegProperties::Widthÿþÿ600ÿþÿ"PublishRNWKProperties::exportFlashÿþÿ1ÿþÿ&PublishRNWKProperties::showBitrateDlogÿþÿ1ÿþÿ(PublishRNWKProperties::speedCorporateLANÿþÿ0ÿþÿ"PublishRNWKProperties::mediaAuthorÿþÿÿþÿPublishGifProperties::Animatedÿþÿ0ÿþÿ&PublishGifProperties::TransparentAlphaÿþÿ128ÿþÿ!PublishPNGProperties::Transparentÿþÿ0ÿþÿ!PublishPNGProperties::PaletteNameÿþÿÿþÿ*PublishQTProperties::UseQTSoundCompressionÿþÿ0ÿþÿPublishQTProperties::Loopingÿþÿ0ÿþÿ%PublishFormatProperties::defaultNamesÿþÿ1ÿþÿ%PublishFormatProperties::projectorWinÿþÿ0ÿþÿ%PublishFormatProperties::rnwkFileNameÿþÿmultipleUpload.smilÿþÿ,PublishHtmlProperties::UsingOwnAlternateFileÿþÿ0ÿþÿPublishPNGProperties::MaxColorsÿþÿ255ÿþÿ%PublishQTProperties::ControllerOptionÿþÿ0ÿþÿ"PublishQTProperties::PausedAtStartÿþÿ0ÿÿÿÿÿþÿÿþÿüÿÿ CColorDefÿ €ÿ €ÿ €ÿ €3ÿPï €fÿPï0 €™ÿPïH €ÌÿPï` €ÿÿPïx €3ÿï €33ÿ(ï €3fÿ<ï0 €3™ÿCïH €3ÌÿFï` €3ÿÿHïx €fÿï0 €f3ÿï0 €ffÿ(ï0 €f™ÿ5ïH €fÌÿ<ï` €fÿÿ@ïx €ÿ €333ÿ0 €ÿ €3ÿ ï €33ÿxï €f3ÿdï0 €™3ÿ]ïH €Ì3ÿZï` €ÿ3ÿXïx €33ÿÈï €333ÿ0 €3f3ÿPPH €3™3ÿPx` €3Ì3ÿPx €3ÿ3ÿPï €f3ÿÜï0 €f33ÿPH €ff3ÿ(PH €f™3ÿ<x` €fÌ3ÿCx €fÿ3ÿFï €ÿ €fffÿ` €ÿ €fÿ ï0 €3fÿŒï0 €ffÿxï0 €™fÿkïH €Ìfÿdï` €ÿfÿ`ïx €3fÿ´ï0 €33fÿ PH €3ffÿxPH €3™fÿdx` €3Ìfÿ]x €3ÿfÿZï €ffÿÈï0 €f3fÿÈPH €fffÿ` €f™fÿP0x €fÌfÿPx €fÿfÿPï¨ €ÿ €™™™ÿ €ÿ €™ÿ ïH €3™ÿ“ïH €f™ÿ…ïH €™™ÿxïH €Ì™ÿnï` €ÿ™ÿhïx €3™ÿ­ïH €33™ÿ x` €3f™ÿŒx` €3™™ÿxx` €3Ì™ÿkx €3ÿ™ÿdï €f™ÿ»ïH €f3™ÿ´x` €ff™ÿ 0x €f™™ÿx0x €fÌ™ÿdx €fÿ™ÿ]ï¨ €ÿ €ÌÌÌÿÀ €ÿ €Ìÿ ï` €3Ìÿ–ï` €fÌÿŒï` €™Ìÿ‚ï` €ÌÌÿxï` €ÿÌÿpïx €3Ìÿªï` €33Ìÿ x €3fÌÿ“x €3™Ìÿ…x €3ÌÌÿxx €3ÿÌÿnï €fÌÿ´ï` €f3Ìÿ­x €ffÌÿ x €f™ÌÿŒx €fÌÌÿxx €fÿÌÿkï¨ €ÿ €ÿÿÿÿð €ÿ €ÿÿ ïx €3ÿÿ˜ïx €fÿÿïx €™ÿÿˆïx €Ìÿÿ€ïx €ÿÿÿxïx €3ÿÿ¨ïx €33ÿÿ ï €3fÿÿ–ï €3™ÿÿŒï €3Ìÿÿ‚ï €3ÿÿÿxï €fÿÿ°ïx €f3ÿÿªï €ffÿÿ ï¨ €f™ÿÿ“ï¨ €fÌÿÿ…ï¨ €fÿÿÿxï¨ €ÿ €ÿÿïx €ÿ €™ÿïH €™3ÿ ïH €™fÿïH €™™ÿ(ïH €™Ìÿ2ï` €™ÿÿ8ïx €Ìÿï` €Ì3ÿ +ï` €Ìfÿï` €Ì™ÿï` €ÌÌÿ(ï` €Ìÿÿ0ïx €ÿÿïx €ÿ3ÿïx €ÿfÿïx €ÿ™ÿïx €ÿÌÿ ïx €ÿÿÿ(ïx €ÿ €ÿÿPïx €ÿ €™3ÿãïH €™33ÿx` €™f3ÿx` €™™3ÿ(x` €™Ì3ÿ5x €™ÿ3ÿ<ï €Ì3ÿæï` €Ì33ÿx €Ìf3ÿ x €Ì™3ÿx €ÌÌ3ÿ(x €Ìÿ3ÿ2ï €ÿ3ÿèïx €ÿ33ÿï €ÿf3ÿ +ï €ÿ™3ÿï €ÿÌ3ÿï €ÿÿ3ÿ(ï €ÿ €ÿÿ ïx €ÿ €™fÿÕïH €™3fÿÜx` €™ffÿ0x €™™fÿ(0x €™Ìfÿ<x €™ÿfÿCï¨ €ÌfÿÜï` €Ì3fÿãx €Ìffÿx €Ì™fÿx €ÌÌfÿ(x €Ìÿfÿ5ï¨ €ÿfÿàïx €ÿ3fÿæï €ÿffÿï¨ €ÿ™fÿ ï¨ €ÿÌfÿï¨ €ÿÿfÿ(ï¨ €ÿ €ÿÿÿ(ïx €ÿ €™™ÿÈïH €™3™ÿÈx` €™f™ÿÈ0x €™™™ÿ €™Ì™ÿPP¨ €™ÿ™ÿPïÀ €Ì™ÿÒï` €Ì3™ÿÕx €Ìf™ÿÜx €Ì™™ÿP¨ €ÌÌ™ÿ(P¨ €Ìÿ™ÿ<ïÀ €ÿ™ÿØïx €ÿ3™ÿÜï €ÿf™ÿãï¨ €ÿ™™ÿïÀ €ÿÌ™ÿïÀ €ÿÿ™ÿ(ïÀ €ÿ €ÿÿÿxïx €ÿ €™Ìÿ¾ï` €™3Ìÿ»x €™fÌÿ´x €™™Ìÿ P¨ €™ÌÌÿxP¨ €™ÿÌÿdïÀ €ÌÌÿÈï` €Ì3ÌÿÈx €ÌfÌÿÈx €Ì™ÌÿÈP¨ €ÌÌÌÿÀ €ÌÿÌÿPïØ €ÿÌÿÐïx €ÿ3ÌÿÒï €ÿfÌÿÕï¨ €ÿ™ÌÿÜïÀ €ÿÌÌÿïØ €ÿÿÌÿ(ïØ €ÿ €ÿÿÿÈïx €ÿ €™ÿÿ¸ïx €™3ÿÿ´ï €™fÿÿ­ï¨ €™™ÿÿ ïÀ €™ÌÿÿŒïÀ €™ÿÿÿxïÀ €ÌÿÿÀïx €Ì3ÿÿ¾ï €Ìfÿÿ»ï¨ €Ì™ÿÿ´ïÀ €ÌÌÿÿ ïØ €ÌÿÿÿxïØ €ÿÿÿÈïx €ÿ3ÿÿÈï €ÿfÿÿÈï¨ €ÿ™ÿÿÈïÀ €ÿÌÿÿÈïØ €ÿÿÿÿð €ÿÿÿÿÿÿÿ €ÿÿÿÿÿÿÿ €ÿÿÿÿÿ €ÿÿÿÿÿ €ÿÿÿÿÿ €ÿfýÿ`ÿÿÿÿzÿÿÿÿ€™fÿªÿÌÿÿÿÿÿÿ €ÿÿÿ*ÿÿÿ]ÿÿÿÿÿªÿÿÔÿÿÿÿÿÿö«ÿËÿþÿ"PublishQTProperties::QTSndSettingsÿÿCQTAudioSettingsÿÿÿþÿhÿþÿÿþÿÿÿÿÿÿþÿÿþÿÿþÿÿþÿ°<?xml version="1.0" encoding="UTF-16" standalone="no" ?> +<mobileSettings> + + <contentType id="standalonePlayer" name="Standalone Player"/> + + <testDevices/> + +</mobileSettings> +•ÿÿÿÿ îBSaved by Adobe Flash Windows 9.0 build 494 timecount = 1244153262andalonePlayer" name="Standalone P \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/_fla/README dokuwiki-rc2009-12-02/lib/_fla/README --- dokuwiki-2009-02-14/lib/_fla/README 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/_fla/README 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +This directory contains the sources for the Flash Multiuploader. Its based on +a example from Alastair Dawson given at +http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ + diff -Naur dokuwiki-2009-02-14/lib/images/admin/acl.png dokuwiki-rc2009-12-02/lib/images/admin/acl.png --- dokuwiki-2009-02-14/lib/images/admin/acl.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/admin/acl.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ +‰PNG + + IHDRÄ´l;gAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<ÊIDATxÚbüÿÿ?-@±€ˆ^C9Ü*è÷–?ÿX€4ã·¿ ìÿÿ(›ÿ¨øÅþG¶uÕÿœ ϳ0€øŸ HžcøÇ@,ĺàÿ?†ß?EE¥ÿfé~OSóû!ÅÊùŸáÓ?Öe“Ö0FþaøÙ0€"Êàؘ¼´ý¿µ…~6ä— +üJp30wÿÑøû—yѤõ á@Ñë0=Dœ‹ÿ3šX&|^dôY˜á3¼l ûúÙ¿¿¼÷ëwPâo]ŽßŒ+;¶0„ƒâH @1ˆ¿ÌŒ8ñÏoL\*–?š ¼¿3¼#ƒ S`˜1ŸïLњߥ7°¼õkù§›føoÐÕJ %6ø?Ðlø÷?&a™?ivq<˜ÇÀ TÌ ‰/ !ò’Qâ¬:bÊŒì úÁ +–†CI €ÀAÁÎÀ„Åû ,Œ ŠfAŸë…d€JßÅ †ò1Û+†°Z^•°8©\ue €;ÐÒû ü¼÷þ00Øàew^a¤1wþþaøÄs’醞%“³à?„Á@mŒ² ²R@¬°f`x}áÍ’‹ mG~eø €ÀNeâfe`ä‚`&NVffV6&fÆ·;¶²M}zA”áË7†ï?˜!†2¨±:›10ü†ÑŽ• Vþypè/ã  à€»ØCO˜N®üÏÈÀô˜~ýe`þ tá7]ç÷¥bN?¾ƒâÛEF~Ki U Vb ¡| §ç2œ\úøߌWŒ+a¸d&@ þÌUÈÿòÿ}cPµrú¸ØµìÞ—_ÿ~\`d5—e`Óêb`²ûÊÀp áʼ[ Å{™÷¼eø»”^@fF:~1)™9|\î^øVÿ05ü¸ÂÄ d*ÅÀ(ôú› wŽyÍðgÿ†us^}m>É´å +Ãß> ök0sˆÃÐLrÆf–ú½6þ Ìóß®²0ˆ˜KB¢óÊE†Ïg¾1œÙðƒAUáÂÌ/ºn0ÏùÌðwPûCd³ˆÙП?™¤Í,߯Í{iñ‹éÃËÀ83¦­¿ß®ÏøÄpëÃÏ=7-»Á°\™•ãÌÏ?×þ3ü_Í‹( €àÿªgðyY`ÖKËߌ@—ÞaaRffx{ì+í£¬ 5‹XŽyó{õ†?·1ràÝOpX‚RÕ_l¥@1€ÊãR'Mñ99r;¾ßbþÿõ!Ãÿ7ÿÿÿ"òÿÿ3þÿmN¼¯D™Ø§Ó˜=)å1@],&ñ³.4í¹;÷_†o÷„ù¾žþÊðòÃÞ»ŒW_ÿûÙ TöŒƒl°ˆøOuVöß _^23i³3ÜÞüŸ¡²™õú­·®Üùô}PÉRk€,,øW„Rœ’À &ÍekÙß®½ó©Xoa‹lðÝ;ÿ?nYÁõó0}ýú´êäïC@C’k(#(ò8Øtÿüb4f>©sç®^JŸ °‚„„äŽyóVü×ÕÕ¯ibž™Utëö§ÿ?}úöÿË—ÿ_¿þò?!!ãPZ¤FDD„! ÀŸÁËËKpϞ݀æüŸ:mé^¾@i €b)RTTs‰Œ gèîžÜ ¡¡Óöëׯ“sçLñ›:eʽ¯_]õh ƒ™¹• ‡5Hžž.ÈûŒÆÆ&y_¾0ÈWTt0LŸÞséËçOK€Ò/œœÜ‚>|b077choï¯hjªdûýç×v~Á¿¿~ý†=(ü€áÁÌÄÄ$ÄËËËÀÃÃÅlffÝ©®nTÜØXuþüùÓóFâ+ 3lð‹OïúôUéû÷o zŒÍ-}E¯^¾Ì466âÅøØÙ¾ÿŒ&V 1·‰ +Ùg®\¹P4fÿ…E,@1‚ÂØÜÜ2¯¡¡w¢ªŠ2÷ï_ØØ9˜™˜~þüÁð÷ß_&fV` ±MŸ=gÆý?¿¿ßÒÒ2vii©:|ïÞ 9ÑÓ1@ fee ŠZž—Wî.", 6ðÿÿ¤”ÿò%ƒ”‚<ƒ  Ãõ+Wî=xÆÐÛÓ|âúõ+¹à€sCCC[[ëû÷o¹s÷–"Ÿ:'#02€²Ã[>®œÅðöõK†—ì\ /_½fPSU`ã¾|ùüé¯_¿^baaa`ffb`z‹ è˜ÿþ38¹±q°3ð ò3021òò $jë¬4³²Û«ml¾5Cßàõû•KþïüßàðÿÈé‹ ”õÿë·?ÿ'L˜óYZZ6’DYAÅÊÀ 4 d @ †Œ?ƒ+ 0ŽÀXAÀ‘“½qONú·×+–ü¿ð˜@ÿ/+*ùÿúÓÿ¿ÿùÿýÇßÿ³g/ÿ£ ¨T ò=(Irrr€  pªˆÿù‹áÛÏŸà¼ÊÄ +Ìó¿I(k¨u‡äÅ‹3Ü[8Ÿáö‰“ Ÿ%¥øþ12|ýúƒá'#/Cbb33 K[gg=ï­›×@‘vq10<3œ Nc`0[ìî|îó¡=ÿ?®]þÿv°çÿõÂ\ÿÍyy.E'Ý9|ôÊÿ;w^þ¿w÷ùÿ—/ßÿf ëÿÿ_¶|ó? í&&`PÓ:@Á NšÅÀà¹'-þù¿kþ\:÷ÿ ×ÿǤøþ{óñ‚²r0'‡N\BúÉC‡/ý¿}ûÙÿ{÷žÿúìÍÿÇ_³ý¯ÿkÖìüonnÝŒ?N€\4˜n<礽ùÿÆÿ÷ó¦üàøÿ²ßÿ AÞ÷ Ì, 0äbfb&MV尘Ç_þäò{ÏþïÚ}úÿ­[Oþ¿xùõzFñ;`*ñ °Á… º»cÂþ¿ýÿ§9þ? ²ÿW÷… Ï6Ö ¡ `Å:(b™䂃#ìÛwèòÿ¯^}ðÿÒåGÿ+«Zÿ‰Š‰¯T6x¶êê?Çöüÿ¾hêÿwÖÿ)óþ¯äúÊÍ +*"¥à‰ž™œ¬@†333JùøíؽûÔÿ ý/)møÃÇÏ· ¨L¤ €ÀoÐV¸ü¿»ôÿßH K•¸þçòq¼cabiÊK¢dSFHz…Î Ê âžž~«RÒò¿ ,*Q© °ÁæŒ +ÅÙ_­•âúãÂÎzèYPVÄÈÿHƒ0 Ðp`¸ }à”VFV @à²X&0r20˜YšÀRâPü"ÿÂf00ò BÆÿŒ`ö/` ˆ öÔ®Ó%ƒÈ<IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/admin/plugin.png dokuwiki-rc2009-12-02/lib/images/admin/plugin.png --- dokuwiki-2009-02-14/lib/images/admin/plugin.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/admin/plugin.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ +‰PNG + + IHDRÄ´l;gAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<IDATxÚbüÿÿ?-@±€ÆtV†¿Œ Øþ3BdþþÕcüû¥² ¼+ +Ãÿ?Œ¹ÿL ÿî¿|þòçï¿) ,ìÛ€‚¹ß@ãþ™»0 Vëþýecù÷ouUpµZŠS +/;ÿÿÀRŒŒŒ ¿ÿþfX|‹dÙ¬šeŸ~þÒe`fyŒn@1¡ò€Öü秶œ°¬r¶[ƒ„Ãõ—î|¹Áp÷ë-†Ÿ¯00²ÿcH÷ˆg0Ñ4ãgøñÕ‰dé_T£ÍÅ@/1þÑ@'³ýgaba8úð(ƒÓ"'v ÃÇßú\ú + ¸8y@~øÍðŸ„P@,HÞgaøùÛ~¬ ?Ô¾üøÂø÷ï_& ×Ù˜ØÀ˜•‰•d3#3XË·ï_¾3a``{Œ#fŽã Œ¬ï@r1øß-fæÍj²Šì¬œ ÿ~üfVddFÚ¿ÿÿÀኌÿ3@R’ºŒ2ÃM“&Þ‚¿ÿ1Ü~|ÿÍ÷_€RÛ’*þü[\æ]®TàVÀ À%Àð÷ß_°«ØX.|ÇŠXÿØ™ØÁìI)í ¿~32311üüó“aé¾õ¢eSê¥Äl°$¿”fªC*ƒ(ŸöÀÔÊCF`001œ{ql ˆ2—ß^fØópÃ?`|0 ý „–’ I‘ 37-™ @`ƒYAáÆÄÌpçÍŸ¹> À ddÅÂÈÀ +t5;$€™‰—•—aùµå K®/Ë3131|ûÿa×Z1ffˆl0H(‚\ÈÎÊ6”™™¬ ¤äRF(»¨™L,L`5  ùê?0>@#ƒ02]ô 3202`&~&ˆ:F&D‰<*úûÿ/Ão?ÀAÁ’ÒÌlÌ |œ|ðˆ¦†ï¾ƒ# äZ«AAñûÿo°  € 4hò99†Yá3Á®YÇÂÂÂpõõU†çf€# 䯾2k3¸*¸2üB¯þ 56êZÍú_–D–km[Úÿÿõý?:8òðÈŽVŽÿÝÿE'ˆþgéfù?ýÂt uÿÿýÿ¿tï†ÿü*ï@fØŘþ%5®oZ»þÌ&In>ÆŸ?~0(Ê2LO™Æðëÿ/hàÃ(F†Ÿ‚Ùe šŽ\<ÆÀÆÁËðç×/†+·¯øøó[6H €X 1vâ矪§ow#Ãw¥Gru?ÿdbfÄŒX„ž¾}žáø‰38ù“òoÎCÀ@ ’ Dª`fùÆÀñ#ÃÐONî`Úfå¿~0üc"ÿY~ÿ†ì¿ß`-<ÀBˆ‹{?×Jpy*ŒþB²;@¡&7P!1˜X1þ–H¦Òf £6€3(¢~ Õ×+ú¤ ˜{þrRe@h³B$™Ù/?yûø郋åRœ’<•¼…¨–øNRþýaXyxÃÙ맾1°s½Ï.€¥"Üp€bÅ c*+¤<…WM ö/`A¹L]BCš•…XBC«ˆwï>¹ÿñÓ÷ï… ,l E/#¤–Úò„ €iU™=åèþþÕIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/admin/popularity.png dokuwiki-rc2009-12-02/lib/images/admin/popularity.png --- dokuwiki-2009-02-14/lib/images/admin/popularity.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/admin/popularity.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,8 @@ +‰PNG + + IHDRÄ´l;gAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<IDATxÚbüÿÿ?-@±ÀŒŒŒ öö• <<ª 0ËääV}ÿþçæýûZ˜™™þþýáï_†? ô—//^¾\Ëðõëe¸0½ÄPRrdÖ„K°±1{åæÚ„¶·{Öxyi +ùüøñÅUìì’ ’’Y ¬¬Z. ¸ÁúúQ ?B4þû÷ŸËÍM½_KK ¨‘—¡¼Üά¿ß{³¥¥Ü& áF¿~ý…ºDÿ¬Ža0@Á þ÷ ¬ä` a%‘j`oy™AC]‚¡­ÕÛ·±Áõ¸ššÐäoß~Iÿùóªç7'§ŠÁãß¿ƒÃ™‰‰A-4Ô°œ‡‡ƒáÃ{†?@Oüý¡ÿ-21VaÓÒ”ÏÙ±ëj芻Ÿ<ù<‘‘å; ‹ ŸÜ`€bA¶ ††Ò½f*\/žƒ,cGØPˆã>‰³2X˜ê‰óñr÷L›q$ôÉ“Ûžß¾]}ÏÂ" 7 €P æáaõð7ñùð‘áû7˜e ¿~10|úô‹áå«÷ Ož¼dxúìÃÓ§¯”U\¼­ÌO¯w*]ýîݸY„dð>g'ÍN 1†7¯Aáú‡áÕë Ož¾ãׯß3|ýö1ÀðâäaHN2f¸÷ä;ŸÃ—OW#; €àËÈtJˆKª¯_•áÙ‹7@Cß ÿtñ?V6V`Òbc``aaaøö“•!2ÚŒAM•™‰›AZÎÄúæ•Í ³àé €àó + +F½ýòŸáÒÇ@¿cà`gaàãçÈÊÀÌÌÂÀÂÊ LV¬ aìî«ÊàêÈ ŽL QF]=#›W8T€ièÌ<€‚'·—ÏÞµµ’bèèð`(,ód°wÔffn Wù„€®ýù—›ÁÊZ–!Ü_œáÐm?aÏtš¹;ƒ¼rPÜů_}ÚrïÎKO)K#A3A†7o~2\¹ü†áÆÍÏ ^ügPP`gˆ ‘cøû’b@©DëéJ2ðóëÚüxsÌ<€‚üãûŸ}·n½üfl"ÅJ,¬ |¼ì ŽŽÒ æÿnÜú,;¸€aÎN% iû7KHq3¨¨˜Xœ=»†h8†À$zëÖ­ç7¾…¿ýÊBs܇@þ21hi +0p°±Å~ü€`P"ù¤9€®Ö×WÆ”Ì<€bBμ;òö݆¯¿!¾‚,ºþëW†÷À\øé3Ä°¯@1>ÿŠÕS&ƒ™µ6+“†3Ì0€B6¦ßö?zøšX*Â5ñwþ¢Añ“‘èqNn €b¿,Ì"0³©<zïçßS·¯?û&£)Ëõh 0…10 `£@C€^f²¿]þàæ{† gî2œ<~þÅÅ §/<}vîÃÕµ0ó©bÿìƵç—,¾ÿ‡Æ4ŒèÂ×O?3\»ô€áÔ‰‹oÏ9}éÞ½³Ç~ÿ¹u(s¨âz± @pƒÿþ™ð•áÞý¯~}übÁñ—‘á깇 çÏ\tæÚÍ›gN|ú|hЋóÀ¨~D¨j FX!+Æ *ê¬jö«IJJO~ýêþóG/ìa`x| +hí]ÝÄÔu0óˆ‘V•)@€k8“K”…IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/admin/README dokuwiki-rc2009-12-02/lib/images/admin/README --- dokuwiki-2009-02-14/lib/images/admin/README 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/admin/README 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,2 @@ +These icons were taken from the nuvoX KDE icon theme and are GPL licensed +See http://www.kde-look.org/content/show.php/nuvoX?content=38467 diff -Naur dokuwiki-2009-02-14/lib/images/admin/revert.png dokuwiki-rc2009-12-02/lib/images/admin/revert.png --- dokuwiki-2009-02-14/lib/images/admin/revert.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/admin/revert.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ +‰PNG + + IHDRÄ´l;gAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<ÐIDATxÚbüÿÿ?022‚i† –âL@ ûÏaÿ…bÖ¿µ ?~p20sU1üac`øà Ä, /ÿ20{Ã3 €˜AK3àLÿ˜¸-5œ*þ2/aøó[ˆêav.„q„`9±ÿE2åÿ? ÿÿ†ã_¾ýiodØT°:šŸMð ÃïZ ßþºÔ‘® €Xà,= þeÿeàcøù/‚•Ó]ˆ[T†é? 30þƒƒæÇ?é¿2¨˜þeØÞ¸Z'º5{ïýw¼˜yÎ1°qÀ Fxg5ƒ‹á'ƒƒ¿äŒ|Çu3m}& ‰ u@ÈÆÁÌ°íßt.m姞 áµÙO¾zbÍÀÊúèÿæÇ`u„jð[Syó“ú8ïðg8ýy?ç?ïÿ‡ Qûïß?nF>†Ïÿ>0xH1ü9¬ÆОÞÊÀÁ]óû°€BÅ?)鹽ќK¾÷1\yyŽÁZЉÁ˜Ó”2 †2121|üõ‘aÇ»u ÜìÜ ²Z÷,þÇÀȺ œ‚  €ÿfHÏ´ÉTÝù}ÃîgûŠäk˜ï‰0l¿°áÇ` þgf†ñÆ?ŒÌñ^ÁŒç‚9’z'®fØubg'Ï!p²ƒ€‚³„xE¢$%ÄŠ®×3H1|»ÊÎP¸8~9Pª‡áëW`ZfGà÷¿…!öžéÑÜù å=½?O\9šÎÀÅ»¤ÿ + €àKòJkÉrË1äJ”3X Ø0䯮~ÎÀÌšÈÀÎþ“á?0|±‚3 +##Ëë=g3ì>wìþã§÷â¸yƒ üÇŒ’Þy\™‚¯´D´Ùx˜xÿþù•ñüã+§þÿÿåÆÀ4”‰—áûgpüÁÑÉðó·>#s"Ós†_¿¹þÕüÌÌþÿÿ¾;ßAæ"U$²‹2üúÃϾ¬œŸ˜~þcøýk"+Ï_ ÁÙ ÿ€üÁ& +L oþýýÏÀòžŠ˜Š (¼|öçë¶ J óÚŒL¯X9 áÄòú'En‘Åa¶¡ÖK¯šóû?4a0ý{ Ž} A¼’æÛ{gɾæ¸Ã ϬÅQX7 €XPK`~F>Ã÷öÊbšË—æÏ—ädçb˜¿u.'0Æ%€‘)~3±3|û‘šž¨u›û0Ãú÷³Y[?{sf@¡ Ê߸š)Ù®Ÿž×Ç}š}ƒöGW7½ °ÿþú“Ðn`ÎûÇÌâjêÄeæ!Å0ía=ƒ¾° Ãs?<¼³f@! ÅüŸ?jºò&+{3›¹çî`¸û쫈 CfŽë?†¿¬ÈxøçCÓÝnAvAÇ¿Ñ ©s'|Õ˜€BÊy@/þüã™h•(xîÿA†ƒO1ˆ°Š1L¾×4è?¼xd€„5' ƒ…°5C gC[Û*† WÏå0°sƒ €©"Xäýû--Ç/lRj§Ü꿳N½=É+]ÆÀÏ$Àðç¢|ýÇð‹…ßQNß*SV]Ûüÿï/ÿ/Ÿ;fûþ³sO>þ±ýãÏÿ LŒ ûþC´|â÷@ÜÄo€ø) H P-ß¿øD’lÓÛ'i9†r3±~ê|ÎàôHÞãàŸüºE5»n|îa 3ЩŒÿÿ2°21軤”LÐq‹ÊÉÀðý7ÐàŸ@4ì­Ù»K}:yýRXÙ$€1€¥þã0 €X„˜1üš!¬ª–¤dbÍËðí!P5 P×W†@ƒ}gøÿå3ƒ¶¥s¤ÅÎ ž=ï~rêéºÉ*ÊËýzõúóÓgŽüøówÙ_†È („ÿ±¤Œ´!3Р/Àbbe`ø tÓï@ú+ß>|úÄ/,ë,?§ÇQ48€ƒ‰“‰áã;ÕS'YÚC +Ï^Nóf0@1½ÚóâãÏ_ß~3üx ‚çà°Ñÿ¼eøtñÿ?Þî¹Î —ÚÅ&žœÈÁÄÏÏðÿ×_°œ& A §yVYéÏ:‡f0@1 +20¼ýJ¿ÕÍìmÿýÿÇðï×g†ÿ¿#ô'0ÿ0¼¾{›û— ƒ`@$8hþÃî7Ðw¿0üÿô‘A@AKŒ_mëνןÿú{ d0@1ß–fb8ÇÁÈpéÏ—»ú\Bäå•ø~üùÅðçÏO†Ÿ?¾2|úô’áýõ› ’Jö lâ2 ÿ½øçÄПßÁAöçÏ?NV†‹G<óâÃVPèË3fžß Ÿ$Ä\—0ÿá¸pŒ›ƒá7/Ã/>?¹Ëðñý º¯@ŸüÿI  ÿý›á/0Yüùl\œ|@I þ@, ßÿ2ˆ +ˆ'Ïtž>û Ã`J;¸iƒáÞS ¿þ11œðÑbà +S`п÷û÷/†ÿ¾Ã3(”ÿþF=Ðw_÷G`³®¿^ƒ‰Žœ;0Eÿ¦„Àtûù÷;†R¼ ÿÅÙ^}¹Ë°ùèw&†ß⊠¼?3Ü>÷€áý£G ï¿gxß)ìÎ`dí(,®h¢öÐö= ÿ¾| nnå¯ o˜~23|ùó‰èb6Fv Ÿ…“ý/á㌠B,ö fª ¢’ ·_93¼³bØyý=ƒºƒƒ³0Å“¨±Š­Õù“]§7UġŸ>þ}ÉðýÏ ¡Ü lÌ`ƒÙXY>?ÿÆðô‰ƒ¶7ÃO¶ ŒÀÄ &ÂÀÀ-ÃÉ`¦ÁÉÀL(@‰HøÆÍðíÝ?† ˆÿ³»f»˃ko<ÿùD–‡ñóO.vVF6pš¹qTDI1|øËÄÀýŸ‰á10#q‹‘ÀÔÅ4ì0e“0ÐQ àôîç_AiI}O€by±óÅ´]Zœ¶þY988˜ÿp0°0°2°ÿÿÍðô¥"ƒ ?Ãg`D½¦2Î_YT.ƒ’Ü ån ™ _þ33|e !i€baxþ~ÃéV†œÇÇD«”,8e…åY˜8yXX¸¾3 + + + + Adobe Fireworks CS3 + 2008-02-17T02:36:45Z + 2008-03-24T19:00:42Z + + + image/png + + + + + + 5Rd}IDAT8ÕSA€ +†á‹öö•½H4/J™`ðbkh³6àT3X¦Ô_ø|`æ`ëhVfÞÓ¤ªéĵ‡óNÒ4#ˆÈQ!QÓÀ7ÙÊÄ›¼ip­]Ç2¨3?™˜%ŽpÀ½ÄP<’6B>¸ÿ¦P@`°Žý9óIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/c.png dokuwiki-rc2009-12-02/lib/images/fileicons/c.png --- dokuwiki-2009-02-14/lib/images/fileicons/c.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/c.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +‰PNG + + IHDR(-S¼PLTECGNEIOOT[PT[U€ÈYÆX‚Å]„Ä^„ÄaˆÃb‰ÃeŠÂg‹ÁiŒÁlŽÀnŽ¿r¿r‘¿v“½z•»{•¼~—º‚š¼…¾ˆ À‹¢ÂŒ¢Â¥Ä‘§Æ’¨Æ•«È—¬É™¬Æ««¬ ±È°°°±²²²²²±´º·¸º·¹¼¹ºººººº»½¾¾¾¿¿¿ÀÀÀÁÁÁÂÂÂÃÃÃÆÆÇÄÇÊÇÇÇÈÈÈÆÉÌÉÉÉÊÊÊÊÊËËËËÁÎáÂÎáÉÍÕÍÍÍÅÐáÐÐÐÉÓãÏÓÛÒÓÔÓÓÓÔÔÔÉØí×××ÒØáÌÙíÎÚìÎÛîÏÛîÏÜïÒÝîÜÜÜÒÞîÒÞïÝÝÝÞÞÞàààÕäù×åûØåúàäêäääØæúØæûÚçûæææÛèûÜèûáçóÝéûÝéüÞéûáéôÞêûÞêüßêúßêûßêüßëüàëüáëüêêêàìüáìûáìüâìûâìüâíüãíûãíüäíüìììãîüãîýäîüåîüåîýíííåïüåïýæïüæïýçïüçðüçðýïïïèðýéñýðððêòüëòýìóýíóýíôþîôýïõþûûûÿÿÿBFMtRNS@æØføIDATxÚc```0·2QV•’cKCË6 c—È ýb“@"j¡uFúFÁ:}½b“@"¦!®=,õUzº@ëÎ(7G=]CÕ®1`0È‹ °60ÐWêho¬-+êÑv µ7ÔÒôlmª©*)[¤n¦a—ÚÜX]YX˜#PtNlo­©.+ÌÏN È··6Ö”—fúÇ ‚äZêkË‹ 3œXXüøA2 5%ŹÙA,>Ѽ éòÒ¢œìt_&ï˜pn€dIavfr‚/³­W'H@"'+%)!6Âf2£;H@\TTXH€‡‹ƒ•¤&@Õô[.XIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/cpp.png dokuwiki-rc2009-12-02/lib/images/fileicons/cpp.png --- dokuwiki-2009-02-14/lib/images/fileicons/cpp.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/cpp.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ +‰PNG + + IHDR(-SgAMA± üaéPLTEA-.1.039;><<<:=A==><>?>>>…‰ ƒ°Z;k»²óÞ…‰ ÇP߀ ®ÖzÝ]@ ˆ{G”Ÿ—•…­~g»0ØäÄ»ÛØXë´·5Ô”õ˜ù…yÚšš¶4VWå-2t2öHjj¨,ÏÏÏ” h{ǵµTW–äçf$Kƒ4ÛZªK‹òKbÓ#$AÍu5¥…ùUìA,Y µúê¢Âìr.n^&A€jiqAfFQ!§[¸H@¹(?#%¡€•ƒQ$ ”™–o9)•ÙŸ9Z$ (''-%/+.*$ÌÏw†Bó·(EIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/css.png dokuwiki-rc2009-12-02/lib/images/fileicons/css.png --- dokuwiki-2009-02-14/lib/images/fileicons/css.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/css.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDR(-SþPLTE1:F4¨ˆCowG[SL½BTÄ®»³½ÑC·(±jkkvW­ñV€eKƒ§|µ“reEI1XÀ¼¡N¦ZF¦ª¼´¸,`ZW«'QY–œ]T 0IŠ P´ Í×Ï“ 2±ð03ñ0©eI‚ 2\í]‚ýØ4ÓDAz‰\ýŒý|A¬*)B /ðõK Xk C@Bl/H@½ ?7'=-!>*,„$ $''-%&"ÈÏÍÉκB8ÏQ]ï IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/js.png dokuwiki-rc2009-12-02/lib/images/fileicons/js.png --- dokuwiki-2009-02-14/lib/images/fileicons/js.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/js.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +‰PNG + + IHDR(-SÝPLTEDGMCHNEHNEINFJOFJPGJPPT[SV[X]eX^eY_fU€ÈYÆX‚Å]„Ä^„ÄaˆÃb‰ÃeŠÂg‹ÁiŒÁlŽÀnŽ¿r¿r‘¿v“½z•»{•¼~—º‚š¼…¾ˆ À‹¢ÂŒ¢Â¥Ä‘§Æ’¨Æ•«È—¬É™¬Æ««¬ ±È°°°±²²²²²±´º·¸º·¹¼¹ºººººº»½¾¾¾¿¿¿ÀÀÀÁÁÁ¸ÃÕÂÂÂÃÃûÅÕÆÆÇÄÇÊÇÇÇÈÈÈÆÉÌÉÉÉÊÊÊÊÊËÀÌàËËËÉÍÕÍÍÍÃÏáÃÐãÆÑâÐÐÐÇÒâÇÒãÉÒáÉÓãÏÓÛÒÓÔÓÓÓÔÔÔ×××ÒØáÍÙíËÚîÎÚìÎÚíÏÚíÏÜïÒÝîÜÜÜÒÞîÓÞíÓÞîÝÝÝÞÞÞÖßï×ßîÖàïàààÙáïÓãùÚâñÖäúàäêäääØæúæææÛèûáçóáéôÞêûßêûßêüßëüàëûàëüêêêàìüáìûáìüâìûâíüãíûãíüäíüìììãîüãîýäîüåîûåîüåîýíííåïüåïýæïüæïýçïüçðüçðýïïïèðýéñýðððêòüëòýìóýíóýíôþîôýïõþûûûÿÿÿBFMûÂ1ÕtRNS@æØfúIDATxÚc```pt±ÓÖPUR“cg+ç‰N¶A9³gÉ͉è¥wZ›[7%™Ìœ!7$bŸ:'ÔÙ\gú4 PÄmJnˆ™©•îÔÉr À`Q™çfaa®5yROGCPqHº‡•‘aØ„Þö–ºj°EúîE}=­Í552 ÍÀÂIÚ[jªÊŠ¥Aê“&´e¤¦•—ÄÇH‚Ôú»²8YÙ88bÄA*ÝíÕ)þ̾<6Qy¢ åÆúÚŠx¶h?n¯la€b]Mq¢7GT¤%W„ H@¡¢4–…Ñ3œižk&H@^VVZJBLDH€Ÿ— YD4¶D7IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/lua.png dokuwiki-rc2009-12-02/lib/images/fileicons/lua.png --- dokuwiki-2009-02-14/lib/images/fileicons/lua.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/lua.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDR(-SØPLTE~ ƒU€ÈYÆX‚Å]„Ä^„ÄaˆÃb‰ÃeŠÂg‹ÁiŒÁlŽÀnŽ¿r¿r‘¿v“½z•»{•¼~—º‚š¼…¾‹¢Â‘§Æ—¬É±Í£¶Ñ©»Ôª¼Õ®¾×¯ÀسÃÚÔäúÖäúÖåúÖåû×åûØåúØæûÙæûÙçûÚçúÚçûÜèûÜéüÞéûÞêûßëüàëüáìûáìüâíüãíüãîýåîýëòýìóýíóýíôþîôýïôýïõþðõþðöýñöýò÷ýò÷þó÷þôøþÿÿÿ}™gº2tRNS@æØf§IDATxÚEŽ‡‚0D£Ø;±÷†€ÅÞErÿÿGæÀÍ]æîÍf'„2è´[ÍF]§”Hõ}ÿûy=n”¤ç{ïçýzIºá|â—ôÄc Dy!cǽÆwKÿ´ìœjÄجU B­–å0i±­"† +€Ç¶yD"os>Í’è#¦1§è®–1ŸŒ† 5MS+¥B.“J*Ê'í-ËKô¶±IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/php.png dokuwiki-rc2009-12-02/lib/images/fileicons/php.png --- dokuwiki-2009-02-14/lib/images/fileicons/php.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/php.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDR(-S³PLTEA731-::8SSXTTYUc£Vd¤Ve¤dk“`l¢_lªjo†jp‡bp­cr°ds´qvŠgu²hu²jv²sz–U€ÈYÆX‚Åw|‘]„Ä^„Äs²t€¶aˆÃv³b‰Ãv‚¶v‚·eŠÂ|„©g‹Áz„³…†z…µiŒÁ|†´…ˆ‘lŽÀnŽ¿~ˆµr¿r‘¿‚Œ·ŒŽ˜ŒÃv“½†¹z•»{•¼Œ‘¨~—º‰”¿‚š¼Š”Ç—¿‹—Ê…¾“™·šÅˆ À‹¢Â”Æ“žÐ™¡Ì™¡Í‘§Æ¥Ç—¬É¦­Ç±Í¦­Ú¡´Îª±×£¶Ñ¤¶Ñ§¹Ó®´Û©»Ô±¸Õ²¸Ôª¼Õ³¹Ö®¾×¯ÀØ·¼Þ³ÃÚÄÉàÒÕïÔäúÖäúÖåúÖåû×åûØåúØæûÙæûÙçûÚçúÚçûÜèûÝéûÞéûÞêûßêüàëüáìûáìüâíüãíüãîýåîüåîýæïüèðýéñýêñýêòüëòýëóýìóýíóýíôýíôþîôýîôþïôýîõþïõýïõþðõþðöýñöýñ÷þò÷ýò÷þó÷þôøþÿÿÿ21.?ª÷­tRNS@æØfîIDATxÚc```ˆö÷ötw²³°`€€È¾¾ÞF‹~¨HD_Og{sCE?T$¬§«£©¾¶( loo©«­ª°@@kcmMeEyYiQ!XÀ76ÊÏÕ-ȶ¤¸0$àb-È7ÁœŸMÈȧ Ï”!„e‚€å„ 6@Z!ǘ!Fs‚Ú„Ð Z@l8›CÁA™)Èñâð <œÚ "Œ˜=&x…&°¨§© ` (§*í,=AW&%Id­£0;+¯½Izjr‚HÀ./7;+3#5%1>N $`eff¬¯£¡$+).* +lE.k® IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/pl.png dokuwiki-rc2009-12-02/lib/images/fileicons/pl.png --- dokuwiki-2009-02-14/lib/images/fileicons/pl.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/pl.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDR(-SƒPLTE!18)7. 6.$B=-D=7K>%QF1LI=ZI6TK@`K.YM8XSB_VKeW=pT8oT>`YSlYFb`dt^?r^E~Z;k`OmdXa@|eG‰c>{gShIrjdˆfKpog†iLnpm{nXMv´ŠkI}q`nLzrl^wŸ[w«xugˆqRex”nHui]{¨yw{…w`f}š’tWˆx]ŽwWT€Ì[€Æ•x`˜yV—y[`„·lƒ ]„ÄŒ~g”|\‚y˜}S›{X|S…€{ƒ‹k‡©_‰Â„‡r…©¢|[Ÿ\h‹¿x‹£‡œ…jkŽÂ¡†as¿ ‰n¦‡i¨ˆd£‹k¯‡`z“¼žy{—ºƒ–®~š½µ’h¹hÀ’›¢¿•m‹¢À¼šuÁs§Å¶£€•¬ÊÃ¥y—¯Í™±Ï¢µÎ§ºÓ©¼Õ«¿Ø¯ÂÛÁÍÛÇÓáââíÞæïÙéýâîüåñÿéòúëôüìõýîöÿðøÿòøúþÿü5&5f}tRNS@æØfbKGDˆHØIDATxÚc```(ÌËÍÉLOIŒ‰a€€ÂººÚºššê˜z¨HWS]]Sɇð+‘< ¿ªª²2@¹~E9@ªAÜ$'u·$@NU©W€±ƒ¨† ›H »D1"+M–±AL\> +$©ÌΞ‘ê"Àde•ˆN÷åtM0 èñr;‡é;š†'KúXøÍTB­ô#A>A4!EE-APbyHHQLN+mQO2€OP=SP4€qQ]ˆ€_a.€a_)bbigB€hhF„ Q€nnCb‚wytu1ywm†€D w‰ƒƒ +q4¯ÀˆˆT€ÌC°SƒÇ[€Æ‹‹]„Ä‹_‰ÂßaŠÃhŒ¿=ÇkŽÂàs¿t•½z“¼|•¾/ß{—º~š½À ‹¢ÀŽ¥Ã§Å‘¨Æ•¬Ê—¯Í™±Ï¡´Í£¶Ï¦¹Ò¨¼Õ«¿Ø­ÁÚ°ÄÝÕåùÖæú×çûØèüÙéýÚêþÞêøÛëÿßëùàìúáíüâîýãïþäñÿéñúæòÿêóûëôüìõýíöÿî÷ÿðøÿòøúþÿü-óï›tRNS@æØfbKGDˆHëIDATxÚc```HONJˆ‹‰Š c€€´ººšºªªª°z¨Hj]M _VŒñ+€`Sq9‰ÊÊŠ²0 škK‰•••–Xõì¬í­,€üâ¢B €µµ‹–·–“JqqaaAƒLh;'ª‰|Ÿ 4ƒ[S˜ÑÏNÈÍÍ d`UbæÔ±¶Tñ³ý*¸Xdlõy ÄÄIJ³|AÖªX[[»ëzš±eezm ŒÔ¥Eø33=@NÐfbâÈÎÊÊÌÈp „‡„úûúxy¸:;º%>éõ¼èßIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/fileicons/rb.png dokuwiki-rc2009-12-02/lib/images/fileicons/rb.png --- dokuwiki-2009-02-14/lib/images/fileicons/rb.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/fileicons/rb.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ +‰PNG + + IHDR(-SøPLTE ‡ Š‰Œ Š’ ‹” ” – ‘‹Žœ š š‰ ž  ¢ ¢œ +£˜¡›œ¥ ¡ +¦™ ”­ +¥©­¬ ±¨ +© ”¬¹£´¡¤±»ª ¿ÅÄ$©1!Â'Â1!¬?3°BC¨HDÀ@1¬JD×:%Ì?-°JF¾F9»KHÐK:±XT×VA«ffU€ÈYÆX‚ÅÑ]R]„Ä^„ÄÝ[IÝ[LaˆÃb‰ÃeŠÂg‹ÁiŒÁlŽÀnŽ¿Ûl_r¿r‘¿v“½z•»{•¼~—º‚š¼¸‰…¾Ï„{‹¢ÂÞ†{¹•œ‘§Æä}—¬É±Í園¡´ÎÚ¢Ÿ£¶Ñ¤¶Ñ§¹Ó©»Ôª¼Õ®¾×¯ÀسÃÚçÌÍÔäúÖäúÖåúÖåû×åûØåúØæûÙæûÙçûÚçúÚçûÜèûÜéüÝéûÞéûÞêûßëüàëüàìüáìûáìüâíüãíüãîýåîýéñýêòüëòýìóýíóýíôýíôþîôýîôþïôýîõþïõýïõþðõþðöýñöýñ÷þò÷ýò÷þó÷þôøþÿÿÿ’ƒ5FtRNS@æØfòIDATxÚc```(+ÊÏÎÊHMNH`€€Ò¥K—,š?wFÂ2¨HÉÒÅ æÍš>5aT¤xñÂù3§M™ €ˆΛ7{ê”I@$P0§ÜÏ)ÈTÖkB_/X 7OKß"ÐUJ¤¿·,¤®¡¥ïn©ÍÖÓÓWS×p0–fìêhòmYåÔô2ÍD¹—··µDÒ X¬l¬u8ÙZ››"€Q9)â’JÒÌüvÍM a@MOg A&.·Æºš €¢‰¡/ª¹ŒG}mUP@YEAˆO×ÞÅ1½º²Âdmb||lLdxh°¿¯·7º^HÑ­ú¶ŒIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/ns.png dokuwiki-rc2009-12-02/lib/images/ns.png --- dokuwiki-2009-02-14/lib/images/ns.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/ns.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,8 @@ +‰PNG + + IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<çIDAT8Ë}“Kh\u…¿{gîÌ4ÃL¦’”)‰BŸ1>Òn\ÔâF²±)µ¡PAD¨  Q¤TWf!”"ØŠ¸®Š¦` ¡HC0ijC“1ͳ“ÌL›fwîëÿû¹(v!ƒg}ø6ß9–ªÒ)wyc‘/T4«"žœ˜ëÔ³þ X˜8Ñ«¢¨Èû»÷Ì›v‡Ë×›*ú¹ôÜØõû‹WGU}[E>ÉîÙß7ø&¶šåœt‚Ji’Gë³+*rQE¾>û{û `áêè¢Ò=ÃÇûŸÂí9o/rorœþgaw=MЪ²Uš¥QŸVcƾ;}ź;qâDÎ>µÌr Ïã7jìTç1a“¨U&mì8þ6‰îl7K½¼ÀVio{åǤ9sðÕËVÔ¨Ñ,O"a´WÅ«—©¯mptìkœÌ.h-£­V}ÝÅÈàÖ¯K§“*ÒR¬\ÊM“- Юޡ«'O¾'CüU0)ð7 ½†·9Msù&î3§P#­¤Š€V +'w'Å¯Ì Í +N,ïo°•póú#âLRi4ŠQ’j„Ç hÉ]¸½GˆS\ÿ²ù;QƒØíƤ³ˆB¬H£Æ`«1…ª‰@<Ѐd÷^²{â9¦]â Æø!Æ󉼉"Ô¶ŠdlÇDÔ @|0mp‹Ä +Ä ‰›QÓÇÉ a+¨ˆk«‘K7¾¢½½ +é"$ºÀ„  h$?$öB©r‡N#&Cif +™N¼7ÚÿS°³²V[¼6¶…lßaìL/HbFå6ºt÷¿ŽåX¿=Çֽɕد}ŽÈGO¦|ë»—zUäC5r®øâh¾8üD>õµ)4VÊwþâÁêͦŠ|«"—Ž¶´ÑñL\>2¤FΫÈ[û^yÇjW–¹?ÿ'q{ýgùBiîßøo¦.¨È§ˆ¤TäËcç¯têýܲÂ^&ýÈIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/page.png dokuwiki-rc2009-12-02/lib/images/page.png --- dokuwiki-2009-02-14/lib/images/page.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/page.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe< IDATÁ¿¯žsàëþ>Ï{ÚÓSG•ˆ3ñ;1Ј„….“Åbc#61Ùl’ŽIÿ£AKD"$‚X$ ÚTDÏyÏóÜ×UI¼ðÞ¥×w÷O¼6Ê9œDBŠ´¥û×›×óYý}ãËÎo*‰—>øòò'o{tŒ:& ¸öﱋßÜôÇoGÿýôÃÏg¿¸pþfS=¼3Og~¼jUiÖ´e‰[Ç«ç¼ÍÓ;îk§ÒÜxîÍOïøü£—TÕé$ÓÎ4ls1 ¦¢Š¡ÐöwœêÀ}œØ÷÷>†¡``£Ê¨2ªŒ*c*¿ÿu˽§=v¶¼ñ̦Íô*Ì óD)©ÒkežØÉðËõØö¢{ëÙûO¨y,0CB0×Ô(…4™;Œ.Ý“Ô3*J ‚4› PC­%# 0C/$4 +IÀè2O!Eˆ²6k3tGB€¥T˜“Ö%`†µYCšÐam‚)6Ó°l0C/щ÷¿Û*ÑER4©€„\¼gãø¨Á ˲ZWö7ž¼{è°†µè$$|u‘ŽãÃÌ°u/ÝÙ®ê«+«®ˆJtÈ(£Ë:¾ÂäÂVáê¬ ¬|oßZ|0 ÀÍÙ†:z1þŠ8aõ³3±ô$_óî,üTÆsñzBŽ(o?ìO,><4éÆL]UGSÚn‹YkŸœü›™ Ö‰ CéLBR6·½Z§–¦òú—_µt2¢0W”|!ö¥£E"·ÆA5(°úf»ÊÎÆŠ>ãNg<0qæ\–°c{ˆÐ•’ -A€Tw¤ÁÞu `ßâë·À`6ªzûbêžÃÑ4½Šðz:¯/l•{ºÂŠúh£Ôi¿·^Ê$%eõ}«¼örD÷n?ohM“Í¿«9åK#‰¹k÷¿*GocwוáËɹå»l›Þüõ© Í8Ÿ©ŒQÑÞs+;¦gôæäCýC²f›Ìhšn… Q<×W}§Ì‰0v%õ”sádÒÙL´ dÎöh$tÊÿå7þ+Ø…<¶IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ + +ÚQȪëIDAT8Ë¥“1LaÇÿ×^›+mñhm°ÅD"ƒ) +‹Ó1œ‹CuÒ0u1q1ÆÁ¸„ʼn`‚‹K;3Øcî¤Q#*J/Ü]K-ÞÝ÷=R½tò–÷Þÿ—|ÿ|O "œEœQb{còåvº[ +Î $E¥éÅ ‚üsç¯Þ¨óÙÒÓAãø¾pü “‹ÛÙëC’Æ9°ú£ygéÑ€·ŸW•ÑË‘×Äk_ËÓ™²poñ—<žŽT¢RP~÷ñ`béñ‘¹¥[sEk{uÏZÿÜȼ»dÈ€{ÈŸ‹ŠòÖŽ[n7ÀòTFÿúû°œˆeÏáy_ˆ}‰PŽˆð½zXêXe«YbH¤Â9ÀcFóXÇÄ=`ü¨|€]Û5@„®¸˜íˆw³öžcø+Z8S!¥ ·/¬ì7j¦[ôÞÌdô•OõBOW@VžlæÛÍã6òɘ(¯}¨Ö_è>ÀÝU­fz ïË•‘èü‡ßäÖlìþ†<|56¿²jlÓ]¸9µ©ùSaÅó(gï;Å]Ó5zÓÒÿ¥þ!I³MϨ™N‘qž»ÐQ|_™aìZücÂɤSÉP–Hžïш­‘ªª$œöUU¥S_cË ÿ˜ÝïÌ_-¾IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/h1.png dokuwiki-rc2009-12-02/lib/images/toolbar/h1.png --- dokuwiki-2009-02-14/lib/images/toolbar/h1.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/h1.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1,5 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -"*ÿ_×#IDAT8Ëí“1nƒP †ªÎ½aaƒÐ.0‘JŒ(pŽª¨r€öQÞ 8@¸éˆÄl¿'wˆ†lºôßl=þý,{ªŠ{ô€;õ÷€G¨ëz çÜÑs(Š¢‘3ƒˆÎmÛ~ÄqüJDÛ¾ïß.U…ª¢ªª±,K3ǪŠ4MM’$£ª"Š¢—0 Íf³—o.#8ç`­ýeˆÀÌ€®ëNÌÜÑz°ÖBDü<Ïß'Û`fY°®"š¦ùœsq?‘?ÇÌ ¹½Yѯ;NMnfÛK]çDdõOžª"˲=ESÁ±ëºC5í&Ûgù¶ÖnsO_ª:xÿ·€§æ×6¶MIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ  *4š¶\TûÖêÝ`ÕcàeN]m8¡ŒÊx/®èå³Å¾]` +<ú Ò_ž› .€7…PŸ5k÷¼1T̨¸ Ç1e?½üæÔ9]7–êaIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/h2.png dokuwiki-rc2009-12-02/lib/images/toolbar/h2.png --- dokuwiki-2009-02-14/lib/images/toolbar/h2.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/h2.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1,5 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -#4KÛRIDAT8ËåS1nÂ@#7nR¸¢±xîQ\QE”!ºäá< Êò’{"=/0i¨¥”a!ØÝ[œÆb¥¤H‘év5;š›ÑUUá´p!þ^ cÌ@TõÍZ;‡FDî™D´dæW"Ñ3¿¬×ë>Dçª.¬µ#¯Þï÷mY–€Y"š1sv8ºÎ¹Þf³)BOVU8çöˆÛíQeD4Z­VE»ÝΘ٪jà,àœƒˆ$ƒÁ`\Û3'Q!Ïó©ç1ó£ªîD$ÿÎD"RÌçó'¿KÓôšˆ?Çqü\óîŽÇã®Ñ‚ˆ€™=Áïêã²,Gι"‚¤!àmÿ3c¿ß#ŽãLDnEä& C«ªï¾µVö„ˆÌŒ4M t:CD8N y‘Ü9U€eUUÍÿñ_øײïžåóñFIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ  +ÒutEXtCommentöÌ–¿&IDAT8Ë¥’¡KA‡?×ÅóT˜“5Þ!X F¹ Ä É ë€Ql†-b«Á¢eºÅ?aµmt›i’' +g™“aØU¼ð{ûö›7¿ydE•óH\þ9R@L„Pf¬ @iµ,…2}àXž;«åÈŸà`µ|uz`µ,]­jà¸õžz-®õ L[-¿š<—aßL̃0 ¬ +eÎ<Øš«·t7«å•gnìÇž±i‚¹†>Úæ]†}S1À¢7êØ6„2{®¶‰PFu†G=ึȊêý—Ëwêv¢ <%1w½xÎ=ý<¸Ýø +ª±÷qÉ:€lØIƒÓšŒªkàÒé]÷¤90J[ܹè` ¸øÓGFü‡:5IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/h3.png dokuwiki-rc2009-12-02/lib/images/toolbar/h3.png --- dokuwiki-2009-02-14/lib/images/toolbar/h3.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/h3.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1,3 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -$â¤â]IDAT8Ë哱jba…Ï-dA«K@lì®O`u%h›pûÀ>òûûIþØ%}|­¬$ VB¶øáÌüäñº¹uŠ-öT3Í™óÍ0™»ã+ºÀõï . ªª˜Ùsáq±XTªz+" ¹‘'’K’ßDäçn·ûY½ÄªªöföB¸©Ý˲ $'«Õêj<¿|‘ Éâp8\5Ì )¥F<’‘º¾Ûn·÷$ŸDdÓ@€”Tu0›Í–§Ø‘I€ˆ Ïócœ¸ûów‡»c>Ÿï§Ói¨{wGQa4íë¾×ë ºÝîK»ÝÞ·Z­kwÿ‹ ªç¸ŸbŒÈó¼è÷ûßÇ㛪ޙ̬h Ô±?KDcD–e×"²ìt:›”Òûiñ«óʲ| YœLž×ëõãp8¬HÞŠTõMUÿ¤”föà·»7ÏøÿÂH)þ €XÑIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ  +ãE;ktEXtCommentöÌ–¿0IDAT8Ë¥Ò=KQÆñŸëÆ·Æ° »„$EÒ ;‹€•"lç'˜`)j‹„ôCŠ4é§ù©V»­dŒXM•€ ÚÜ•Ë°ƒ«8\žÃ¹žsîÕê º÷Ž&’‰H²¢ƒ7x‚~™§ý$+ÚØÇ3ãg™§ÿc7€2O‡AwÊ<í‡Ú#àG|yXa¬KÌ—y:ž¶ƒ*`1dµo¡nUÀ^&YqÁ^…úL€e\”yú%Zn»uÏ8ÍÁÊ”>³‡¬öÍÕžFV7±­$+vBm{h$Y‘=z±½†OøŠ×Z½Á¿;~¾xœÿnÔm7Š¼ô7ü NÏ›•æ«È»p~Æ_¬ã9ÆZ½ÁÕ-FøéÃðüð«9ÃÌíŠ>Ãwœbx ðBM/ó1ãIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/h4.png dokuwiki-rc2009-12-02/lib/images/toolbar/h4.png --- dokuwiki-2009-02-14/lib/images/toolbar/h4.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/h4.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,6 +1,3 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -"4Pê@:IDAT8Ëí“¡NÃ`…ÏÈDÕÄ|§VÕº*0U[Bffh=á à–>à -³S˜©=US Éô@íž{›Ó6+vÃuçäÿ¿œsóÿ=çΙ œ9è@–e9€°öÞŠ¢(æóy¦ª7ª -’åz½^@E¾ˆÜm·ÛÀ9çÒ4ݧiºl´s“Éd™$ɾÑaÆãñûh4jÏu*TUÕ‰G"Òjy&98õú§—ÍÌŸÍfulˆˆOÁɹo¼ÀÌ ªŸ«Õê±ñâ8¾<~W$¯k`¤ªð“ (‚ÑbÅ")´ +HX¢2  Ø)¶o°ÅºXˆ2Mš¤Jï”[¥´Ø^Ü![‰AaqdØkácœ&°âáÁ7ÜÃ=÷ÝG{˜S£ð*L€‹Àsà,pèp‚ÀT˜|öKì>°UgàÕ4ÜWí*8Éà|…5Ó5žZÄà*pÓe^wì2ðÀ[wþU{˜ð +j"26^ç€÷iŽŒWgÀ%àCaùÕ¤µ<˜Üh÷“âZÓ(€ëiŽ;¦À `¿0#B_í¶I9gd•æ~³4 +sX*¦/²'CÝl½œ4þu>°$Ê +"Û~S±û×16Þ)Õ]+4ç–EÈQE9.|L£°WîSà.•íÊ€\•=”7þwù²hDU#”Ý¿üiönUKË&5 (̽DÕ¯¨¾ÍòOÙë?ÅÆÆ·;À-cã®cW€‡€gll Ûe¼¦ÜQúIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/hplus.png dokuwiki-rc2009-12-02/lib/images/toolbar/hplus.png --- dokuwiki-2009-02-14/lib/images/toolbar/hplus.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/hplus.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +‰PNG + + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ  (îˆetEXtCommentöÌ–¿tIDAT8ËÓ1kQàïímäÎ"«ì5^#b´-lDƒÍ…bea»öâEƒ`£à66Zˆ?`kÄ$Øh![QŽ{6›ã\ïr™röÍì¼až¥Gƒ[öƼlp·1„Ƀ€SXG èî~L‘íÃ`ýF‚+ê¿Ï3HöJ™àЃuì¦.ìÇà,.à<®ÖÜIܨµy:Çà#®5¸-Üœ,qlåå™ZÐÆûªèmdyywp ð¦*z;S;¨ŠÞ'ÅéªèmÔÜ6¾â.^ZGÖ6/O»BR'›ÄFUÑÂâÚ Åë!¸Ÿâpãpg•²Øß\h‰«’°Žî´¬dyùb‚/¯Õ¶„§!Z„´.¬‰ÏUÑ»7Qîxy!ú.x'8ŽtÞ;ø­Ÿá›èIŒ^a˜ÌXg˜ÅýxÞ¿þ$[1Æg£ßþcååE\¹,/Wkn¼¼,/ó,/Û¿/ÇÑhøEŒý¿I¶cD-…*êIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/h.png dokuwiki-rc2009-12-02/lib/images/toolbar/h.png --- dokuwiki-2009-02-14/lib/images/toolbar/h.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/h.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,5 @@ +‰PNG + + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ + + *|õ9èIDAT8ËÅ“¿A1Æ.áb¨?³DL‰•ÕMlM,b7öl¼Bwƒ'è{˜%s7 KI]D¸ƒ/9COz~ùrú•êt3$W‰â¯€ Pº„2  €¥Õr%”©C ¬…Õòè;¸¬–[ 4¬–+×Û{` Ìýá'€SÚ9óu²VËó«ÄyWqèç8…@K(3²@h~È«åÄ[îè½{Æò @á›Äíø½Ô;@èYí] -”é{ÙPF eÂBuº¹üšÂ(Š.A’a~ý‰·a€+b¯5;tÏ'aIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/image.png dokuwiki-rc2009-12-02/lib/images/toolbar/image.png --- dokuwiki-2009-02-14/lib/images/toolbar/image.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/image.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -$ë·èÉßIDAT8Ë¥“½k“aÅo0bóQýH  èСIQÄU·‚‹“€ÎŠ®ââ訃(Š .‚CmÑ­A‡TÐ"X¤1i’æ¹ç:<¯¶ƒŠ wy8çp鉻3Ìd_Ü8ñWÉ‘“L˜‰`",¾eªs3È Üqw𠸻ã -BfH'Ãò›å 4×¾ÒÝlýs¾X`¢2¹£ÀÍén¶x~ú5îDvßµÀµÊ%F÷Nâþõ;ÇLd”º°¸u›Å­[ô“LÒ¼Ú¨£n×6Á„§d¢æ(ûhé#ýä K‹ Ô$ „þÖOÒj¿ÇLH`òTA -,p,_ÇÌxÙ;Ë€Õb°Ò®ò´yËîþV 9YÉQ°h˜¼k5˜¯–ùÒéÑ™gãÇc:ÇçõS´{“(ŒP“ÇTvõò7fLQɦVòŸò«ˆG©>DʵäX°X$“£à˜‰‰=‡‹àÛÈ…#¦rÓ± !ÜïjàÏ2'·o”ÞÍg¸E°˜ùN,í†ä”K%~]@ÖLà ű2…Â~¤ø1sþ -µ@äÊÇyûànB8$I 0y|uÖwwû_ÌšdØkÌ0äü_¡¿,ÖOBIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ + 8;æËÌIñIDAT8Ë“?kTQÅoYtÅdÍš¸+„›€îðX Š¥…`¡`‘V¬´$…E–!iE+¢ BüŠ$5»oßÌ‹}ÙÝuš{æžsîÌ™$"øר×ëGÉâìÌž…R ®À\¸ sa&æ^U ¸S|lú$r‡"¢€"‚ ¹#f' +ÉÍùÍ؈O/_ï© Í|»y[Ñ…1KþJ·l{P`åÅ +îê~An|ÿø…ÆæV‡=³6kÚ²sÿ@™‘ÚѶš^€ð ±¹ÅâùçD@DÀ­Ú5úŒbîöŽ ã.\A¡£ ÌÒö}–¶ï‘&o0 žmL¡Æ*¡æ"ò˜© €Ú²O¾'M³üû +欦už~=ÃÖ¯w¸ Üe¡y Ùe.fcxê˜i7€Ì1S•oLU©•N0Qg½ÿ-V½ŠhOGË›w„½¸‹‘ýÇQ‹Fµ4ŠÂ""ø¡U»ö/š+cP:ØGóÎÂÛ`ijí3óŽ©*ƒƒô®OÑs"aàP…rù0ÊS£gO¢T™aíÑCÂ…\$I·÷ÉÂõI€èµ¨õÈsæ^õÆùõ$ùŸuî?v—¯ =kÏIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/toolbar/link.png dokuwiki-rc2009-12-02/lib/images/toolbar/link.png --- dokuwiki-2009-02-14/lib/images/toolbar/link.png 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/toolbar/link.png 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,6 @@ ‰PNG  - IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEÕ -#"èŸnP·IDAT8ËíÒ±‹ÚPð/yÏfH% -9$*§àªSJ§)-”šÅ±7tréPZèX,å†þ: -[…ºdª‹Õ¾÷N"œ`‚§‰M§ú8té7}Óoøø”$IpLT™п¥V«é•JåY>ŸaYVv:ÎV«Õ?3™Ì·b±X”R^sÎߌF£÷Ãá0<Žãܲmû5cìy³ÙD†(•JwƒÁÇÝn÷«Õjå)¥Rf=Ï{;›ÍNÇyåyÞŽ@’$cçõzýºÝn_¯×lÛ&ÕjõTJyÚív!„اÓéÏFã.cìœsþÀ' -Š¢œ†¡õûýöf³ùÁÂuÝÛÙlAÀ÷}\\\l(¥}ßo†ñNQ”³EÑ%çüÆ4Í4!¤§ªªÖét ë: C¨ªªBz„/œó›(Š.Äq<B\•Ëå—®ëþ¦”¦‹&“ 4MC¡P@.—KÅq|o>ŸßB\Åq<%I0ƈeYU]×{¶mŸhšF¨Ëåò)nšf@j»Ýî…~†¤”?Æãñ^ùåã?K¿¾äÇ™u±IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku + IHDRóÿasRGB®ÎébKGDÿÿÿ ½§“ pHYs  šœtIMEÙ + ; ë?¯&ÃIDAT8ËÕ’±‹Ú`Å_’ÏfH% +9$*§à7T§”N.Z:Z(5‹coèäÒ¡´Ð±XŠCÿ…Ž-ˆB ]2ÕEj¿ï;‰p‚ ž&6Î? ¥ozËûñx<)Žc#GêßÈ©T*Z©Tz–Íf_˜¦™žN§³ÕjõÀÏT*õ-ŸÏç…WŒ±7£Ñèýp8 Û¶oY–õšRú¼Ñh  +…;ƒÁàãn·ûÕl6³„!Ò®ë¾Íf'¶m¿r]wG Žã‡”ÒójµzÕjµ¾¯×ë–e)årùTqÚétÀ9ß'“ÉÏõzý.¥ôœ1öÀ'’$麮öûýÖf³ùàûþÂqœÛét¾ïÃóáÃI{ºRâéD8kj‘buT,ÇÎT¢bQoijΣ¢6[yNYõ.Äsv-`/åiÄ­”–T,ê"ÔG?j‹ú s@ˆ÷4”*ÔÁ;õ>eêíÜꢷ?rÈôäƒæP± Š±_ -sIDAT8Ë¥“ÍKÔaÇ?ÏomÍÝm})¡ CŠ ©(V/bDKQtÐCOv«£àEë/ºw*ŠèAQuH("¢¢µÍÐpM«ÕÝßïyž™Ú&z šË Ã|?|afŒªò?Q±¾áž˜”*½*œ!£ +*¼aH…Ë[Îhaí¼YëÀ=1*\5 }¦&ƒÆë@=ZÌã^ŽæDè©íÔ§nØtjMÇ`{7š¨Æ/DÂyÔ•Àl&ØÜ„±áämÂoO»êÏêÝ2À›:U&b-·RüÄ—r`!.D}i"Š©l VÙ‘svíèÖï€ +½Á®”ÆA¸%†ïåA"ðÏØîç[|8Nbß@J<½€§Mm+RÊ¡®ˆŠåè©*T,ê-íTBÔp‹¯¨¨ÙƒxN¯4S™FÜbY¤bQ¡>Z­-ê#$Ì!ÞÓX¨PTWïx|÷9_?O¯½]Í!ãó ?œFÅ‚*"Äþ:ðä°E N[Ç^FßO15>‹úËdn±O dZÓ˜ ø +lÈXùDx`ó¯5 $’3´µ7òöåW>¼™oIV2™j’‰éó؈å5.Ü1õ"|IµÞH‰ý„/|@¢EÔ…ˆû³Fˆ%›0éLÜ?_p–݇úu.¨íÒ9z–Ç®ƒî$–nÅÄêPQ%ˆocSýq4qŒùw÷°=‡úunÃ)ÏÜ4Yñ\I6÷5Æ·î'Ø€8\èYšùÌìÈ`ÎY.¾¨CÙlVÍúoœºfRâéá¤÷d\ÎòÂY†œeðÈ¥•gÊf³ºÁÁ¿Æ1Ào,÷‘'\ò#?IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/images/up.png dokuwiki-rc2009-12-02/lib/images/up.png --- dokuwiki-2009-02-14/lib/images/up.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/images/up.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDRóÿatEXtSoftwareAdobe ImageReadyqÉe<IDATxÚ¤’ÝNƒ@…¦·¦&(à¶øwá¥ê+ø¾„—JQC ]ÁT!ad7JÚÒ݆x’Énfg¾ÌžŒqqyè÷4TºfÙ1j©§jÕ'§ÇÍ~H«&Y ¡káèpžË„¸SUá)ˆZe1gžÇ0Í¿šä4/eŽˆà?¿.@æt`ïaȤ³ÖXiYÊ7‡o ä@î`®c!áŸJW^È ^Þ%DȶL ¬LÒ ë4) +Y[Q…0ŠINP_dôû›0Ím- ŽÜÝg &6†pžÑV Ñ©®ÊD©q¡‹–:ª§ØýuRáüŒi;¯o|ý*ß>øÿúfE7~h@n¿Œ>üIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/admin.php dokuwiki-rc2009-12-02/lib/plugins/acl/admin.php --- dokuwiki-2009-02-14/lib/plugins/acl/admin.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/admin.php 2009-12-02 19:50:12.000000000 +0100 @@ -31,8 +31,8 @@ return array( 'author' => 'Andreas Gohr', 'email' => 'andi@splitbrain.org', - 'date' => '2008-12-16', - 'name' => 'ACL', + 'date' => '2009-08-07', + 'name' => 'ACL Manager', 'desc' => 'Manage Page Access Control Lists', 'url' => 'http://dokuwiki.org/plugin:acl', ); @@ -62,6 +62,7 @@ function handle() { global $AUTH_ACL; global $ID; + global $auth; // fresh 1:1 copy without replacements $AUTH_ACL = file(DOKU_CONF.'acl.auth.php'); @@ -76,9 +77,9 @@ // user or group choosen? $who = trim($_REQUEST['acl_w']); if($_REQUEST['acl_t'] == '__g__' && $who){ - $this->who = '@'.ltrim($who,'@'); + $this->who = '@'.ltrim($auth->cleanGroup($who),'@'); }elseif($_REQUEST['acl_t'] == '__u__' && $who){ - $this->who = ltrim($who,'@'); + $this->who = ltrim($auth->cleanUser($who),'@'); }elseif($_REQUEST['acl_t'] && $_REQUEST['acl_t'] != '__u__' && $_REQUEST['acl_t'] != '__g__'){ @@ -221,10 +222,7 @@ } $ns = utf8_encodeFN(str_replace(':','/',$ns)); - - $data = array(); - search($data,$conf['datadir'],'search_index',array('ns' => $ns)); - + $data = $this->_get_tree($ns); // wrap a list with the root level around the other namespaces $item = array( 'level' => 0, 'id' => '*', 'type' => 'd', @@ -244,6 +242,48 @@ } /** + * get a combined list of media and page files + * + * @param string $folder an already converted filesystem folder of the current namespace + * @param string $limit limit the search to this folder + */ + function _get_tree($folder,$limit=''){ + global $conf; + + // read tree structure from pages and media + $data = array(); + search($data,$conf['datadir'],'search_index',array('ns' => $folder),$limit); + $media = array(); + search($media,$conf['mediadir'],'search_index',array('ns' => $folder, 'nofiles' => true),$limit); + $data = array_merge($data,$media); + unset($media); + + // combine by sorting and removing duplicates + usort($data,array($this,'_tree_sort')); + $count = count($data); + if($count>0) for($i=1; $i<$count; $i++){ + if($data[$i]['type'] == 'f') break; // namespaces come first, we're done + if($data[$i-1]['id'] == $data[$i]['id']) unset($data[$i]); + } + return $data; + } + + /** + * usort callback + * + * Sorts the combined trees of media and page files + */ + function _tree_sort($a,$b){ + if($a['type'] == 'd' && $b['type'] == 'f'){ + return -1; + }elseif($a['type'] == 'f' && $b['type'] == 'd'){ + return 1; + }else{ + return strcmp($a['id'],$b['id']); + } + } + + /** * Display the current ACL for selected where/who combination with * selectors and modification form * diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/ajax.php dokuwiki-rc2009-12-02/lib/plugins/acl/ajax.php --- dokuwiki-2009-02-14/lib/plugins/acl/ajax.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/ajax.php 2009-12-02 19:50:12.000000000 +0100 @@ -45,8 +45,7 @@ $lvl = count(explode(':',$ns)); $ns = utf8_encodeFN(str_replace(':','/',$ns)); - $data = array(); - search($data,$conf['datadir'],'search_index',array('ns' => $ns),$ns); + $data = $acl->_get_tree($ns,$ns); foreach($data as $item){ $item['level'] = $lvl+1; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,10 @@ + + * @author Yaman Hokan */ $lang['admin_acl'] = 'إدارة قوائم التحكم بالدخول'; $lang['acl_group'] = 'مجموعة'; @@ -11,6 +12,10 @@ $lang['acl_perms'] = 'ترخيص لـ'; $lang['page'] = 'صÙحة'; $lang['namespace'] = 'Ùضاء التسمية'; +$lang['btn_select'] = 'اختيار'; +$lang['who'] = 'اسم المستخدم / المجموعة'; +$lang['perm'] = 'التصاريح'; +$lang['acl_perm0'] = 'لا يوجد'; $lang['acl_perm1'] = 'قراءة'; $lang['acl_perm2'] = 'تحرير'; $lang['acl_perm4'] = 'إنشاء'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/bg/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,15 +6,16 @@ * @author Nikolay Vladimirov * @author Nikolay Vladimirof */ -$lang['admin_acl'] = 'Управление на ÑпиÑъците за доÑтъп'; -$lang['acl_group'] = 'Група'; -$lang['acl_user'] = 'Потребител'; -$lang['acl_perms'] = 'Права за'; -$lang['page'] = 'Страница'; -$lang['namespace'] = 'ИменнопроÑтранÑтво'; -$lang['acl_perm1'] = 'Четене'; -$lang['acl_perm2'] = 'Редактиране'; -$lang['acl_perm4'] = 'Създаване'; -$lang['acl_perm8'] = 'Качване'; -$lang['acl_perm16'] = 'Изтриване'; -$lang['acl_new'] = 'ДобавÑне на ново'; +$lang['admin_acl'] = 'Управление на ÑпиÑъците за доÑтъп'; +$lang['acl_group'] = 'Група'; +$lang['acl_user'] = 'Потребител'; +$lang['acl_perms'] = 'Права за'; +$lang['page'] = 'Страница'; +$lang['namespace'] = 'ИменнопроÑтранÑтво'; +$lang['btn_select'] = 'Избор'; +$lang['acl_perm1'] = 'Четене'; +$lang['acl_perm2'] = 'Редактиране'; +$lang['acl_perm4'] = 'Създаване'; +$lang['acl_perm8'] = 'Качване'; +$lang['acl_perm16'] = 'Изтриване'; +$lang['acl_new'] = 'ДобавÑне на ново'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-va/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-va/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-va/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-va/help.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -=== Ajuda ràpida: === - -En esta pàgina pot afegir i llevar permissos per a espais de noms i -pàgines del wiki. - -El panel esquerre mostra tots els espais de noms i pàgines disponibles. El formulari de dalt permet vore i modificar els permissos de un usuari -o grup seleccionat. En la taula de baix es mostren totes les regles d'accés actuals. Pot -usar-la per a canviar o borrar ràpidament vàries regles. - -Llegir la [[doku>wiki:acl|documentació oficial sobre ACL]] pot ajudar -a comprendre millor com funciona el control d'accés en DokuWiki. - diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ - - */ - -$lang['admin_acl'] = 'Gestor de les llistes de control d\'accés'; -$lang['acl_group'] = 'Grup'; -$lang['acl_user'] = 'Usuari'; -$lang['acl_perms'] = 'Permissos per a'; -$lang['page'] = 'Pàgina'; -$lang['namespace'] = 'Espai de noms'; - -$lang['btn_select'] = 'Seleccionar'; - -$lang['p_user_id'] = 'L\'usuari %s té actualment els següents permissos en la pàgina %s: %s.'; -$lang['p_user_ns'] = 'L\'usuari %s té actualment els següents permissos en l\'espai de noms %s: %s.'; -$lang['p_group_id'] = 'Els membres del grup %s tenen actualment els següents permissos en la pàgina %s: %s.'; -$lang['p_group_ns'] = 'Els membres del grup %s tenen actualment els següents permissos en l\'espai de noms %s: %s.'; - -$lang['p_choose_id'] = 'Per favor, introduïxca un usuari o grup en el formulari de dalt per a vore o editar els per a la pàgina %s.'; -$lang['p_choose_ns'] = 'Per favor, introduïxca un usuari o grup en el formulari de dalt per a vore o editar els permissos per a l\'espai de noms %s.'; - - -$lang['p_inherited'] = 'Nota: estos permissos no s\'han indicat explícitament sino que s\'hereten d\'atres grups o d\'espais de noms antecessors.'; -$lang['p_isadmin'] = 'Nota: el grup o usuari seleccionat té sempre tots els permissos perque està configurat com a superusuari.'; - -$lang['current'] = 'Regles ACL actuals'; -$lang['where'] = 'Pàgina/espai de noms'; -$lang['who'] = 'Usuari/grup'; -$lang['perm'] = 'Permissos'; - -$lang['acl_perm0'] = 'Cap'; -$lang['acl_perm1'] = 'Llegir'; -$lang['acl_perm2'] = 'Editar'; -$lang['acl_perm4'] = 'Crear'; -$lang['acl_perm8'] = 'Pujar'; -$lang['acl_perm16'] = 'Borrar'; -$lang['acl_new'] = 'Afegir nova entrada'; -$lang['acl_mod'] = 'Modificar entrada'; -//Setup VIM: ex: et ts=2 enc=utf-8 : diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-valencia/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-valencia/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-valencia/help.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-valencia/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,11 @@ +=== Ajuda ràpida === + +En esta pàgina podeu afegir i treure permisos per a espais i pàgines del vostre wiki. + +La subfinestra de l'esquerra mostra tots els espais i pàgines disponibles. + +El formulari de dalt vos permet vore i modificar els permisos de l'usuari o grup que seleccioneu. + +En la taula de baix es mostren totes les regles de control d'accés que hagen estat definides. Podeu utilitzar esta taula per suprimir o modificar ràpidament totes les regles que vulgueu. + +Llegir la [[doku>acl|documentació oficial sobre ACL]] vos pot ajudar a entendre del tot com funciona el control d'accés en DokuWiki. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-valencia/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ca-valencia/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ca-valencia/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,36 @@ + + * @author Bernat Arlandis + */ +$lang['admin_acl'] = 'Gestió de la Llista de Control d\'Accés'; +$lang['acl_group'] = 'Grup'; +$lang['acl_user'] = 'Usuari'; +$lang['acl_perms'] = 'Permisos per a'; +$lang['page'] = 'Pàgina'; +$lang['namespace'] = 'Espai'; +$lang['btn_select'] = 'Selecciona'; +$lang['p_user_id'] = 'L\'usuari %s té a hores d\'ara els permisos següents en la pàgina %s: %s.'; +$lang['p_user_ns'] = 'L\'usuari %s té a hores d\'ara els permisos següents en l\'espai %s: %s.'; +$lang['p_group_id'] = 'Els membres del grup %s tenen a hores d\'ara els permisos següents en la pàgina %s: %s.'; +$lang['p_group_ns'] = 'Els membres del grup %s tenen a hores d\'ara els permisos següents en l\'espai %s: %s.'; +$lang['p_choose_id'] = 'Introduïu un usuari o grup en el formulari de dalt per vore o editar els seus permisos en la pàgina %s.'; +$lang['p_choose_ns'] = 'Introduïu un usuari o grup en el formulari de dalt per vore o editar els seus permisos en l\'espai %s.'; +$lang['p_inherited'] = 'Nota: estos permisos no s\'han definit explícitament, sinó que són heretats d\'altres grups o d\'espais d\'orde superior.'; +$lang['p_isadmin'] = 'Nota: l\'usuari o grup seleccionat té sempre tots els permisos perquè ha estat configurat com a superusuari.'; +$lang['p_include'] = 'Els permisos més alts inclouen tots els permisos inferiors. Els permisos per a crear, penjar i suprimir només s\'apliquen als espais, no a pàgines.'; +$lang['current'] = 'Regles ACL actuals'; +$lang['where'] = 'Pàgina/espai'; +$lang['who'] = 'Usuari/grup'; +$lang['perm'] = 'Permisos'; +$lang['acl_perm0'] = 'Cap'; +$lang['acl_perm1'] = 'Lectura'; +$lang['acl_perm2'] = 'Edició'; +$lang['acl_perm4'] = 'Creació'; +$lang['acl_perm8'] = 'Penjar fitxers'; +$lang['acl_perm16'] = 'Suprimir'; +$lang['acl_new'] = 'Afig nova entrada'; +$lang['acl_mod'] = 'Modifica entrada'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Bohumir Zamecnik * @author Zbynek Krivka + * @author tomas@valenta.cz */ $lang['admin_acl'] = 'Správa přístupových práv'; $lang['acl_group'] = 'Skupina'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/da/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/da/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/da/help.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/da/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,11 @@ +=== Vejledning === + +PÃ¥ denne side kan du tilføje og fjerne tilladelser for navnerum og sider i din wiki. + +Panelet i venstre side viser alle tilgængelige navnerum og sider. + +I kassen for oven giver dig mulighed for at se og ændre tilladelser for en bestemt bruger eller gruppe. + +NedenstÃ¥ende skema viser dig alle de satte regler for adgangskontrol. Du kan bruge den til hurtigt at slette eller ændre nogle af dem. + +Ved at læse [[doku>acl|den officielle vejledning til ACL]] kan du opnÃ¥ yderligere hjælp til at blive sat helt ind i, hvordan adgangskontrol virker i DokuWiki. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,9 @@ * @author Lars Næsbye Christensen * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ $lang['admin_acl'] = 'Rettighedsadministration'; $lang['acl_group'] = 'Gruppe'; @@ -17,16 +20,23 @@ $lang['namespace'] = 'Navnerum'; $lang['btn_select'] = 'Vælg'; $lang['p_user_id'] = 'Bruger %s har følgende adgang pÃ¥ siden %s: %s'; -$lang['p_isadmin'] = 'Note: Den valgte gruppe eller bruger har altid fuldt adgang fordi den er konfigueret som en super gruppe/bruger'; -$lang['current'] = 'Aktuelle ACL regler'; -$lang['where'] = 'Side/Namespace'; -$lang['who'] = 'Bruger/Gruppe'; +$lang['p_user_ns'] = 'Bruger %s har foreløbig følgende tilladelse i navnerummet %s: %s.'; +$lang['p_group_id'] = 'Medlemmerne af gruppen %s har foreløbigt de følgende tilladelser pÃ¥ siden %s: %s.'; +$lang['p_group_ns'] = 'Medlemmerne af gruppen %s har foreløbigt de følgende tilladelser i navnerummet %s: %s.'; +$lang['p_choose_id'] = 'Venligst udfyld en bruger eller gruppe i ovennævnte formular for at se eller redigere tilladelserne for denne side%s.'; +$lang['p_choose_ns'] = 'Venligst udfyld en bruger eller gruppe i ovennævnte formular for at se eller redigere tilladelserne for navnerummet %s.'; +$lang['p_inherited'] = 'Bemærk: Disse tilladelser var ikke lagt entydigt ind, men var arvet fra andre grupper eller højere navnerum.'; +$lang['p_isadmin'] = 'Bemærk: Den valgte gruppe eller bruger har altid fuld adgang, fordi den er sat til at være en supergruppe eller -bruger'; +$lang['p_include'] = 'Højere tilladelse inkluderer ogsÃ¥ lavere. Tilladelser til at oprette, lægge filer op og slette gælder kun for navnerum, ikke sider.'; +$lang['current'] = 'Aktuelle ACL-regler'; +$lang['where'] = 'Side/navnerum'; +$lang['who'] = 'Bruger/gruppe'; $lang['perm'] = 'Adgangsniveau'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Læs'; $lang['acl_perm2'] = 'Skriv'; $lang['acl_perm4'] = 'Opret'; -$lang['acl_perm8'] = 'Upload'; +$lang['acl_perm8'] = 'Overføre'; $lang['acl_perm16'] = 'Slet'; $lang['acl_new'] = 'Tilføj ny post'; $lang['acl_mod'] = 'Ændre post'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -13,6 +13,9 @@ * @author Florian Anderiasch * @author Robin Kluth * @author Arne Pelka + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/de-informal/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de-informal/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/de-informal/help.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de-informal/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,11 @@ +=== Schnellhilfe === + +Auf dieser Seite kannst Du Rechte für Namensräume und Seiten in deinem Wiki hinzufügen oder entfernen. + +Der linke Bereich zeigt alle Namensräume und Seiten. + +Das obere Formular zeigt die die Rechte der ausgewählten Gruppe bzw. Benutzers. + +In der Tabelle unten werden alle momentan gesetzten Zugriffsregeln gezeigt. Hier kannst Du schnell mehrere Regeln löschen oder ändern. + +Das Lesen von [[doku>acl|official documentation on ACL]] kann Dir helfen zu verstehen, wie die Zugriffskontrole in DokuWiki funktioniert. diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,35 @@ + + * @author Juergen Schwarzer + */ +$lang['admin_acl'] = 'Zugriffskontrollsystem Management'; +$lang['acl_group'] = 'Gruppe'; +$lang['acl_user'] = 'Benutzer'; +$lang['acl_perms'] = 'Rechte für'; +$lang['page'] = 'Seite'; +$lang['namespace'] = 'Namensraum'; +$lang['btn_select'] = 'Auswählen'; +$lang['p_user_id'] = 'Benutzer %s hat im Moment folgende Rechte auf der Seite %s: %s'; +$lang['p_user_ns'] = 'Benutzer %s hat momentan die folgenden Rechte im Namensraum%s: %s.'; +$lang['p_group_id'] = 'Die Gruppenmitglieder %s haben momentan die folgenden Rechte auf der Seite %s: %s.'; +$lang['p_group_ns'] = 'Die Mitglieder der Gruppe %s haben gerade Zugriff in folgenden Namensräumen %s: %s.'; +$lang['p_choose_id'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen der Seite%s anzusehen oder zu bearbeiten.'; +$lang['p_choose_ns'] = 'Bitte gib einen Nutzer oder eine Gruppe in das Formular ein, um die Berechtigungen des Namenraumes%s anzusehen oder zu bearbeiten.'; +$lang['p_inherited'] = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.'; +$lang['p_isadmin'] = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.'; +$lang['p_include'] = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Loeschrechte sind nur fuer Namensräume, nicht fuer Seiten.'; +$lang['current'] = 'Momentane Zugriffsregeln'; +$lang['where'] = 'Seite/Namensraum'; +$lang['who'] = 'Benutzer/Gruppe'; +$lang['perm'] = 'Rechte'; +$lang['acl_perm0'] = 'Keine'; +$lang['acl_perm1'] = 'Lesen'; +$lang['acl_perm2'] = 'Editieren'; +$lang['acl_perm4'] = 'Erstellen'; +$lang['acl_perm8'] = 'Hochladen'; +$lang['acl_perm16'] = 'Löschen'; +$lang['acl_new'] = 'Neuen Eintrag zufügen'; +$lang['acl_mod'] = 'Eintrag modifizieren'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/el/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/el/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/el/help.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/el/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,10 @@ +=== ΓÏήγοÏη Βοήθεια: === + +Στη σελίδα αυτή μποÏείτε να Ï€Ïοσθέσετε και αφαιÏέσετε δικαιώματα Ï€Ïόσβασης για φακέλους και σελίδες στο wiki σας. + +Το αÏιστεÏÏŒ πλαίσιο δείχνει όλους τους διαθέσιμους φακέλους και αÏχεία. + +Η παÏαπάνω φόÏμα επιτÏέπει να δείτε και να Ï„Ïοποποιήσετε τα διακαιώματα μίας επιλεγμένης ομάδας χÏηστών ή ενός χÏήστη. + +Στον παÏακάτω πίνακα εμφανίζονται όλοι οι Ï„Ïέχοντες κανόνες παÏαχώÏησης δικαιωμάτων Ï€Ïόσβασης. ΜποÏείτε να τον χÏησιμοποιήσετε ώστε να σβήσετε ή να Ï„Ïοποποιήσετε γÏήγοÏα πολλαπλοÏÏ‚ κανόνες. +Διαβάζοντας την [[doku>acl|επίσημη τεκμηÏίωση για τις Λίστες Δικαιωμάτων ΠÏόσβασης - ACL]] ίσως σας βοηθήσει να καταλάβετε πλήÏως το πως αυτές εφαÏμόζονται στην DokuWiki. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/el/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,7 @@ * @author Matthias Grimm * @author Thanos Massias * @author Αθανάσιος Îταής + * @author Konstantinos Koryllos */ $lang['admin_acl'] = 'ΔιαχείÏιση Δικαιωμάτων ΠÏόσβασης'; $lang['acl_group'] = 'Ομάδα'; @@ -18,9 +19,25 @@ $lang['acl_perms'] = 'Δικαιώματα για'; $lang['page'] = 'Σελίδα'; $lang['namespace'] = 'Φάκελος'; +$lang['btn_select'] = 'Επιλογή'; +$lang['p_user_id'] = 'Ο χÏήστης %s έχει τα ακόλουθα δικαιώματα Ï€Ïόσβασης στην σελίδα %s: %s.'; +$lang['p_user_ns'] = 'Ο χÏήστης %s έχει τα ακόλουθα δικαιώματα Ï€Ïόσβασης στον φάκελο %s: %s.'; +$lang['p_group_id'] = 'Τα μέλη της ομάδας %s έχουν τα ακόλουθα δικαιώματα Ï€Ïόσβασης στην σελίδα %s: %s.'; +$lang['p_group_ns'] = 'Τα μέλη της ομάδας %s έχουν τα ακόλουθα δικαιώματα Ï€Ïόσβασης στον φάκελο %s: %s.'; +$lang['p_choose_id'] = 'ΠαÏακαλώ δώστε ένα όνομα χÏήστη ή ομάδας χÏηστών στην παÏαπάνω μοÏφή για να δείτε τα αντίστοιχα δικαιώματα Ï€Ïόσβασης για την σελίδα %s.'; +$lang['p_choose_ns'] = 'ΠαÏακαλώ δώστε ένα όνομα χÏήστη ή ομάδας χÏηστών στην παÏαπάνω μοÏφή για να δείτε τα αντίστοιχα δικαιώματα Ï€Ïόσβασης για τον φάκελο %s.'; +$lang['p_inherited'] = 'Σημείωση: Αυτά τα διακαιώματα χÏήσης δεν οÏίστηκαν άμεσα αλλά κληÏονομήθηκαν από άλλες ομάδες χÏηστών ή φακέλους σε υψηλότεÏο επίπεδο.'; +$lang['p_isadmin'] = 'Σημείωση: Η επιλεγμένη ομάδα χÏηστών ή χÏήστης έχει πάντα πλήÏη διακαιώματα Ï€Ïόσβασης διότι είναι δηλωμένος σαν υπεÏχÏήστης (superuser).'; +$lang['p_include'] = 'Τα υψηλότεÏα δικαιώματα Ï€Ïόσβασης πεÏιλαμβάνουν τα χαμηλότεÏα. Τα δικαιώματα για ΔημιουÏγία, ΦόÏτωση και ΔιαγÏαφή αφοÏοÏν μόνο φακέλους και όχι σελίδες. '; +$lang['current'] = 'ΤÏέχοντες κανόνες Λίστας Δικαιωμάτων ΠÏόσβασης - ACL'; +$lang['where'] = 'Σελίδα/Φάκελος'; +$lang['who'] = 'ΧÏήστης/Ομάδα χÏηστών'; +$lang['perm'] = 'Δικαιώματα Ï€Ïόσβασης'; +$lang['acl_perm0'] = 'Κανένα'; $lang['acl_perm1'] = 'Ανάγνωση'; $lang['acl_perm2'] = 'ΤÏοποποίηση'; $lang['acl_perm4'] = 'ΔημιουÏγία'; $lang['acl_perm8'] = 'ΦόÏτωση'; $lang['acl_perm16'] = 'ΔιαγÏαφή'; $lang['acl_new'] = 'ΠÏοσθήκη νέας εγγÏαφής'; +$lang['acl_mod'] = 'ΤÏοποποίηση εγγÏαφής'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,10 @@ * @author Felipe Castro * @author Felipo Kastro * @author Felipe Castro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ $lang['admin_acl'] = 'Administrado de Alirkontrola Listo (ACL)'; $lang['acl_group'] = 'Grupo'; @@ -17,8 +21,8 @@ $lang['p_user_ns'] = 'Uzanto %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; $lang['p_group_id'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la paÄo %s: %s.'; $lang['p_group_ns'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; -$lang['p_choose_id'] = 'Bonvole enmeti uzulon aÅ­ grupon en la suba agordilo por rigardi aÅ­ redakti la aron da rajtoj por la paÄo %s.'; -$lang['p_choose_ns'] = 'Bonvole enmeti uzulon aÅ­ grupon en la suba agordilo por rigardi aÅ­ redakti la aron da rajtoj por la nomspaco %s.'; +$lang['p_choose_id'] = 'Bonvole enmeti uzanton aÅ­ grupon en la suba agordilo por rigardi aÅ­ redakti la aron da rajtoj por la paÄo %s.'; +$lang['p_choose_ns'] = 'Bonvole enmeti uzanton aÅ­ grupon en la suba agordilo por rigardi aÅ­ redakti la aron da rajtoj por la nomspaco %s.'; $lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aÅ­ nomspacoj.'; $lang['p_isadmin'] = 'Rimarko: la elektita grupo aÅ­ uzanto ĉiam havas plenan rajtaron ĉar Äi estas difinita kiel superuzanto.'; $lang['p_include'] = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, AlÅuti kaj Forigi nur aplikeblas al nomspacoj, ne al paÄoj.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,12 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; @@ -21,15 +27,15 @@ $lang['btn_select'] = 'Seleccionar'; $lang['p_user_id'] = 'El usuario %s tiene los siguientes permisos sobre la página %s: %s.'; $lang['p_user_ns'] = 'El usuario %s tiene los siguientes permisos sobre el espacio de nombres %s: %s.'; -$lang['p_group_id'] = 'Los miembros del grupo %s tiene los siguientes permisos sobre la página %s: %s.'; -$lang['p_group_ns'] = 'Los miembros del grupo %s tiene los siguientes permisos sobre el espacio de nombres %s: %s.'; -$lang['p_choose_id'] = 'Por favor proporciones un usuario o grupoen el formulario arriba mostrado para ver o editar los permisos asignados sobre la página%s.'; -$lang['p_choose_ns'] = 'Por favor proporciones un usuario o grupoen el formulario arriba mostrado para ver o editar los permisos asignados sobre el espacio de nombres %s.'; -$lang['p_inherited'] = 'Nota: Esos permisos no fueron establecidos explicitamente sino que fueron heredados desde otros grupos o espacios de nombres superiores'; -$lang['p_isadmin'] = 'Nota: El grupo o usuario seleccionado simepres tiene permisos totales debido a que se encuentra configurado como superusuario'; -$lang['p_include'] = 'Los Permisos superiores incluyen inferiores. Crear, cargar y eliminar los permisos sólo se aplican a los nombres, no a las páginas.'; +$lang['p_group_id'] = 'Los miembros del grupo %s tienen actualmente los siguientes permisos sobre la página %s: %s.'; +$lang['p_group_ns'] = 'Los miembros del grupo %s tienen actualmente los siguientes permisos sobre el espacio de nombres %s: %s.'; +$lang['p_choose_id'] = 'Por favor proporcione un usuario o grupoen el formulario arriba mostrado para ver o editar los permisos asignados sobre la página%s.'; +$lang['p_choose_ns'] = 'Por favor proporcione un usuario o grupoen el formulario arriba mostrado para ver o editar los permisos asignados sobre el espacio de nombres %s.'; +$lang['p_inherited'] = 'Nota: Esos permisos no fueron establecidos explícitamente sino que fueron heredados desde otros grupos o espacios de nombres superiores'; +$lang['p_isadmin'] = 'Nota: El grupo o usuario seleccionado simepre tiene permisos totales debido a que se encuentra configurado como superusuario.'; +$lang['p_include'] = 'Los permisos superiores incluyen a los inferiores. Los permisos Crear, Cargar y Eliminar sólo se aplican a los espacios de nombres, no a las páginas.'; $lang['current'] = 'Reglas ACL vigentes'; -$lang['where'] = 'Pagina/Espacio de nombres'; +$lang['where'] = 'Página/Espacio de nombres'; $lang['who'] = 'Usuario/Grupo'; $lang['perm'] = 'Permisos'; $lang['acl_perm0'] = 'ninguno'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/eu/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/eu/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/eu/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/eu/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -8,4 +8,4 @@ Beheko taulan une honetan ezarritako atzipen kontrol arauak daude. Hainbat arau bizkor ezabatu edo aldatzeko erabili dezakezu. -[[doku>acl|Atzipen Kontrol Listen inguruko dokumentazio ofiziala]] irakurtzeak atzipen kontrolak DokuWiki-n nola funtzionatzen duen ulertzen lagundu zaitzaike. +[[doku>acl|Atzipen Kontrol Listen inguruko dokumentazio ofiziala]] irakurtzeak atzipen kontrolak DokuWiki-n nola funtzionatzen duen ulertzen lagundu zaitzaike. diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['admin_acl'] = 'مدیریت کنترل دسترسی‌ها'; $lang['acl_group'] = 'گروه'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * * @author otto@valjakko.net * @author Otto Vainio + * @author Teemu Mattila */ $lang['admin_acl'] = 'Käyttöoikeudet (ACL)'; $lang['acl_group'] = 'Ryhmä'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -14,6 +14,9 @@ * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ $lang['admin_acl'] = 'Gestion de la liste des contrôles d\'accès (ACL)'; $lang['acl_group'] = 'Groupe'; @@ -30,7 +33,7 @@ $lang['p_choose_ns'] = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie %s.'; $lang['p_inherited'] = 'Note : Ces permissions n\'ont pas été explicitement fixées mais sont héritées d\'autres groupes ou catégories supérieures.'; $lang['p_isadmin'] = 'Note : Le groupe ou l\'utilisateur sélectionné dispose de toutes les permissions car il est paramétré en tant que superutilisateur.'; -$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages'; +$lang['p_include'] = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages.'; $lang['current'] = 'ACL actuelles'; $lang['where'] = 'Page/Catégorie'; $lang['who'] = 'Utilisateur/Groupe'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/gl/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/gl/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/gl/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/gl/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,11 +1,11 @@ -=== Axuda Rápida: === +=== Axuda rápida: === -Nesta páxina podes engadir e eliminar permisos para os nomes de espazo e as páxinas do teu wiki. +Nesta páxina pode engadir e eliminar os permisos para os nomes de espazo e as páxinas do seu wiki. -O panel da esquerda amosa todos os nomes de espazo e páxinas dispoñibles. +O panel da esquerda mostra todos os nomes de espazo e páxinas dispoñíbeis. -O formulario de enriba permíteche ver e modificar os permisos do usuario ou grupo seleccionado. +O formulario de arriba permítelle ver e modificar os permisos da persoa usuaria ou grupo seleccionada. -Na táboa de embaixo amósanse todas as regras de control de accesos establecidas. Podes empregala para mudar ou eliminar varias regras dun xeito rápido. +Na táboa de abaixo móstranse todas as regras de control de accesos estabelecidas. Pode empregala para cambiar ou eliminar varias regras dun xeito rápido. -A lectura da [[doku>acl|documentación oficial do ACL]] pode servirche de axuda para comprender como funciona o control de accesos no Dokuwiki. +A lectura da [[doku>acl|documentación oficial da ACL]] pode servirlle de axuda para comprender como funciona o control de accesos no Dokuwiki. diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,32 +3,34 @@ * Galicianlanguage file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['admin_acl'] = 'Xestión da Lista de Control de Acceso'; +$lang['admin_acl'] = 'Xestión da Lista de control de acceso (ACL)'; $lang['acl_group'] = 'Grupo'; -$lang['acl_user'] = 'Usuario'; +$lang['acl_user'] = 'Usuaria/o'; $lang['acl_perms'] = 'Permisos para'; $lang['page'] = 'Páxina'; $lang['namespace'] = 'Nome de espazo'; -$lang['btn_select'] = 'Escolle'; -$lang['p_user_id'] = 'O usuario %s dispón actualmente dos seguintes permisos na páxina %s: %s.'; -$lang['p_user_ns'] = 'O usuario %s dispón actualmente dos seguintes permisos no nome de espazo %s: %s.'; -$lang['p_group_id'] = 'Os membros do grupo %s dispoñen actualmente dos seguintes permisos na páxina %s: %s.'; -$lang['p_group_ns'] = 'Os membros do grupo %s cdispoñen actualmente dos seguintes permisos no nome de espazo %s: %s.'; -$lang['p_choose_id'] = 'Por favor, insire un usuario ou grupo no formulario de enriba para ver ou editar os permisos establecidos para a páxina %s.'; -$lang['p_choose_ns'] = 'Por favor insire un usuario ou grupo no formulario de enriba para ver ou editar os permisos establecidos no nome de espazo %s.'; -$lang['p_inherited'] = 'Nota: Estes permisos non foron establecidos explicitamente senón que foron herdadas de outros grupos ou nomes de espazo meirandes.'; -$lang['p_isadmin'] = 'Nota: O grupo ou usuario seleccionado terá sempre permisos completos por estar configurado como super-usuario.'; -$lang['p_include'] = 'Os permisos meirandes inclúen os menores. Os permisos de Creación, Subida e Eliminado só se aplican aos nomes de espazo, non ás páxinas.'; -$lang['current'] = 'Regras ACL Actuais'; -$lang['where'] = 'Páxina/Nome de Espazo'; -$lang['who'] = 'Usuario/Grupo'; +$lang['btn_select'] = 'Selecciona'; +$lang['p_user_id'] = 'A persoa usuaria %s dispón actualmente dos seguintes permisos na páxina %s: %s.'; +$lang['p_user_ns'] = 'A persoa usuaria %s dispón actualmente dos seguintes permisos no nome de espazo %s: %s.'; +$lang['p_group_id'] = 'As e os integrantes do grupo %s dispoñen actualmente dos seguintes permisos na páxina %s: %s.'; +$lang['p_group_ns'] = 'As e os integrantes do grupo %s dispoñen actualmente dos seguintes permisos no nome de espazo %s: %s.'; +$lang['p_choose_id'] = 'Insira un nome de usuaria/o ou grupo no formulario de arriba para ver ou editar os permisos estabelecidos para a páxina %s.'; +$lang['p_choose_ns'] = 'Insira un nome de usuaria/o ou grupo no formulario de arriba para ver ou editar os permisos estabelecidos no nome de espazo %s.'; +$lang['p_inherited'] = 'Nota: Estes permisos non foron estabelecidos explicitamente senón que foron herdados doutros grupos ou nomes de espazo maiores.'; +$lang['p_isadmin'] = 'Nota: O grupo ou a persoa usuaria seleccionado terá sempre permisos completos por estar configurado como superusuaria/o.'; +$lang['p_include'] = 'Os permisos máis grandes inclúen os menores. Os permisos de Creación, Subida e Eliminación só se aplican aos nomes de espazo, non ás páxinas.'; +$lang['current'] = 'Regras ACL actuais'; +$lang['where'] = 'Páxina/Nome de espazo'; +$lang['who'] = 'Usuaria/o/Grupo'; $lang['perm'] = 'Permisos'; $lang['acl_perm0'] = 'Ningún'; $lang['acl_perm1'] = 'Ler'; $lang['acl_perm2'] = 'Editar'; $lang['acl_perm4'] = 'Crear'; -$lang['acl_perm8'] = 'Subir arquivos'; +$lang['acl_perm8'] = 'Subir ficheiros'; $lang['acl_perm16'] = 'Eliminar'; -$lang['acl_new'] = 'Engadir nova Entrada'; -$lang['acl_mod'] = 'Modificar Entrada'; +$lang['acl_new'] = 'Engadir una entrada'; +$lang['acl_mod'] = 'Modificar unha entrada'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['admin_acl'] = 'Hozzáférési lista (ACL) kezelÅ‘'; $lang['acl_group'] = 'Csoport:'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,15 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['acl_group'] = 'Hópur'; +$lang['acl_user'] = 'Notandi'; +$lang['page'] = 'Síða'; +$lang['namespace'] = 'Nafnrými'; +$lang['btn_select'] = 'Veldu'; +$lang['where'] = 'Síða/Nafnrými'; +$lang['acl_perm16'] = 'Eyða'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['admin_acl'] = 'Gestione Lista Controllo Accessi (ACL)'; $lang['acl_group'] = 'Gruppo'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Davilin(Yuji Takenaka) * @author Yuji Takenaka * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['admin_acl'] = 'アクセスコントロール管ç†'; $lang['acl_group'] = 'グループ'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/lt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,20 +3,20 @@ * lithuanian language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Linas Valiukas + * @author Linas Valiukas + * @author audrius.klevas@gmail.com + * @author Arunas Vaitekunas */ - -$lang['admin_acl'] = 'PriÄ—jimo KontrolÄ—s SÄ…rašų valdymas'; -$lang['acl_group'] = 'GrupÄ—'; -$lang['acl_user'] = 'Vartotojas'; -$lang['acl_perms'] = 'Leidimai'; -$lang['page'] = 'Puslapis'; -$lang['namespace'] = 'Pavadinimas'; - -$lang['acl_perm1'] = 'Skaityti'; -$lang['acl_perm2'] = 'Redaguoti'; -$lang['acl_perm4'] = 'Sukurti'; -$lang['acl_perm8'] = 'Atsiųsti'; -$lang['acl_perm16'] = 'IÅ¡trinti'; -$lang['acl_new'] = 'PridÄ—ti naujÄ… įraÅ¡Ä…'; -//Setup VIM: ex: et ts=2 enc=utf-8 : +$lang['admin_acl'] = 'PriÄ—jimo KontrolÄ—s SÄ…rašų valdymas'; +$lang['acl_group'] = 'GrupÄ—'; +$lang['acl_user'] = 'Vartotojas'; +$lang['acl_perms'] = 'Leidimai'; +$lang['page'] = 'Puslapis'; +$lang['namespace'] = 'Pavadinimas'; +$lang['btn_select'] = 'Rinktis'; +$lang['acl_perm1'] = 'Skaityti'; +$lang['acl_perm2'] = 'Redaguoti'; +$lang['acl_perm4'] = 'Sukurti'; +$lang['acl_perm8'] = 'Atsiųsti'; +$lang['acl_perm16'] = 'IÅ¡trinti'; +$lang['acl_new'] = 'PridÄ—ti naujÄ… įraÅ¡Ä…'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/mr/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/mr/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/mr/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/mr/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -6,7 +6,7 @@ वरील फॉरà¥à¤® वापरून तà¥à¤®à¤šà¥€ निवडलेलà¥à¤¯à¤¾ सदसà¥à¤¯ किंवा गटाचà¥à¤¯à¤¾ परवानगà¥à¤¯à¤¾ बदलू शकता. -खालील टेबल मधे सधà¥à¤¯à¤¾ सेट असलेले नियम दिलेले आहेत. +खालील टेबल मधे सधà¥à¤¯à¤¾ सेट असलेले नियम दिलेले आहेत. हे टेबल वापरून तà¥à¤®à¥à¤¹à¥€ चटकन हे नियम बदलू शकता. [[doku>acl| ACL वरील अधिकृत माहितीसंगà¥à¤°à¤¹ ]] वाचून तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿à¤®à¤§à¥‡ परवानगीची वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾ कशी काम करते ते नीट समजेल. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/mr/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/mr/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/mr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/mr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -22,6 +22,7 @@ $lang['p_choose_ns'] = 'वरील फॉरà¥à¤® मधे à¤à¤–ादà¥à¤¯à¤¾ सदसà¥à¤¯ किंवा गटाचे नाव टाकà¥à¤¨ %s या नेमसà¥à¤ªà¥‡à¤¸à¤¸à¤¾à¤ à¥€ तà¥à¤¯à¤¾à¤‚चà¥à¤¯à¤¾ परवानगà¥à¤¯à¤¾ पाहू/बदलू शकता.'; $lang['p_inherited'] = 'टीप : हà¥à¤¯à¤¾ परवानगà¥à¤¯à¤¾ पà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤· सेट केलà¥à¤¯à¤¾ नसून तà¥à¤¯à¤¾ इतर गट किंवा अधिक उचà¥à¤š नेमसà¥à¤ªà¥‡à¤¸ कडून वारसाहकà¥à¤•à¤¾à¤¨à¥‡ :) आलà¥à¤¯à¤¾ आहेत.'; $lang['p_isadmin'] = 'टीप : निवडलेलà¥à¤¯à¤¾ सदसà¥à¤¯ किंवा गटाला कायम सरà¥à¤µ परवानगà¥à¤¯à¤¾ असतात कारण तो सà¥à¤ªà¤° सदसà¥à¤¯ मà¥à¤¹à¤£à¥à¤¨ सेट केला आहे.'; +$lang['p_include'] = 'उचà¥à¤š परवानगà¥à¤¯à¤¾à¤‚मधे तà¥à¤¯à¤¾à¤–ालिल परवानगà¥à¤¯à¤¾ अधà¥à¤¯à¤¾à¤¹à¥ƒà¤¤ असतात. कà¥à¤°à¤¿à¤à¤Ÿ, अपलोड आणि डिलीट परवानगà¥à¤¯à¤¾ फ़कà¥à¤¤ नामसमà¥à¤¹à¤¾à¤µà¤° (नेमसà¥à¤ªà¥‡à¤¸) लागू असतात, पानांवर नाही.'; $lang['current'] = 'सदà¥à¤¯ ACL नियम'; $lang['where'] = 'पान/नेमसà¥à¤ªà¥‡à¤¸'; $lang['who'] = 'सदसà¥à¤¯/गट'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,9 @@ * @author John de Graaff * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; @@ -27,6 +31,7 @@ $lang['p_choose_ns'] = 'Før inn en bruker eller gruppe i skjemaet over for Ã¥ vise eller redigere tillatelser satt for navnerommet %s.'; $lang['p_inherited'] = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.'; $lang['p_isadmin'] = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.'; +$lang['p_include'] = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for Ã¥ opprette, laste opp og slette gjelder bare for navnerom, ikke enkeltsider.'; $lang['current'] = 'NÃ¥gjeldende ACL-regler'; $lang['where'] = 'Side/Navnerom'; $lang['who'] = 'Bruker/Gruppe'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Grzegorz Å»ur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author SÅ‚awomir Boczek */ $lang['admin_acl'] = 'ZarzÄ…dzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,8 @@ * @author José Carlos Monteiro * @author José Monteiro * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ $lang['admin_acl'] = 'Gestão de ACLs'; $lang['acl_group'] = 'Grupo'; @@ -14,6 +16,15 @@ $lang['page'] = 'Documento'; $lang['namespace'] = 'Namespace'; $lang['btn_select'] = 'Selecionar'; +$lang['p_user_id'] = 'O utilizador %s tem as seguintes permissões na página %s: %s.'; +$lang['p_user_ns'] = 'O utilizador %s tem as seguintes permissões no espaço de nomes %s: %s.'; +$lang['p_group_id'] = 'Os membros do grupo %s têm as seguintes permissões na página %s: %s.'; +$lang['p_group_ns'] = 'Os membros do grupo %s têm as seguintes permissões no espaço de nomes %s: %s.'; +$lang['p_choose_id'] = 'Por favor digite um utilizador ou grupo no formulário acima para ver ou editar as permissões para a página %s.'; +$lang['p_choose_ns'] = 'Por favor digite um utilizador ou grupo no formulário acima para ver ou editar as permissões para o espaço de nomes %s.'; +$lang['p_inherited'] = 'Nota: Essas permissões não foram definidas explicitamente, mas sim herdadas de outros grupos ou espaço de nomes superiores.'; +$lang['p_isadmin'] = 'Nota: O grupo ou utilizador seleccionado tem sempre permissões completas, porque ele está configurado como superutilizador.'; +$lang['p_include'] = 'As permissões superiores incluem as inferiores. Permissões para Criar, Enviar e Apagar aplicam-se apenas aos espaços de nomes e não às páginas.'; $lang['current'] = 'Regras Actuais ACL'; $lang['where'] = 'Página/Espaço de Nomes'; $lang['who'] = 'Utilizador/Grupo'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -14,6 +14,8 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ $lang['admin_acl'] = 'Administração da Lista de Controles de Acesso'; $lang['acl_group'] = 'Grupo'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @author Sergiu Baltariu * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric AndraÈ™i + * @author Emanuel-Emeric AndraÅŸi + * @author Emanuel-Emeric Andrasi */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['admin_acl'] = 'Управление ÑпиÑками ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð´Ð¾Ñтупа'; $lang['acl_group'] = 'Группа'; @@ -28,7 +32,7 @@ $lang['where'] = 'Страница/ПроÑтранÑтво имён'; $lang['who'] = 'Пользователь/Группа'; $lang['perm'] = 'Права доÑтупа'; -$lang['acl_perm0'] = 'Замечание'; +$lang['acl_perm0'] = 'Ðет доÑтупа'; $lang['acl_perm1'] = 'Чтение'; $lang['acl_perm2'] = 'Правка'; $lang['acl_perm4'] = 'Создание'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ $lang['acl_group'] = 'Skupina'; $lang['acl_user'] = 'Uporabnik'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Filip Brcic * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['admin_acl'] = 'Управљање лиÑтом контроле приÑтупа'; $lang['acl_group'] = 'Група'; @@ -21,6 +22,7 @@ $lang['p_choose_ns'] = 'Молим Ð’Ð°Ñ ÑƒÐ½ÐµÑите кориÑника или групу у формулар изнад да биÑте приказали или изменили дозволе за именÑки проÑтор %s.'; $lang['p_inherited'] = 'Ðапомена: Ове дозволе Ñе не поÑтављају екÑплицитно већ Ñамо тамо где Ñе не Ñударају Ñа оÑталим групама или вишем иманÑком проÑтору.'; $lang['p_isadmin'] = 'Ðапомена: Одабран кориÑник или група има увек пуне дозволе јер је поÑтављен за ÑуперкориÑника.'; +$lang['p_include'] = 'Више дозволе укључују ниже. Дозволе одавања, Ñлања и бриÑања ће бити примењене Ñамо на именÑке проÑторе, не и на Ñтране.'; $lang['current'] = 'Тренутна правила проÑтупа'; $lang['where'] = 'Страница/ИменÑки проÑтор'; $lang['who'] = 'КориÑник/Група'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/sv/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sv/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/sv/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sv/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,6 @@ Till vänster visas alla tillgängliga namnrymder och sidor du kan välja. I formuläret ovanför kan du sedan välja användare eller grupp för vilken Ã¥tkomsträttigheterna ska visas eller ändras. -Tabellen nedanför visar samtliga uppsatta regler för Ã¥tkomsträttigheter. Den kan du använda för att snabbt ta bort eller ändra flera regler pÃ¥ en gÃ¥ng. +Tabellen nedanför visar samtliga uppsatta regler för Ã¥tkomsträttigheter. Den kan du använda för att snabbt ta bort eller ändra flera regler pÃ¥ en gÃ¥ng. Läs gärna [[doku>acl|den officiella dokumentationen för ACL]] som kan hjälpa dig till fullo förstÃ¥ hur Ã¥tkomsträttigheter fungerar i DokuWiki. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ $lang['admin_acl'] = 'Hantera behörighetslistan (ACL)'; $lang['acl_group'] = 'Grupp'; @@ -22,8 +27,8 @@ $lang['p_user_ns'] = 'Användaren %s har för närvarande följande rättigheter i namnrymden %s: %s.'; $lang['p_group_id'] = 'Medlemmar av gruppen %s har för närvarande följande rättigheter pÃ¥ sidan %s: %s.'; $lang['p_group_ns'] = 'Medlemmar av gruppen %s har för närvarande följande rättigheter i namnrymden %s: %s.'; -$lang['p_choose_id'] = 'Vänligen ange en användare eller grupp i formuläret ovan för att visa eller ändra rättigheterna för sidan %sacl|official documentation on ACL]] น่าจะช่วยให้คุณเข้าใจวิธีควบคุมà¸à¸²à¸£à¹€à¸‚้าถึงของโดà¸à¸¸à¸§à¸´à¸à¸´à¹„ด้อย่างถ่องà¹à¸—้ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,26 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Kittithat Arnontavilas + */ +$lang['admin_acl'] = 'จัดà¸à¸²à¸£à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸­à¹€à¸žà¸·à¹ˆà¸­à¸„วบคุมà¸à¸²à¸£à¹€à¸‚้าถึง (Access Control List:ACL)'; +$lang['acl_group'] = 'à¸à¸¥à¸¸à¹ˆà¸¡'; +$lang['acl_user'] = 'ผู้ใช้'; +$lang['acl_perms'] = 'สิทธิสำหรับ'; +$lang['page'] = 'เพจ'; +$lang['namespace'] = 'เนมสเปซ'; +$lang['btn_select'] = 'เลือà¸'; +$lang['where'] = 'เพจ/เนมสเปซ'; +$lang['who'] = 'ผู้ใช้/à¸à¸¥à¸¸à¹ˆà¸¡'; +$lang['perm'] = 'สิทธิ์'; +$lang['acl_perm0'] = 'ไร้สิทธิ์'; +$lang['acl_perm1'] = 'อ่าน'; +$lang['acl_perm2'] = 'à¹à¸à¹‰à¹„ข'; +$lang['acl_perm4'] = 'สร้าง'; +$lang['acl_perm8'] = 'อัพโหลด'; +$lang['acl_perm16'] = 'ลบ'; +$lang['acl_new'] = 'เพิ่มเนื้อหาใหม่'; +$lang['acl_mod'] = 'ปรับà¹à¸à¹‰à¹€à¸™à¸·à¹‰à¸­à¸«à¸²'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['admin_acl'] = 'EriÅŸim Kontrol Listesi (ACL) Yönetimi'; $lang['acl_group'] = 'Grup'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/uk/help.txt dokuwiki-rc2009-12-02/lib/plugins/acl/lang/uk/help.txt --- dokuwiki-2009-02-14/lib/plugins/acl/lang/uk/help.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/uk/help.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1,4 @@ -=== Швидка допомога: === +=== Швидка довідка: === Ðа цій Ñторінці ви можете додавати чи знищувати права доÑтупу Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñторів імен чи Ñторінок вашої вікі. diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Oleksiy Voronin * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ $lang['admin_acl'] = 'ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÑпиÑками контролю доÑтупу'; $lang['acl_group'] = 'Група'; @@ -17,14 +20,15 @@ $lang['p_user_ns'] = 'КориÑтувач %s зараз має такі права доÑтупу до проÑтору імен %s: %s.'; $lang['p_group_id'] = 'Члени групи %s зараз мають такі права Ð´Ð»Ñ Ñторінки %s: %s.'; $lang['p_group_ns'] = 'Члени групи %s зараз мають такі права доÑтупу до проÑтору імен %s: %s.'; -$lang['p_choose_id'] = 'Будь-лаÑка введіть кориÑтувача або групу у вікно зверху, щоб подивитиÑÑ Ñ‡Ð¸ редагувати права доÑтупу до Ñторінки %s.'; -$lang['p_choose_ns'] = 'Будь-лаÑка введіть кориÑтувача або групу у вікно зверху, щоб подивитиÑÑ Ñ‡Ð¸ редагувати права доÑтупу до Ñторінки %s.'; -$lang['p_inherited'] = 'Увага: Права доÑтупу не вÑтановлені Ñвно, але наÑлідуютьÑÑ Ð²Ñ–Ð´ інших груп чи вищих проÑторів імен'; -$lang['p_isadmin'] = 'Увага: Обрані група чи кориÑтувач завжди мають повні права доÑтупу, оÑкільки вони Ñ” ÑуперкориÑтувачами'; +$lang['p_choose_id'] = 'Будь-лаÑка введіть кориÑтувача або групу в поле зверху, щоб подивитиÑÑ Ñ‡Ð¸ змінити права доÑтупу до Ñторінки %s.'; +$lang['p_choose_ns'] = 'Будь-лаÑка введіть кориÑтувача або групу у вікно зверху, щоб подивитиÑÑ Ñ‡Ð¸ змінити права доÑтупу до Ñторінки %s.'; +$lang['p_inherited'] = 'Зверніть увагу! Права доÑтупу, не вÑтановлені Ñвно, наÑлідуютьÑÑ Ð²Ñ–Ð´ інших груп чи вищих проÑторів імен.'; +$lang['p_isadmin'] = 'Зверніть увагу! Обрані група чи кориÑтувач завжди мають повні права доÑтупу, оÑкільки вони Ñ” ÑуперкориÑтувачами.'; +$lang['p_include'] = 'Старші права доÑтупу включають молодші. СтвореннÑ, Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ– Ð’Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð·Ð°ÑтоÑовні лише до проÑторів імен.'; $lang['current'] = 'Поточні правила ACL'; $lang['where'] = 'Сторінка/ПроÑÑ‚Ñ–Ñ€ імен'; $lang['who'] = 'КориÑтувач/Група'; -$lang['perm'] = 'Дозволи'; +$lang['perm'] = 'Права доÑтупу'; $lang['acl_perm0'] = 'Жодних'; $lang['acl_perm1'] = 'ЧитаннÑ'; $lang['acl_perm2'] = 'РедагуваннÑ'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,8 @@ * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['admin_acl'] = '访问控制列表（ACL）管ç†å™¨'; $lang['acl_group'] = '组'; diff -Naur dokuwiki-2009-02-14/lib/plugins/acl/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/acl/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/acl/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/acl/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['admin_acl'] = '設定 ACL å­˜å–åå–®'; $lang['acl_group'] = '群組'; @@ -23,6 +24,7 @@ $lang['p_choose_ns'] = '請在上表中輸入用戶å或組å稱，來查看或編輯命å空間 %s 的權é™è¨­ç½®ã€‚'; $lang['p_inherited'] = '請注æ„：這些權é™ä¸¦æ²’有明確設定，而是從其他組或更高級的å稱空間繼承而來。'; $lang['p_isadmin'] = '請注æ„：é¸å®šçš„組或用戶æ“有完全權é™ï¼Œå› ç‚ºå®ƒè¢«è¨­å®šç‚ºè¶…級用戶。'; +$lang['p_include'] = '較高的權é™äº¦åŒ…å«äº†è¼ƒä½Žçš„權é™ã€‚新增ã€ä¸Šå‚³èˆ‡åˆªé™¤æ¬Šé™åªèƒ½åœ¨å‘½å空間中使用，而éžé é¢ã€‚'; $lang['current'] = 'ç›®å‰çš„ACLè¦å‰‡'; $lang['where'] = 'é é¢/命å空間'; $lang['who'] = '使用者/群組'; diff -Naur dokuwiki-2009-02-14/lib/plugins/action.php dokuwiki-rc2009-12-02/lib/plugins/action.php --- dokuwiki-2009-02-14/lib/plugins/action.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/action.php 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ */ diff -Naur dokuwiki-2009-02-14/lib/plugins/config/admin.php dokuwiki-rc2009-12-02/lib/plugins/config/admin.php --- dokuwiki-2009-02-14/lib/plugins/config/admin.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/admin.php 2009-12-02 19:50:12.000000000 +0100 @@ -16,6 +16,7 @@ define('PLUGIN_SELF',dirname(__FILE__).'/'); define('PLUGIN_METADATA',PLUGIN_SELF.'settings/config.metadata.php'); +if(!defined('DOKU_PLUGIN_IMAGES')) define('DOKU_PLUGIN_IMAGES',DOKU_BASE.'lib/plugins/config/images/'); require_once(PLUGIN_SELF.'settings/config.class.php'); // main configuration class and generic settings classes require_once(PLUGIN_SELF.'settings/extra.class.php'); // settings classes specific to these settings @@ -151,11 +152,12 @@ $class = $setting->is_default() ? ' class="default"' : ($setting->is_protected() ? ' class="protected"' : ''); $error = $setting->error() ? ' class="value error"' : ' class="value"'; + $icon = $setting->caution() ? ''.$setting->caution().'' : ''; ptln(' '); ptln(' '); - ptln(' '.$setting->_out_key(true).''); - ptln(' '.$label); + ptln(' '.$setting->_out_key(true, true).''); + ptln(' '.$icon.$label); ptln(' '); ptln(' '.$input.''); ptln(' '); diff -Naur dokuwiki-2009-02-14/lib/plugins/config/images/danger.png dokuwiki-rc2009-12-02/lib/plugins/config/images/danger.png --- dokuwiki-2009-02-14/lib/plugins/config/images/danger.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/images/danger.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<OIDAT8Ë¥“ËK”aÆ¿Ô •éSAœocŠ”«ˆ6áÆ.PDC‹Ä ¸ê‚ôDÕ¢Í@«ZxÁh1àNŒ¢"¤…CN©£˜:vfæ}Ïó¶°¾³6uvïáœßyïyòŒ1øŸÈÿ=!·¯4ИvCv‘¬$ ’ŸHöS8dßéæÖçå*P·.û M`+¯ÐSØ°ùn÷v~cÉHVr}…”ÞŠûO‚»™›—ü†ìKWÔ55Bb `l`yj`yk±1AjúÝEº« @úÆEÉ™ÊoqS2¯FE×6¯÷4(l=‰õð$6#1![÷?™³@Dw$-W¶ÙfW£&D$ÇFàn>SRîÕJu€ZëNWc#di†£¹@% ‘ž‹b_s ”R¹€ªÛ†^œ‡Ñt&:?“!DmçS³QØeÐJWeJÈqMTÓáì +ê'D¡µBŽµœŽ¯ÁòÔ:REß_Žasø±3ŠÈ¯®C2‡Vz9WÁÀ·ð[ìñÖ9Å¢wÏU”œ»*B4!B¸ê|øz­õ€PJ fVc±ÄdEm§ÈZàVw!²ý¶OŸÁ×p‰Å™˜ÖzpÇ!MuóS¤Ï>x¤¸´¹©ù9¤f£0ÆÀUއx8„¯G·Hv·=}ÜuÊ¡óGýBö–y=å-‡à²Ka J¬áóÄ8K³+${?ûü£`üìá’ív‘²ÓLäЉç37ӿĕѯLjëÿIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/images/security.png dokuwiki-rc2009-12-02/lib/plugins/config/images/security.png --- dokuwiki-2009-02-14/lib/plugins/config/images/security.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/images/security.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,5 @@ +‰PNG + + IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<IDAT8ËmRAkA}›¤I›µ54JM›hAAÄ[=‚=ˆâA½ySP„@Ní±sì¯ð"zöˆ©ZÐF›–4(”“&¦Ivvf}³kÚµ:ð13ß|ß›÷ÞŒaÛ6¼ciiiD)5'¥œaœd€ñ“±bYÖb.—ûå­7¼…Bá +›—“Éäd,ƒÏç÷èõz¨×ëØâ нùùùµØ<ÂÃét:cš&jµ:Ž¾@‰D©+‹Ì]^XXèê½o€Ää³ñññŒåry³Ýn§¸êÐëR©ôC“]†R²ƒ¾À`ÁäL$A¥R›îd³ÙªGj5ŸÏ߬V«ÅT*åÔþ`Lkæmz½…#Cç4;]C¶cy°ý摽R™ÆÎ^ØÑ|÷Ò*ü¶€--Ø–BH¼X»ê˜šnàö™UL?ù`¸ òàþ ´Äð‡9ß”A~Ãú H«ç³æ…Ó²ñòí¡}“.´v_!…aŒ°pÇ™VÀþdëÌîw(káÉ,l³ï E(}“‰æú{ê<†øÅk¨½^dÿiL\ŸEóë:ˆ¦N°„-L/€pdؤŸ¾_p”î(ȾħÝ0&`"žžD¯bí¾Ãjàü›îjT­µñy,ÞñÄ‚ê)ô»¤j“Yé šåmW®RNÏ!½Ñ¨”?Ÿ‚?rŠ&¦>Å”`CkÇÓI[C.Ê=`:¨ÊÒ¬ + ÓÈ@y ÐD·Q‡è´ˆÑnåÊöh ¡³>ç‡ ¹OèãK(J3»ˆvÛTØ'Qéú¥?à“l.Ϲ^8Gü ë`æs?–”îZqür²²Í‡oÁEIEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/images/warning.png dokuwiki-rc2009-12-02/lib/plugins/config/images/warning.png --- dokuwiki-2009-02-14/lib/plugins/config/images/warning.png 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/images/warning.png 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,4 @@ +‰PNG + + IHDRóÿagAMA¯È7ŠétEXtSoftwareAdobe ImageReadyqÉe<,IDAT8Ë¥SKH”þþ‡«®ëkËTC[RLÊÈ5 o= êÔc©kÑ)¤c‡.$B‹ìD…P‡Š,,‰ˆNY(FFf®»²˜Šþ™¯ƒkÌÌaf>¾o˜1Hb=f¯U˜~±Ï¢ð=USªl.ÞÿZÒõ™kPØ(9X(>ÐHÑ3kR ¹Êýáx_ÃOqg覆8ñt÷ôøã]át½i¨èÝì²X®aš°s–ǽü_ âÏj'{ë…âЉ_§›è¢ºI~}°ÃëÞ^ûOT½ªj5ÕŸÃ羇}vêM¢ æ‚¥¢]b¼7Ë(ŒVçl9Š…o­ XoCn¤™%M£·+ciâ½Ñª¶+ŽCýi@—§I¨zÐÅäW€Š^¾¹5´ +@E»‚eÇ6dVÀK>@dW„Á™¼ì¢2äUžÜì/zWæ ’øѳ'BÕO¥‡lYxoêT3# óÉYdæ(,‹°òšaåÁPG+Ž_½óRrÔ\:ím;gSç ³o*âËà0¦>N @…Ÿê‡aΣ¨¾5à;Þ50¾?©k±òkz65µÃŸ} /qoI’¤0-  R`Z‘UÞ†1ÌŒ ¶U¤³ rjé1B °CÑeqÆŠüåÀßû€@éÞ³H \µ):xuþ4E¡¢ø3‹'ǃïxǃ8>Äõ!ž@}úòÖXï;ÿ”LcÙ§¹S/IEND®B`‚ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,23 @@ + */ $lang['menu'] = 'الإعدادات'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/bg/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/bg/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/bg/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/bg/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,6 +1,6 @@ ====== Управление на наÑтройките ====== -Използвайте тази Ñтраница за да управлÑвате наÑтройките на вашета Dokuwiki инÑталациÑ. За отделните наÑтройки вижте [[doku>config]]. За повече подробноÑти за тази приÑтавка вижте [[doku>plugin:config]]. +Използвайте тази Ñтраница за да управлÑвате наÑтройките на вашета Dokuwiki инÑталациÑ. За отделните наÑтройки вижте [[doku>config]]. За повече подробноÑти за тази приÑтавка вижте [[doku>plugin:config]]. ÐаÑтройките показани ÑÑŠÑ Ñветло червен фон за защитени и не могат да Ñе променÑÑ‚ Ñ Ñ‚Ð°Ð·Ð¸ приÑтавка. ÐаÑтройките показани ÑÑŠÑ Ñин фон Ñа Ñтандартните ÑтойноÑти и наÑтройките Ñ Ð±Ñл фон Ñа били наÑтроени локално за тази конкретна инÑталациÑ. Както Ñините, така и белите наÑтройки могат да Ñе променÑÑ‚. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/bg/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,144 +5,145 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Nikolay Vladimirov + * @author Nikolay Vladimirov */ -$lang['menu'] = 'ÐаÑтройки'; -$lang['error'] = 'Ðевъзможно е обновÑването на наÑтройките, поради невалидна ÑтойноÑÑ‚, молÑ, прегледайте промените Ñи и пробвайте отново. +$lang['menu'] = 'ÐаÑтройки'; +$lang['error'] = 'Ðевъзможно е обновÑването на наÑтройките, поради невалидна ÑтойноÑÑ‚, молÑ, прегледайте промените Ñи и пробвайте отново.
    Ðеверните ÑтойноÑти ще бъдат обградени от червена рамка.'; -$lang['updated'] = 'ОбновÑването на наÑтройките бе уÑпешно.'; -$lang['nochoice'] = '(нÑма друг възможен избор)'; -$lang['locked'] = 'Ðевъзможно е обновÑването на файлът Ñ Ð½Ð°Ñтройките, ако това не е нарочно, проверете,
    +$lang['updated'] = 'ОбновÑването на наÑтройките бе уÑпешно.'; +$lang['nochoice'] = '(нÑма друг възможен избор)'; +$lang['locked'] = 'Ðевъзможно е обновÑването на файлът Ñ Ð½Ð°Ñтройките, ако това не е нарочно, проверете,
    дали локалните име на файл и права Ñа верни.'; -$lang['_configuration_manager'] = 'Управление на наÑтройките'; -$lang['_header_dokuwiki'] = 'DokuWiki наÑтройки'; -$lang['_header_plugin'] = 'ÐаÑтройки на приÑтавките'; -$lang['_header_template'] = 'ÐаÑтройки на шаблоните'; -$lang['_header_undefined'] = 'Ðеопределени наÑтройки'; -$lang['_basic'] = 'ОÑновни наÑтройки'; -$lang['_display'] = 'ÐаÑтройки на изгледа'; -$lang['_authentication'] = 'ÐаÑтройки на идентификациÑта'; -$lang['_anti_spam'] = 'Ðнти-Ñпам наÑтройки'; -$lang['_editing'] = 'ÐаÑтройки на редактирането'; -$lang['_links'] = 'ÐаÑтройки на препратките'; -$lang['_media'] = 'ÐаÑтройки на медиÑта'; -$lang['_advanced'] = 'Допълнителни наÑтройки'; -$lang['_network'] = 'Мрежови наÑтройки'; -$lang['_plugin_sufix'] = 'ÐаÑтройки на приÑтавките'; -$lang['_template_sufix'] = 'ÐаÑтройки на шаблони'; -$lang['_msg_setting_undefined'] = 'ÐÑма метаданни на наÑтройките.'; -$lang['_msg_setting_no_class'] = 'ÐÑма ÐºÐ»Ð°Ñ Ð½Ð°Ñтройки.'; +$lang['_configuration_manager'] = 'Управление на наÑтройките'; +$lang['_header_dokuwiki'] = 'DokuWiki наÑтройки'; +$lang['_header_plugin'] = 'ÐаÑтройки на приÑтавките'; +$lang['_header_template'] = 'ÐаÑтройки на шаблоните'; +$lang['_header_undefined'] = 'Ðеопределени наÑтройки'; +$lang['_basic'] = 'ОÑновни наÑтройки'; +$lang['_display'] = 'ÐаÑтройки на изгледа'; +$lang['_authentication'] = 'ÐаÑтройки на идентификациÑта'; +$lang['_anti_spam'] = 'Ðнти-Ñпам наÑтройки'; +$lang['_editing'] = 'ÐаÑтройки на редактирането'; +$lang['_links'] = 'ÐаÑтройки на препратките'; +$lang['_media'] = 'ÐаÑтройки на медиÑта'; +$lang['_advanced'] = 'Допълнителни наÑтройки'; +$lang['_network'] = 'Мрежови наÑтройки'; +$lang['_plugin_sufix'] = 'ÐаÑтройки на приÑтавките'; +$lang['_template_sufix'] = 'ÐаÑтройки на шаблони'; +$lang['_msg_setting_undefined'] = 'ÐÑма метаданни на наÑтройките.'; +$lang['_msg_setting_no_class'] = 'ÐÑма ÐºÐ»Ð°Ñ Ð½Ð°Ñтройки.'; $lang['_msg_setting_no_default'] = 'ÐÑма Ñтандартна ÑтойноÑÑ‚.'; -$lang['fmode'] = 'Режим(права) на Ñъздаване на файловете'; -$lang['dmode'] = 'Режим(права) за Ñъздаване на директориите'; -$lang['lang'] = 'Език'; -$lang['basedir'] = 'Главна директориÑ'; -$lang['baseurl'] = 'Главен адреÑ(URL)'; -$lang['savedir'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° запиÑване на данните'; -$lang['start'] = 'Име на началната Ñтраница'; -$lang['title'] = 'Име на Уикито'; -$lang['template'] = 'Шаблон'; -$lang['fullpath'] = 'Показване на Ð¿ÑŠÐ»Ð½Ð¸Ñ Ð¿ÑŠÑ‚ до Ñтраниците в Ð´Ð¾Ð»Ð½Ð¸Ñ Ð¸Ð¼ край.'; -$lang['recent'] = 'ПоÑледни промени'; -$lang['breadcrumbs'] = 'Брой на Ñледите'; -$lang['youarehere'] = 'Йерархични Ñледи'; -$lang['typography'] = 'ПоправÑне на размеÑтени букви'; -$lang['htmlok'] = 'ПозволÑване на HTML'; -$lang['phpok'] = 'ПозволÑване на PHP'; -$lang['dformat'] = 'Формат на датата (виж. strftime функциÑта на PHP)'; -$lang['signature'] = 'ПодпиÑ'; -$lang['toptoclevel'] = 'Главно ниво за Ñъдържанието'; -$lang['maxtoclevel'] = 'МакÑимално ниво на Ñъдържанието'; -$lang['maxseclevel'] = 'МакÑимално ниво на редактиране на ÑекциÑ'; -$lang['camelcase'] = 'Използване CamelCase за препратки'; -$lang['deaccent'] = 'ЧиÑти имена на Ñтраници'; -$lang['useheading'] = 'Използване на първото заглавие за име на Ñтраница'; -$lang['refcheck'] = 'Проверка за препратка на медиÑ'; -$lang['refshow'] = 'Number of media references to show'; -$lang['allowdebug'] = 'ПуÑкане на debug изключете, ако не е нужен!'; -$lang['usewordblock'] = 'Блокиране на Ñпам базирано на ÑпиÑък от думи'; -$lang['indexdelay'] = 'ЗабавÑне преди индекÑиране(Ñекунди)'; -$lang['relnofollow'] = 'Използване на rel="nofollow" за външни връзки'; -$lang['mailguard'] = 'ОбезобразÑване на адреÑа на е-пощата'; -$lang['iexssprotect'] = 'ПроверÑване на качените файлове за възможно зловреден JavaScript и HTML код'; -$lang['useacl'] = 'Използване на ÑпиÑъци за доÑтъп'; -$lang['autopasswd'] = 'Ðвтоматично генериране на пароли'; -$lang['authtype'] = 'Метод на идентификациÑ'; -$lang['passcrypt'] = 'Метод за криптиране на паролите'; -$lang['defaultgroup'] = 'Група по подразбиране'; -$lang['superuser'] = 'Суперпотребител - група или потребител Ñ Ð¿ÑŠÐ»ÐµÐ½ доÑтъп до вÑички Ñтраници и функции без значение от наÑтройките на ÑпиÑъците за доÑтъп(ACL)'; -$lang['manager'] = 'Управител - група или потребител, Ñ Ð´Ð¾Ñтъп до определени управлÑващи фунции '; -$lang['profileconfirm'] = 'Потвърждаване на промени в профила Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°'; -$lang['disableactions'] = 'Изключване на DokuWiki дейÑÑ‚Ð²Ð¸Ñ '; -$lang['disableactions_check'] = 'Проверка'; +$lang['fmode'] = 'Режим(права) на Ñъздаване на файловете'; +$lang['dmode'] = 'Режим(права) за Ñъздаване на директориите'; +$lang['lang'] = 'Език'; +$lang['basedir'] = 'Главна директориÑ'; +$lang['baseurl'] = 'Главен адреÑ(URL)'; +$lang['savedir'] = 'Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° запиÑване на данните'; +$lang['start'] = 'Име на началната Ñтраница'; +$lang['title'] = 'Име на Уикито'; +$lang['template'] = 'Шаблон'; +$lang['fullpath'] = 'Показване на Ð¿ÑŠÐ»Ð½Ð¸Ñ Ð¿ÑŠÑ‚ до Ñтраниците в Ð´Ð¾Ð»Ð½Ð¸Ñ Ð¸Ð¼ край.'; +$lang['recent'] = 'ПоÑледни промени'; +$lang['breadcrumbs'] = 'Брой на Ñледите'; +$lang['youarehere'] = 'Йерархични Ñледи'; +$lang['typography'] = 'ПоправÑне на размеÑтени букви'; +$lang['htmlok'] = 'ПозволÑване на HTML'; +$lang['phpok'] = 'ПозволÑване на PHP'; +$lang['dformat'] = 'Формат на датата (виж. strftime функциÑта на PHP)'; +$lang['signature'] = 'ПодпиÑ'; +$lang['toptoclevel'] = 'Главно ниво за Ñъдържанието'; +$lang['maxtoclevel'] = 'МакÑимално ниво на Ñъдържанието'; +$lang['maxseclevel'] = 'МакÑимално ниво на редактиране на ÑекциÑ'; +$lang['camelcase'] = 'Използване CamelCase за препратки'; +$lang['deaccent'] = 'ЧиÑти имена на Ñтраници'; +$lang['useheading'] = 'Използване на първото заглавие за име на Ñтраница'; +$lang['refcheck'] = 'Проверка за препратка на медиÑ'; +$lang['refshow'] = 'Number of media references to show'; +$lang['allowdebug'] = 'ПуÑкане на debug изключете, ако не е нужен!'; +$lang['usewordblock'] = 'Блокиране на Ñпам базирано на ÑпиÑък от думи'; +$lang['indexdelay'] = 'ЗабавÑне преди индекÑиране(Ñекунди)'; +$lang['relnofollow'] = 'Използване на rel="nofollow" за външни връзки'; +$lang['mailguard'] = 'ОбезобразÑване на адреÑа на е-пощата'; +$lang['iexssprotect'] = 'ПроверÑване на качените файлове за възможно зловреден JavaScript и HTML код'; +$lang['useacl'] = 'Използване на ÑпиÑъци за доÑтъп'; +$lang['autopasswd'] = 'Ðвтоматично генериране на пароли'; +$lang['authtype'] = 'Метод на идентификациÑ'; +$lang['passcrypt'] = 'Метод за криптиране на паролите'; +$lang['defaultgroup'] = 'Група по подразбиране'; +$lang['superuser'] = 'Суперпотребител - група или потребител Ñ Ð¿ÑŠÐ»ÐµÐ½ доÑтъп до вÑички Ñтраници и функции без значение от наÑтройките на ÑпиÑъците за доÑтъп(ACL)'; +$lang['manager'] = 'Управител - група или потребител, Ñ Ð´Ð¾Ñтъп до определени управлÑващи фунции '; +$lang['profileconfirm'] = 'Потвърждаване на промени в профила Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð°'; +$lang['disableactions'] = 'Изключване на DokuWiki дейÑÑ‚Ð²Ð¸Ñ '; +$lang['disableactions_check'] = 'Проверка'; $lang['disableactions_subscription'] = 'ЗапиÑване/ОтпиÑване'; $lang['disableactions_wikicode'] = 'Преглед на кода/ЕкÑпортиране на Rаw'; -$lang['disableactions_other'] = 'Други дейÑÑ‚Ð²Ð¸Ñ (разделени Ñ Ð·Ð°Ð¿ÐµÑ‚Ð°Ñ)'; -$lang['sneaky_index'] = 'По подразбиране DokuWiki ще показва вÑички именнипроÑтранÑтва в ИндекÑа. Избирането на наÑтройката ще доведе до Ñкриване на тези, за които потребителÑÑ‚ нÑма права за четене. Това може да означава и Ñкриване на доÑтъпните подименнипроÑтранÑтва. Това може да направи индекÑа неизползваем при определени наÑтрокйки на ÑпиÑъците за контрол на доÑтъп(ACL). '; -$lang['updatecheck'] = 'Проверка за нови верÑии и Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð·Ð° ÑигурноÑÑ‚? Dokiwiki Ñ‚Ñ€Ñбва да може да Ñе Ñвърже ÑÑŠÑ splitbrain.org за тази функционалноÑÑ‚.'; -$lang['userewrite'] = 'Използване на приÑтни URL'; -$lang['useslash'] = 'Използване на наклонена черта за разделител на именнипроÑтранÑвта в URL'; -$lang['usedraft'] = 'Ðвтоматично запазване на чернова при редактиране'; -$lang['sepchar'] = 'Разделител между думите в имената на Ñтраници'; -$lang['canonical'] = 'Използване на уеднаквени URL'; -$lang['autoplural'] = 'Проверка за множеÑтвено чиÑло в препратките'; -$lang['compression'] = 'Метод за компреÑÐ¸Ñ Ð½Ð° attic файлове'; -$lang['cachetime'] = 'МакÑимална възраÑÑ‚ на кеша (Ñек)'; -$lang['locktime'] = 'МакÑимална възраÑÑ‚ на заключващите файлове (Ñек)'; -$lang['fetchsize'] = 'МакÑимален размер (байтове), който fetch.php може да дърпа'; -$lang['notify'] = 'Пращане на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° промени на тази e-поща'; -$lang['registernotify'] = 'Пращане Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° нови потребители на тази е-поща'; -$lang['mailfrom'] = 'ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща, който да Ñе използва за пращане на автоматичната поща'; -$lang['gzip_output'] = 'Използване gzip Кодиране на Ñъдържанието(Content-Encoding) за xhtml'; -$lang['gdlib'] = 'ВерÑÐ¸Ñ Ð½Ð° GD Lib'; -$lang['im_convert'] = 'Път до инÑтрумента за транÑÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° ImageMagick'; -$lang['jpg_quality'] = 'KачеÑтво на JPG компреÑиÑта (0-100)'; -$lang['subscribers'] = 'Поддръжка за абониране към Ñтраница'; -$lang['compress'] = 'Компактен CSS и javascript изход'; -$lang['hidepages'] = 'Скриване на Ñъвпадащи имена на Ñтраници(regular expressions)'; -$lang['send404'] = 'Пращане на "HTTP 404/Page Not Found" за неÑъщеÑтвуващи Ñтраници'; -$lang['sitemap'] = 'Генериране на Google sitemap (дни)'; -$lang['broken_iua'] = 'Отметнете, ако ignore_user_abort функциÑта не работи, Ñ‚ÑŠÑ€Ñенето може да не Ñе извършва правилно.ИзвеÑтно е, че комбинациÑта IIS+PHP/CGI е лоша. Вижте Грешка 852 за повече информациÑ.'; -$lang['rss_type'] = 'Вид на XML източника(feed)'; -$lang['rss_linkto'] = 'XML feed links to'; -$lang['rss_update'] = 'Интервал на обновÑване XML източника (Ñек)'; -$lang['recent_days'] = 'Колко поÑледни промени да Ñе пазÑÑ‚ (дни)'; -$lang['rss_show_summary'] = 'XML feed show summary in title'; -$lang['target____wiki'] = 'Прозорец за вътрешни препратки'; -$lang['target____interwiki'] = 'Прозорец за вътрешни уики препратки'; -$lang['target____extern'] = 'Прозорец за външни препратки'; -$lang['target____media'] = 'Прозорец за препратки към медиÑ'; -$lang['target____windows'] = 'Прозорец за препратки към прозорци'; -$lang['proxy____host'] = 'Име на прокÑи Ñървър'; -$lang['proxy____port'] = 'Порт на прокÑито'; -$lang['proxy____user'] = 'Потребител за прокÑито'; -$lang['proxy____pass'] = 'Парола за прокÑито'; -$lang['proxy____ssl'] = 'Използване на ssl за връзка към прокÑито'; -$lang['safemodehack'] = 'safemode хак'; -$lang['ftp____host'] = 'FTP Ñървър за safemode хака'; -$lang['ftp____port'] = 'FTP порт за safemode хака'; -$lang['ftp____user'] = 'FTP потребител за safemode хака'; -$lang['ftp____pass'] = 'FTP парола за safemode хака'; -$lang['ftp____root'] = 'FTP главна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ safemode хака'; -$lang['typography_o_0'] = 'без'; -$lang['typography_o_1'] = 'Само кавички'; -$lang['typography_o_2'] = 'Ð’ÑÑкакви апоÑтрофи(не винаги работи)'; -$lang['userewrite_o_0'] = 'без'; -$lang['userewrite_o_1'] = '.htaccess'; -$lang['userewrite_o_2'] = 'вътрешно от DokuWiki '; -$lang['deaccent_o_0'] = 'изключено'; -$lang['deaccent_o_1'] = 'премахване на акценти'; -$lang['deaccent_o_2'] = 'романизациÑ'; -$lang['gdlib_o_0'] = 'GD Lib не е доÑтъпна'; -$lang['gdlib_o_1'] = 'ВерÑÐ¸Ñ 1.x'; -$lang['gdlib_o_2'] = 'Ðвтоматично разпознаване'; -$lang['rss_type_o_rss'] = 'RSS 0.91'; -$lang['rss_type_o_rss1'] = 'RSS 1.0'; -$lang['rss_type_o_rss2'] = 'RSS 2.0'; -$lang['rss_type_o_atom'] = 'Atom 0.3'; -$lang['rss_linkto_o_diff'] = 'изглед на разликите'; -$lang['rss_linkto_o_page'] = 'променената Ñтраница'; -$lang['rss_linkto_o_rev'] = 'ÑпиÑък на текущите верÑии'; -$lang['rss_linkto_o_current'] = 'текущата Ñтраница'; -$lang['compression_o_0'] = 'без'; -$lang['compression_o_gz'] = 'gzip'; -$lang['compression_o_bz2'] = 'bz2'; +$lang['disableactions_other'] = 'Други дейÑÑ‚Ð²Ð¸Ñ (разделени Ñ Ð·Ð°Ð¿ÐµÑ‚Ð°Ñ)'; +$lang['sneaky_index'] = 'По подразбиране DokuWiki ще показва вÑички именнипроÑтранÑтва в ИндекÑа. Избирането на наÑтройката ще доведе до Ñкриване на тези, за които потребителÑÑ‚ нÑма права за четене. Това може да означава и Ñкриване на доÑтъпните подименнипроÑтранÑтва. Това може да направи индекÑа неизползваем при определени наÑтрокйки на ÑпиÑъците за контрол на доÑтъп(ACL). '; +$lang['updatecheck'] = 'Проверка за нови верÑии и Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð·Ð° ÑигурноÑÑ‚? Dokiwiki Ñ‚Ñ€Ñбва да може да Ñе Ñвърже ÑÑŠÑ splitbrain.org за тази функционалноÑÑ‚.'; +$lang['userewrite'] = 'Използване на приÑтни URL'; +$lang['useslash'] = 'Използване на наклонена черта за разделител на именнипроÑтранÑвта в URL'; +$lang['usedraft'] = 'Ðвтоматично запазване на чернова при редактиране'; +$lang['sepchar'] = 'Разделител между думите в имената на Ñтраници'; +$lang['canonical'] = 'Използване на уеднаквени URL'; +$lang['autoplural'] = 'Проверка за множеÑтвено чиÑло в препратките'; +$lang['compression'] = 'Метод за компреÑÐ¸Ñ Ð½Ð° attic файлове'; +$lang['cachetime'] = 'МакÑимална възраÑÑ‚ на кеша (Ñек)'; +$lang['locktime'] = 'МакÑимална възраÑÑ‚ на заключващите файлове (Ñек)'; +$lang['fetchsize'] = 'МакÑимален размер (байтове), който fetch.php може да дърпа'; +$lang['notify'] = 'Пращане на ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð·Ð° промени на тази e-поща'; +$lang['registernotify'] = 'Пращане Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° нови потребители на тази е-поща'; +$lang['mailfrom'] = 'ÐÐ´Ñ€ÐµÑ Ð½Ð° е-поща, който да Ñе използва за пращане на автоматичната поща'; +$lang['gzip_output'] = 'Използване gzip Кодиране на Ñъдържанието(Content-Encoding) за xhtml'; +$lang['gdlib'] = 'ВерÑÐ¸Ñ Ð½Ð° GD Lib'; +$lang['im_convert'] = 'Път до инÑтрумента за транÑÑ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½Ð° ImageMagick'; +$lang['jpg_quality'] = 'KачеÑтво на JPG компреÑиÑта (0-100)'; +$lang['subscribers'] = 'Поддръжка за абониране към Ñтраница'; +$lang['compress'] = 'Компактен CSS и javascript изход'; +$lang['hidepages'] = 'Скриване на Ñъвпадащи имена на Ñтраници(regular expressions)'; +$lang['send404'] = 'Пращане на "HTTP 404/Page Not Found" за неÑъщеÑтвуващи Ñтраници'; +$lang['sitemap'] = 'Генериране на Google sitemap (дни)'; +$lang['broken_iua'] = 'Отметнете, ако ignore_user_abort функциÑта не работи, Ñ‚ÑŠÑ€Ñенето може да не Ñе извършва правилно.ИзвеÑтно е, че комбинациÑта IIS+PHP/CGI е лоша. Вижте Грешка 852 за повече информациÑ.'; +$lang['rss_type'] = 'Вид на XML източника(feed)'; +$lang['rss_linkto'] = 'XML feed links to'; +$lang['rss_update'] = 'Интервал на обновÑване XML източника (Ñек)'; +$lang['recent_days'] = 'Колко поÑледни промени да Ñе пазÑÑ‚ (дни)'; +$lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['target____wiki'] = 'Прозорец за вътрешни препратки'; +$lang['target____interwiki'] = 'Прозорец за вътрешни уики препратки'; +$lang['target____extern'] = 'Прозорец за външни препратки'; +$lang['target____media'] = 'Прозорец за препратки към медиÑ'; +$lang['target____windows'] = 'Прозорец за препратки към прозорци'; +$lang['proxy____host'] = 'Име на прокÑи Ñървър'; +$lang['proxy____port'] = 'Порт на прокÑито'; +$lang['proxy____user'] = 'Потребител за прокÑито'; +$lang['proxy____pass'] = 'Парола за прокÑито'; +$lang['proxy____ssl'] = 'Използване на ssl за връзка към прокÑито'; +$lang['safemodehack'] = 'safemode хак'; +$lang['ftp____host'] = 'FTP Ñървър за safemode хака'; +$lang['ftp____port'] = 'FTP порт за safemode хака'; +$lang['ftp____user'] = 'FTP потребител за safemode хака'; +$lang['ftp____pass'] = 'FTP парола за safemode хака'; +$lang['ftp____root'] = 'FTP главна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ safemode хака'; +$lang['typography_o_0'] = 'без'; +$lang['typography_o_1'] = 'Само кавички'; +$lang['typography_o_2'] = 'Ð’ÑÑкакви апоÑтрофи(не винаги работи)'; +$lang['userewrite_o_0'] = 'без'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'вътрешно от DokuWiki '; +$lang['deaccent_o_0'] = 'изключено'; +$lang['deaccent_o_1'] = 'премахване на акценти'; +$lang['deaccent_o_2'] = 'романизациÑ'; +$lang['gdlib_o_0'] = 'GD Lib не е доÑтъпна'; +$lang['gdlib_o_1'] = 'ВерÑÐ¸Ñ 1.x'; +$lang['gdlib_o_2'] = 'Ðвтоматично разпознаване'; +$lang['rss_type_o_rss'] = 'RSS 0.91'; +$lang['rss_type_o_rss1'] = 'RSS 1.0'; +$lang['rss_type_o_rss2'] = 'RSS 2.0'; +$lang['rss_type_o_atom'] = 'Atom 0.3'; +$lang['rss_linkto_o_diff'] = 'изглед на разликите'; +$lang['rss_linkto_o_page'] = 'променената Ñтраница'; +$lang['rss_linkto_o_rev'] = 'ÑпиÑък на текущите верÑии'; +$lang['rss_linkto_o_current'] = 'текущата Ñтраница'; +$lang['compression_o_0'] = 'без'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ca/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ca/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -13,6 +13,9 @@ $lang['nochoice'] = '(no hi altres opcions disponibles)'; $lang['locked'] = 'El fitxer de paràmetres no es pot actualitzar. Si això és involuntari,
    assegureu-vos que el nom i els permisos del fitxer local de paràmetres són correctes.'; +$lang['danger'] = 'Alerta: si canvieu aquesta opció podeu fer que el wiki i el menú de configuració no siguin accessibles.'; +$lang['warning'] = 'Avís: modificar aquesta opció pot provocar un comportament no desitjat.'; +$lang['security'] = 'Avís de seguretat: modificar aquesta opció pot implicar un risc de seguretat.'; $lang['_configuration_manager'] = 'Gestió de la configuració'; $lang['_header_dokuwiki'] = 'Paràmetres de DokuWiki'; $lang['_header_plugin'] = 'Paràmetres de connectors'; @@ -84,6 +87,7 @@ $lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu aquest paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; $lang['auth_security_timeout'] = 'Temps d\'espera de seguretat en l\'autenticació (segons)'; $lang['securecookie'] = 'Les galetes que s\'han creat via HTTPS, només s\'han d\'enviar des del navegador per HTTPS? Inhabiliteu aquesta opció si només l\'inici de sessió del wiki es fa amb SSL i la navegació del wiki es fa sense seguretat.'; +$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; $lang['updatecheck'] = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb splitbrain.org per utilitzar aquesta característica.'; $lang['userewrite'] = 'Utilitza URL nets'; $lang['useslash'] = 'Utilitza la barra / com a separador d\'espais en els URL'; @@ -109,7 +113,6 @@ $lang['sitemap'] = 'Genera mapa del lloc en format Google (dies)'; $lang['broken_iua'] = 'No funciona en el vostre sistema la funció ignore_user_abort? Això podria malmetre l\'índex de cerques. Amb IIS+PHP/CGI se sap que no funciona. Vg. Bug 852 per a més informació.'; $lang['xsendfile'] = 'Utilitza la capçalera X-Sendfile perquè el servidor web distribueixi fitxers estàtics. No funciona amb tots els servidors web.'; -$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; $lang['renderer_xhtml'] = 'Renderitzador que cal utilitzar per a la sortida principal (xhtml) del wiki'; $lang['renderer__core'] = '% (ànima del dokuwiki)'; $lang['renderer__plugin'] = '% (connector)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ca-va/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-va/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/ca-va/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-va/intro.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -====== Gestor de configuració ====== - -Controle des d'esta pàgina els ajusts de DokuWiki. -Per a obtindre ajuda sobre cada ajust vaja a [[doku>wiki:config]]. -Per a més informació al voltant d'este plúgin vaja a [[doku>plugin:config]]. - -Els ajusts mostrats en un fondo roig claret estan protegits i no els pot -modificar en este plúgin. -Els ajusts mostrats en un fondo blau tenen els valors predeterminats i els ajusts -mostrats en un fondo blanc han segut modificats localment per ad esta instalació. Abdós ajusts, blaus i blancs, es poden modificar. - -Recorde pulsar el botó **GUARDAR** ans d'anar-se'n d'esta pàgina o perdrà els -canvis que haja fet. - diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,211 +0,0 @@ - - */ - -// 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'] = 'Ajusts de configuració'; - -$lang['error'] = 'Els ajusts no s\'han actualisat per algun valor invàlit, per favor, revise els canvis i torne a guardar. -
    El(s) valor(s) incorrecte(s) es mostraran rodejats en roig.'; -$lang['updated'] = 'Els ajusts s\'han actualisat correctament.'; -$lang['nochoice'] = '(no n\'hi ha atres opcions disponibles)'; -$lang['locked'] = 'L\'archiu de configuració no es pot actualisar, si açò no és intencionat,
    - comprove que els permissos de l\'archiu de configuració local estiguen be.'; - -/* --- Config Setting Headers --- */ -$lang['_configuration_manager'] = 'Gestió de configuració'; //same as heading in intro.txt -$lang['_header_dokuwiki'] = 'Ajusts de DokuWiki'; -$lang['_header_plugin'] = 'Configuració de plúgins'; -$lang['_header_template'] = 'Configuració de plantilles'; -$lang['_header_undefined'] = 'Atres configuracions'; - -/* --- Config Setting Groups --- */ -$lang['_basic'] = 'Ajusts bàsics'; -$lang['_display'] = 'Ajusts de visualisació'; -$lang['_authentication'] = 'Ajusts d\'autenticació'; -$lang['_anti_spam'] = 'Ajusts d\'Anti-Spam'; -$lang['_editing'] = 'Ajusts d\'edició'; -$lang['_links'] = 'Ajusts de vínculs'; -$lang['_media'] = 'Ajusts de mijos'; -$lang['_advanced'] = 'Ajusts alvançats'; -$lang['_network'] = 'Ajusts de ret'; -// The settings group name for plugins and templates can be set with -// plugin_settings_name and template_settings_name respectively. If one -// of these lang properties is not set, the group name will be generated -// from the plugin or template name and the localized suffix. -$lang['_plugin_sufix'] = 'Ajusts de plúgins'; -$lang['_template_sufix'] = '(ajusts de la plantilla)'; - -/* --- Undefined Setting Messages --- */ -$lang['_msg_setting_undefined'] = 'Ajust sense informació.'; -$lang['_msg_setting_no_class'] = 'Ajust sense classe.'; -$lang['_msg_setting_no_default'] = 'Sense valor predeterminat.'; - -/* -------------------- Config Options --------------------------- */ - -$lang['fmode'] = 'Modo de creació d\'archius'; -$lang['dmode'] = 'Modo de creació de directoris'; -$lang['lang'] = 'Idioma'; -$lang['basedir'] = 'Directori base'; -$lang['baseurl'] = 'URL base'; -$lang['savedir'] = 'Directori per a guardar senyes'; -$lang['start'] = 'Nom de la pàgina inicial'; -$lang['title'] = 'Títul del Wiki'; -$lang['template'] = 'Plantilla'; -$lang['fullpath'] = 'Mostrar en el peu de pàgina el camí complet a les pàgines'; -$lang['recent'] = 'Canvis recents'; -$lang['breadcrumbs'] = 'Llongitut del rastre'; -$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['signature'] = 'firma'; -$lang['toptoclevel'] = 'Nivell superior de la taula de continguts'; -$lang['maxtoclevel'] = 'Nivell màxim de la taula de continguts'; -$lang['maxseclevel'] = 'Nivell màxim d\'edició de seccions'; -$lang['camelcase'] = 'Utilisar CamelCase per als vínculs'; -$lang['deaccent'] = 'Depurar els noms de pàgines'; -$lang['useheading'] = 'Utilisar el primer encapçalament per al nom de pàgina'; -$lang['refcheck'] = 'Comprovar referències a mijos'; -$lang['refshow'] = 'Número de referències a mijos a mostrar'; -$lang['allowdebug'] = 'Permetre depurar (¡desactivar quan no es necessite!)'; - -$lang['usewordblock']= 'Bloquejar spam basant-se en una llista de paraules'; -$lang['indexdelay'] = 'Retart ans d\'indexar (seg.)'; -$lang['relnofollow'] = 'Utilisar rel="nofollow" en vínculs externs'; -$lang['mailguard'] = 'Ofuscar les direccions de correu'; -$lang['iexssprotect']= 'Comprovar que els archius pujats no tinguen possible còdic Javascript o HTML maliciós'; - -/* Authentication Options */ -$lang['useacl'] = 'Utilisar llistes de control d\'accés'; -$lang['autopasswd'] = 'Generar contrasenyes automàticament'; -$lang['authtype'] = 'Sistema d\'autenticació'; -$lang['passcrypt'] = 'Mètodo de sifrat de la contrasenya'; -$lang['defaultgroup']= 'Grup predeterminat'; -$lang['superuser'] = 'Superusuari - grup, usuari o llista separada per comes (usuari1,#grup1,usuari2) en accés total a totes les pàgines i funcions independentment dels ajusts ACL'; -$lang['manager'] = 'Manager - grup, usuari o llista separada per comes (usuari1,#grup1,usuari2) en accés a certes funcions d\'administració'; -$lang['profileconfirm'] = 'Confirmar canvis al perfil en la contrasenya'; -$lang['disableactions'] = 'Desactivar accions de DokuWiki'; -$lang['disableactions_check'] = 'Comprovar'; -$lang['disableactions_subscription'] = 'Subscriure\'s/Desubscriure\'s'; -$lang['disableactions_nssubscription'] = 'Subscriure\'s/desubscriure\'s a l\'espai de noms'; -$lang['disableactions_wikicode'] = 'Vore/exportar còdic'; -$lang['disableactions_other'] = 'Atres accions (separades per comes)'; -$lang['sneaky_index'] = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.'; -$lang['auth_security_timeout'] = 'Temps de seguritat màxim per a l\'autenticació (segons)'; - -/* Advanced Options */ -$lang['updatecheck'] = '¿Buscar actualisacions i advertències de seguritat? DokuWiki necessita conectar a splitbrain.org per ad açò.'; -$lang['userewrite'] = 'Utilisar URL millorades'; -$lang['useslash'] = 'Utilisar \'/\' per a separar espais de noms en les URL'; -$lang['usedraft'] = 'Guardar automàticament un borrador mentres s\'edita'; -$lang['sepchar'] = 'Separador de paraules en els noms de pàgines'; -$lang['canonical'] = 'Utilisar URL totalment canòniques'; -$lang['autoplural'] = 'Buscar formes en plural en els vínculs'; -$lang['compression'] = 'Mètodo de compressió per als archius de l\'àtic'; -$lang['cachetime'] = 'Edat màxima de la caché (seg.)'; -$lang['locktime'] = 'Edat màxima d\'archius de bloqueig (seg.)'; -$lang['fetchsize'] = 'Tamany màxim (bytes) que fetch.php pot descarregar externament'; -$lang['notify'] = 'Enviar notificacions de canvis ad esta direcció de correu'; -$lang['registernotify'] = 'Enviar informació d\'usuaris recentment registrats ad esta direcció de correu'; -$lang['mailfrom'] = 'Direcció de correu a utilisar per a mensages automàtics'; -$lang['gzip_output'] = 'Utilisar Content-Encoding gzip per a xhtml'; -$lang['gdlib'] = 'Versió de GD Lib'; -$lang['im_convert'] = 'Ruta al conversor ImageMagick'; -$lang['jpg_quality'] = 'Calitat de compressió JPG (0-100)'; -$lang['spellchecker']= 'Activar corrector'; -$lang['subscribers'] = 'Activar la subscripció a pàgines'; -$lang['compress'] = 'Compactar l\'eixida CSS i Javascript'; -$lang['hidepages'] = 'Amagar les pàgines coincidents (expressions regulars)'; -$lang['send404'] = 'Enviar "HTTP 404/Page Not Found" per a les pàgines que no existixen'; -$lang['sitemap'] = 'Generar sitemap de Google (dies)'; -$lang['broken_iua'] = '¿La funció ignore_user_abort funciona mal en este sistema? Podria ser la causa d\'un índex de busca que no funcione. Es sap que IIS+PHP/CGI té este problema. Veja Bug 852 per a més informació.'; -$lang['xsendfile'] = '¿Utilisar l\'encapçalament X-Sendfile per a que el servidor web servixca archius estàtics? El servidor web ha d\'admetre-ho.'; -$lang['xmlrpc'] = 'Activar/desactivar interfaç XML-RPC.'; -$lang['renderer_xhtml'] = 'Visualisador a utilisar per a l\'eixida principal del wiki (xhtml)'; -$lang['renderer__core'] = '%s (dokuwiki core)'; -$lang['renderer__plugin'] = '%s (plugin)'; - -$lang['rss_type'] = 'Tipo de canal XML'; -$lang['rss_linkto'] = 'El canal XML vincula a'; -$lang['rss_content'] = '¿Qué mostrar en els ítems del canal XML?'; -$lang['rss_update'] = 'Interval d\'actualisació del canal XML (seg.)'; -$lang['recent_days'] = 'Quants canvis recents guardar (dies)'; -$lang['rss_show_summary'] = 'Que el canal XML mostre el sumari en el títul'; - -/* Target options */ -$lang['target____wiki'] = 'Finestra destí per a vínculs interns'; -$lang['target____interwiki'] = 'Finestra destí per a vínculs interwiki'; -$lang['target____extern'] = 'Finestra destí per a vínculs externs'; -$lang['target____media'] = 'Finestra destí per a vinculs a mijos'; -$lang['target____windows'] = 'Finestra destí per a vínculs a finestres'; - -/* Proxy Options */ -$lang['proxy____host'] = 'Nom del servidor proxy'; -$lang['proxy____port'] = 'Port del proxy'; -$lang['proxy____user'] = 'Nom d\'usuari del Proxy'; -$lang['proxy____pass'] = 'Contrasenya del proxy'; -$lang['proxy____ssl'] = 'Utilisar SSL per a conectar al proxy'; - -/* Safemode Hack */ -$lang['safemodehack'] = 'Activar hack de modo segur'; -$lang['ftp____host'] = 'Servidor FTP per al hack de modo segur'; -$lang['ftp____port'] = 'Port FTP per al hack de modo segur'; -$lang['ftp____user'] = 'Nom de l\'usuari per al hack de modo segur'; -$lang['ftp____pass'] = 'Contrasenya FTP per al hack de modo segur'; -$lang['ftp____root'] = 'Directori base FTP per al hack de modo segur'; - -/* typography options */ -$lang['typography_o_0'] = 'cap'; -$lang['typography_o_1'] = 'Només cometes dobles'; -$lang['typography_o_2'] = 'Totes les cometes (podria no funcionar sempre)'; - -/* userewrite options */ -$lang['userewrite_o_0'] = 'cap'; -$lang['userewrite_o_1'] = '.htaccess'; -$lang['userewrite_o_2'] = 'Interna de DokuWiki'; - -/* deaccent options */ -$lang['deaccent_o_0'] = 'desactivat'; -$lang['deaccent_o_1'] = 'llevar accents'; -$lang['deaccent_o_2'] = 'romanisar'; - -/* gdlib options */ -$lang['gdlib_o_0'] = 'GD Lib no està disponible'; -$lang['gdlib_o_1'] = 'Versió 1.x'; -$lang['gdlib_o_2'] = 'Autodetecció'; - -/* 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'; - -/* rss_content options */ -$lang['rss_content_o_abstract'] = 'Abstracte'; -$lang['rss_content_o_diff'] = 'Unified Diff'; -$lang['rss_content_o_htmldiff'] = 'Taula de diferències en format HTML'; -$lang['rss_content_o_html'] = 'Contingut complet de la pàgina en HTML'; - -/* rss_linkto options */ -$lang['rss_linkto_o_diff'] = 'mostrar diferències'; -$lang['rss_linkto_o_page'] = 'la pàgina revisada'; -$lang['rss_linkto_o_rev'] = 'llista de revisions'; -$lang['rss_linkto_o_current'] = 'la pàgina actual'; - -/* compression options */ -$lang['compression_o_0'] = '-'; -$lang['compression_o_gz'] = 'gzip'; -$lang['compression_o_bz2'] = 'bz2'; - -/* xsendfile header */ -$lang['xsendfile_o_0'] = "No utilisar"; -$lang['xsendfile_o_1'] = 'Encapçalament propietari lighttpd (abans de la versió 1.5)'; -$lang['xsendfile_o_2'] = 'Encapçalament Standard X-Sendfile'; -$lang['xsendfile_o_3'] = 'Encapçalament propietari Nginx X-Accel-Redirect'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ca-valencia/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-valencia/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/ca-valencia/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-valencia/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ +====== Gestió de la configuració ====== + +Utilitzeu esta pàgina per controlar els paràmetres de la vostra instal·lació de DokuWiki. Ajuda sobre paràmetres individuals en [[doku>config]]. Més detalls sobre este connector en [[doku>plugin:config]]. + +Els paràmetres que es visualitzen sobre fons roig clar estan protegits i no es poden modificar amb este connector. Els paràmetres que es visualitzen sobre fons blau tenen valors per defecte. Els de fons blanc s'han configurat localment per a esta instal·lació. Tant els blaus com els blanc es poden modificar. + +Recordeu que cal prémer el botó **DESA** abans d'eixir d'esta pàgina, o si no es perdrien els canvis. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-valencia/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ca-valencia/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ca-valencia/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,180 @@ + + * @author Bernat Arlandis + */ +$lang['menu'] = 'Paràmetres de configuració'; +$lang['error'] = 'Els paràmetres no s\'han pogut actualitzar per causa d\'un valor incorrecte Reviseu els canvis i torneu a enviar-los.
    Els valors incorrectes es ressaltaran amb un marc roig.'; +$lang['updated'] = 'Els paràmetres s\'han actualitzat amb èxit.'; +$lang['nochoice'] = '(no hi altres opcions disponibles)'; +$lang['locked'] = 'El fitxer de paràmetres no es pot actualitzar. Si això és involuntari,
    +assegureu-vos que el nom i els permisos del fitxer local de paràmetres són correctes.'; +$lang['danger'] = 'Alerta: si canvieu esta opció podeu fer que el wiki i el menú de configuració no siguen accessibles.'; +$lang['warning'] = 'Avís: modificar esta opció pot provocar un comportament no desitjat.'; +$lang['security'] = 'Avís de seguretat: modificar esta opció pot implicar un risc de seguretat.'; +$lang['_configuration_manager'] = 'Gestió de la configuració'; +$lang['_header_dokuwiki'] = 'Paràmetres de DokuWiki'; +$lang['_header_plugin'] = 'Paràmetres de connectors'; +$lang['_header_template'] = 'Paràmetres de plantilles'; +$lang['_header_undefined'] = 'Paràmetres no definits'; +$lang['_basic'] = 'Paràmetres bàsics'; +$lang['_display'] = 'Paràmetres de visualització'; +$lang['_authentication'] = 'Paràmetres d\'autenticació'; +$lang['_anti_spam'] = 'Paràmetres anti-brossa'; +$lang['_editing'] = 'Paràmetres d\'edició'; +$lang['_links'] = 'Paràmetres d\'enllaços'; +$lang['_media'] = 'Paràmetres de mitjans'; +$lang['_advanced'] = 'Paràmetres avançats'; +$lang['_network'] = 'Paràmetres de xarxa'; +$lang['_plugin_sufix'] = 'Paràmetres de connectors'; +$lang['_template_sufix'] = 'Paràmetres de plantilla'; +$lang['_msg_setting_undefined'] = 'Falten metadades de paràmetre.'; +$lang['_msg_setting_no_class'] = 'Falta classe de paràmetre.'; +$lang['_msg_setting_no_default'] = 'No hi ha valor per defecte.'; +$lang['fmode'] = 'Mode de creació de fitxers'; +$lang['dmode'] = 'Mode de creació de directoris'; +$lang['lang'] = 'Idioma'; +$lang['basedir'] = 'Directori base'; +$lang['baseurl'] = 'URL base'; +$lang['savedir'] = 'Directori per alçar les dades'; +$lang['start'] = 'Nom de la pàgina d\'inici'; +$lang['title'] = 'Títol del wiki'; +$lang['template'] = 'Plantilla'; +$lang['license'] = 'Amb quina llicència voleu publicar el contingut?'; +$lang['fullpath'] = 'Mostra el camí complet de les pàgines al peu'; +$lang['recent'] = 'Canvis recents'; +$lang['breadcrumbs'] = 'Nombre d\'engrunes'; +$lang['youarehere'] = 'Camí d\'engrunes jeràrquic'; +$lang['typography'] = 'Substitucions tipogràfiques'; +$lang['htmlok'] = 'Permet HTML incrustat'; +$lang['phpok'] = 'Permet PHP incrustat'; +$lang['dformat'] = 'Format de data (vg. la funció PHP strftime)'; +$lang['signature'] = 'Signatura'; +$lang['toptoclevel'] = 'Nivell superior per a la taula de continguts'; +$lang['tocminheads'] = 'Quantitat mínima d\'encapçalaments que determina si es construeix o no la taula de continguts.'; +$lang['maxtoclevel'] = 'Nivell màxim per a la taula de continguts'; +$lang['maxseclevel'] = 'Nivell màxim d\'edició de seccions'; +$lang['camelcase'] = 'Utilitza CamelCase per als enllaços'; +$lang['deaccent'] = 'Noms de pàgina nets'; +$lang['useheading'] = 'Utilitza el primer encapçalament per als noms de pàgina'; +$lang['refcheck'] = 'Comprova la referència en els fitxers de mitjans'; +$lang['refshow'] = 'Nombre de referències de mitjans per mostrar'; +$lang['allowdebug'] = 'Permet depuració inhabiliteu si no és necessari'; +$lang['usewordblock'] = 'Bloca brossa per llista de paraules'; +$lang['indexdelay'] = 'Retard abans d\'indexar (segons)'; +$lang['relnofollow'] = 'Utilitza rel="nofollow" en enllaços externs'; +$lang['mailguard'] = 'Ofusca les adreces de correu'; +$lang['iexssprotect'] = 'Comprova codi HTML o Javascript maligne en els fitxers penjats'; +$lang['showuseras'] = 'Què cal visualitzar quan es mostra el darrer usuari que ha editat la pàgina'; +$lang['useacl'] = 'Utilitza llistes de control d\'accés'; +$lang['autopasswd'] = 'Generació automàtica de contrasenyes'; +$lang['authtype'] = 'Rerefons d\'autenticació'; +$lang['passcrypt'] = 'Mètode d\'encriptació de contrasenyes'; +$lang['defaultgroup'] = 'Grup per defecte'; +$lang['superuser'] = 'Superusuari: un grup o usuari amb accés complet a totes les pàgines i funcions independentment dels paràmetres ACL'; +$lang['manager'] = 'Administrador: un grup o usuari amb accés a certes funcions d\'administració'; +$lang['profileconfirm'] = 'Confirma amb contrasenya els canvis en el perfil'; +$lang['disableactions'] = 'Inhabilita accions DokuWiki'; +$lang['disableactions_check'] = 'Revisa'; +$lang['disableactions_subscription'] = 'Subscripció/cancel·lació'; +$lang['disableactions_nssubscription'] = 'Subscripció/cancel·lació a espai'; +$lang['disableactions_wikicode'] = 'Mostra/exporta font'; +$lang['disableactions_other'] = 'Altres accions (separades per comes)'; +$lang['sneaky_index'] = 'Per defecte, DokuWiki mostrarà tots els espai en la visualització d\'índex. Si activeu este paràmetre, s\'ocultaran aquells espais en els quals l\'usuari no té accés de lectura. Això pot fer que s\'ocultin subespais que sí que són accessibles. En algunes configuracions ACL pot fer que l\'índex resulti inutilitzable.'; +$lang['auth_security_timeout'] = 'Temps d\'espera de seguretat en l\'autenticació (segons)'; +$lang['securecookie'] = 'Les galetes que s\'han creat via HTTPS, només s\'han d\'enviar des del navegador per HTTPS? Inhabiliteu esta opció si només l\'inici de sessió del wiki es fa amb SSL i la navegació del wiki es fa sense seguretat.'; +$lang['xmlrpc'] = 'Habilita/inhabilita la interfície XML-RPC'; +$lang['updatecheck'] = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb splitbrain.org per utilitzar esta característica.'; +$lang['userewrite'] = 'Utilitza URL nets'; +$lang['useslash'] = 'Utilitza la barra / com a separador d\'espais en els URL'; +$lang['usedraft'] = 'Alça automàticament un esborrany mentre s\'edita'; +$lang['sepchar'] = 'Separador de paraules en els noms de pàgina'; +$lang['canonical'] = 'Utilitza URL canònics complets'; +$lang['autoplural'] = 'Comprova formes plurals en els enllaços'; +$lang['compression'] = 'Mètode de compressió per als fitxers de les golfes'; +$lang['cachetime'] = 'Durada màxima de la memòria cau (segons)'; +$lang['locktime'] = 'Durada màxima dels fitxers de bloqueig (segons)'; +$lang['fetchsize'] = 'Grandària màxima (bytes) que fetch.php pot baixar d\'un lloc extern'; +$lang['notify'] = 'Envia notificacions de canvis a esta adreça de correu'; +$lang['registernotify'] = 'Envia informació sobre nous usuaris registrats a esta adreça de correu'; +$lang['mailfrom'] = 'Adreça de correu remitent per a missatges automàtics'; +$lang['gzip_output'] = 'Codifica contingut xhtml com a gzip'; +$lang['gdlib'] = 'Versió GD Lib'; +$lang['im_convert'] = 'Camí de la utilitat convert d\'ImageMagick'; +$lang['jpg_quality'] = 'Qualitat de compressió JPEG (0-100)'; +$lang['subscribers'] = 'Habilita la subscripció a pàgines'; +$lang['compress'] = 'Eixida CSS i Javascript compacta'; +$lang['hidepages'] = 'Oculta pàgines coincidents (expressions regulars)'; +$lang['send404'] = 'Envia "HTTP 404/Page Not Found" per a les pàgines inexistents'; +$lang['sitemap'] = 'Genera mapa del lloc en format Google (dies)'; +$lang['broken_iua'] = 'No funciona en el vostre sistema la funció ignore_user_abort? Això podria malmetre l\'índex de cerques. Amb IIS+PHP/CGI se sap que no funciona. Vg. Bug 852 per a més informació.'; +$lang['xsendfile'] = 'Utilitza la capçalera X-Sendfile perquè el servidor web distribuisca fitxers estàtics. No funciona amb tots els servidors web.'; +$lang['renderer_xhtml'] = 'Renderitzador que cal utilitzar per a l\'eixida principal (xhtml) del wiki'; +$lang['renderer__core'] = '% (ànima del dokuwiki)'; +$lang['renderer__plugin'] = '% (connector)'; +$lang['rememberme'] = 'Permet galetes de sessió permanents ("recorda\'m")'; +$lang['rss_type'] = 'Tipus de canal XML'; +$lang['rss_linkto'] = 'Destinació dels enllaços en el canal XML'; +$lang['rss_content'] = 'Què es mostrarà en els elements del canal XML?'; +$lang['rss_update'] = 'Interval d\'actualització del canal XML (segons)'; +$lang['recent_days'] = 'Quantitat de canvis recents que es mantenen (dies)'; +$lang['rss_show_summary'] = 'Mostra resum en els títols del canal XML'; +$lang['target____wiki'] = 'Finestra de destinació en enllaços interns'; +$lang['target____interwiki'] = 'Finestra de destinació en enllaços interwiki'; +$lang['target____extern'] = 'Finestra de destinació en enllaços externs'; +$lang['target____media'] = 'Finestra de destinació en enllaços de mitjans'; +$lang['target____windows'] = 'Finestra de destinació en enllaços de Windows'; +$lang['proxy____host'] = 'Nom del servidor intermediari'; +$lang['proxy____port'] = 'Port del servidor intermediari'; +$lang['proxy____user'] = 'Nom d\'usuari del servidor intermediari'; +$lang['proxy____pass'] = 'Contrasenya del servidor intermediari'; +$lang['proxy____ssl'] = 'Utilitza SSL per connectar amb el servidor intermediari'; +$lang['safemodehack'] = 'Utilitza el hack per a safemode'; +$lang['ftp____host'] = 'Servidor FTP per al hack de safemode'; +$lang['ftp____port'] = 'Port FTP per al hack de safemode'; +$lang['ftp____user'] = 'Nom d\'usuari FTP per al hack de safemode'; +$lang['ftp____pass'] = 'Contrasenya FTP per al hack de safemode'; +$lang['ftp____root'] = 'Directori arrel FTP per al hack de safemode'; +$lang['license_o_'] = 'Cap selecció'; +$lang['typography_o_0'] = 'cap'; +$lang['typography_o_1'] = 'només cometes dobles'; +$lang['typography_o_2'] = 'totes les cometes (podria no funcionar sempre)'; +$lang['userewrite_o_0'] = 'cap'; +$lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'intern del DokuWiki'; +$lang['deaccent_o_0'] = 'desactivat'; +$lang['deaccent_o_1'] = 'treure accents'; +$lang['deaccent_o_2'] = 'romanització'; +$lang['gdlib_o_0'] = 'GD Lib no està disponible'; +$lang['gdlib_o_1'] = 'Versió 1.x'; +$lang['gdlib_o_2'] = 'Detecció automàtica'; +$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'] = 'Resum'; +$lang['rss_content_o_diff'] = 'Diff unificat'; +$lang['rss_content_o_htmldiff'] = 'Taula de diferències en format HTML'; +$lang['rss_content_o_html'] = 'Contingut complet de la pàgina en format HTML'; +$lang['rss_linkto_o_diff'] = 'Visualització de diferències'; +$lang['rss_linkto_o_page'] = 'pàgina modificada'; +$lang['rss_linkto_o_rev'] = 'llista de revisions'; +$lang['rss_linkto_o_current'] = 'revisió actual'; +$lang['compression_o_0'] = 'cap'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'no utilitzis'; +$lang['xsendfile_o_1'] = 'Capçalera pròpia de lighttpd (anterior a la versió 1.5)'; +$lang['xsendfile_o_2'] = 'Capçalera X-Sendfile estàndard'; +$lang['xsendfile_o_3'] = 'Capçalera X-Accel-Redirect de propietat de Nginx '; +$lang['showuseras_o_loginname'] = 'Nom d\'usuari'; +$lang['showuseras_o_username'] = 'Nom complet de l\'usuari'; +$lang['showuseras_o_email'] = 'Adreça de correu electrònic de l\'usuari (ofuscada segons el paràmetre de configuració corresponent)'; +$lang['showuseras_o_email_link'] = 'Adreça de correu electrònic amb enllaç mailto:'; +$lang['useheading_o_0'] = 'Mai'; +$lang['useheading_o_navigation'] = 'Només navegació'; +$lang['useheading_o_content'] = 'Només contingut wiki'; +$lang['useheading_o_1'] = 'Sempre'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Bohumir Zamecnik * @author Zbynek Krivka + * @author tomas@valenta.cz */ $lang['menu'] = 'Správa nastavení'; $lang['error'] = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce, @@ -15,6 +16,9 @@ $lang['locked'] = 'Nelze upravovat soubor s nastavením. Pokud to není záměrné, ujistěte se,
    že název a přístupová práva souboru s lokálním nastavením jsou v pořádku.'; +$lang['danger'] = 'Pozor: ZmÄ›na tohoto nastavení může způsobit nedostupnost wiki a konfiguraÄních menu.'; +$lang['warning'] = 'Varování: ZmÄ›na nastavení může mít za následek chybné chování.'; +$lang['security'] = 'BezpeÄnostní varování: ZmÄ›na tohoto nastavení může způsobit bezpeÄnostní riziko.'; $lang['_configuration_manager'] = 'Správa nastavení'; $lang['_header_dokuwiki'] = 'Nastavení DokuWiki'; $lang['_header_plugin'] = 'Nastavení pluginů'; @@ -91,6 +95,8 @@ nastaveních ACL nepoužitelný.'; $lang['auth_security_timeout'] = 'ÄŒasový limit pro autentikaci (v sekundách)'; $lang['securecookie'] = 'Má prohlížeÄ posílat cookies nastavené pÅ™es HTTPS opÄ›t jen pÅ™es HTTPS? Vypňete tuto volbu, pokud chcete, aby bylo pomocí SSL zabezpeÄeno pouze pÅ™ihlaÅ¡ování do wiki, ale obsah budete prohlížet nezabezpeÄenÄ›.'; +$lang['xmlrpc'] = 'Povolit/Zakázat rozhraní XML-RPC.'; +$lang['xmlrpcuser'] = 'Omezit přístup pomocí XML-RPC pouze na zde zadané skupiny Äi uživatele (oddÄ›lené Äárkami). Necháte-li pole prázdné, dáte přístup komukoliv.'; $lang['updatecheck'] = 'Kontrolovat aktualizace a bezpeÄnostní varování? DokuWiki potÅ™ebuje pro tuto funkci přístup k splitbrain.org'; $lang['userewrite'] = 'Používat "pÄ›kná" URL'; $lang['useslash'] = 'Používat lomítko jako oddÄ›lovaÄ jmenných prostorů v URL'; @@ -116,7 +122,6 @@ $lang['sitemap'] = 'Generovat Google sitemap (interval ve dnech)'; $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.'; -$lang['xmlrpc'] = 'Povolit/Zakázat rozhraní XML-RPC.'; $lang['renderer_xhtml'] = 'Vykreslovací jádro pro hlavní (xhtml) výstup wiki'; $lang['renderer__core'] = '%s (jádro DokuWiki)'; $lang['renderer__plugin'] = '%s (plugin)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/da/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/da/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/da/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/da/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,8 +1,8 @@ -====== Konfigurationsstyring ====== +====== Opsætningsstyring ====== -Brug denne side til at kontrollere indstillingerne for din Dokuwiki installation. For hjælp med specifikke indstillinger, se [[doku>config]]. For flere detaljer om dette plugin, se [[doku>plugin:config]]. +Brug denne side til at kontrollere indstillingerne for din Dokuwiki-opsætning. For at fÃ¥ hjælp med specifikke indstillinger, se [[doku>config]]. For flere detaljer om denne udvidelse, se [[doku>plugin:config]]. -Indstillinger vist med lys rød baggrund er beskyttede og kan ikke ændres med dette plugin. Indstillinger vist med blÃ¥ baggrund er standardindstillinger og indstillinger vist med hvid baggrund er blevet sat lokalt denne konkrete installation. BÃ¥de blÃ¥ og hvide indstillinger kan ændres. +Indstillinger vist med lys rød baggrund er beskyttede og kan ikke ændres med denne udvidelse. Indstillinger vist med blÃ¥ baggrund er standardindstillinger og indstillinger vist med hvid baggrund er blevet sat lokalt denne konkrete opsætning. BÃ¥de blÃ¥ og hvide indstillinger kan ændres. -Husk at trykke pÃ¥ **Gem** knappen før du forlader siden, ellers mister du dine ændringer. +Husk at trykke pÃ¥ **Gem**-knappen før du forlader siden, for at du ikke mister dine ændringer. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,29 +6,35 @@ * @author Lars Næsbye Christensen * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ -$lang['menu'] = 'Konfigurationsindstillinger'; -$lang['error'] = 'Indstillingerne blev ikke opdateret pÃ¥ grund af en ugyldig værdi, gennemse venligst dine ændringer og gem dem igen. -
    De(n) ugyldig(e) værdie(r) vil blive rammet ind med rødt.'; +$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. +
    Ugyldige værdier vil blive rammet ind med rødt.'; $lang['updated'] = 'Indstillingerne blev opdateret korrekt.'; $lang['nochoice'] = '(ingen andre valgmuligheder)'; -$lang['locked'] = 'Indstillingsfilen kunne ikke opdateres, hvis dette er en fejl,
    - sørg da for at den lokale indstillingsfils navn og rettigheder er korrekte.'; -$lang['_configuration_manager'] = 'Konfigurationsstyring'; +$lang['locked'] = 'Indstillingsfilen kunne ikke opdateres, Hvis dette er en fejl,
    +sørg da for at navnet på den lokale indstillingsfil samt dens rettigheder er korrekte.'; +$lang['danger'] = 'Fare: Ændring af denne mulighed kan gøre din wiki og opsætningsoversigt utilgængelige.'; +$lang['warning'] = 'Advarsel: Ændring af denne mulighed kan forårsage utilsigtet opførsel.'; +$lang['security'] = 'Sikkerhedsadvarsel: Ændring af denne mulighed kan forårsage en sikkerhedsrisiko.'; +$lang['_configuration_manager'] = 'Opsætningsstyring'; $lang['_header_dokuwiki'] = 'DokuWiki indstillinger'; -$lang['_header_plugin'] = 'Pluginindstillinger'; +$lang['_header_plugin'] = 'Udvidelsesindstillinger'; $lang['_header_template'] = 'Skabelonindstillinger'; -$lang['_header_undefined'] = 'Udefinerede indstillinger'; +$lang['_header_undefined'] = 'Ikke satte indstillinger'; $lang['_basic'] = 'Grundindstillinger'; $lang['_display'] = 'Synlighedsindstillinger'; $lang['_authentication'] = 'Bekræftelsesindstillinger'; -$lang['_anti_spam'] = 'Anti-spam indstillinger'; +$lang['_anti_spam'] = 'Trafikkontrolsindstillinger'; $lang['_editing'] = 'Redigeringsindstillinger'; -$lang['_links'] = 'Linkindstillinger'; +$lang['_links'] = 'Henvisningsindstillinger'; $lang['_media'] = 'Medieindstillinger'; $lang['_advanced'] = 'Avancerede indstillinger'; $lang['_network'] = 'Netværksindstillinger'; -$lang['_plugin_sufix'] = 'Pluginindstillinger'; +$lang['_plugin_sufix'] = 'Udvidelsesindstillinger'; $lang['_template_sufix'] = 'Skabelonindstillinger'; $lang['_msg_setting_undefined'] = 'Ingen indstillingsmetadata.'; $lang['_msg_setting_no_class'] = 'Ingen indstillingsklasse.'; @@ -37,7 +43,7 @@ $lang['dmode'] = 'Katalogoprettelsestilstand'; $lang['lang'] = 'Sprog'; $lang['basedir'] = 'Grundkatalog'; -$lang['baseurl'] = 'Grund URL'; +$lang['baseurl'] = 'Grundadresse'; $lang['savedir'] = 'Katalog til opbevaring af data'; $lang['start'] = 'Startsidens navn'; $lang['title'] = 'Wiki titel'; @@ -50,110 +56,116 @@ $lang['typography'] = 'Typografiske erstatninger'; $lang['htmlok'] = 'Tillad indlejret HTML'; $lang['phpok'] = 'Tillad indlejret PHP'; -$lang['dformat'] = 'Datoformat (se PHP\'s strftime funktion)'; -$lang['signature'] = 'Signatur'; -$lang['toptoclevel'] = 'Højeste niveau for indholdsfortegnelse'; -$lang['maxtoclevel'] = 'Maksimalt niveau for indholdsfortegnelse'; -$lang['maxseclevel'] = 'Maksimalt niveau for redigering af sektioner'; -$lang['camelcase'] = 'Brug CamelCase til links'; +$lang['dformat'] = 'Datoformat (se PHP\'s strftime-funktion)'; +$lang['signature'] = 'Underskrift'; +$lang['toptoclevel'] = 'Øverste niveau for indholdsfortegnelse'; +$lang['tocminheads'] = 'Mindste antal overskrifter for at danne Indholdsfortegnelsen'; +$lang['maxtoclevel'] = 'Højeste niveau for indholdsfortegnelse'; +$lang['maxseclevel'] = 'Højeste niveau for redigering af sektioner'; +$lang['camelcase'] = 'Brug KamelKasse til henvisninger'; $lang['deaccent'] = 'Pæne sidenavne'; $lang['useheading'] = 'Brug første overskrift til sidenavne'; -$lang['refcheck'] = 'Mediereference kontrol'; -$lang['refshow'] = 'Antal viste mediereferencer'; -$lang['allowdebug'] = 'Tillad debugging slå fra hvis unødvendig!'; -$lang['usewordblock'] = 'Bloker spam baseret på ordliste'; -$lang['indexdelay'] = 'Tidsforsinkelse af indeksering'; -$lang['relnofollow'] = 'Brug rel="nofollow"'; -$lang['mailguard'] = 'Slør email adresser'; -$lang['iexssprotect'] = 'Tjek uploadede filer for mulig skadelig JavaScript eller HTML kode.'; -$lang['showuseras'] = 'Hvad skal vises når den sidste bruger der har ændret siden vises'; +$lang['refcheck'] = 'Mediehenvisningerkontrol'; +$lang['refshow'] = 'Antal viste mediehenvisninger'; +$lang['allowdebug'] = 'Tillad fejlretning slå fra hvis unødvendig!'; +$lang['usewordblock'] = 'Hindr uønsket brug med en ordliste'; +$lang['indexdelay'] = 'Tidsforsinkelse før katalogisering (sek.)'; +$lang['relnofollow'] = 'Brug rel="nofollow" til udadgående henvisninger'; +$lang['mailguard'] = 'Slør elektroniske adresser'; +$lang['iexssprotect'] = 'Gennemse oplagte filer for mulig skadelig JavaScript- eller HTML-kode.'; +$lang['showuseras'] = 'Hvad skal vises når den sidste bruger, der har ændret siden, fremstilles'; $lang['useacl'] = 'Benyt adgangskontrollister'; -$lang['autopasswd'] = 'Generer passwords automatisk'; -$lang['authtype'] = 'Bekræftelsesbackend'; -$lang['passcrypt'] = 'Passwordkrypteringsmetode'; +$lang['autopasswd'] = 'Generer adgangskoder automatisk'; +$lang['authtype'] = 'Bekræftelsesgrundlag'; +$lang['passcrypt'] = 'Krypteringsmetode for adgangskoder'; $lang['defaultgroup'] = 'Standardgruppe'; $lang['superuser'] = 'Superbruger'; $lang['manager'] = 'Bestyrer - en gruppe eller bruger med adgang til bestemte styrende funktioner'; -$lang['profileconfirm'] = 'Bekræft profilændringer med password'; -$lang['disableactions'] = 'Slå DokuWiki muligheder fra'; -$lang['disableactions_check'] = 'Check'; -$lang['disableactions_subscription'] = 'Abonner/Fjern abonnement'; -$lang['disableactions_nssubscription'] = 'Namespace tilmelding / Afmelding'; -$lang['disableactions_wikicode'] = 'Vis kilde/eksporter råtekst'; +$lang['profileconfirm'] = 'Bekræft profilændringer med kodeord'; +$lang['disableactions'] = 'Slå DokuWiki-muligheder fra'; +$lang['disableactions_check'] = 'Tjek'; +$lang['disableactions_subscription'] = 'Tliføj/Fjern opskrivning'; +$lang['disableactions_nssubscription'] = 'Tilmelding / afmelding af navnerum'; +$lang['disableactions_wikicode'] = 'Vis kilde/Eksporter grundkode'; $lang['disableactions_other'] = 'Andre muligheder (kommasepareret)'; -$lang['auth_security_timeout'] = 'Authentikation sikkerheds timeout (sekunder)'; -$lang['updatecheck'] = 'Tjek for opdateringer og sikkerheds advarsler? DokuWiki er nød til at kontakte splitbrain.org for denne funktion.'; -$lang['userewrite'] = 'Brug pæne URLer'; -$lang['useslash'] = 'Brug skråstreg som navnerumsdeler i URLer'; +$lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerum i indholdsfortegnelsen. Ved at slå denne valgmulighed til vil skjule de navnerum, hvor brugeren ikke har læsetilladelse. Dette kan føre til, at tilgængelige undernavnerum bliver skjult. Ligeledes kan det også gøre indholdsfortegnelsen ubrugelig med visse ACL-opsætninger.'; +$lang['auth_security_timeout'] = 'Tidsudløb for bekræftelse (sekunder)'; +$lang['securecookie'] = 'Skal datafiler skabt af HTTPS kun sendes af HTTPS gennem browseren? Slå denne valgmulighed fra hvis kun brugen af din wiki er SSL-beskyttet, mens den almindelige tilgang udefra ikke er sikret.'; +$lang['xmlrpc'] = 'Slå XML-RPC-grænseflade til/fra.'; +$lang['xmlrpcuser'] = 'Begræns XML-RPC-adgang til de nævnte og med komma adskilte grupper eller brugere. Lad den stå tom for at give alle adgang.'; +$lang['updatecheck'] = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte splitbrain.org for at tilgå denne funktion.'; +$lang['userewrite'] = 'Brug pæne netadresser'; +$lang['useslash'] = 'Brug skråstreg som navnerumsdeler i netadresser'; $lang['usedraft'] = 'Gem automatisk en kladde under redigering'; $lang['sepchar'] = 'Orddelingstegn til sidenavne'; -$lang['canonical'] = 'Benyt fuldt kanoniske URLer'; -$lang['autoplural'] = 'Check for flertalsendelser i links'; -$lang['compression'] = 'Kompressions metode for attic filer'; -$lang['cachetime'] = 'Maksimum levetid for cache (sek)'; -$lang['locktime'] = 'Maksimum levetid for låsningsfiler (sek)'; -$lang['fetchsize'] = 'Maksimum antal (bytes) fetch.php må downloade fra extern'; -$lang['notify'] = 'Send ændringsnotifikationer til denne e-mailadresse'; -$lang['registernotify'] = 'Send info om nyoprettede brugere til denne email adresse'; -$lang['mailfrom'] = 'Email adresse til brug for automatiske mails'; -$lang['gzip_output'] = 'Benyt gzip Content-Encoding til XHTML'; -$lang['gdlib'] = 'GD Lib version'; -$lang['im_convert'] = 'Sti til ImageMagick\'s convert værktøj'; +$lang['canonical'] = 'Benyt fuldt kanoniske netadresser'; +$lang['autoplural'] = 'Tjek for flertalsendelser i henvisninger'; +$lang['compression'] = 'Pakningsmetode for attic-filer'; +$lang['cachetime'] = 'Længste levetid for "cache" (sek)'; +$lang['locktime'] = 'Længste levetid for låsefiler (sek)'; +$lang['fetchsize'] = 'Største antal (bytes) fetch.php må hente udefra'; +$lang['notify'] = 'Send ændringsmeddelelser til denne e-adresse'; +$lang['registernotify'] = 'Send info om nyoprettede brugere til denne e-adresse'; +$lang['mailfrom'] = 'E-adresse til brug for automatiske meddelelser'; +$lang['gzip_output'] = 'Benyt gzip-Content-Encoding (indholdskryptering) til XHTML'; +$lang['gdlib'] = 'Udgave af GD Lib'; +$lang['im_convert'] = 'Sti til ImageMagick\'s omdannerværktøj'; $lang['jpg_quality'] = 'JPG komprimeringskvalitet (0-100)'; $lang['subscribers'] = 'Slå understøttelse af abonnement på sider til'; -$lang['compress'] = 'Komprimer CSS og Javascript filer'; -$lang['hidepages'] = 'Skjul matchende sider (regulære udtryk)'; +$lang['compress'] = 'Komprimer CSS- og JavaScript-filer'; +$lang['hidepages'] = 'Skjul lignende sider (almindelige udtryk)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider'; -$lang['sitemap'] = 'Generer Google sitemap (dage)'; -$lang['broken_iua'] = 'Er ignore_user_abort funktionen i stykker p� dit system? Dette kunne forudsage et ikke virkende s�geindeks. IIS+PHP/CGI er kendt for ikke at virke. Se Bug 852 for mere information.'; -$lang['xmlrpc'] = 'Aktiver/Deaktiver XML-RPC interface.'; -$lang['renderer_xhtml'] = 'Renderer XHTML wiki output'; -$lang['renderer__core'] = '%s (dokuwiki kerne)'; -$lang['renderer__plugin'] = '%s (plugin)'; -$lang['rss_type'] = 'XML feed type'; -$lang['rss_linkto'] = 'XML feed linker til'; -$lang['rss_content'] = 'Hvad skal der vises i XML feed tingene?'; -$lang['rss_update'] = 'XML feed opdateringsinterval (sek)'; +$lang['sitemap'] = 'Generer Google-"sitemap" (dage)'; +$lang['broken_iua'] = 'Er funktionen "ignore_user_abort" uvirksom på dit system? Dette kunne forårsage en ikke virkende søgeoversigt. IIS+PHP/CGI er kendt for ikke at virke. Se Fejl 852 for flere oplysninger.'; +$lang['xsendfile'] = 'Brug hovedfilen til X-Sendfile for at få netserveren til at sende statiske filer? Din netserver skal understøtte dette for at bruge det.'; +$lang['renderer_xhtml'] = 'Udskriver der skal bruges til størstedelen af wiki-udskriften (XHTML)'; +$lang['renderer__core'] = '%s (dokuwiki-kerne)'; +$lang['renderer__plugin'] = '%s (udvidelse)'; +$lang['rememberme'] = 'Tillad varige datafiler for brugernavne (husk mig)'; +$lang['rss_type'] = 'Type af XML-liste'; +$lang['rss_linkto'] = 'XML-liste henviser til'; +$lang['rss_content'] = 'Hvad skal der vises i XML-listepunkteren?'; +$lang['rss_update'] = 'XML-listens opdateringsinterval (sek)'; $lang['recent_days'] = 'Hvor mange nye ændringer der skal beholdes (dage)'; -$lang['rss_show_summary'] = 'XML feed vis resume i titlen'; -$lang['target____wiki'] = 'Destinationsvindue til interne links'; -$lang['target____interwiki'] = 'Destinationsvindue til interwiki links'; -$lang['target____extern'] = 'Destinationsvindue til externe links'; -$lang['target____media'] = 'Destinationsvindue til medie links'; -$lang['target____windows'] = 'Destinationsvindue til Windows links'; -$lang['proxy____host'] = 'Proxy servernavn'; -$lang['proxy____port'] = 'Proxy port'; -$lang['proxy____user'] = 'Proxy brugernavn'; -$lang['proxy____pass'] = 'Proxy password'; +$lang['rss_show_summary'] = 'XML-liste vis referat i overskriften'; +$lang['target____wiki'] = 'Målvindue for indre henvisninger'; +$lang['target____interwiki'] = 'Målvindue for egne wikihenvisninger '; +$lang['target____extern'] = 'Målvindue for udadgående henvisninger'; +$lang['target____media'] = 'Målvindue for mediehenvisninger'; +$lang['target____windows'] = 'Målvindue til Windows-henvisninger'; +$lang['proxy____host'] = 'Proxy-servernavn'; +$lang['proxy____port'] = 'Proxy-port'; +$lang['proxy____user'] = 'Proxy-brugernavn'; +$lang['proxy____pass'] = 'Proxy-kodeord'; $lang['proxy____ssl'] = 'Brug SSL til at forbinde til proxy'; -$lang['safemodehack'] = 'Slå safemode hack til'; -$lang['ftp____host'] = 'FTP server til safemode hack'; -$lang['ftp____port'] = 'FTP port til safemode hack'; -$lang['ftp____user'] = 'FTP brugernavn til safemode hack'; -$lang['ftp____pass'] = 'FTP adgangskode til safemode hack'; -$lang['ftp____root'] = 'FTP rodkatalog til safemode hack'; +$lang['safemodehack'] = 'Slå "safemode hack" til '; +$lang['ftp____host'] = 'FTP-server til "safemode hack"'; +$lang['ftp____port'] = 'FTP-port til "safemode hack"'; +$lang['ftp____user'] = 'FTP-brugernavn til "safemode hack"'; +$lang['ftp____pass'] = 'FTP-adgangskode til "safemode hack"'; +$lang['ftp____root'] = 'FTP-rodmappe til "safemode hack"'; $lang['license_o_'] = 'Ingen valgt'; $lang['typography_o_0'] = 'ingen'; -$lang['typography_o_1'] = 'Gåseøjne tegn kun'; -$lang['typography_o_2'] = 'All citationstegn (vil måske ikke altid virke)'; +$lang['typography_o_1'] = 'Kun gåseøjne'; +$lang['typography_o_2'] = 'Tillader enkelttegnscitering (vil måske ikke altid virke)'; $lang['userewrite_o_0'] = 'ingen'; $lang['userewrite_o_1'] = '.htaccess'; -$lang['userewrite_o_2'] = 'Dokuwiki intern'; +$lang['userewrite_o_2'] = 'Dokuwiki indre'; $lang['deaccent_o_0'] = 'fra'; -$lang['deaccent_o_1'] = 'fjern accenter'; +$lang['deaccent_o_1'] = 'fjern accenttegn'; $lang['deaccent_o_2'] = 'romaniser'; $lang['gdlib_o_0'] = 'GD Lib ikke tilstede'; -$lang['gdlib_o_1'] = 'version 1.x'; -$lang['gdlib_o_2'] = 'automatisk detektering'; +$lang['gdlib_o_1'] = 'Udgave 1.x'; +$lang['gdlib_o_2'] = 'automatisk sondering'; $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'] = 'Abstrakt'; -$lang['rss_content_o_diff'] = 'Unified Diff'; -$lang['rss_content_o_htmldiff'] = 'HTML formateret diff tabel'; -$lang['rss_content_o_html'] = 'Fuld HTML side indhold'; +$lang['rss_content_o_diff'] = '"Unified Diff" (Sammensat)'; +$lang['rss_content_o_htmldiff'] = 'HTML-formateret diff-tabel'; +$lang['rss_content_o_html'] = 'Fuldt HTML-sideindhold'; $lang['rss_linkto_o_diff'] = 'liste over forskelle'; $lang['rss_linkto_o_page'] = 'den redigerede side'; $lang['rss_linkto_o_rev'] = 'liste over ændringer'; @@ -162,10 +174,14 @@ $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'brug ikke'; -$lang['xsendfile_o_1'] = 'Proprietær lighttpd header (før version 1.5)'; -$lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; -$lang['xsendfile_o_3'] = 'Proprietær Nginx X-Accel-Redirect header'; -$lang['showuseras_o_loginname'] = 'Login navn'; +$lang['xsendfile_o_1'] = 'Proprietær lighttpd-hovedfil (før udgave 1.5)'; +$lang['xsendfile_o_2'] = 'Standard X-Sendfile-hovedfil'; +$lang['xsendfile_o_3'] = 'Proprietær Nginx X-Accel-Redirect hovedfil'; +$lang['showuseras_o_loginname'] = 'Brugernavn'; $lang['showuseras_o_username'] = 'Brugerens fulde navn'; -$lang['showuseras_o_email'] = 'brugerens email adresse (manipuleret i forhold til mailguard indstillingerne)'; -$lang['showuseras_o_email_link'] = 'Brugers email adresse som et mailto: link'; +$lang['showuseras_o_email'] = 'Brugerens e-adresse (ændret i forhold til mailguard-indstillingerne)'; +$lang['showuseras_o_email_link'] = 'Brugers e-adresse som en mailto:-henvisning'; +$lang['useheading_o_0'] = 'Aldrig'; +$lang['useheading_o_navigation'] = 'Kun navigering'; +$lang['useheading_o_content'] = 'Kun wiki-indhold'; +$lang['useheading_o_1'] = 'Altid'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,14 +9,20 @@ * @author Florian Anderiasch * @author Robin Kluth * @author Arne Pelka + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['menu'] = 'Konfiguration'; $lang['error'] = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert. -
    Bitte überprüfen sie die rot umrandeten Eingaben und speichern Sie erneut.'; +
    Bitte überprüfen sie die rot umrandeten Eingaben und speichern Sie erneut.'; $lang['updated'] = 'Einstellungen erfolgreich gespeichert.'; $lang['nochoice'] = '(keine Auswahlmöglichkeiten vorhanden)'; $lang['locked'] = 'Die Konfigurationsdatei kann nicht geändert werden, wenn dies unbeabsichtigt ist -
    überprüfen Sie, dass die Dateiberechtigungen korrekt gesetzt sind.'; +
    überprüfen Sie, dass die Dateiberechtigungen korrekt gesetzt sind.'; +$lang['danger'] = 'Vorsicht: Die Änderung dieser Option könnte Ihr Wiki und das Konfigurationsmenü unzugänglich machen.'; +$lang['warning'] = 'Hinweis: Die Änderung dieser Option könnte unbeabsichtigtes Verhalten hervorrufen.'; +$lang['security'] = 'Sicherheitswarnung: Die Änderung dieser Option könnte ein Sicherheitsrisiko darstellen.'; $lang['_configuration_manager'] = 'Konfiguration'; $lang['_header_dokuwiki'] = 'DokuWiki-Konfiguration'; $lang['_header_plugin'] = 'Plugin-Konfiguration'; @@ -31,8 +37,8 @@ $lang['_media'] = 'Medien-Konfiguration'; $lang['_advanced'] = 'Erweiterte Konfiguration'; $lang['_network'] = 'Netzwerk-Konfiguration'; -$lang['_plugin_sufix'] = 'Plugin Konfiguration'; -$lang['_template_sufix'] = 'Template Konfiguration'; +$lang['_plugin_sufix'] = 'Plugin-Konfiguration'; +$lang['_template_sufix'] = 'Template-Konfiguration'; $lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.'; $lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.'; $lang['_msg_setting_no_default'] = 'Kein Standardwert.'; @@ -56,7 +62,7 @@ $lang['dformat'] = 'Datumsformat (Siehe PHP strftime Funktion)'; $lang['signature'] = 'Signatur'; $lang['toptoclevel'] = 'Inhaltsverzeichnis bei dieser Überschriftsgröße beginnen'; -$lang['tocminheads'] = 'Mindestanzahl der Überschriften, die entscheidet ob ein Inhaltsverzeichnis erscheinen soll'; +$lang['tocminheads'] = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll'; $lang['maxtoclevel'] = 'Maximale Überschriftsgröße für Inhaltsverzeichnis'; $lang['maxseclevel'] = 'Abschnitte bis zu dieser Stufe einzeln editierbar machen'; $lang['camelcase'] = 'CamelCase-Verlinkungen verwenden'; @@ -69,8 +75,8 @@ $lang['indexdelay'] = 'Zeit bevor Suchmaschinenindexierung erlaubt ist'; $lang['relnofollow'] = 'rel="nofollow" verwenden'; $lang['mailguard'] = 'E-Mail-Adressen schützen'; -$lang['iexssprotect'] = 'Hochgeladene Dateien auf bösartigen JavaScript- und HTML-Code untersuchen.'; -$lang['showuseras'] = 'Was angezeigt werden soll wenn der Benutzer, der zuletzt eine Seite bearbeitet hat angezeigt wird'; +$lang['iexssprotect'] = 'Hochgeladene Dateien auf bösartigen JavaScript- und HTML-Code untersuchen'; +$lang['showuseras'] = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird'; $lang['useacl'] = 'Zugangskontrolle verwenden'; $lang['autopasswd'] = 'Passwort automatisch generieren'; $lang['authtype'] = 'Authentifizierungsmechanismus'; @@ -88,6 +94,8 @@ $lang['sneaky_index'] = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.'; $lang['auth_security_timeout'] = 'Authentifikations-Timeout (Sekunden)'; $lang['securecookie'] = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktivieren Sie diese Option, wenn nur der Login Ihres Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.'; +$lang['xmlrpc'] = 'XML-RPC-Zugriff erlauben.'; +$lang['xmlrpcuser'] = 'XML-RPC-Zugriff auf folgende Gruppen oder Benutzer (kommasepariert) beschrängen. Wenn Sie dieses Feld leer lassen, wir der Zugriff jedem gewährt.'; $lang['updatecheck'] = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit splitbrain.org verbinden.'; $lang['userewrite'] = 'URL rewriting'; $lang['useslash'] = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden'; @@ -96,12 +104,12 @@ $lang['canonical'] = 'Immer Links mit vollständigen URLs erzeugen'; $lang['autoplural'] = 'Bei Links automatisch nach vorhandenen Pluralformen suchen'; $lang['compression'] = 'Komprimierungsmethode für alte Seitenrevisionen'; -$lang['cachetime'] = 'Maximale Cachespeicherung (Sek.)'; -$lang['locktime'] = 'Maximales Alter für Seitensperren (Sek.)'; +$lang['cachetime'] = 'Maximale Cachespeicherung (Sekunden)'; +$lang['locktime'] = 'Maximales Alter für Seitensperren (Sekunden)'; $lang['fetchsize'] = 'Maximale Größe (in Bytes), die fetch.php von extern herunterladen darf'; $lang['notify'] = 'Änderungsmitteilungen an diese E-Mail-Adresse versenden'; $lang['registernotify'] = 'Information über neu registrierte Nutzer an diese E-Mail-Adresse senden'; -$lang['mailfrom'] = 'Absendermail für automatische Mails'; +$lang['mailfrom'] = 'Absender-E-Mail-Adresse für automatische Mails'; $lang['gzip_output'] = 'Seiten mit gzip komprimiert ausliefern'; $lang['gdlib'] = 'GD Lib Version'; $lang['im_convert'] = 'Pfad zu ImageMagicks Konvertierwerkzeug'; @@ -113,15 +121,14 @@ $lang['sitemap'] = 'Google Sitemap erzeugen (Tage)'; $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!'; -$lang['xmlrpc'] = 'XML-RPC Zugriff erlauben.'; $lang['renderer_xhtml'] = 'Standard-Renderer für die normale (XHTML) Wiki-Ausgabe.'; $lang['renderer__core'] = '%s (DokuWiki Kern)'; $lang['renderer__plugin'] = '%s (Plugin)'; $lang['rememberme'] = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)'; -$lang['rss_type'] = 'XML-Feed Format'; +$lang['rss_type'] = 'XML-Feed-Format'; $lang['rss_linkto'] = 'XML-Feed verlinken auf'; $lang['rss_content'] = 'Welche Inhalte sollen im XML-Feed dargestellt werden?'; -$lang['rss_update'] = 'XML-Feed Aktualisierungsintervall (sec)'; +$lang['rss_update'] = 'XML-Feed Aktualisierungsintervall (Sekunden)'; $lang['recent_days'] = 'Wieviele letzte Änderungen sollen einsehbar bleiben? (Tage)'; $lang['rss_show_summary'] = 'Bearbeitungs-Zusammenfassung im XML Feed anzeigen'; $lang['target____wiki'] = 'Zielfenster für interne Links (target Attribut)'; @@ -160,8 +167,8 @@ $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Abstrakt'; $lang['rss_content_o_diff'] = 'Unified Diff'; -$lang['rss_content_o_htmldiff'] = 'HTML formatierte Diff Tabelle'; -$lang['rss_content_o_html'] = 'Vollständiger HTML Inhalt'; +$lang['rss_content_o_htmldiff'] = 'HTML formatierte Diff-Tabelle'; +$lang['rss_content_o_html'] = 'Vollständiger HTML-Inhalt'; $lang['rss_linkto_o_diff'] = 'Änderungen zeigen'; $lang['rss_linkto_o_page'] = 'geänderte Seite'; $lang['rss_linkto_o_rev'] = 'Liste aller Änderungen'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/de-informal/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/de-informal/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/de-informal/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/de-informal/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ +===== Einstellungs-Manager ===== + +Benutze diese Seite zur Kontrolle der Einstellungen deiner DokuWiki-Installation. Für Hilfe zu individuellen Einstellungen gehe zu [[doku>config]]. Für mehr Details über diese Erweiterunge siehe [[doku>plugin:config]]. + +Einstellungen die mit einem hellroten Hintergrund angezeigt werden, können mit dieser Erweiterung nicht verändert werden. Einstellungen mit einem blauen Hintergrund sind Standardwerte und Einstellungen mit einem weißen Hintergrund wurden lokal gesetzt für diese Installation. Sowohl blaue als auch weiße Einstellungen können angepasst werden. + +Denke dran **SAVE** zu drücken bevor du die Seite verläßt, andernfalls werden deine Änderungen nicht übernommen. \ Brak znaku nowej linii na końcu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,74 @@ + + * @author Juergen Schwarzer + */ +$lang['menu'] = 'Einstellungen'; +$lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfen Sie Ihre Änderungen und versuchen Sie es erneut. +
    Die/der inkorrekte(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.'; +$lang['updated'] = 'Einstellungen erfolgreich hochgeladen.'; +$lang['nochoice'] = '(keine andere Option möglich)'; +$lang['warning'] = 'Achtung: Änderungen dieser Option kann zu unbabsichtigtem Verhalten führen.'; +$lang['security'] = 'Sicherheitswarnung: Änderungen dieser Option können eine Sicherheitsrisiko bedeuten.'; +$lang['_configuration_manager'] = 'Einstellungen'; +$lang['_header_dokuwiki'] = 'DokuWiki-Einstellungen'; +$lang['_header_plugin'] = 'Erweiterugs-Einstellungen'; +$lang['_header_template'] = 'Vorlageneinstellungen'; +$lang['_header_undefined'] = 'unbestimmte Einstellungen'; +$lang['_basic'] = 'Grundeinstellungen'; +$lang['_display'] = 'Darstellungs-Einstellungen'; +$lang['_authentication'] = 'Bestätigungseinstellungen'; +$lang['_anti_spam'] = 'Anti-Spam Einstellungen'; +$lang['_editing'] = 'Bearbeitungseinstellungen'; +$lang['_links'] = 'Link-Einstellungen'; +$lang['_media'] = 'Media-Einstellungen'; +$lang['_advanced'] = 'erweiterte Einstellungen'; +$lang['_network'] = 'Netzwerk-Einstellungen'; +$lang['_plugin_sufix'] = 'Ereiterungseinstellungen'; +$lang['_template_sufix'] = 'Vorlageneinstellungen'; +$lang['_msg_setting_no_default'] = 'Kein Standardwert.'; +$lang['lang'] = 'Sprache'; +$lang['savedir'] = 'Ordner zum Speichern von Daten'; +$lang['start'] = 'Name der Startseite'; +$lang['title'] = 'Wiki Titel'; +$lang['template'] = 'Vorlage'; +$lang['license'] = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?'; +$lang['recent'] = 'letzte Änderungen'; +$lang['typography'] = 'Mach drucktechnische Ersetzungen'; +$lang['htmlok'] = 'Erlaube eingebettetes HTML'; +$lang['phpok'] = 'Erlaube eingebettetes PHP'; +$lang['dformat'] = 'Datumsformat (siehe PHP\'s strftime function)'; +$lang['signature'] = 'Signatur'; +$lang['usewordblock'] = 'Blockier Spam basierend auf der Wortliste'; +$lang['useacl'] = 'Benutze Zugangskontrollliste'; +$lang['autopasswd'] = 'Automatisch erzeugte Passwörter'; +$lang['defaultgroup'] = 'Standardgruppe'; +$lang['disableactions'] = 'Deaktiviere DokuWiki\'s Zugriffe'; +$lang['disableactions_subscription'] = 'Bestellen/Abbestellen'; +$lang['disableactions_nssubscription'] = 'Namensraum Bestellen/Abbestellen'; +$lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten'; +$lang['disableactions_other'] = 'Weitere Aktionen (durch Komma getrennt)'; +$lang['renderer__plugin'] = '%s (Erweiterung)'; +$lang['license_o_'] = 'Nichts ausgewählt'; +$lang['typography_o_0'] = 'nichts'; +$lang['userewrite_o_0'] = 'nichts'; +$lang['deaccent_o_0'] = 'aus'; +$lang['gdlib_o_1'] = 'Version 1.x'; +$lang['gdlib_o_2'] = 'Autoerkennung'; +$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['compression_o_0'] = 'nichts'; +$lang['compression_o_gz'] = 'gzip'; +$lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'Nicht benutzen'; +$lang['showuseras_o_loginname'] = 'Login-Name'; +$lang['showuseras_o_username'] = 'Voller Name des Nutzers'; +$lang['useheading_o_0'] = 'Niemals'; +$lang['useheading_o_navigation'] = 'Nur Navigation'; +$lang['useheading_o_content'] = 'Nur Wiki-Inhalt'; +$lang['useheading_o_1'] = 'Immer'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/el/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/el/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/el/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/el/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -4,4 +4,4 @@ Οι Ïυθμίσεις που εμφανίζονται σε απαλό κόκκινο φόντο είναι κλειδωμένες και δεν μποÏοÏν να Ï„ÏοποποιηθοÏν μέσω αυτής της επέκτασης. Οι Ïυθμίσεις που εμφανίζονται σε μπλε φόντο είναι οι Ï€Ïοεπιλεγμένες ενώ οι Ïυθμίσεις που εμφανίζονται σε λευκό φόντο είναι αυτές που διαφέÏουν από τις Ï€Ïοεπιλεγμένες. Και οι Ïυθμίσεις που εμφανίζονται σε μπλε φόντο και οι Ïυθμίσεις που εμφανίζονται σε λευκό φόντο μποÏοÏν να Ï„ÏοποποιηθοÏν. -Θημηθείτε να επιλέξετε **Αποθήκευση** Î±Ï†Î¿Ï ÎºÎ¬Î½ÎµÏ„Îµ τις αλλαγές που θέλετε. +Θυμηθείτε να επιλέξετε **Αποθήκευση** Î±Ï†Î¿Ï ÎºÎ¬Î½ÎµÏ„Îµ τις αλλαγές που θέλετε. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/el/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,14 +9,17 @@ * @author Christopher Smith * @author Thanos Massias * @author Αθανάσιος Îταής + * @author Konstantinos Koryllos */ $lang['menu'] = 'Ρυθμίσεις'; $lang['error'] = 'Οι Ïυθμίσεις σας δεν έγιναν δεκτές λόγω λανθασμένης τιμής κάποιας ÏÏθμισης. ΔιοÏθώστε την λάθος τιμή και Ï€Ïοσπαθήστε ξανά.
    Η λανθασμένη τιμή υποδεικνÏεται με κόκκινο πλαίσιο.'; -$lang['updated'] = 'Επιτυχής Ï„Ïοποποίση Ïυθμίσεων.'; +$lang['updated'] = 'Επιτυχής Ï„Ïοποποίηση Ïυθμίσεων.'; $lang['nochoice'] = '(δεν υπάÏχουν άλλες διαθέσιμες επιλογές)'; -$lang['locked'] = 'Το αÏχείο Ïυθμίσεων δεν μποÏεί να Ï„Ïοποποιηθεί. -
    Εάν αυτό δεν είναι επιθυμητό, διοÏθώστε τα δικαιώματα Ï€Ïόσβασης του αÏχείου Ïυθμίσεων'; +$lang['locked'] = 'Το αÏχείο Ïυθμίσεων δεν μποÏεί να Ï„Ïοποποιηθεί.
    Εάν αυτό δεν είναι επιθυμητό, διοÏθώστε τα δικαιώματα Ï€Ïόσβασης του αÏχείου Ïυθμίσεων'; +$lang['danger'] = 'Κίνδυνος: Η αλλαγή αυτής της επιλογής θα μποÏοÏσε να αποτÏέψει την Ï€Ïόσβαση στο wiki και στις Ïυθμίσεις του.'; +$lang['warning'] = 'ΠÏοσοχή: Η αλλαγή αυτής της επιλογής θα μποÏοÏσε να Ï€Ïοκαλέσει ανεπιθÏμητη συμπεÏιφοÏά.'; +$lang['security'] = 'ΠÏοσοχή: Η αλλαγή αυτής της επιλογής θα μποÏοÏσε να Ï€Ïοκαλέσει Ï€Ïοβλήματα ασφαλείας.'; $lang['_configuration_manager'] = 'Ρυθμίσεις'; $lang['_header_dokuwiki'] = 'Ρυθμίσεις DokuWiki'; $lang['_header_plugin'] = 'Ρυθμίσεις Επεκτάσεων'; @@ -45,6 +48,7 @@ $lang['start'] = 'Ονομασία αÏχικής σελίδας'; $lang['title'] = 'Τίτλος Wiki'; $lang['template'] = 'ΠÏότυπο Ï€Ïοβολής'; +$lang['license'] = 'Κάτω από ποια άδεια θέλετε να δημοσιευτεί το υλικό σας?'; $lang['fullpath'] = 'Εμφάνιση πλήÏους διαδÏομής σελίδας στην υποκεφαλίδα'; $lang['recent'] = 'ΑÏιθμός Ï€Ïόσφατων αλλαγών ανά σελίδα'; $lang['breadcrumbs'] = 'ΑÏιθμός συνδέσμων ιστοÏικοÏ'; @@ -55,40 +59,45 @@ $lang['dformat'] = 'ΜοÏφή ημεÏομηνίας (βλέπε την strftime function της PHP)'; $lang['signature'] = 'ΥπογÏαφή'; $lang['toptoclevel'] = 'Ανώτατο επίπεδο πίνακα πεÏιεχομένων σελίδας'; +$lang['tocminheads'] = 'Ελάχιστος αÏιθμός κεφαλίδων για την δημιουÏγία πίνακα πεÏιεχομένων - TOC'; $lang['maxtoclevel'] = 'Μέγιστο επίπεδο για πίνακα πεÏιεχομένων σελίδας'; $lang['maxseclevel'] = 'Μέγιστο επίπεδο για εμφάνιση της επιλογής Ï„Ïοποποίησης επιπέδου'; $lang['camelcase'] = 'ΧÏήση CamelCase στους συνδέσμους'; $lang['deaccent'] = 'ΑφαίÏεση σημείων στίξης από ονόματα σελίδων'; -$lang['useheading'] = 'ΧÏήση κεφαλίδας Ï€Ïώτου επιπέδου σαν τίτλο σθνδέσμων'; +$lang['useheading'] = 'ΧÏήση κεφαλίδας Ï€Ïώτου επιπέδου σαν τίτλο συνδέσμων'; $lang['refcheck'] = 'ΠÏιν τη διαγÏαφή ενός αÏχείου να ελέγχεται η ÏπαÏξη σελίδων που το χÏησιμοποιοÏν'; $lang['refshow'] = 'Εμφανιζόμενος αÏιθμός σελίδων που χÏησιμοποιοÏν ένα αÏχείο'; $lang['allowdebug'] = 'Δεδομένα εκσφαλμάτωσης (debug) απενεÏγοποιήστε τα εάν δεν τα έχετε ανάγκη!'; $lang['usewordblock'] = 'ΧÏήστη λίστα απαγοÏευμένων λέξεων για καταπολέμηση του spam'; -$lang['indexdelay'] = 'ΧÏόνος αναμονής Ï€ÏÏ‰Ï„Î¿Ï ÎµÏ€Î¹Ï„Î±Ï€ÎµÎ¯ σε μηχανές αναζήτησης να ευÏετηÏιάσουν μια Ï„Ïοποποιημένη σελίδα (sec)'; +$lang['indexdelay'] = 'ΧÏόνος αναμονής Ï€ÏÎ¿Ï„Î¿Ï ÎµÏ€Î¹Ï„Ïαπεί σε μηχανές αναζήτησης να ευÏετηÏιάσουν μια Ï„Ïοποποιημένη σελίδα (sec)'; $lang['relnofollow'] = 'ΧÏήση rel="nofollow"'; $lang['mailguard'] = 'Κωδικοποίηση e-mail διευθÏνσεων'; $lang['iexssprotect'] = 'Έλεγχος μεταφοÏτώσεων για πιθανώς επικίνδυνο κώδικα JavaScript ή HTML'; +$lang['showuseras'] = 'Τι να εμφανίζεται όταν φαίνεται ο χÏήστης που Ï„Ïοποποίησε τελευταίος μία σελίδα'; $lang['useacl'] = 'ΧÏήση Λίστας Δικαιωμάτων ΠÏόσβασης (ACL)'; $lang['autopasswd'] = 'Αυτόματη δημιουÏγία ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï‡Ïήστη'; $lang['authtype'] = 'ΤÏπος πιστοποίησης στοιχείων χÏήστη'; $lang['passcrypt'] = 'Μέθοδος κÏυπτογÏάφησης ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï‡Ïήστη'; $lang['defaultgroup'] = 'ΠÏοεπιλεγμένη ομάδα χÏηστών'; -$lang['superuser'] = 'ΥπεÏ-χÏήστης - μία ομάδα ή ένας χÏήστης με πλήÏη δικαιώματα Ï€Ïόσβασης σε όλες τις σελίδες και όλες τις λειτουÏγίες ανεξάÏτητα από τις Ïυθμίσης των Λιστών Δικαιωμάτων ΠÏόσβασης (ACL)'; +$lang['superuser'] = 'ΥπεÏ-χÏήστης - μία ομάδα ή ένας χÏήστης με πλήÏη δικαιώματα Ï€Ïόσβασης σε όλες τις σελίδες και όλες τις λειτουÏγίες ανεξάÏτητα από τις Ïυθμίσεις των Λιστών Δικαιωμάτων ΠÏόσβασης (ACL)'; $lang['manager'] = 'ΔιαχειÏιστής - μία ομάδα ή ένας χÏήστης με δικαιώματα Ï€Ïόσβασης σε οÏισμένες από τις λειτουÏγίες της εφαÏμογής'; $lang['profileconfirm'] = 'Îα απαιτείται ο κωδικός χÏήστη για την επιβεβαίωση αλλαγών στο Ï€Ïοφίλ χÏήστη'; $lang['disableactions'] = 'ΑπενεÏγοποίηση λειτουÏγιών DokuWiki'; $lang['disableactions_check'] = 'Έλεγχος'; $lang['disableactions_subscription'] = 'ΕγγÏαφή/ΔιαγÏαφή χÏήστη'; +$lang['disableactions_nssubscription'] = 'ΕγγÏαφή/ΔιαγÏαφή σε φάκελο'; $lang['disableactions_wikicode'] = 'ΠÏοβολή κώδικα σελίδας'; $lang['disableactions_other'] = 'Άλλες λειτουÏγίες (διαχωÏίστε τις με κόμμα)'; -$lang['sneaky_index'] = 'Εξ οÏισμοÏ, η εφαÏμογή DokuWiki δείχνει όλους τους φακέλους στην Ï€Ïοβολή Καταλόγου. - ΕνεÏγοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χÏήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαÏτήτως δικαιωμάτων Ï€Ïόσβασης.'; +$lang['sneaky_index'] = 'Εξ οÏισμοÏ, η εφαÏμογή DokuWiki δείχνει όλους τους φακέλους στην Ï€Ïοβολή Καταλόγου. ΕνεÏγοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χÏήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαÏτήτως δικαιωμάτων Ï€Ïόσβασης.'; $lang['auth_security_timeout'] = 'ΔιάÏκεια χÏόνου για ασφάλεια πιστοποίησης (δευτεÏόλεπτα)'; +$lang['securecookie'] = 'Τα cookies που έχουν οÏιστεί μέσω HTTPS Ï€Ïέπει επίσης να αποστέλλονται μόνο μέσω HTTPS από τον φυλλομετÏητή? ΑπενεÏγοποιήστε αυτή την επιλογή όταν μόνο η είσοδος στο wiki σας διασφαλίζεται μέσω SSL αλλά η πεÏιήγηση γίνεται και χωÏίς αυτό.'; +$lang['xmlrpc'] = 'ΕνεÏγοποίηση/ΑπενεÏγοποίηση της διασÏνδεσης XML-RPC '; +$lang['xmlrpcuser'] = 'ΠεÏιοÏισμός XML-RPC Ï€Ïόσβασης στις ομάδες η τους χÏήστες (διαχωÏιζόμενοι με κόμμα). Αφήστε το κενό για Ï€Ïόσβαση από όλους.'; $lang['updatecheck'] = 'Έλεγχος για ÏπαÏξη νέων εκδόσεων και ενημεÏώσεων ασφαλείας της εφαÏμογής? Απαιτείται η σÏνδεση με το splitbrain.org για να λειτουÏγήσει σωστά αυτή η επιλογή.'; $lang['userewrite'] = 'ΧÏήση ωÏαίων URLs'; $lang['useslash'] = 'ΧÏήση slash σαν διαχωÏιστικό φακέλων στα URLs'; $lang['usedraft'] = 'Αυτόματη αποθήκευση αντιγÏάφων κατά την Ï„Ïοποποίηση σελίδων'; -$lang['sepchar'] = 'ΔιαχωÏιστικός χαÏακτήÏας για κανονικοποίση ονόματος σελίδας'; +$lang['sepchar'] = 'ΔιαχωÏιστικός χαÏακτήÏας για κανονικοποίηση ονόματος σελίδας'; $lang['canonical'] = 'ΠλήÏη και κανονικοποιημένα URLs'; $lang['autoplural'] = 'ΤαίÏιασμα Ï€Î»Î·Î¸Ï…Î½Ï„Î¹ÎºÎ¿Ï ÏƒÏ„Î¿Ï…Ï‚ συνδέσμους'; $lang['compression'] = 'Μέθοδος συμπίεσης για αÏχεία attic'; @@ -96,7 +105,7 @@ $lang['locktime'] = 'Μέγιστος χÏόνος κλειδώματος αÏχείου υπό Ï„Ïοποποίηση (sec)'; $lang['fetchsize'] = 'Μέγιστο μέγεθος (σε bytes) εξωτεÏÎ¹ÎºÎ¿Ï Î±Ïχείου που επιτÏέπεται να μεταφέÏει η fetch.php'; $lang['notify'] = 'Αποστολή ενημέÏωσης για αλλαγές σε αυτή την e-mail διεÏθυνση'; -$lang['registernotify'] = 'Αποστολή ενημεÏωτικών μυνημάτων σε αυτή την e-mail διεÏθυνση κατά την εγγÏαφή νέων χÏηστών'; +$lang['registernotify'] = 'Αποστολή ενημεÏωτικών μηνυμάτων σε αυτή την e-mail διεÏθυνση κατά την εγγÏαφή νέων χÏηστών'; $lang['mailfrom'] = 'e-mail διεÏθυνση αποστολέα για μηνÏματα από την εφαÏμογή'; $lang['gzip_output'] = 'ΧÏήση gzip Content-Encoding για την xhtml'; $lang['gdlib'] = 'Έκδοση βιβλιοθήκης GD'; @@ -108,6 +117,11 @@ $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάÏχουν'; $lang['sitemap'] = 'ΔημιουÏγία Google sitemap (ημέÏες)'; $lang['broken_iua'] = 'Η συνάÏτηση ignore_user_abort δεν λειτουÏγεί σωστά στο σÏστημά σας? Σε αυτή την πεÏίπτωση μποÏεί να μην δουλεÏει σωστά η λειτουÏγία Καταλόγου. Ο συνδυασμός IIS+PHP/CGI είναι γνωστό ότι έχει τέτοιο Ï€Ïόβλημα. Δείτε και Bug 852 για λεπτομέÏειες.'; +$lang['xsendfile'] = 'ΧÏήση της κεφαλίδας X-Sendfile από τον εξυπηÏετητή κατά την φόÏτωση στατικών αÏχείων? Ο εξυπηÏετητής σας Ï€Ïέπει να υποστηÏίζει αυτή την δυνατότητα.'; +$lang['renderer_xhtml'] = 'ΠÏόγÏαμμα δημιουÏγίας βασικής (xhtml) εξόδου wiki.'; +$lang['renderer__core'] = '%s (βασικός κώδικας dokuwiki)'; +$lang['renderer__plugin'] = '%s (επέκταση)'; +$lang['rememberme'] = 'Îα επιτÏέπονται τα cookies λογαÏÎ¹ÏƒÎ¼Î¿Ï Ï‡Ïήστη αοÏίστου χÏόνου (Απομνημόνευση στοιχείων λογαÏιασμοÏ)'; $lang['rss_type'] = 'ΤÏπος XML feed'; $lang['rss_linkto'] = 'ΤÏπος συνδέσμων στο XML feed'; $lang['rss_content'] = 'Τι να εμφανίζεται στα XML feed items?'; @@ -130,15 +144,16 @@ $lang['ftp____user'] = 'Όνομα χÏήστη FTP για safemode hack'; $lang['ftp____pass'] = 'Κωδικός χÏήστη FTP για safemode hack'; $lang['ftp____root'] = 'ΑÏχικός φάκελος FTP για safemode hack'; +$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'] = 'από DokuWiki'; $lang['deaccent_o_0'] = 'όχι'; -$lang['deaccent_o_1'] = 'ΑφαίÏεση σημείων στίξης'; -$lang['deaccent_o_2'] = 'Λατινοποίηση'; +$lang['deaccent_o_1'] = 'αφαίÏεση σημείων στίξης'; +$lang['deaccent_o_2'] = 'λατινοποίηση'; $lang['gdlib_o_0'] = 'Δεν υπάÏχει βιβλιοθήκη GD στο σÏστημα'; $lang['gdlib_o_1'] = 'Έκδοση 1.x'; $lang['gdlib_o_2'] = 'Αυτόματος εντοπισμός'; @@ -158,3 +173,15 @@ $lang['compression_o_0'] = 'none'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'να μην χÏησιμοποιείται'; +$lang['xsendfile_o_1'] = 'Ιδιοταγής κεφαλίδα lighttpd (Ï€Ïιν από την έκδοση 1.5)'; +$lang['xsendfile_o_2'] = 'Τυπική κεφαλίδα X-Sendfile'; +$lang['xsendfile_o_3'] = 'Ιδιοταγής κεφαλίδα Nginx X-Accel-Redirect '; +$lang['showuseras_o_loginname'] = 'Όνομα χÏήστη'; +$lang['showuseras_o_username'] = 'Ονοματεπώνυμο χÏήστη'; +$lang['showuseras_o_email'] = 'e-mail διεÏθυνση χÏήστη (εμφανίζεται σÏμφωνα με την ÏÏθμιση για την κωδικοποίηση e-mail διευθÏνσεων)'; +$lang['showuseras_o_email_link'] = 'Εμφάνιση e-mail διεÏθυνσης χÏήστη σαν σÏνδεσμος mailto:'; +$lang['useheading_o_0'] = 'Ποτέ'; +$lang['useheading_o_navigation'] = 'Μόνο κατά την πλοήγηση'; +$lang['useheading_o_content'] = 'Μόνο για τα πεÏιεχόμενα του wiki'; +$lang['useheading_o_1'] = 'Πάντα'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/en/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/en/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/en/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/en/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -17,6 +17,10 @@ $lang['locked'] = 'The settings file can not be updated, if this is unintentional,
    ensure the local settings file name and permissions are correct.'; +$lang['danger'] = 'Danger: Changing this option could make your wiki and the configuration menu inaccessible.'; +$lang['warning'] = 'Warning: Changing this option could cause unintended behaviour.'; +$lang['security'] = 'Security Warning: Changing this option could present a security risk.'; + /* --- Config Setting Headers --- */ $lang['_configuration_manager'] = 'Configuration Manager'; //same as heading in intro.txt $lang['_header_dokuwiki'] = 'DokuWiki Settings'; @@ -103,6 +107,8 @@ $lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the index view. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces. This may make the index unusable with certain ACL setups.'; $lang['auth_security_timeout'] = 'Authentication Security Timeout (seconds)'; $lang['securecookie'] = 'Should cookies set via HTTPS only be sent via HTTPS by the browser? Disable this option when only the login of your wiki is secured with SSL but browsing the wiki is done unsecured.'; +$lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; +$lang['xmlrpcuser'] = 'Restrict XML-RPC access to the comma separated groups or users given here. Leave empty to give access to everyone.'; /* Advanced Options */ $lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact splitbrain.org for this feature.'; @@ -130,7 +136,6 @@ $lang['sitemap'] = 'Generate Google sitemap (days)'; $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.'; -$lang['xmlrpc'] = 'Enable/disable XML-RPC interface.'; $lang['renderer_xhtml'] = 'Renderer to use for main (xhtml) wiki output'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/eo/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/eo/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/eo/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/eo/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,6 +1,6 @@ ====== Administrilo de Agordoj ====== -Uzu tiun ĉi paÄon por kontroli la difinojn de via DokuWiki-a instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. +Uzu tiun ĉi paÄon por kontroli la difinojn de via DokuWiki-instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. Difinoj montrataj kun hela ruÄa fono estas protektitaj kaj ne povas esti modifataj per tiu ĉi kromaĵo. Difinoj kun blua fono estas aprioraj valoroj kaj difinoj montrataj kun blanka fono estis iam difinataj por tiu ĉi specifa instalo. AmbaÅ­ blua kaj blanka difinoj povas esti modifataj. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,29 +6,36 @@ * @author Felipe Castro * @author Felipe Castro * @author Felipo Kastro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ $lang['menu'] = 'Agordaj Difinoj'; $lang['error'] = 'La difinoj ne estas Äisdatigitaj pro malvalida valoro: kompleze reviziu viajn ÅanÄojn kaj resubmetu ilin. -
    La malkorekta(j) valoro(j) estas ĉirkaÅ­ita(j) de ruÄa randaĵo.'; +
    La malkorekta(j) valoro(j) estas ĉirkaÅ­ita(j) de ruÄa kadro.'; $lang['updated'] = 'La difinoj estis sukcese Äisdatigitaj.'; $lang['nochoice'] = '(neniu alia elekto disponeblas)'; $lang['locked'] = 'La difin-dosiero ne povas esti Äisdatigita; se tio ne estas intenca,
    certiÄu, ke la dosieroj de lokaj difinoj havas korektajn nomojn kaj permesojn.'; -$lang['_configuration_manager'] = 'Administrilo de Agordoj'; +$lang['danger'] = 'DanÄero: ÅanÄo tiun opcion povus igi vian vikion kaj la agordan menuon neatingebla.'; +$lang['warning'] = 'Averto: ÅanÄi tiun opcion povus rezulti en neatendita konduto.'; +$lang['security'] = 'Sekureca averto: ÅanÄi tiun opcion povus krei sekurecan riskon.'; +$lang['_configuration_manager'] = 'Administrilo de agordoj'; $lang['_header_dokuwiki'] = 'Difinoj por DokuWiki'; -$lang['_header_plugin'] = 'Difinoj por Kromaĵoj'; -$lang['_header_template'] = 'Difinoj por Åœablonoj'; -$lang['_header_undefined'] = 'Ceteraj Difinoj'; -$lang['_basic'] = 'Bazaj Difinoj'; -$lang['_display'] = 'Difinoj por Montrado'; -$lang['_authentication'] = 'Difinoj por IdentiÄo'; -$lang['_anti_spam'] = 'KontraÅ­-spamaj Difinoj'; -$lang['_editing'] = 'Difinoj por Redakto'; -$lang['_links'] = 'Difinoj por Ligiloj'; -$lang['_media'] = 'Difinoj por Audvidaĵoj'; -$lang['_advanced'] = 'Fakaj Difinoj'; -$lang['_network'] = 'Difinoj por Reto'; -$lang['_plugin_sufix'] = 'Difinoj por Kromaĵoj'; -$lang['_template_sufix'] = 'Difinoj por Åœablonoj'; +$lang['_header_plugin'] = 'Difinoj por kromaĵoj'; +$lang['_header_template'] = 'Difinoj por Åablonoj'; +$lang['_header_undefined'] = 'Ceteraj difinoj'; +$lang['_basic'] = 'Bazaj difinoj'; +$lang['_display'] = 'Difinoj por montrado'; +$lang['_authentication'] = 'Difinoj por identiÄo'; +$lang['_anti_spam'] = 'KontraÅ­-spamaj difinoj'; +$lang['_editing'] = 'Difinoj por redakto'; +$lang['_links'] = 'Difinoj por ligiloj'; +$lang['_media'] = 'Difinoj por aÅ­dvidaĵoj'; +$lang['_advanced'] = 'Fakaj difinoj'; +$lang['_network'] = 'Difinoj por reto'; +$lang['_plugin_sufix'] = 'Difinoj por kromaĵoj'; +$lang['_template_sufix'] = 'Difinoj por Åablonoj'; $lang['_msg_setting_undefined'] = 'Neniu difinanta metadatenaro.'; $lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.'; $lang['_msg_setting_no_default'] = 'Neniu apriora valoro.'; @@ -49,10 +56,10 @@ $lang['typography'] = 'Fari tipografiajn anstataÅ­igojn'; $lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj'; $lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj'; -$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['toptoclevel'] = 'Supera nivelo por la enhavtabelo'; -$lang['tocminheads'] = 'Minimuma kvanto da kaplinioj, kiu difinas ĉu la TOC estas kreita.'; +$lang['tocminheads'] = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreita.'; $lang['maxtoclevel'] = 'Maksimuma nivelo por la enhavtabelo'; $lang['maxseclevel'] = 'Maksimuma nivelo por redakti sekciojn'; $lang['camelcase'] = 'Uzi KamelUsklecon por ligiloj'; @@ -72,46 +79,47 @@ $lang['authtype'] = 'Tipo de identiÄo'; $lang['passcrypt'] = 'Metodo por ĉifri pasvortojn'; $lang['defaultgroup'] = 'AntaÅ­difinita grupo'; -$lang['superuser'] = 'Superanto - grupo aÅ­ uzanto, kiu plene alireblas al ĉiuj paÄoj kaj funkcioj, sendepende de la reguloj ACL'; -$lang['manager'] = 'Administranto - grupo aÅ­ uzanto, kiu havas alirpermeson al kelkaj administraj funkcioj'; +$lang['superuser'] = 'Superanto - grupo, uzanto aÅ­ listo (apartite per komoj), kiu plene alireblas al ĉiuj paÄoj kaj funkcioj, sendepende de la reguloj ACL'; +$lang['manager'] = 'Administranto - grupo, uzanto aÅ­ listo (apartite per komoj), kiu havas alirpermeson al kelkaj administraj funkcioj'; $lang['profileconfirm'] = 'Konfirmi ÅanÄojn en la trajtaro per pasvorto'; $lang['disableactions'] = 'Malebligi DokuWiki-ajn agojn'; $lang['disableactions_check'] = 'Kontroli'; $lang['disableactions_subscription'] = 'AliÄi/MalaliÄi'; -$lang['disableactions_nssubscription'] = 'AliÄi/MalaliÄi al Nomspaco'; -$lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti Krudaĵon'; +$lang['disableactions_nssubscription'] = 'AliÄi/MalaliÄi al nomspaco'; +$lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti krudaĵon'; $lang['disableactions_other'] = 'Aliaj agoj (apartite per komoj)'; -$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indica modo. Ebligi tiun ĉi elekteblon kaÅus tion, kion la uzulon ne rajtas legi laÅ­ AKL. Tio povus rezulti ankaÅ­an kaÅon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de AKL.'; -$lang['auth_security_timeout'] = 'Sekureca Templimo por AÅ­tentikigo (sekundoj)'; -$lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu sendita de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; +$lang['sneaky_index'] = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaÅus tion, kion la uzanto ne rajtas legi laÅ­ ACL. Tio povus rezulti ankaÅ­an kaÅon de alireblaj subnomspacoj. Kaj tiel la indekso estus neuzebla por kelkaj agordoj de ACL.'; +$lang['auth_security_timeout'] = 'Sekureca Templimo por aÅ­tentigo (sekundoj)'; +$lang['securecookie'] = 'Ĉu kuketoj difinitaj per HTTPS nur estu senditaj de la foliumilo per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.'; +$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; +$lang['xmlrpcuser'] = 'Permesi XML-RPC-an aliron al certaj grupoj aÅ­ uzantoj, bonvolu meti iliajn komoseparitajn nomojn tie ĉi. Alirebli de ĉiu, Äin lasu malplena.'; $lang['updatecheck'] = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti splitbrain.org por tiu ĉi trajto.'; -$lang['userewrite'] = 'Uzi malaĉajn URL-ojn'; +$lang['userewrite'] = 'Uzi netajn URL-ojn'; $lang['useslash'] = 'Uzi frakcistrekon kiel apartigsignaĵo por nomspacoj en URL-oj'; $lang['usedraft'] = 'AÅ­tomate konservi skizon dum redaktado'; $lang['sepchar'] = 'Apartigsignaĵo de vortoj en paÄnomoj'; $lang['canonical'] = 'Uzi tute evidentajn URL-ojn'; $lang['autoplural'] = 'Kontroli pluralajn formojn en ligiloj'; -$lang['compression'] = 'Kompaktigmetodo por "subtegmentaj" dosieroj'; +$lang['compression'] = 'Kompaktigmetodo por arkivaj dosieroj'; $lang['cachetime'] = 'Maksimuma aÄo por provizmemoro (sek.)'; $lang['locktime'] = 'Maksimuma aÄo por serurdosierojn (sek.)'; $lang['fetchsize'] = 'Maksimuma grandeco (bitokoj) permesita al "fetch.php" elÅuti el ekstere'; $lang['notify'] = 'Sendi avizojn pri ÅanÄoj al tiu ĉi retadreso'; $lang['registernotify'] = 'Sendi informon pri ĵus aliÄintoj al tiu ĉi retadreso'; $lang['mailfrom'] = 'Retadreso uzota por aÅ­tomataj retmesaÄoj '; -$lang['gzip_output'] = 'Uzi gzip-a Enhav-Enkodigo por XHTML'; +$lang['gzip_output'] = 'Uzi gzip-a enhav-enkodigo por XHTML'; $lang['gdlib'] = 'Versio de GD Lib'; $lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ÅanÄoj sur paÄoj'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; -$lang['hidepages'] = 'KaÅi kongruantajn paÄojn (laÅ­ ordinaraj esprimoj - "regular expressions")'; +$lang['hidepages'] = 'KaÅi kongruantajn paÄojn (laÅ­ regulaj esprimoj)'; $lang['send404'] = 'Sendi la mesaÄon "HTTP 404/Ne Trovita PaÄo" por ne ekzistantaj paÄoj'; $lang['sitemap'] = 'Krei Guglan paÄarmapon "sitemap" (po kiom tagoj)'; $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.'; $lang['xsendfile'] = 'Ĉu oni uzu la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo bezonus subteni tion.'; -$lang['xmlrpc'] = 'Ebligi/malebligi la interfacon XML-RPC.'; -$lang['renderer_xhtml'] = 'Estetiko por la ĉefa vikia rezulto (xhtml)'; -$lang['renderer__core'] = '%s (dokuwiki-a nukleo)'; +$lang['renderer_xhtml'] = 'Prezentilo por la ĉefa vikia rezulto (xhtml)'; +$lang['renderer__core'] = '%s (DokuWiki-a nukleo)'; $lang['renderer__plugin'] = '%s (kromaĵo)'; $lang['rememberme'] = 'Permesi longdaÅ­ran ensalutajn kuketojn (rememoru min)'; $lang['rss_type'] = 'XML-a tipo de novaĵ-fluo'; @@ -126,15 +134,15 @@ $lang['target____media'] = 'Parametro "target" (celo) por aÅ­dvidaĵaj ligiloj'; $lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; $lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; -$lang['proxy____port'] = 'Pordo de la "Proxy"'; -$lang['proxy____user'] = 'Uzulnomo de la "Proxy"'; -$lang['proxy____pass'] = 'Pasvorto de la "Proxy"'; +$lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; +$lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; +$lang['proxy____pass'] = 'Pasvorto ĉe la "Proxy"'; $lang['proxy____ssl'] = 'Uzi SSL por konekti al la "Proxy"'; $lang['safemodehack'] = 'Ebligi sekuran modon'; $lang['ftp____host'] = 'FTP-a servilo por sekura modo'; $lang['ftp____port'] = 'FTP-a pordo por sekura modo'; -$lang['ftp____user'] = 'FTP-a uzant-nomo por sekura modo'; -$lang['ftp____pass'] = 'FTP-a pasvonto por sekura modo'; +$lang['ftp____user'] = 'FTP-a uzantonomo por sekura modo'; +$lang['ftp____pass'] = 'FTP-a pasvorto por sekura modo'; $lang['ftp____root'] = 'FTP-a superuzanta (root) subdosierujo por sekura modo'; $lang['license_o_'] = 'Nenio elektite'; $lang['typography_o_0'] = 'nenio'; @@ -155,7 +163,7 @@ $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Resumo'; -$lang['rss_content_o_diff'] = 'UnuiÄita "Diff"'; +$lang['rss_content_o_diff'] = 'Unuigita "Diff"'; $lang['rss_content_o_htmldiff'] = '"Diff" tabelo formatita laÅ­ HTML'; $lang['rss_content_o_html'] = 'Enhavo laÅ­ kompleta HTML-paÄo'; $lang['rss_linkto_o_diff'] = 'diferenca rigardo'; @@ -166,14 +174,14 @@ $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uzi'; -$lang['xsendfile_o_1'] = 'Posedata kaplinio "lighttpd" (antaÅ­ lanĉo 1.5)'; +$lang['xsendfile_o_1'] = 'Propra kaplinio "lighttpd" (antaÅ­ lanĉo 1.5)'; $lang['xsendfile_o_2'] = 'Ordinara kaplinio X-Sendfile'; -$lang['xsendfile_o_3'] = 'Posedata kaplinio Nginx X-Accel-Redirect'; +$lang['xsendfile_o_3'] = 'Propra kaplinio Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Ensalut-nomo'; $lang['showuseras_o_username'] = 'Kompleta nomo de uzanto'; $lang['showuseras_o_email'] = 'Retadreso de uzanto (sekur-montrita laÅ­ agordo de \'mailguard\')'; $lang['showuseras_o_email_link'] = 'Retadreso de uzanto kiel ligilo \'mailto:\''; $lang['useheading_o_0'] = 'Neniam'; -$lang['useheading_o_navigation'] = 'Foliumado Nur'; -$lang['useheading_o_content'] = 'Vikia Enhavo Nur'; +$lang['useheading_o_navigation'] = 'Nur foliumado'; +$lang['useheading_o_content'] = 'Nur vikia enhavo'; $lang['useheading_o_1'] = 'Ĉiam'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,12 +11,21 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ -$lang['menu'] = 'Parámetros de Configuración'; +$lang['menu'] = 'Parámetros de configuración'; $lang['error'] = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario.
    Los valores incorrectos se mostrarán con un marco rojo alrededor.'; -$lang['updated'] = 'Los parámetros se actualizaron con exito.'; +$lang['updated'] = 'Los parámetros se actualizaron con éxito.'; $lang['nochoice'] = '(no hay otras alternativas disponibles)'; $lang['locked'] = 'El archivo de configuración no ha podido ser actualizado, si esto no es lo deseado,
    asegúrese que el nombre del archivo local de configuraciones y los permisos sean los correctos.'; +$lang['danger'] = 'Atención: Cambiar esta opción podría hacer inaccesible el wiki y su menú de configuración.'; +$lang['warning'] = 'Advertencia: Cambiar esta opción podría causar comportamientos no deseados.'; +$lang['security'] = 'Advertencia de Seguridad: Cambiar esta opción podría representar un riesgo de seguridad.'; $lang['_configuration_manager'] = 'Administrador de configuración'; $lang['_header_dokuwiki'] = 'Parámetros de DokuWiki'; $lang['_header_plugin'] = 'Parámetros de Plugin'; @@ -28,25 +37,25 @@ $lang['_anti_spam'] = 'Parámetros Anti-Spam'; $lang['_editing'] = 'Parámetros de Edición'; $lang['_links'] = 'Parámetros de Enlaces'; -$lang['_media'] = 'Parámetros de Almacenamiento'; +$lang['_media'] = 'Parámetros de Medios'; $lang['_advanced'] = 'Parámetros Avanzados'; $lang['_network'] = 'Parámetros de Red'; $lang['_plugin_sufix'] = 'Parámetros de Plugins'; $lang['_template_sufix'] = 'Parámetros de Plantillas'; $lang['_msg_setting_undefined'] = 'Sin parámetros de metadata.'; -$lang['_msg_setting_no_class'] = 'Sin Clase (class) establecida.'; +$lang['_msg_setting_no_class'] = 'Sin clase establecida.'; $lang['_msg_setting_no_default'] = 'Sin valor por defecto.'; $lang['fmode'] = 'Modo de creación de ficheros'; $lang['dmode'] = 'Modo de creación de directorios'; $lang['lang'] = 'Idioma'; -$lang['basedir'] = 'Directorio de Base'; -$lang['baseurl'] = 'URL de Base'; +$lang['basedir'] = 'Directorio de base'; +$lang['baseurl'] = 'URL de base'; $lang['savedir'] = 'Directorio para guardar los datos'; $lang['start'] = 'Nombre de la página inicial'; -$lang['title'] = 'Título del Wiki'; +$lang['title'] = 'Título del wiki'; $lang['template'] = 'Plantilla'; $lang['license'] = '¿Bajo qué licencia será liberado tu contenido?'; -$lang['fullpath'] = 'Camino (path) completo en el pié de página'; +$lang['fullpath'] = 'Mostrar ruta completa en el pie de página'; $lang['recent'] = 'Cambios recientes'; $lang['breadcrumbs'] = 'Número de pasos de traza'; $lang['youarehere'] = 'Traza jerárquica'; @@ -77,19 +86,20 @@ $lang['passcrypt'] = 'Método de cifrado de contraseñas'; $lang['defaultgroup'] = 'Grupo por defecto'; $lang['superuser'] = 'Super-usuario - grupo ó usuario con acceso total a todas las páginas y funciones, configuraciones ACL'; -$lang['manager'] = 'Manager - grupo ó usuario con acceso a ciertas tareas de mantenimiento.'; +$lang['manager'] = 'Manager - grupo o usuario con acceso a ciertas tareas de mantenimiento'; $lang['profileconfirm'] = 'Confirmar cambios en perfil con contraseña'; $lang['disableactions'] = 'Deshabilitar acciones DokuWiki'; $lang['disableactions_check'] = 'Controlar'; -$lang['disableactions_subscription'] = 'Subscribirse/Desubscribirse'; -$lang['disableactions_nssubscription'] = 'Directorio Subscribirse/Desubscribirse'; -$lang['disableactions_wikicode'] = 'Ver el fuente/Exportar en formato crudo (raw)'; +$lang['disableactions_subscription'] = 'Suscribirse/Cancelar suscripción'; +$lang['disableactions_nssubscription'] = 'Suscribirse/Cancelar suscripción (Espacio de nombres)'; +$lang['disableactions_wikicode'] = 'Ver la fuente/Exportar en formato raw'; $lang['disableactions_other'] = 'Otras acciones (separadas por coma)'; $lang['sneaky_index'] = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.'; $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad'; -$lang['securecookie'] = 'Las cookies establecidas por HTTPS, el naveagdor solo puede enviarlas por HTTPS? -Inhabilite esta opción cuando solo se asegure la entrada , pero no la navegación de su wiki.'; -$lang['updatecheck'] = 'Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que Dokuwiki se conecte a splitbrain.org.'; +$lang['securecookie'] = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.'; +$lang['xmlrpc'] = 'Habilitar/Deshabilitar interfaz XML-RPC'; +$lang['xmlrpcuser'] = 'Restringir el acceso XML-RPC a los grupos o usuarios separados por coma mencionados aquí. Dejar en blanco para dar acceso a todo el mundo. '; +$lang['updatecheck'] = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a splitbrain.org.'; $lang['userewrite'] = 'Usar URLs bonitas'; $lang['useslash'] = 'Usar barra (/) como separador de espacios de nombres en las URLs'; $lang['usedraft'] = 'Guardar automáticamente un borrador mientras se edita'; @@ -98,7 +108,7 @@ $lang['autoplural'] = 'Controlar plurales en enlaces'; $lang['compression'] = 'Método de compresión para archivos en el ático'; $lang['cachetime'] = 'Edad máxima para caché (segundos)'; -$lang['locktime'] = 'Edad máxima para archivos de lock (segundos)'; +$lang['locktime'] = 'Edad máxima para archivos de bloqueo (segundos)'; $lang['fetchsize'] = 'Tamaño máximo (bytes) que fetch.php puede descargar de sitios externos'; $lang['notify'] = 'Enviar notificación de cambios a esta dirección de correo electrónico'; $lang['registernotify'] = 'Enviar información cuando se registran nuevos usuarios a esta dirección de correo electrónico'; @@ -112,12 +122,11 @@ $lang['hidepages'] = 'Ocultar páginas con coincidencias (expresiones regulares)'; $lang['send404'] = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes'; $lang['sitemap'] = 'Generar sitemap de Google (días)'; -$lang['broken_iua'] = '¿Se ha roto su sistema a causa de la función ignore_user_abort?. Esto puede causar que no funcione el index de búsqueda. Leer el Bug 852para más información.'; +$lang['broken_iua'] = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea Bug 852para más información.'; $lang['xsendfile'] = 'Utilice el X-Sendfile header para permitirle sl servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.'; -$lang['xmlrpc'] = 'Habilitar/Deshabilitar interfase XML-RPC'; $lang['renderer_xhtml'] = 'Visualizador a usar para salida (xhtml) principal del wiki'; -$lang['renderer__core'] = '%s (nucleo dokuwiki)'; -$lang['renderer__plugin'] = '%s (complemento)'; +$lang['renderer__core'] = '%s (núcleo dokuwiki)'; +$lang['renderer__plugin'] = '%s (plugin)'; $lang['rememberme'] = 'Permitir cookies para acceso permanente (recordarme)'; $lang['rss_type'] = 'Tipo de resumen (feed) XML'; $lang['rss_linkto'] = 'Feed XML enlaza a'; @@ -138,9 +147,9 @@ $lang['safemodehack'] = 'Habilitar edición (hack) de modo seguro'; $lang['ftp____host'] = 'Nombre del servidor FTP para modo seguro'; $lang['ftp____port'] = 'Puerto del servidor FTP para modo seguro'; -$lang['ftp____user'] = 'Nombre de usuario para el servidor FTP para modo seguro'; -$lang['ftp____pass'] = 'Contraseña para el servidor FTP para modo seguro'; -$lang['ftp____root'] = 'Directorio raiz para el servidor FTP para modo seguro'; +$lang['ftp____user'] = 'Nombre de usuario para el servidor FTP para modo seguro'; +$lang['ftp____pass'] = 'Contraseña para el servidor FTP para modo seguro'; +$lang['ftp____root'] = 'Directorio raiz para el servidor FTP para modo seguro'; $lang['license_o_'] = 'No se eligió ninguna'; $lang['typography_o_0'] = 'ninguno'; $lang['typography_o_1'] = 'Dobles comillas solamente'; @@ -148,9 +157,9 @@ $lang['userewrite_o_0'] = 'ninguno'; $lang['userewrite_o_1'] = '.htaccess'; $lang['userewrite_o_2'] = 'Interno de DokuWiki'; -$lang['deaccent_o_0'] = 'Apagado'; -$lang['deaccent_o_1'] = 'Eliminar tildes'; -$lang['deaccent_o_2'] = 'Romanizar'; +$lang['deaccent_o_0'] = 'apagado'; +$lang['deaccent_o_1'] = 'eliminar tildes'; +$lang['deaccent_o_2'] = 'romanizar'; $lang['gdlib_o_0'] = 'GD Lib no está disponible'; $lang['gdlib_o_1'] = 'Versión 1.x'; $lang['gdlib_o_2'] = 'Autodetección'; @@ -167,18 +176,18 @@ $lang['rss_linkto_o_page'] = 'la página revisada'; $lang['rss_linkto_o_rev'] = 'lista de revisiones'; $lang['rss_linkto_o_current'] = 'la página actual'; -$lang['compression_o_0'] = 'Ninguna'; +$lang['compression_o_0'] = 'ninguna'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; -$lang['xsendfile_o_0'] = 'No utiliazar'; +$lang['xsendfile_o_0'] = 'no utilizar'; $lang['xsendfile_o_1'] = 'Encabezado propietario de lighttpd (antes de la versión 1.5)'; $lang['xsendfile_o_2'] = 'Encabezado X-Sendfile estándar'; $lang['xsendfile_o_3'] = 'Encabezado propietario Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Nombre de entrada'; $lang['showuseras_o_username'] = 'Nombre completo del usuario'; -$lang['showuseras_o_email'] = 'Dirección de correo electrónico del usuario (Ofuscada según la configuración de "mailguard")'; +$lang['showuseras_o_email'] = 'Dirección de correo electrónico del usuario (ofuscada según la configuración de "mailguard")'; $lang['showuseras_o_email_link'] = 'Dirección de correo de usuario como enlace de envío de correo'; $lang['useheading_o_0'] = 'Nunca'; -$lang['useheading_o_navigation'] = 'Solamente Navegacion'; -$lang['useheading_o_content'] = 'Contenido Wiki solamente'; +$lang['useheading_o_navigation'] = 'Solamente Navegación'; +$lang['useheading_o_content'] = 'Contenido wiki solamente'; $lang['useheading_o_1'] = 'Siempre'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/eu/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/eu/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/eu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/eu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,9 @@ $lang['nochoice'] = '(ez dago beste aukerarik)'; $lang['locked'] = 'Ezarpenen fitxategia ezin da eguneratu, eta intentzioa hau ez bada,
    ziurtatu ezarpen lokalen izena eta baimenak zuzenak direla.'; +$lang['danger'] = 'Kontuz: Aukera hau aldatzeak zure wikia eta konfigurazio menua eskuraezin utzi dezake.'; +$lang['warning'] = 'Oharra: Aukera hau aldatzeak ustekabeko portaera bat sortu dezake.'; +$lang['security'] = 'Segurtasun Oharra: Aukera hau aldatzeak segurtasun arrisku bat sortu dezake.'; $lang['_configuration_manager'] = 'Konfigurazio Kudeatzailea'; $lang['_header_dokuwiki'] = 'DokuWiki Ezarpenak'; $lang['_header_plugin'] = 'Plugin Ezarpenak'; @@ -81,6 +84,8 @@ $lang['sneaky_index'] = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.'; $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)'; $lang['securecookie'] = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. '; +$lang['xmlrpc'] = 'Gaitu/ezgaitu XML-RPC interfazea.'; +$lang['xmlrpcuser'] = 'XML-RPC atzipena mugatu hemen emandako komaz bereiztutako talde eta erabiltzaileei. Utzi hutsik atzipena guztiei emateko.'; $lang['updatecheck'] = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako splitbrain.org kontaktatu behar du.'; $lang['userewrite'] = 'Erabili URL politak'; $lang['useslash'] = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan'; @@ -106,7 +111,6 @@ $lang['sitemap'] = 'Sortu Google gune-mapa (egunak)'; $lang['broken_iua'] = 'Zure sisteman ignore_user_abort (erabiltzailearen bertan behera uztea kontuan ez hartu) funtzioa hautsia al dago? Honek funtzionatzen ez duen bilaketa indize bat eragin dezake. ISS+PHP/CGI hautsiak daude. Ikusi Bug 852 informazio gehiago jasotzeko.'; $lang['xsendfile'] = 'X-Sendfile goiburua erabili web zerbitzariari fitxategi estatikoak bidaltzen uzteko? Zure web zerbitzariak hau ahalbidetuta eduki beharko du.'; -$lang['xmlrpc'] = 'Gaitu/ezgaitu XML-RPC interfazea.'; $lang['renderer_xhtml'] = 'Erabiliko den errenderizatzailea wiki irteera (xhtml) nagusiarentzat'; $lang['renderer__core'] = '%s (dokuwiki-ren nukleoa)'; $lang['renderer__plugin'] = '%s (plugina)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/fa/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/fa/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/fa/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/fa/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,8 @@ +====== تنظیمات پیکربندی ====== + +از این صÙحه برای مدیریت تنظیمات DokuWiki استÙاده کنید. برای راهنمایی بیش‌تر به [[doku>config]] مراجعه نماید. +برای جزییات در مورد این اÙزونه نیز می‌توانید به [[doku>plugin:config]] مراجعه کنید. + +تنظیماتی Ú©Ù‡ با پیش‌زمینه‌ی قرمز مشخص شده‌اند، غیرقابل تغییر می‌باشند. تنظیماتی Ú©Ù‡ به پیش‌زمینه‌ی آبی مشخص شده‌اند نیز حامل مقادیر پیش‌Ùرض می‌باشند Ùˆ تنظیماتی Ú©Ù‡ پیش‌زمینه‌ی سÙید دارند به طور محلی برای این سیستم تنظیم شده‌اند. تمامی مقادیر آبی Ùˆ سÙید قابلیت تغییر دارند. + +به یاد داشته باشید Ú©Ù‡ قبل از ترک صÙحه، دکمه‌ی **ذخیره** را بÙشارید، در غیر این صورت تنظیمات شما از بین خواهد رÙت. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,12 +6,16 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['menu'] = 'تنظیمات پیکر‌بندی'; $lang['error'] = 'به دلیل ایراد در مقادیر وارد شده، تنظیمات اعمال نشد، خواهشمندیم تغییرات را مجددن کنترل نمایید Ùˆ دوباره ارسال کنید.
    مقادیر مشکل‌دار با کادر قرمز مشخص شده‌اند.'; $lang['updated'] = 'تنظیمات با موÙقیت به روز رسانی شد.'; $lang['nochoice'] = '(گزینه‌های دیگری موجود نیست)'; $lang['locked'] = 'تنظیمات قابلیت به روز رسانی ندارند، اگر نباید چنین باشد،
    نام Ùایل تنظیمات Ùˆ دسترسی‌های آن را بررسی کنید.'; +$lang['danger'] = 'خطر: ممکن است با تغییر این گزینه دسترسی به منوی تنظیمات قطع شود.'; +$lang['warning'] = 'هشدار: ممکن است با تغییر این گزینه رÙتارهای غیرمترقبه‌ای مشاهده کنید.'; +$lang['security'] = 'هشدار امنیتی: تغییر این گزینه ممکن است با خطرات امنیتی همراه باشد.'; $lang['_configuration_manager'] = 'مدیریت تنظیمات'; $lang['_header_dokuwiki'] = 'تنظیمات DokuWiki'; $lang['_header_plugin'] = 'تنظیمات اÙزونه'; @@ -29,6 +33,7 @@ $lang['_plugin_sufix'] = 'تنظیمات اÙزونه'; $lang['_template_sufix'] = 'تنظیمات قالب'; $lang['_msg_setting_undefined'] = 'داده‌نمایی برای تنظیمات وجود ندارد'; +$lang['_msg_setting_no_class'] = 'هیچ دسته‌ای برای تنظیمات وجود ندارد.'; $lang['_msg_setting_no_default'] = 'بدون مقدار پیش‌Ùرض'; $lang['fmode'] = 'دسترسی پیش‌Ùرض Ùایل‌ها در زمان ایجاد'; $lang['dmode'] = 'زبان'; @@ -44,6 +49,7 @@ $lang['recent'] = 'تغییرات اخیر'; $lang['breadcrumbs'] = 'تعداد ردپاها'; $lang['youarehere'] = 'ردپای درختی'; +$lang['typography'] = 'جای‌گزاری متن‌ها انجام شود'; $lang['htmlok'] = 'امکان اÙزودن HTML باشد'; $lang['phpok'] = 'امکان اÙزودن PHP باشد'; $lang['dformat'] = 'Ùرمت تاریخ (راهنمای تابع strftime را مشاهده کنید)'; @@ -51,28 +57,46 @@ $lang['toptoclevel'] = 'بیشترین عمق برای «Ùهرست مطالب»'; $lang['tocminheads'] = 'حداقل مقدار عنوان‌های یک صÙحه، برای تشخیص این‌که «Ùهرست مطالب» (TOC) ایجاد شود'; $lang['maxtoclevel'] = 'حداکثر عمق «Ùهرست مطالب»'; +$lang['maxseclevel'] = 'بیش‌ترین سطح ویرایش بخش‌ها'; $lang['camelcase'] = 'از «حالت شتری» (CamelCase) برای پیوندها استÙاده شود'; $lang['deaccent'] = 'تمیز کردن نام صÙحات'; $lang['useheading'] = 'استÙاده از اولین عنوان برای نام صÙحه'; +$lang['refcheck'] = 'بررسی کردن مرجع رسانه‌ها'; +$lang['refshow'] = 'تعداد مراجعی Ú©Ù‡ برای یک رسانه نمایش داده شود'; $lang['allowdebug'] = 'امکان کرم‌زدایی (debug) اگر نیازی ندارید، غیرÙعال کنید'; +$lang['usewordblock'] = 'اسپم‌ها را براساس لیست کلمات مسدود Ú©Ù†'; +$lang['indexdelay'] = 'مقدار تاخیر پیش از Ùهرست‌بندی (ثانیه)'; $lang['relnofollow'] = 'از «rel=nofollow» در پیوندهای خروجی استÙاده شود'; $lang['mailguard'] = 'مبهم کردن آدرس‌های ایمیل'; $lang['iexssprotect'] = 'بررسی کردن Ùایل‌های ارسال شده را برای کدهای HTML یا JavaScript مخرب'; +$lang['showuseras'] = 'چگونه آخرین کاربر ویرایش کننده، یک صÙحه نمایش داده شود'; $lang['useacl'] = 'استÙاده از مدیریت دسترسی‌ها'; $lang['autopasswd'] = 'ایجاد خودکار گذرواژه‌ها'; $lang['authtype'] = 'روش معتبرسازی'; $lang['passcrypt'] = 'روش کد کردن گذرواژه'; $lang['defaultgroup'] = 'گروه پیش‌Ùرض'; +$lang['superuser'] = 'کاربر اصلی - گروه، کاربر یا لیستی Ú©Ù‡ توسط ویرگول جدا شده از کاربرها Ùˆ گروه‌ها (مثل user1,@group1,user2) با دسترسی کامل به همه‌ی صÙحات Ùˆ امکانات سیستم، Ùارغ از دسترسی‌های آن کاربر.'; +$lang['manager'] = 'مدیر - گروه، کاربر یا لیستی Ú©Ù‡ توسط ویرگول جدا شده از کاربرها Ùˆ گروه‌ها (مثل user1,@group1,user2) با دسترسی‌های خاص به بخش‌های متÙاوت'; +$lang['profileconfirm'] = 'تغییرات پروÙایل با وارد کردن گذرواژه تایید شود'; $lang['disableactions'] = 'غیرÙعال کردن Ùعالیت‌های DokuWiki'; $lang['disableactions_check'] = 'بررسی'; $lang['disableactions_subscription'] = 'عضویت/عدم عضویت'; $lang['disableactions_nssubscription'] = 'عضویت/عدم عضویت Ùضای‌نام'; +$lang['disableactions_wikicode'] = 'نمایش سورس/برون‌بری خام'; $lang['disableactions_other'] = 'Ùعالیت‌های دیگر (با ویرگول انگلیسی «,» از هم جدا کنید)'; +$lang['sneaky_index'] = 'به طور پیش‌Ùرض، DokuWiki در Ùهرست تمامی Ùضای‌نام‌ها را نمایش می‌دهد. Ùعال کردن این گزینه، مواردی را Ú©Ù‡ کاربر حق خواندنشان را ندارد مخÙÛŒ می‌کند. این گزینه ممکن است باعث دیده نشدن زیرÙضای‌نام‌هایی شود Ú©Ù‡ دسترسی خواندن به آن‌ها وجود دارد. Ùˆ ممکن است باعث شود Ú©Ù‡ Ùهرست در حالاتی از دسترسی‌ها، غیرقابل استÙاده شود.'; $lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه'; +$lang['securecookie'] = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی Ú©Ù‡ Ùقط صÙحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرÙعال نمایید.'; +$lang['xmlrpc'] = 'Ùعال/غیرÙعال کردن XML-RPC'; +$lang['xmlrpcuser'] = 'محمدود کردن دسترسی به XML-RPC توسط گروه های جدا شده توسط ویرگول ویا اعضای داده شده در اینجا. این مکان را خالی بگزارید تا به همه دسترسی داده شود.'; +$lang['updatecheck'] = 'هشدارهای به روز رسانی Ùˆ امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور splitbrain.org تماس خواهد گرÙت.'; $lang['userewrite'] = 'از زیباکننده‌ی آدرس‌ها استÙاده شود'; $lang['useslash'] = 'از اسلش «/» برای جداکننده‌ی آدرس Ùضای‌نام‌ها استÙاده شود'; $lang['usedraft'] = 'ایجاد خودکار چرک‌نویس در زمان نگارش'; $lang['sepchar'] = 'کلمه‌ی جداکننده‌ی نام صÙحات'; +$lang['canonical'] = 'استÙاده از آدرس‌های استاندارد'; +$lang['autoplural'] = 'بررسی جمع بودن در پیوندها'; +$lang['compression'] = 'روش Ùشرده‌سازی برای Ùایل‌های Ø®Ùرد'; $lang['cachetime'] = 'بیشینه‌ی زمان حاÙظه‌ی موقت (cache) به ثانیه'; $lang['locktime'] = 'بیشینه‌ی زمان Ù‚ÙÙ„ شدن Ùایل‌ها به ثانیه'; $lang['fetchsize'] = 'بیشینه‌ی حجمی Ú©Ù‡ Ùایل fetch.php می‌تواند دریاÙت کند (به بایت)'; @@ -87,7 +111,9 @@ $lang['compress'] = 'Ùشرده‌سازی کد‌های CSS Ùˆ JavaScript'; $lang['hidepages'] = 'مخÙÛŒ کردن صÙحات با Ùرمت زیر (از عبارات منظم استÙاده شود)'; $lang['send404'] = 'ارسال «HTTP 404/Page Not Found» برای صÙحاتی Ú©Ù‡ وجود ندارند'; -$lang['xmlrpc'] = 'Ùعال/غیرÙعال کردن XML-RPC'; +$lang['sitemap'] = 'تولید کردن نقشه‌ی سایت توسط Ú¯ÙˆÚ¯Ù„ (روز)'; +$lang['broken_iua'] = 'آیا تابع ignore_user_about در ویکی شما کار نمی‌کند؟ ممکن است Ùهرست جستجوی شما کار نکند. IIS به همراه PHP/CGI باعث خراب شدن این گزینه می‌شود. برای اطلاعات بیشتر باگ Û¸ÛµÛ² را مشاهده کنید.'; +$lang['xsendfile'] = 'استÙاده از هدر X-SendfileØŒ تا به وب‌سرور توانایی ارسال Ùایل‌های ثابت را بدهد. وب‌سرور شما باید این مورد را پشتیبانی کند.'; $lang['renderer_xhtml'] = 'Ù…Ùسری Ú©Ù‡ برای خروجی اصلی ویکی استÙاده شود'; $lang['renderer__core'] = '%s (هسته‌ی dokuwiki)'; $lang['renderer__plugin'] = '%s (اÙزونه)'; @@ -108,6 +134,12 @@ $lang['proxy____user'] = 'نام کاربری پروکسی'; $lang['proxy____pass'] = 'گذرواژهي پروکسی'; $lang['proxy____ssl'] = 'استÙاده از SSL برای اتصال به پروکسی'; +$lang['safemodehack'] = 'Ùعال کردن safemode hack'; +$lang['ftp____host'] = 'آدرس FTP برای safemode hack'; +$lang['ftp____port'] = 'پورت FTP برای safemode hack'; +$lang['ftp____user'] = 'نام کاربری FTP برای safemode hack'; +$lang['ftp____pass'] = 'گذرواژه‌ی FTP برای safemode hack'; +$lang['ftp____root'] = 'شاخه‌ی FTP برای safemode hack'; $lang['license_o_'] = 'هیچ کدام'; $lang['typography_o_0'] = 'هیچ'; $lang['typography_o_1'] = 'حذ٠کردن single-quote'; @@ -126,6 +158,11 @@ $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'] = 'یکی کردن تÙاوت‌ها'; +$lang['rss_content_o_htmldiff'] = 'جدول تÙاوت‌ها با ساختار HTML'; +$lang['rss_content_o_html'] = 'تمامی محتویات صÙحه، با ساختار HTML'; +$lang['rss_linkto_o_diff'] = 'نمایه‌های متÙاوت'; $lang['rss_linkto_o_page'] = 'صÙحه‌ی تجدید نظر شده'; $lang['rss_linkto_o_rev'] = 'لیست نگارش‌ها'; $lang['rss_linkto_o_current'] = 'صÙحه‌ی کنونی'; @@ -133,6 +170,9 @@ $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'استÙاده نکنید'; +$lang['xsendfile_o_1'] = 'هدر اختصاصی lighttpd (پیش از نگارش Û±.Ûµ)'; +$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_email'] = 'آدرس ایمیل کاربران (با تنظیمات «نگهبان ایمیل» مبهم می‌شود)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/fi/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/fi/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/fi/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/fi/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ ====== Asetusten hallinta ====== -Käytä tätä sivua hallitaksesi DokuWikisi asetuksia. Apua yksittäisiin asetuksiin löytyy sivulta [[doku>config]]. Lisätietoa tästä liitännäisestä katso [[doku>plugin:config]]. +Käytä tätä sivua hallitaksesi DokuWikisi asetuksia. Apua yksittäisiin asetuksiin löytyy sivulta [[doku>config]]. Lisätietoa tästä liitännäisestä löytyy sivulta [[doku>plugin:config]]. -Asetukset, jotka näkyvät vaalealla punaisella taustalla ovat suojattuja, eikä niitä voi muutta tämän liitännäisen avulla. Asetukset, jotka näkyvät sinisellä taustalla ovat oletusasetuksia ja asetukset valkoisella taustalla on asetettu paikallisesti tätä asennusta varten. Sekä sinisiä, että valkoisia asetuksia voi muokata. +Asetukset, jotka näkyvät vaaleanpunaisella taustalla ovat suojattuja, eikä niitä voi muutta tämän liitännäisen avulla. Asetukset, jotka näkyvät sinisellä taustalla ovat oletusasetuksia. Asetukset valkoisella taustalla ovat asetettu paikallisesti tätä asennusta varten. Sekä sinisiä että valkoisia asetuksia voi muokata. -Muista painaa **TALLENNA** nappia ennen, kuin poistut sivulta. Muuten muutoksesi häviävät. \ Brak znaku nowej linii na koÅ„cu pliku +Muista painaa **TALLENNA**-nappia ennen kuin poistut sivulta. Muuten muutoksesi häviävät. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,14 +4,18 @@ * * @author otto@valjakko.net * @author Otto Vainio + * @author Teemu Mattila */ $lang['menu'] = 'Asetukset'; $lang['error'] = 'Asetuksia ei päivitetty väärän arvon vuoksi. Tarkista muutokset ja lähetä sivu uudestaan.
    Väärät arvot on merkitty punaisella reunuksella.'; $lang['updated'] = 'Asetukset päivitetty onnistuneesti.'; $lang['nochoice'] = '(ei muita valintoja saatavilla)'; -$lang['locked'] = 'Asetustiedosta ei voi päivittää. Jos tämä ei ole tarkoitus,
    +$lang['locked'] = 'Asetustiedosta ei voi päivittää. Jos tämä ei ole tarkoitus
    niin varmista, että paikallisten asetusten tiedoston nimi ja oikeudet ovat kunnossa.'; +$lang['danger'] = 'Vaara: tämän asetuksen muuttaminen saattaa estää wikisi ja asetusvalikon toimimisen.'; +$lang['warning'] = 'Varoitus: tämän asetuksen muuttaminen saattaa aiheuttaa olettamattomia toimintoja.'; +$lang['security'] = 'Turvallisuusvaroitus: tämän asetuksen muuttaminen saattaa aiheuttaa tietoturva-aukon.'; $lang['_configuration_manager'] = 'Asetusten hallinta'; $lang['_header_dokuwiki'] = 'DokuWikin asetukset'; $lang['_header_plugin'] = 'Liitännäisten asetukset'; @@ -26,7 +30,7 @@ $lang['_media'] = 'Media-asetukset'; $lang['_advanced'] = 'Lisäasetukset'; $lang['_network'] = 'Verkkoasetukset'; -$lang['_plugin_sufix'] = 'Liitännäisten asetukset'; +$lang['_plugin_sufix'] = 'liitännäisen asetukset'; $lang['_template_sufix'] = 'Sivumallin asetukset'; $lang['_msg_setting_undefined'] = 'Ei asetusten metadataa.'; $lang['_msg_setting_no_class'] = 'Ei asetusluokkaa.'; @@ -34,7 +38,7 @@ $lang['fmode'] = 'Tiedoston luontioikeudet'; $lang['dmode'] = 'Hakemiston luontioikeudet'; $lang['lang'] = 'Kieli'; -$lang['basedir'] = 'Peruhakemisto'; +$lang['basedir'] = 'Perushakemisto'; $lang['baseurl'] = 'Perus URL'; $lang['savedir'] = 'Hakemisto tietojen tallennukseen.'; $lang['start'] = 'Alkusivun nimi'; @@ -57,8 +61,8 @@ $lang['camelcase'] = 'Käytä CamelCase linkkejä'; $lang['deaccent'] = 'Siivoa sivun nimet'; $lang['useheading'] = 'Käytä ensimmäistä otsikkoriviä sivun nimenä.'; -$lang['refcheck'] = 'Median viitteen tarkistus'; -$lang['refshow'] = 'Montako media viitettä näytetään'; +$lang['refcheck'] = 'Mediaviitteen tarkistus'; +$lang['refshow'] = 'Montako mediaviitettä näytetään'; $lang['allowdebug'] = 'Salli debuggaus pois, jos ei tarvita!'; $lang['usewordblock'] = 'Estä spam sanalistan avulla'; $lang['indexdelay'] = 'Aikaraja indeksoinnille (sek)'; @@ -74,43 +78,44 @@ $lang['superuser'] = 'Pääkäyttäjä. Ryhmä tai käyttäjä, jolla on täysi oikeus kaikkiin sivuihin ja toimintoihin käyttöoikeuksista huolimatta'; $lang['manager'] = 'Ylläpitäjä. Ryhmä tai käyttäjä, jolla on pääsy joihinkin ylläpitotoimintoihin'; $lang['profileconfirm'] = 'Vahvista profiilin päivitys salasanan avulla'; -$lang['disableactions'] = 'Estä DokuWiki toimintojen käyttö'; +$lang['disableactions'] = 'Estä DokuWiki-toimintojen käyttö'; $lang['disableactions_check'] = 'Tarkista'; $lang['disableactions_subscription'] = 'Tilaa/Peruuta tilaus'; $lang['disableactions_nssubscription'] = 'Nimiavaruuden tilaus/tilauksen poisto'; $lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana'; $lang['disableactions_other'] = 'Muut toiminnot (pilkulla erotettuna)'; -$lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja ali-nimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; +$lang['sneaky_index'] = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla'; $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)'; -$lang['securecookie'] = 'Lähetetäänkö HTTPS kautta asetetut cookies tiedot HTTPS yhdeydellä? Kytke pois, jos vain kirjautuminen wikisi on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.'; +$lang['securecookie'] = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhdeydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.'; +$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää'; +$lang['xmlrpcuser'] = 'Estä XML-RPC:n käyttö pilkulla erotetun listan ryhmille tai käyttäjille. Jätä tyhjäksi salliaksesi käyttö kaikille.'; $lang['updatecheck'] = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys splitbrain.orgiin.'; $lang['userewrite'] = 'Käytä siivottuja URLeja'; $lang['useslash'] = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa'; -$lang['usedraft'] = 'Automaattisesti tallenna vedos muokkaustilassa'; +$lang['usedraft'] = 'Tallenna vedos muokkaustilassa automaattisesti '; $lang['sepchar'] = 'Sivunimen sanaerotin'; -$lang['canonical'] = 'Käytä "Canonical URL"'; +$lang['canonical'] = 'Käytä kanonisoituja URLeja'; $lang['autoplural'] = 'Etsi monikkomuotoja linkeistä'; -$lang['compression'] = 'Attic tiedostojen pakkausmenetelmä'; +$lang['compression'] = 'Attic-tiedostojen pakkausmenetelmä'; $lang['cachetime'] = 'Välimuisti-tiedostojen maksimi-ikä (sek)'; $lang['locktime'] = 'Lukitustiedostojen maksimi-ikä (sek)'; $lang['fetchsize'] = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä'; -$lang['notify'] = 'Lähetä muutos ilmoitukset tähän osoitteeseen'; +$lang['notify'] = 'Lähetä muutosilmoitukset tähän osoitteeseen'; $lang['registernotify'] = 'Lähetä ilmoitus uusista rekisteröitymisistä tähän osoitteeseen'; $lang['mailfrom'] = 'Sähköpostiosoite automaattisia postituksia varten'; -$lang['gzip_output'] = 'Käytä gzip "Content.Encoding" tapaa xhtml varten'; +$lang['gzip_output'] = 'Käytä gzip "Content-Encoding"-otsaketta xhtml-tiedostojen lähettämiseen'; $lang['gdlib'] = 'GD Lib versio'; -$lang['im_convert'] = 'ImageMagick muunnostyökalun polku'; -$lang['jpg_quality'] = 'JPG pakkauslaatu'; +$lang['im_convert'] = 'ImageMagick-muunnostyökalun polku'; +$lang['jpg_quality'] = 'JPG pakkauslaatu (0-100)'; $lang['subscribers'] = 'Salli tuki sivujen tilaamiselle'; $lang['compress'] = 'Pakkaa CSS ja javascript'; $lang['hidepages'] = 'Piilota seuraavat sivut (säännönmukainen lauseke)'; $lang['send404'] = 'Lähetä "HTTP 404/Page Not Found" puuttuvista sivuista'; $lang['sitemap'] = 'Luo Google sitemap (päiviä)'; -$lang['broken_iua'] = 'Onko "ignore_user_abort" toiminto rikki systeemissäsi. Tämä voi aiheuttaa toimimattoman index-näkymän. +$lang['broken_iua'] = 'Onko "ignore_user_abort" toiminto rikki järjestelmässäsi? Tämä voi aiheuttaa toimimattoman index-näkymän. IIS+PHP/CGI on tunnetusti rikki. Katso Bug 852 lisätietoja varten.'; $lang['xsendfile'] = 'Käytä X-Sendfile otsikkoa, kun web-palvelin lähettää staattisia tiedostoja? Palvelimesi pitää tukea tätä.'; -$lang['xmlrpc'] = 'Käytä/poista XML-RPC liityntää'; -$lang['renderer_xhtml'] = 'Renderöinti, jota käytetään wikin pääasialliseen (xhtml) outputtiin'; +$lang['renderer_xhtml'] = 'Renderöinti, jota käytetään wikin pääasialliseen (xhtml) tulostukseen'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (liitännäinen)'; $lang['rememberme'] = 'Salli pysyvät kirjautumis-cookiet (muista minut)'; @@ -138,7 +143,7 @@ $lang['ftp____root'] = 'FTP-juurihakemisto safemode kiertoa varten'; $lang['license_o_'] = 'ei mitään valittuna'; $lang['typography_o_0'] = 'ei mitään'; -$lang['typography_o_1'] = 'paitsi yksinkertaiset lainausmerkit'; +$lang['typography_o_1'] = 'ilman yksinkertaisia lainausmerkkejä'; $lang['typography_o_2'] = 'myös yksinkertaiset lainausmerkit (ei aina toimi)'; $lang['userewrite_o_0'] = 'ei mitään'; $lang['userewrite_o_1'] = '.htaccess'; @@ -156,7 +161,7 @@ $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Yhteenveto'; $lang['rss_content_o_diff'] = 'Yhdistetty erot'; -$lang['rss_content_o_htmldiff'] = 'HTML muotoiltu erot lista'; +$lang['rss_content_o_htmldiff'] = 'HTML-muotoiltu eroavuuslista'; $lang['rss_content_o_html'] = 'Täysi HTML-sivu'; $lang['rss_linkto_o_diff'] = 'erot-näkymä'; $lang['rss_linkto_o_page'] = 'muutettu sivu'; @@ -171,9 +176,9 @@ $lang['xsendfile_o_3'] = 'Oma Nginx X-Accel-Redirect header'; $lang['showuseras_o_loginname'] = 'Kirjautumisnimi'; $lang['showuseras_o_username'] = 'Käyttäjän koko nimi'; -$lang['showuseras_o_email'] = 'Käyttäjän sähköpostiosoite. (sumennettu mailguard asetusten mukaisesti)'; +$lang['showuseras_o_email'] = 'Käyttäjän sähköpostiosoite (sumennettu mailguard-asetusten mukaisesti)'; $lang['showuseras_o_email_link'] = 'Käyttäjän sähköpostiosoite mailto: linkkinä'; $lang['useheading_o_0'] = 'Ei koskaan'; $lang['useheading_o_navigation'] = 'Vain Navigointi'; -$lang['useheading_o_content'] = 'Vain Wiki Sisältö'; +$lang['useheading_o_content'] = 'Vain Wiki-sisältö'; $lang['useheading_o_1'] = 'Aina'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,12 +9,18 @@ * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ $lang['menu'] = 'Paramètres de configuration'; $lang['error'] = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez.
    La valeur(s) erronée(s) est entourée d\'une bordure rouge.'; $lang['updated'] = 'Paramètres mis à jour avec succès.'; $lang['nochoice'] = '(aucun autre choix possible)'; $lang['locked'] = 'Le fichier des paramètres ne peut être modifié, si ceci n\'est pas intentionnel,
    vérifiez que le nom et les droits du fichier sont corrects.'; +$lang['danger'] = 'Danger : Modifier cette option pourrait rendre inaccessible votre wiki et son menu de configuration.'; +$lang['warning'] = 'Attention : Modifier cette option pourrait engendrer un comportement indésirable.'; +$lang['security'] = 'Avertissement de sécurité : Modifier cette option pourrait induire un risque de sécurité.'; $lang['_configuration_manager'] = 'Gestionnaire de configuration'; $lang['_header_dokuwiki'] = 'Paramètres DokuWiki'; $lang['_header_plugin'] = 'Paramètres plugin'; @@ -30,7 +36,7 @@ $lang['_advanced'] = 'Paramètres avancés'; $lang['_network'] = 'Paramètres réseaux'; $lang['_plugin_sufix'] = 'Paramètres plugin'; -$lang['_template_sufix'] = 'Paramètres template'; +$lang['_template_sufix'] = 'Paramètres de modèle'; $lang['_msg_setting_undefined'] = 'Pas de métadonnée de paramètres.'; $lang['_msg_setting_no_class'] = 'Pas de classe de paramètres.'; $lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.'; @@ -42,7 +48,7 @@ $lang['savedir'] = 'Répertoire de stockage'; $lang['start'] = 'Nom de la page d\'accueil'; $lang['title'] = 'Titre du wiki'; -$lang['template'] = 'Template'; +$lang['template'] = 'Modèle'; $lang['license'] = 'Sous quelle licence doit être placée votre contribution ?'; $lang['fullpath'] = 'Utiliser le chemin complet dans le pied de page'; $lang['recent'] = 'Nombre de derniers changements à afficher'; @@ -85,7 +91,9 @@ $lang['disableactions_other'] = 'Autres actions (séparées par des virgules)'; $lang['sneaky_index'] = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher celles pour lesquelles l\'utilisateur n\'a pas la permission de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certaines ACL.'; $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)'; -$lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée'; +$lang['securecookie'] = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.'; +$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; +$lang['xmlrpcuser'] = 'Restreindre l\'accès à XML-RPC aux groupes et utilisateurs indiqués ici. Laisser vide afin que tout le monde y ait accès.'; $lang['updatecheck'] = 'Vérifier les mises à jour ? DokuWiki doit pouvoir contacter splitbrain.org.'; $lang['userewrite'] = 'URLs esthétiques'; $lang['useslash'] = 'Utiliser slash comme séparateur de catégorie dans les URLs'; @@ -105,14 +113,13 @@ $lang['im_convert'] = 'Chemin vers l\'outil de conversion d\'ImageMagick'; $lang['jpg_quality'] = 'Qualité de la compression JPG (0-100)'; $lang['subscribers'] = 'Activer l\'abonnement aux pages'; -$lang['compress'] = 'Compresser CSS & javascript'; +$lang['compress'] = 'Compresser CSS & JavaScript'; $lang['hidepages'] = 'Cacher les pages correspondant à (expression régulière)'; -$lang['send404'] = 'Renvoyer "HTTP 404/Page Not Found" pour les pages introuvables'; -$lang['sitemap'] = 'Générer une carte google du site tous les (jours)'; +$lang['send404'] = 'Renvoyer "HTTP 404/Page Non Trouvée" pour les pages introuvables'; +$lang['sitemap'] = 'Générer une carte G|oogle du site tous les (jours)'; $lang['broken_iua'] = 'La fonction ignore_user_abort est-elle opérationnelle sur votre système ? Ceci peut empêcher le fonctionnement de l\'index de recherche. IIS+PHP/ CGI dysfonctionne. Voir le bug 852 pour plus d\'info.'; $lang['xsendfile'] = 'Utiliser l\'en-tête X-Sendfile pour permettre au serveur Web de délivrer des fichiers statiques ? Votre serveur Web doit supporter cette fonctionnalité.'; -$lang['xmlrpc'] = 'Activer l\'interface XML-RPC.'; $lang['renderer_xhtml'] = 'Moteur de rendu du format de sortie principal (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; @@ -123,22 +130,22 @@ $lang['rss_update'] = 'Fréquence de mise à jour du flux RSS (sec)'; $lang['recent_days'] = 'Signaler les pages modifiées depuis (jours)'; $lang['rss_show_summary'] = 'Le flux XML affiche le résumé dans le titre'; -$lang['target____wiki'] = 'Target pour liens internes'; -$lang['target____interwiki'] = 'Target pour liens interwiki'; -$lang['target____extern'] = 'Target pour liens externes'; -$lang['target____media'] = 'Target pour liens media'; -$lang['target____windows'] = 'Target pour liens windows'; +$lang['target____wiki'] = 'Cible pour liens internes'; +$lang['target____interwiki'] = 'Cible pour liens interwiki'; +$lang['target____extern'] = 'Cible pour liens externes'; +$lang['target____media'] = 'Cible pour liens media'; +$lang['target____windows'] = 'Cible pour liens windows'; $lang['proxy____host'] = 'Proxy - hôte'; $lang['proxy____port'] = 'Proxy - port'; $lang['proxy____user'] = 'Proxy - identifiant'; $lang['proxy____pass'] = 'Proxy - mot de passe'; $lang['proxy____ssl'] = 'Proxy - utilisation de ssl'; -$lang['safemodehack'] = 'Activer l\'option safemode'; -$lang['ftp____host'] = 'FTP - hôte pour safemode'; -$lang['ftp____port'] = 'FTP - port pour safemode'; -$lang['ftp____user'] = 'FTP - identifiant pour safemode'; -$lang['ftp____pass'] = 'FTP - mot de passe pour safemode'; -$lang['ftp____root'] = 'FTP - répertoire racine pour safemode'; +$lang['safemodehack'] = 'Activer l\'option Mode sans échec'; +$lang['ftp____host'] = 'FTP - hôte pour Mode sans échec'; +$lang['ftp____port'] = 'FTP - port pour Mode sans échec'; +$lang['ftp____user'] = 'FTP - identifiant pour Mode sans échec'; +$lang['ftp____pass'] = 'FTP - mot de passe pour Mode sans échec'; +$lang['ftp____root'] = 'FTP - répertoire racine pour Mode sans échec'; $lang['license_o_'] = 'Aucune choisie'; $lang['typography_o_0'] = 'aucun'; $lang['typography_o_1'] = 'guillemets uniquement'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/gl/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/gl/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/gl/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/gl/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ -====== Xestor de Configuración ====== +====== Xestor de configuración ====== -Usa esta páxina para controlar a configuración da túa instalación do Dokuwiki. Para atopar axuda verbo de cada opción da configuración vai a [[doku>config]]. Para obter pormenores deste plugin bota un ollo a [[doku>plugin:config]]. +Use esta páxina para controlar a configuración da súa instalación do Dokuwiki. Para encontrar axuda sobre cada unha das opcións da configuración vaia a [[doku>config]]. Para obter máis información sobre este plugin vexa o documento [[doku>plugin:config]]. -As opcións que amosan un fondo de cor vermella clara están protexidas e non poden ser alteradas con este plugin. As opcións que amosan un fondo de cor azul son valores predeterminados e as opcións que teñen fondo branco foron configuradas de xeito local para esta instalación en concreto. Ãmbalas dúas, as opcións azuis e brancas, poden ser alteradas. +As opcións que se mostran cun fondo de cor vermello claro, están protexidas e non poden ser alteradas con este plugin. As opcións que se mostran cun fondo de cor azul, son valores predeterminados. As opcións que teñen un fondo branco foron configuradas de modo local para esta instalación en concreto. Ambas as dúas, as opcións azuis e brancas, poden ser alteradas. -Lembra premer no boton **GARDAR** denantes de sair desta páxina ou, en caso contrario, os teus trocos perderanse. +Lembre premer no botón **GARDAR** antes de saír desta páxina ou, en caso contrario, as súas modificacións perderanse. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,34 +3,39 @@ * Galicianlanguage file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['menu'] = 'Opcións de Configuración'; -$lang['error'] = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo. -
    O(s) valor(es) incorrecto(s) amosanse cinguidos por un borde vermello.'; -$lang['updated'] = 'Configuración actualizada correctamente.'; -$lang['nochoice'] = '(non hai outras escollas dispoñibles)'; -$lang['locked'] = 'Non se puido actualizar o arquivo de configuración, se non ocorre como debería ser,
    -asegúrate de que o nome do arquivo de configuración local e os permisos son correctos.'; -$lang['_configuration_manager'] = 'Xestor de Configuración'; +$lang['menu'] = 'Opcións de configuración'; +$lang['error'] = 'A configuración non foi actualizada debido a un valor non válido; verifique as modificacións feitas e envíeas de novo. +
    Os valores incorrectos móstranse cun bordo de cor vermella.'; +$lang['updated'] = 'A configuración foi actualizada correctamente.'; +$lang['nochoice'] = '(non hai outras opcións dispoñíbeis)'; +$lang['locked'] = 'Non se puido actualizar o ficheiro de configuración; se isto non debería ser así,
    +asegúrese de que o nome do ficheiro de configuración local e os permisos son correctos.'; +$lang['danger'] = 'Perigo: Se modifica esta opción podería facer que tanto o seu Wiki como o menú de configuración fiquen inaccesíbeis.'; +$lang['warning'] = 'Aviso: Se modifica esta opción podería causar un comportamento inesperado.'; +$lang['security'] = 'Aviso de seguranza: Cambiar esta opción podería supoñer un perigo de seguranza.'; +$lang['_configuration_manager'] = 'Xestor de configuración'; $lang['_header_dokuwiki'] = 'Configuración do DokuWiki'; -$lang['_header_plugin'] = 'Configuración de Plugin'; -$lang['_header_template'] = 'Configuración de Sobreplanta'; -$lang['_header_undefined'] = 'Configuración Indefinida'; -$lang['_basic'] = 'Configuración Básica'; -$lang['_display'] = 'Configuración de Visualización'; -$lang['_authentication'] = 'Configuración de Autenticación'; -$lang['_anti_spam'] = 'Configuración de Anti-Spam'; -$lang['_editing'] = 'Configuración de Edición'; -$lang['_links'] = 'Configuración de Ligazón'; -$lang['_media'] = 'Configuración de Media'; -$lang['_advanced'] = 'Configuración Avanzada'; -$lang['_network'] = 'Configuración de Rede'; -$lang['_plugin_sufix'] = 'Configuración de Plugin'; -$lang['_template_sufix'] = 'Configuración de Sobreplanta'; -$lang['_msg_setting_undefined'] = 'Non hai configuración de metadata.'; -$lang['_msg_setting_no_class'] = 'Non hai configuración de clase.'; -$lang['_msg_setting_no_default'] = 'Non hai valor predeterminado.'; -$lang['fmode'] = 'Modo de creación de arquivos'; +$lang['_header_plugin'] = 'Configuración de plugins'; +$lang['_header_template'] = 'Configuración do modelo'; +$lang['_header_undefined'] = 'Configuración indefinida'; +$lang['_basic'] = 'Configuración básica'; +$lang['_display'] = 'Configuración da visualización'; +$lang['_authentication'] = 'Configuración da autenticación'; +$lang['_anti_spam'] = 'Configuración do Anti-Spam'; +$lang['_editing'] = 'Configuración da edición'; +$lang['_links'] = 'Configuración das ligazóns'; +$lang['_media'] = 'Configuración dos ficheiros multimedia'; +$lang['_advanced'] = 'Configuración avanzada'; +$lang['_network'] = 'Configuración de rede'; +$lang['_plugin_sufix'] = 'Configuración de plugins'; +$lang['_template_sufix'] = 'Configuración do modelo'; +$lang['_msg_setting_undefined'] = 'Non hai configuracións de metadatos.'; +$lang['_msg_setting_no_class'] = 'Non hai configuracións de clase.'; +$lang['_msg_setting_no_default'] = 'Non hai un valor predeterminado.'; +$lang['fmode'] = 'Modo de creación de ficheiros'; $lang['dmode'] = 'Modo de creación de directorios'; $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio base'; @@ -38,103 +43,104 @@ $lang['savedir'] = 'Directorio no que se gardarán os datos'; $lang['start'] = 'Nome da páxina inicial'; $lang['title'] = 'Título do Wiki'; -$lang['template'] = 'Sobreplanta'; -$lang['license'] = 'Baixo de que licenza será ceibado o teu contido?'; -$lang['fullpath'] = 'Amosar a ruta completa das páxinas no pé das mesmas'; -$lang['recent'] = 'Trocos recentes'; +$lang['template'] = 'Modelo'; +$lang['license'] = 'Baixo que licenza será liberado os seus contidos?'; +$lang['fullpath'] = 'Mostrar o camiño completo das páxinas no pé das mesmas'; +$lang['recent'] = 'Cambios recentes'; $lang['breadcrumbs'] = 'Número de niveis da estrutura de navegación'; $lang['youarehere'] = 'Niveis xerárquicos da estrutura de navegación'; $lang['typography'] = 'Facer substitucións tipográficas'; $lang['htmlok'] = 'Permitir a inserción de HTML'; $lang['phpok'] = 'Permitir a inserción de PHP'; -$lang['dformat'] = 'Formato de Data (bótalle un ollo á función strftime do PHP)'; +$lang['dformat'] = 'Formato de data (vexa a función strftime do PHP)'; $lang['signature'] = 'Sinatura'; $lang['toptoclevel'] = 'Nivel superior para a táboa de contidos'; -$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se a TDC vai ser xerada'; +$lang['tocminheads'] = 'Cantidade mínima de liñas de cabeceira que determinará se se xerará a TDC'; $lang['maxtoclevel'] = 'Nivel máximo para a táboa de contidos'; $lang['maxseclevel'] = 'Nivel máximo de edición da sección'; $lang['camelcase'] = 'Utilizar CamelCase para as ligazóns'; -$lang['deaccent'] = 'Limpar nomes de páxina'; +$lang['deaccent'] = 'Limpar os nomes de páxina'; $lang['useheading'] = 'Utilizar a primeira cabeceira para os nomes de páxina'; -$lang['refcheck'] = 'Comprobar a referencia media'; -$lang['refshow'] = 'Número de referencias media a amosar'; -$lang['allowdebug'] = 'Permitir o depurado desactívao se non o precisas!'; -$lang['usewordblock'] = 'Bloquear spam segundo unha lista de verbas'; -$lang['indexdelay'] = 'Retardo denantes de indexar (seg)'; +$lang['refcheck'] = 'Comprobar a referencia de multimedia'; +$lang['refshow'] = 'Número de referencias multimedia para mostrar'; +$lang['allowdebug'] = 'Permitir a depuración desactíveo se non o precisa!'; +$lang['usewordblock'] = 'Bloquear o spam segundo unha listaxe de palabras'; +$lang['indexdelay'] = 'Atraso antes de indexar (en seg.)'; $lang['relnofollow'] = 'Utilizar rel="nofollow" nas ligazóns externas'; -$lang['mailguard'] = 'Ofuscar enderezos de correo-e'; -$lang['iexssprotect'] = 'Comprobar arquivos subidos na procura de posible código JavaScript ou HTML malicioso'; -$lang['showuseras'] = 'Que amosar cando se informe do usuario que fixo a última modificación dunha páxina'; -$lang['useacl'] = 'Utilizar lista de control de acceso'; -$lang['autopasswd'] = 'Xerar contrasinais automaticamente'; +$lang['mailguard'] = 'Escurecer os enderezos de correo'; +$lang['iexssprotect'] = 'Comprobar os ficheiros que se suban na procura dun posíbel código JavaScript ou HTML maliciosos'; +$lang['showuseras'] = 'Que se mostrará ao informar da persoa usuaria que fixo a última modificación dunha páxina?'; +$lang['useacl'] = 'Utilizar a lista de control de acceso (ACL)'; +$lang['autopasswd'] = 'Xerar os contrasinais automaticamente'; $lang['authtype'] = 'Backend de autenticación'; -$lang['passcrypt'] = 'Método de encriptado do contrasinal'; -$lang['defaultgroup'] = 'Grupo por defecto'; -$lang['superuser'] = 'Super-usuario - un grupo ou usuario con acceso completo a todas as páxinas e funcións independentemente da configuración da ACL'; -$lang['manager'] = 'Xestor - un grupo ou usuario con acceso a certas funcións de xestión'; -$lang['profileconfirm'] = 'Confirmar trocos de perfil mediante contrasinal'; +$lang['passcrypt'] = 'Método de codificación do contrasinal'; +$lang['defaultgroup'] = 'Grupo predeterminado'; +$lang['superuser'] = 'Superusuaria/o - un grupo ou usuaria/o con acceso completo a todas as páxinas e funcións, independentemente da configuración da ACL'; +$lang['manager'] = 'Xestor - un grupo ou usuaria/o con acceso a certas funcións de xestión'; +$lang['profileconfirm'] = 'Confirmar as modificacións de perfil mediante un contrasinal'; $lang['disableactions'] = 'Desactivar accións do DokuWiki'; $lang['disableactions_check'] = 'Comprobar'; $lang['disableactions_subscription'] = 'Subscribir/Desubscribir'; -$lang['disableactions_nssubscription'] = 'Subscribir/Desubscribir en Nomes de Espazo'; -$lang['disableactions_wikicode'] = 'Ver fonte/Exportar Datos Raw'; -$lang['disableactions_other'] = 'Outras accións (separadas por comas)'; -$lang['sneaky_index'] = 'O DokuWiki amosará por defecto todos os nomes de espazo na vista de índice. Se activas isto agocharanse aqueles onde o usuario non teña permisos de lectura.'; -$lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)'; -$lang['securecookie'] = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a nevegación do mesmo se faga de xeito inseguro.'; -$lang['updatecheck'] = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con splitbrain.org para executar esta característica.'; -$lang['userewrite'] = 'Utilizar URLs amigables'; -$lang['useslash'] = 'Utilizar a barra inclinada (slash) como separador de nome de espazo nos URLs'; -$lang['usedraft'] = 'Gardar un borrador automaticamente no tempo da edición'; -$lang['sepchar'] = 'Verba separadora do nome de páxina'; -$lang['canonical'] = 'Utilizar URLs completamente canónicos'; -$lang['autoplural'] = 'Comprobar formas plurais nas ligazóns'; -$lang['compression'] = 'Método de compresión para arquivos attic'; -$lang['cachetime'] = 'Tempo máximo para a caché (seg.)'; -$lang['locktime'] = 'Tempo máximo para o bloqueo de arquivos (seg.)'; -$lang['fetchsize'] = 'Tamaño máximo (en bytes) que pode descargar fetch.php dende fontes externas'; -$lang['notify'] = 'Enviar notificacións de trocos a este enderezo de correo-e'; -$lang['registernotify'] = 'Enviar información de novos usuarios rexistrados a este enderezo de correo-e'; -$lang['mailfrom'] = 'Enderezo de correo-e a usar para as mensaxes automáticas'; -$lang['gzip_output'] = 'Utilizar Contido-Codificación gzip para o xhtml'; -$lang['gdlib'] = 'Versión da Libraría GD'; -$lang['im_convert'] = 'Ruta deica a ferramenta de conversión ImageMagick'; +$lang['disableactions_nssubscription'] = 'Subscribir/Desubscribir en nomes de espazo'; +$lang['disableactions_wikicode'] = 'Ver o código/Exportar datos raw'; +$lang['disableactions_other'] = 'Outras accións (separadas por vírgulas)'; +$lang['sneaky_index'] = 'O DokuWiki mostrará por defecto todos os nomes de espazo na vista de índice. Se activa isto serán ocultados aqueles onde o usuario non teña permisos de lectura.'; +$lang['auth_security_timeout'] = 'Tempo límite de seguranza de autenticación (en segundos)'; +$lang['securecookie'] = 'Débense enviar só mediante HTTPS as cookies configuradas para HTTPS enviadas polo navegador? Desactive esta opción só cando o inicio de sesión do seu wiki estea asegurado con SSL, mais a navegación no mesmo se faga de modo inseguro.'; +$lang['xmlrpc'] = 'Activar/Desactivar a interface XML-RPC'; +$lang['xmlrpcuser'] = 'Restrinxir o acceso mediante XML-RPC á lista separada por comas dos grupos e/ou usuarios proporcionados aquí. Deixe baleiro para darlle acceso a todo o mundo.'; +$lang['updatecheck'] = 'Débese comprobar se hai actualizacións e avisos de seguranza? O DokuWiki precisa contactar con splitbrain.org para executar esta funcionalidade.'; +$lang['userewrite'] = 'Utilizar URL amigábeis'; +$lang['useslash'] = 'Utilizar a barra oblícua (/) como separador de nome de espazo nos URL'; +$lang['usedraft'] = 'Gardar un borrador automaticamente ao editar'; +$lang['sepchar'] = 'Palabra de separación do nome de páxina'; +$lang['canonical'] = 'Utilizar URL completamente canónicos'; +$lang['autoplural'] = 'Comprobar as formas plurais nas ligazóns'; +$lang['compression'] = 'Método de compresión para os ficheiros attic'; +$lang['cachetime'] = 'Tempo máximo para a caché (en seg.)'; +$lang['locktime'] = 'Tempo máximo para o bloqueo de ficheiros (en seg.)'; +$lang['fetchsize'] = 'Tamaño máximo (en bytes) que o fetch.php pode descargar de fontes externas'; +$lang['notify'] = 'Enviar as notificacións de cambios a este enderezo de correo'; +$lang['registernotify'] = 'Enviar a información de novas persoas usuarias rexistradas a este enderezo de correo'; +$lang['mailfrom'] = 'Enderezo de correo-e para usar nas mensaxes automáticas'; +$lang['gzip_output'] = 'Utilizar o Contido-Codificación do Gzip para o XHTML'; +$lang['gdlib'] = 'Versión da biblioteca GD'; +$lang['im_convert'] = 'Camiño para a ferramenta de conversión ImageMagick'; $lang['jpg_quality'] = 'Calidade de compresión dos JPG (0-100)'; -$lang['subscribers'] = 'Activar posibilidade de subscrición de páxina'; -$lang['compress'] = 'Saída compacta de CSS e javascript'; -$lang['hidepages'] = 'Agochar páxinas que coincidan (expresións regulares)'; -$lang['send404'] = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes'; -$lang['sitemap'] = 'Xerar mapa do sitio co Google (días)'; -$lang['broken_iua'] = 'Rachou a función ignore_user_abort no teu sistema? Isto podería causar que o índice de procura non funcione. Coñécese que o IIS+PHP/CGI ráchaa. Bótalle un ollo ao Bug 852 para obter máis información.'; -$lang['xsendfile'] = 'Empregar a cabeceira X-Sendfile para que o servidor web envie arquivos estáticos? O teu servidor web precisa soportar isto.'; -$lang['xmlrpc'] = 'Activar/desactivar interface XML-RPC'; -$lang['renderer_xhtml'] = 'Intérprete a empregar para a saída principal (xhtml) do wiki'; -$lang['renderer__core'] = '%s (núcleo do dokuwiki)'; +$lang['subscribers'] = 'Activar a posibilidade de subscrición á páxina'; +$lang['compress'] = 'Saída compacta de CSS e Javascript'; +$lang['hidepages'] = 'Ocultar as páxinas que coincidan (expresións regulares)'; +$lang['send404'] = 'Enviar "HTTP 404/Páxina non encontrada" para as páxinas inexistentes'; +$lang['sitemap'] = 'Xerar o mapa do sitio do Google (en días)'; +$lang['broken_iua'] = 'Está danada a función ignore_user_abort no seu sistema? Isto podería causar que o índice de procura non funcione. Sábese que o IIS+PHP/CGI a dana. Vexa Bug 852 para obter máis información.'; +$lang['xsendfile'] = 'Débese empregar a cabeceira X-Sendfile para que o servidor web envíe ficheiros estáticos? O seu servidor web debe soportar isto.'; +$lang['renderer_xhtml'] = 'Intérprete para empregar na saída principal (XHTML) do Wiki'; +$lang['renderer__core'] = '%s (núcleo do Dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; -$lang['rememberme'] = 'Permitir cookies permanentes de inicio de sesión (lembrarme)'; -$lang['rss_type'] = 'Tipo de corrente XML'; -$lang['rss_linkto'] = 'A corrente XML liga a'; -$lang['rss_content'] = 'Que queres amosar nos elementos da corrente XML?'; -$lang['rss_update'] = 'Intervalo de actualización da corrente XML (seg)'; -$lang['recent_days'] = 'Número de trocos recentes a manter (días)'; -$lang['rss_show_summary'] = 'Amosar sumario no título da corrente XML'; -$lang['target____wiki'] = 'Fiestra de destino para as ligazóns internas'; -$lang['target____interwiki'] = 'Fiestra de destino para as ligazóns interwiki'; -$lang['target____extern'] = 'Fiestra de destino para as ligazóns externas'; -$lang['target____media'] = 'Fiestra de destino para as ligazóns de media'; -$lang['target____windows'] = 'Fiestra de destino para as ligazóns de xanelas'; -$lang['proxy____host'] = 'Nome do servidor Proxy'; -$lang['proxy____port'] = 'Porto do Proxy'; -$lang['proxy____user'] = 'Nome de usuario do Proxy'; -$lang['proxy____pass'] = 'Contrasinal do Proxy'; -$lang['proxy____ssl'] = 'Utilizar ssl para conectar ao Proxy'; -$lang['safemodehack'] = 'Activar hack de modo seguro (safemode)'; +$lang['rememberme'] = 'Permitir as cookies permanentes de inicio de sesión (lembrar)'; +$lang['rss_type'] = 'Tipo de fío RSS XML'; +$lang['rss_linkto'] = 'O fío XML vincúlase a'; +$lang['rss_content'] = 'Que quere mostrar nos elementos do fío XML?'; +$lang['rss_update'] = 'Intervalo de actualización do fío XML (en seg.)'; +$lang['recent_days'] = 'Número de modificacións recentes para manter (en días)'; +$lang['rss_show_summary'] = 'Mostrar o sumario no título do fío XML'; +$lang['target____wiki'] = 'Xanela de destino para as ligazóns internas'; +$lang['target____interwiki'] = 'Xanela de destino para as ligazóns interwiki'; +$lang['target____extern'] = 'Xanela de destino para as ligazóns externas'; +$lang['target____media'] = 'Xanela de destino para as ligazóns multimedia'; +$lang['target____windows'] = 'Xanela de destino para as ligazóns de xanelas'; +$lang['proxy____host'] = 'Nome do servidor proxy'; +$lang['proxy____port'] = 'Porto do proxy'; +$lang['proxy____user'] = 'Nome de usuaria/o do proxy'; +$lang['proxy____pass'] = 'Contrasinal do proxy'; +$lang['proxy____ssl'] = 'Utilizar SSL para conectar co proxy'; +$lang['safemodehack'] = 'Activar o hack de modo seguro (safemode)'; $lang['ftp____host'] = 'Servidor FTP para o hack de modo seguro (safemode)'; $lang['ftp____port'] = 'Porto FTP para o hack de modo seguro(safemode)'; -$lang['ftp____user'] = 'Nome de usuario FTP para o hack de modo seguro(safemode)'; +$lang['ftp____user'] = 'Nome de usuaria/o FTP para o hack de modo seguro(safemode)'; $lang['ftp____pass'] = 'Contrasinal FTP para o hack de modo seguro(safemode)'; -$lang['ftp____root'] = 'Directorio raigaña do FTP para o hack de modo seguro(safemode)'; -$lang['license_o_'] = 'Non se escolleu nada'; +$lang['ftp____root'] = 'Directorio raíz do FTP para o hack de modo seguro(safemode)'; +$lang['license_o_'] = 'Non se seleccionou nada'; $lang['typography_o_0'] = 'ningunha'; $lang['typography_o_1'] = 'Só dobres aspas'; $lang['typography_o_2'] = 'Todas as aspas (pode que non funcione sempre)'; @@ -142,36 +148,36 @@ $lang['userewrite_o_1'] = '.htaccess'; $lang['userewrite_o_2'] = 'Interno do DokuWiki'; $lang['deaccent_o_0'] = 'desconectado'; -$lang['deaccent_o_1'] = 'Eliminar acentos'; +$lang['deaccent_o_1'] = 'Eliminar os acentos'; $lang['deaccent_o_2'] = 'romanizar'; -$lang['gdlib_o_0'] = 'Libraría GD non dispoñible'; +$lang['gdlib_o_0'] = 'A biblioteca GD non está dispoñíbel'; $lang['gdlib_o_1'] = 'Versión 1.x'; -$lang['gdlib_o_2'] = 'Autodetección'; +$lang['gdlib_o_2'] = 'Detección automática'; $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'] = 'Sumario'; +$lang['rss_content_o_abstract'] = 'Resumo'; $lang['rss_content_o_diff'] = 'Formato Unified Diff'; -$lang['rss_content_o_htmldiff'] = 'Táboa diff formateada en HTML'; +$lang['rss_content_o_htmldiff'] = 'Táboa diff formatada en HTML'; $lang['rss_content_o_html'] = 'Contido HTML completo da páxina'; -$lang['rss_linkto_o_diff'] = 'vista de diferenzas'; +$lang['rss_linkto_o_diff'] = 'visualización de diferenzas'; $lang['rss_linkto_o_page'] = 'a páxina revisada'; -$lang['rss_linkto_o_rev'] = 'lista de revisións'; +$lang['rss_linkto_o_rev'] = 'listaxe de revisións'; $lang['rss_linkto_o_current'] = 'a páxina actual'; $lang['compression_o_0'] = 'ningunha'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; -$lang['xsendfile_o_0'] = 'non o empregues'; -$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (denantes da versión 1.5)'; +$lang['xsendfile_o_0'] = 'non usar'; +$lang['xsendfile_o_1'] = 'Cabeceira lighttpd propietaria (anterior á versión 1.5)'; $lang['xsendfile_o_2'] = 'Cabeceira X-Sendfile estándar'; $lang['xsendfile_o_3'] = 'Cabeceira X-Accel-Redirect propia de Nginx'; $lang['showuseras_o_loginname'] = 'Nome de inicio de sesión'; -$lang['showuseras_o_username'] = 'Nome completo do usuario'; -$lang['showuseras_o_email'] = 'Enderezo de correo-e do usuario (ofuscado segundo a configuración mailguard)'; -$lang['showuseras_o_email_link'] = 'Enderezo de correo-e do usuario como ligazón mailto:'; -$lang['useheading_o_0'] = 'Endexamais'; -$lang['useheading_o_navigation'] = 'Só Navegación'; -$lang['useheading_o_content'] = 'Só Contido do Wiki'; +$lang['showuseras_o_username'] = 'Nome completo da persoa usuaria'; +$lang['showuseras_o_email'] = 'Enderezo de correo da persoa usuaria (escurecido conforme a configuración mailguard)'; +$lang['showuseras_o_email_link'] = 'Enderezo de correo da persoa usuaria como unha ligazón mailto:'; +$lang['useheading_o_0'] = 'Nunca'; +$lang['useheading_o_navigation'] = 'Só a navegación'; +$lang['useheading_o_content'] = 'Só o contido do Wiki'; $lang['useheading_o_1'] = 'Sempre'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,12 @@ + + */ +$lang['sepchar'] = 'पृषà¥à¤  का नाम शबà¥à¤¦ पà¥à¤°à¤¥à¤•à¥à¤•à¤°'; +$lang['sitemap'] = 'गूगल का सूचना पटल नकà¥à¤¶à¤¾ बनायें (दिन)'; +$lang['license_o_'] = 'कà¥à¤› नहीं चà¥à¤¨à¤¾'; +$lang['typography_o_0'] = 'कà¥à¤› नहीं'; +$lang['showuseras_o_username'] = 'उपयोगकरà¥à¤¤à¤¾ का पूरà¥à¤£ नाम'; +$lang['useheading_o_0'] = 'कभी नहीं'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['menu'] = 'Beállító Központ'; $lang['error'] = 'Helytelen érték miatt a módosítások nem mentÅ‘dtek. Nézd át a módosításokat, és ments újra. @@ -11,6 +13,9 @@ $lang['nochoice'] = '(nincs egyéb lehetÅ‘ség)'; $lang['locked'] = 'A beállításokat tartalmazó fájlt nem tudtam frissíteni.
    Nézd meg, hogy a fájl neve és jogosultságai helyesen vannak-e beállítva!'; +$lang['danger'] = 'Figyelem: ezt a beállítást megváltoztatva a konfigurációs menü hozzáférhetetlenné válhat.'; +$lang['warning'] = 'Figyelmeztetés: a beállítás megváltoztatása nem kívánt viselkedést okozhat.'; +$lang['security'] = 'Biztonsági figyelmeztetés: a beállítás megváltoztatása biztonsági veszélyforrást okozhat.'; $lang['_configuration_manager'] = 'Beállító Központ'; $lang['_header_dokuwiki'] = 'DokuWiki beállítások'; $lang['_header_plugin'] = 'Bővítmények beállításai'; @@ -82,6 +87,8 @@ $lang['sneaky_index'] = 'Alapértelmezetten minden névtér látszik a DokuWiki áttekintő (index) oldalán. Ezen opció bekapcsolása után azok nem jelennek meg, melyekhez a felhasználónak nincs olvasás joga. De ezzel eltakarhatunk egyébként elérhető al-névtereket is, így bizonyos ACL beállításoknál használhatatlan indexet eredményez ez a beállítás.'; $lang['auth_security_timeout'] = 'Authentikációs biztonsági időablak (másodperc)'; $lang['securecookie'] = 'A böngészők a HTTPS felett beállított sütijüket csak HTTPS felett küldhetik? Kapcsoljuk ki ezt az opciót, ha csak a bejelentkezést védjük SSL-lel, a wiki tartalmának böngészése nyílt forgalommal történik.'; +$lang['xmlrpc'] = 'XML-RPC interfész engedélyezése/tiltása'; +$lang['xmlrpcuser'] = 'Korlátozza XML-RPC hozzáférést az itt megadott vesszővel elválasztott csoportok vagy felhasználók számára. Hagyja üresen, ha mindenki számára biztosítja a hozzáférést.'; $lang['updatecheck'] = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a splitbrain.org-gal.'; $lang['userewrite'] = 'Szép URL-ek használata'; $lang['useslash'] = 'Per-jel használata névtér-elválasztóként az URL-ekben'; @@ -102,12 +109,11 @@ $lang['jpg_quality'] = 'JPG tömörítés minősége (0-100)'; $lang['subscribers'] = 'Oldalváltozás-listára feliratkozás engedélyezése'; $lang['compress'] = 'CSS és JavaScript fájlok tömörítése'; -$lang['hidepages'] = 'Az itt megadott oldalak elrejtése (regularis kifejezés)'; +$lang['hidepages'] = 'Az itt megadott oldalak elrejtése (reguláris kifejezés)'; $lang['send404'] = '"HTTP 404/Page Not Found" küldése nemlétező oldalak esetén'; $lang['sitemap'] = 'Hány naponként generáljunk Google sitemap-ot?'; $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.'; -$lang['xmlrpc'] = 'XML-RPC interfész engedélyezése/tiltása'; $lang['renderer_xhtml'] = 'Az elsődleges (xhtml) wiki kimenet generálója'; $lang['renderer__core'] = '%s (dokuwiki mag)'; $lang['renderer__plugin'] = '%s (bővítmény)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,58 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['menu'] = 'Stillingar'; +$lang['error'] = 'Stillingum ekki breitt þar sem rangar upplýsingar voru settar inn, vinsamlegast yfirfarið stillingar merktar með rauðu'; +$lang['updated'] = 'Stillingum breitt'; +$lang['nochoice'] = '(engir aðrir valmöguleikar fyrir hendi)'; +$lang['_display'] = 'Skjástillingar'; +$lang['_anti_spam'] = 'Stillingar gegn ruslpósti'; +$lang['_editing'] = 'Útgáfastillingar'; +$lang['_plugin_sufix'] = 'Viðbótstillingar'; +$lang['lang'] = 'Tungumál'; +$lang['title'] = 'Heiti wikis'; +$lang['template'] = 'Mát'; +$lang['recent'] = 'Nýlegar breytingar'; +$lang['breadcrumbs'] = 'Fjöldi brauðmolar'; +$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['signature'] = 'Undirskrift'; +$lang['passcrypt'] = 'Dulritunaraðferð aðgangsorðs'; +$lang['defaultgroup'] = 'Sjálfgefinn hópur'; +$lang['superuser'] = 'Hópur kerfisstjóra '; +$lang['profileconfirm'] = 'Staðfestu breytingar með aðgangsorði'; +$lang['mailfrom'] = 'Rafpóstfang fyrir sjálfvirkar póstsendingar'; +$lang['gdlib'] = 'Útgáfa af GD Lib'; +$lang['jpg_quality'] = 'JPG gæðastilling (0-100)'; +$lang['proxy____host'] = 'Heiti staðgengilsþjóns'; +$lang['proxy____port'] = 'Staðgengilstengi'; +$lang['proxy____user'] = 'Staðgengill notendanafn'; +$lang['proxy____pass'] = 'Staðgengilsaðgangsorð'; +$lang['proxy____ssl'] = 'Nýta SSL til að tengjast staðgengill'; +$lang['license_o_'] = 'Ekkert valið'; +$lang['typography_o_0'] = 'engin'; +$lang['userewrite_o_0'] = 'engin'; +$lang['deaccent_o_0'] = 'slökkt'; +$lang['deaccent_o_1'] = 'fjarlægja broddi'; +$lang['deaccent_o_2'] = 'gera rómverskt'; +$lang['gdlib_o_0'] = 'GD Lib ekki til staðar'; +$lang['gdlib_o_1'] = 'Útgáfa 1,x'; +$lang['gdlib_o_2'] = 'Sjálfvirk leit'; +$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['compression_o_0'] = 'engin'; +$lang['showuseras_o_loginname'] = 'Innskránafn'; +$lang['showuseras_o_username'] = 'Fullt notendanafn'; +$lang['useheading_o_0'] = 'Aldrei'; +$lang['useheading_o_1'] = 'Alltaf'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['menu'] = 'Configurazione Wiki'; $lang['error'] = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo. @@ -17,6 +19,9 @@ $lang['nochoice'] = '(nessun\'altra scelta disponibile)'; $lang['locked'] = 'Il file di configurazione non può essere aggiornato, se questo non è intenzionale,
    assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.'; +$lang['danger'] = 'Attenzione: Cambiare questa opzione può rendere inaccessibile la tua wiki e il menu di configurazione.'; +$lang['warning'] = 'Avviso: Cambiare questa opzione può causare comportamenti indesiderati.'; +$lang['security'] = 'Avviso di sicurezza: Cambiare questa opzione può esporre a rischi di sicurezza.'; $lang['_configuration_manager'] = 'Configurazione Wiki'; $lang['_header_dokuwiki'] = 'Impostazioni DokuWiki'; $lang['_header_plugin'] = 'Impostazioni Plugin'; @@ -88,6 +93,8 @@ $lang['sneaky_index'] = 'Normalmente, DokuWiki mostra tutte le categorie nella vista indice. Abilitando questa opzione, saranno nascoste quelle per cui l\'utente non ha il permesso in lettura. Questo potrebbe far sì che alcune sottocategorie accessibili siano nascoste. La pagina indice potrebbe quindi diventare inutilizzabile con alcune configurazioni dell\'ACL.'; $lang['auth_security_timeout'] = 'Timeout di sicurezza per l\'autenticazione (secondi)'; $lang['securecookie'] = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.'; +$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC'; +$lang['xmlrpcuser'] = 'Limita l\'accesso XML-RPC ai gruppi o utenti indicati qui (separati da virgola). Lascia il campo vuoto per dare accesso a tutti.'; $lang['updatecheck'] = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare splitbrain.org per questa funzione.'; $lang['userewrite'] = 'Usa il rewrite delle URL'; $lang['useslash'] = 'Usa lo slash come separatore nelle URL'; @@ -113,7 +120,6 @@ $lang['sitemap'] = 'Genera una sitemap Google (giorni)'; $lang['broken_iua'] = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi ilBug 852 per maggiori informazioni.'; $lang['xsendfile'] = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.'; -$lang['xmlrpc'] = 'Abilita/disabilita interfaccia XML-RPC'; $lang['renderer_xhtml'] = 'Renderer da usare la visualizzazione del wiki (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Yuji Takenaka * @author Christopher Smith * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['menu'] = 'サイト設定'; $lang['error'] = 'ä¸æ­£ãªå€¤ãŒå­˜åœ¨ã™ã‚‹ãŸã‚ã€è¨­å®šã¯æ›´æ–°ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚入力値を確èªã—ã¦ã‹ã‚‰ã€å†åº¦æ›´æ–°ã—ã¦ãã ã•ã„。 @@ -14,6 +15,9 @@ $lang['nochoice'] = '（他ã®é¸æŠžè‚¢ã¯ã‚ã‚Šã¾ã›ã‚“）'; $lang['locked'] = '設定用ファイルを更新ã§ãã¾ã›ã‚“。もã—æ„図ã—ã¦å¤‰æ›´ä¸å¯ã«ã—ã¦ã„ã‚‹ã®ã§ãªã‘ã‚Œã°ã€
    ローカル設定ファイルã®åå‰ã¨æ¨©é™ã‚’確èªã—ã¦ä¸‹ã•ã„。'; +$lang['danger'] = 'å±é™ºï¼šã“ã®è¨­å®šã‚’変更ã™ã‚‹ã¨ã‚¦ã‚£ã‚­ã‚„設定管ç†ç”»é¢ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚‹æã‚ŒãŒã‚ã‚Šã¾ã™ã€‚'; +$lang['warning'] = '注æ„：ã“ã®è¨­å®šã‚’変更ã™ã‚‹ã¨æ„図ã—ãªã„作動ã«ã¤ãªãŒã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚'; +$lang['security'] = '警告：ã“ã®è¨­å®šã‚’変更ã™ã‚‹ã¨ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ã«æ‚ªå½±éŸ¿ã™ã‚‹æã‚ŒãŒã‚ã‚Šã¾ã™ã€‚'; $lang['_configuration_manager'] = '設定管ç†'; $lang['_header_dokuwiki'] = 'DokuWiki'; $lang['_header_plugin'] = 'プラグイン'; @@ -85,6 +89,8 @@ $lang['sneaky_index'] = 'デフォルトã§ã¯ç´¢å¼•ã«ã™ã¹ã¦ã®åå‰ç©ºé–“を表示ã—ã¾ã™ãŒã€ã“ã®æ©Ÿèƒ½ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«é–²è¦§æ¨©é™ã®ãªã„åå‰ç©ºé–“ã‚’éžè¡¨ç¤ºã«ã—ã¾ã™ã€‚ãŸã ã—ã€é–²è¦§ãŒå¯èƒ½ãªå‰¯åå‰ç©ºé–“ã¾ã§è¡¨ç¤ºã•ã‚Œãªããªã‚‹ãŸã‚ã€ACLã®è¨­å®šãŒé©æ­£ã§ãªã„å ´åˆã¯ç´¢å¼•æ©Ÿèƒ½ãŒä½¿ãˆãªããªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚'; $lang['auth_security_timeout'] = 'èªè¨¼ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆè¨­å®šï¼ˆç§’）'; $lang['securecookie'] = 'クッキーをHTTPSã«ã¦ã‚»ãƒƒãƒˆã™ã‚‹å ´åˆã¯ã€ãƒ–ラウザよりHTTPS経由ã§é€ä¿¡ã•ã‚ŒãŸå ´åˆã«ã¿ã«åˆ¶é™ã—ã¾ã™ã‹ï¼Ÿãƒ­ã‚°ã‚¤ãƒ³ã®ã¿ã‚’SSLã§è¡Œã†å ´åˆã¯ã€ã“ã®æ©Ÿèƒ½ã‚’無効ã«ã—ã¦ãã ã•ã„。'; +$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効ã«ã™ã‚‹'; +$lang['xmlrpcuser'] = 'XML-RPCアクセスを指定グループã¨ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«åˆ¶é™ã—ã¾ã™ï¼ˆåŠè§’コンマ区切り）。　ã™ã¹ã¦ã®äººã«ã‚¢ã‚¯ã‚»ã‚¹ã‚’許å¯ã™ã‚‹å ´åˆã¯ç©ºã®ã¾ã¾ã«ã—ã¦ãã ã•ã„。'; $lang['updatecheck'] = 'DokuWikiã®æ›´æ–°ã¨ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ã«é–¢ã™ã‚‹æƒ…報をãƒã‚§ãƒƒã‚¯ã—ã¾ã™ã‹ï¼Ÿ ã“ã®æ©Ÿèƒ½ã¯ splitbrain.org ã¸ã®æŽ¥ç¶šãŒå¿…è¦ã§ã™ã€‚'; $lang['userewrite'] = 'URLã®æ›¸ãæ›ãˆ'; $lang['useslash'] = 'URL上ã®åå‰ç©ºé–“ã®åŒºåˆ‡ã‚Šã«ã‚¹ãƒ©ãƒƒã‚·ãƒ¥ã‚’使用'; @@ -110,7 +116,6 @@ $lang['sitemap'] = 'Googleサイトマップ作æˆé »åº¦ï¼ˆæ—¥æ•°ï¼‰'; $lang['broken_iua'] = 'ignore_user_abort関数ãŒç ´æã—ã¦ã„ã‚‹æã‚ŒãŒã‚ã‚Šã¾ã™ã€‚ãã®ãŸã‚ã€æ¤œç´¢ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãŒå‹•ä½œã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚IIS+PHP/CGIã®çµ„ã¿åˆã‚ã›ã§ç ´æã™ã‚‹ã“ã¨ãŒåˆ¤æ˜Žã—ã¦ã„ã¾ã™ã€‚詳ã—ãã¯Bug 852ã‚’å‚ç…§ã—ã¦ãã ã•ã„。'; $lang['xsendfile'] = 'ウェブサーãƒãƒ¼ãŒé™çš„ファイルを生æˆã™ã‚‹ãŸã‚ã« X-Sendfile ヘッダーを使用ã—ã¾ã™ã‹ï¼ŸãªãŠã€ã“ã®æ©Ÿèƒ½ã‚’ウェブサーãƒãƒ¼ãŒã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚'; -$lang['xmlrpc'] = 'XML-RPCインターフェースを有効/無効ã«ã™ã‚‹'; $lang['renderer_xhtml'] = 'Wikiã®å‡ºåŠ›ï¼ˆxhtml）ã«ãƒ¬ãƒ³ãƒ€ãƒ©ãƒ¼ã‚’使用ã™ã‚‹'; $lang['renderer__core'] = '%s （Dokuwikiコア）'; $lang['renderer__plugin'] = '%s （プラグイン）'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ko/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ko/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ko/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ko/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -14,6 +14,9 @@ $lang['updated'] = 'ì„¤ì •ì´ ì„±ê³µì ìœ¼ë¡œ 변경ë˜ì—ˆìŠµë‹ˆë‹¤.'; $lang['nochoice'] = '(다른 ì„ íƒì´ 불가능합니다.)'; $lang['locked'] = '환경 설정 파ì¼ì„ 수정할 수 없습니다. ì˜ë„ëœ í–‰ë™ì´ 아니ë¼ë©´,
    파ì¼ì´ë¦„ê³¼ ê¶Œí•œì´ ë§žëŠ”ì§€ 확ì¸í•˜ê¸° ë°”ëžë‹ˆë‹¤. '; +$lang['danger'] = '위험 : ì´ ì˜µì…˜ì„ ìž˜ëª» 수정하면 환경설정 메뉴를 사용할 수 ì—†ì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.'; +$lang['warning'] = '경고 : ì´ ì˜µì…˜ì„ ìž˜ëª» 수정하면 잘못 ë™ìž‘ í•  수 있습니다.'; +$lang['security'] = '보안 경고 : ì´ ì˜µì…˜ì€ ë³´ì•ˆì— ìœ„í—˜ì´ ìžˆì„ ìˆ˜ 있습니다.'; $lang['_configuration_manager'] = '환경 설정 관리ìž'; $lang['_header_dokuwiki'] = 'DokuWiki 설정'; $lang['_header_plugin'] = 'Plugin 설정'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/lt/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,22 @@ + + */ +$lang['lang'] = 'Kalba'; +$lang['template'] = 'ParuoÅ¡tukas'; +$lang['recent'] = 'Paskutiniai taisymai'; +$lang['disableactions_check'] = 'Patikrinti'; +$lang['xsendfile_o_1'] = 'FirminÄ— lighthttpd antraÅ¡tÄ— (prieÅ¡ 1.5 iÅ¡leidimÄ…)'; +$lang['xsendfile_o_2'] = 'StandartinÄ— X-Sendfile antraÅ¡tÄ—'; +$lang['xsendfile_o_3'] = 'FirminÄ— Nginx X-Accel-Redirect antraÅ¡tÄ—'; +$lang['showuseras_o_loginname'] = 'Prisijungimo vardas'; +$lang['showuseras_o_username'] = 'Vartotojo pilnas vardas'; +$lang['showuseras_o_email'] = 'Vartotojo el. paÅ¡to adresas (pasak paÅ¡to apsaugos yra netinkamas)'; +$lang['showuseras_o_email_link'] = 'Vartotojo el. paÅ¡to adresas kaip mailto: nuoroda'; +$lang['useheading_o_0'] = 'Niekada'; +$lang['useheading_o_navigation'] = 'Tik Navigacija'; +$lang['useheading_o_content'] = 'Tik Wiki Turinys'; +$lang['useheading_o_1'] = 'Visada'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/lv/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/lv/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/lv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/lv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,10 +11,13 @@ $lang['nochoice'] = '(citu iespÄ“ju nav)'; $lang['locked'] = 'IestatÄ«jumu fails nav grozÄms, ja tÄ nevajag bÅ«t,
    pÄrliecinies, ka ir pareizs lokÄlo iestatÄ«juma faila vÄrds un tiesÄ«bas.'; +$lang['danger'] = 'BÄ«stami: Å Ä« parametra maiņa var padarÄ«t wiki sistÄ“mu un konfigurÄcijas izvÄ“lni nepieejamu.'; +$lang['warning'] = 'BrÄ«dinÄjums: Å Ä« parametra maiņa var izraisÄ«t negaidÄ«tu programmas uzvedÄ«bu.'; +$lang['security'] = 'DroÅ¡Ä«bas brÄ«dinÄjums: Å Ä« parametra maiņa var bÅ«t riskanta droÅ¡Ä«bai.'; $lang['_configuration_manager'] = 'KonfigurÄcijas pÄrvaldnieks'; $lang['_header_dokuwiki'] = 'Dokuwiki iestatÄ«jumi'; $lang['_header_plugin'] = 'Moduļu iestatÄ«jumi'; -$lang['_header_template'] = 'Å ablonu iestatÄ«jmui'; +$lang['_header_template'] = 'Å ablonu iestatÄ«jumi'; $lang['_header_undefined'] = 'Citi iestatÄ«jumi'; $lang['_basic'] = 'PamatiestatÄ«jumi'; $lang['_display'] = 'Izskata iestatÄ«jumi'; @@ -28,6 +31,7 @@ $lang['_plugin_sufix'] = 'moduļa iestatÄ«jumi'; $lang['_template_sufix'] = 'Å¡ablona iestatÄ«jumi'; $lang['_msg_setting_undefined'] = 'Nav atrodami iestatÄ«jumu metadati'; +$lang['_msg_setting_no_class'] = 'Nav iestatÄ«jumu klases'; $lang['_msg_setting_no_default'] = 'Nav noklusÄ“tÄs vÄ“rtÄ«bas'; $lang['fmode'] = 'TiesÄ«bas izveidotajiem failiem'; $lang['dmode'] = 'TiesÄ«bas izveidotajÄm direktorijÄm'; @@ -36,7 +40,7 @@ $lang['baseurl'] = 'Saknes adrese (URL)'; $lang['savedir'] = 'Direktorija datu glabÄÅ¡anai'; $lang['start'] = 'SÄkumlapas vÄrds'; -$lang['title'] = 'Wiki visrsraksts'; +$lang['title'] = 'Wiki virsraksts'; $lang['template'] = 'Å ablons'; $lang['license'] = 'Ar kÄdu licenci saturs tiks publicÄ“ts?'; $lang['fullpath'] = 'NorÄdÄ«t kÄjenÄ“ pilnu lapas ceļu'; @@ -49,6 +53,7 @@ $lang['dformat'] = 'Datuma formÄts (sk. PHP strftime funkciju)'; $lang['signature'] = 'Paraksts'; $lang['toptoclevel'] = 'Satura rÄdÄ«tÄja pirmais lÄ«menis'; +$lang['tocminheads'] = 'MazÄkais virsrakstu skaits, no kuriem jÄveido satura rÄdÄ«tÄjs.'; $lang['maxtoclevel'] = 'Satura rÄdÄ«tÄja dziļÄkais lÄ«menis'; $lang['maxseclevel'] = 'DziļÄkais sekciju laboÅ¡anas lÄ«menis'; $lang['camelcase'] = 'Lietot saitÄ“m CamelCase'; @@ -62,6 +67,7 @@ $lang['relnofollow'] = 'rel="nofollow" ÄrÄ“jÄm saitÄ“m'; $lang['mailguard'] = 'SlÄ“pt epasta adreses'; $lang['iexssprotect'] = 'PÄrbaudÄ«t, vai augÅ¡upielÄdÄ“tajÄ failÄ nav nav potenciÄli bÄ«stamÄ JavaScript vai HTML koda.'; +$lang['showuseras'] = 'KÄ rÄdÄ«t pÄ“dÄ“jo lietotÄju, ka labojis lapu'; $lang['useacl'] = 'Izmantot piekļuves tiesÄ«bas'; $lang['autopasswd'] = 'AutomÄtiski Ä£enerÄ“t paroles'; $lang['authtype'] = 'AutentifikÄcijas mehÄnisms'; @@ -71,12 +77,16 @@ $lang['manager'] = 'PÄrziņi - grupa, lietotÄjs vai to saraksts ( piem.: user1,@group1,user2), kam ir pieeja pie dažÄm administrÄ“Å¡anas funkcijÄm.'; $lang['profileconfirm'] = 'Profila laboÅ¡anai vajag paroli'; $lang['disableactions'] = 'BloÄ·Ä“t Dokuwiki darbÄ«bas'; +$lang['disableactions_check'] = 'atzÄ«mÄ“t'; $lang['disableactions_subscription'] = 'abonÄ“t/atteikties'; $lang['disableactions_nssubscription'] = 'abonÄ“t nodaļu/atteikties'; -$lang['disableactions_wikicode'] = 'skatÄ«t/ekportÄ“t izejtekstu'; +$lang['disableactions_wikicode'] = 'skatÄ«t/eksportÄ“t izejtekstu'; $lang['disableactions_other'] = 'citas darbÄ«bas (atdalÄ«t ar komatiem)'; $lang['sneaky_index'] = 'PÄ“c noklusÄ“tÄ DokuWiki lapu sarakstÄ parÄda visu nodaļu lapas. IeslÄ“dzot Å¡o parametru, noslÄ“ps tÄs nodaļas, kuras apmeklÄ“tÄjam nav tiesÄ«bas lasÄ«t. Bet tad tiks arÄ« paslÄ“ptas dziļÄkas, bet atļautas nodaļas. AtseviÅ¡Ä·os pieejas tiesÄ«bu konfigurÄcijas gadÄ«jumos lapu saraksts var nedarboties.'; $lang['auth_security_timeout'] = 'AutorizÄcijas droÅ¡Ä«bas intervÄls (sekundÄ“s)'; +$lang['securecookie'] = 'Vai pa HTTPS sÅ«tÄmÄs sÄ«kdatnes sÅ«tÄ«t tikai pa HTTPS? AtslÄ“dz Å¡o iespÄ“ju, kad tikai pieteikÅ¡anÄs wiki sistÄ“mÄ notiek pa SSL Å¡ifrÄ“tu savienojumu, bet skatÄ«Å¡ana - pa neÅ¡ifrÄ“tu.'; +$lang['xmlrpc'] = 'IeslÄ“gt/izslÄ“gt XML-RPC interfeisu.'; +$lang['xmlrpcuser'] = 'Ierobežot XML-RPC piekļuvi norÄdÄ«tÄm lietotÄju grupÄm vai lietotÄjiem (atdalÄ«t ar komatiem!). AtstÄt tukÅ¡u, lai piekļuve bÅ«tu visiem.'; $lang['updatecheck'] = 'PÄrbaudÄ«t, vai pieejami atjauninÄjumi un droÅ¡Ä«bas brÄ«dinÄjumi? Dokuwiki sazinÄsies ar splitbrain.org'; $lang['userewrite'] = 'Ä’rti lasÄmas adreses (URL)'; $lang['useslash'] = 'Lietot slÄ«piņu par URL atdalÄ«tÄju'; @@ -102,9 +112,10 @@ $lang['sitemap'] = 'Lapas karte priekÅ¡ Google (dienas)'; $lang['broken_iua'] = 'VarbÅ«t tavÄ serverÄ« nedarbojas funkcija ignore_user_abort? TÄ dēļ var nestÄdÄt meklÄ“Å¡anas indeksÄcija. Å Ä« problÄ“ma sastopama, piemÄ“ram, IIS ar PHP/CGI. Papildus informÄciju skatÄ«t KļūdÄ Nr.852.'; $lang['xsendfile'] = 'Lietot X-Sendfile virsrakstu, augÅ¡upielÄdÄ“jot failu serverÄ«? '; -$lang['xmlrpc'] = 'IeslÄ“gt/izslÄ“gt XML-RPC interfeisu.'; +$lang['renderer_xhtml'] = 'Galveno (xhtml) wiki saturu renderÄ“t ar '; $lang['renderer__core'] = '%s (dokuwiki kodols)'; $lang['renderer__plugin'] = '%s (modulis)'; +$lang['rememberme'] = 'Atļaut pastÄvÄ«gas ielogoÅ¡anÄs sÄ«kdatnes ("atceries mani")'; $lang['rss_type'] = 'XML barotnes veids'; $lang['rss_linkto'] = 'XML barotnes uz '; $lang['rss_content'] = 'Ko attÄ“lot XML barotnÄ“?'; @@ -147,7 +158,7 @@ $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Abstract'; $lang['rss_content_o_diff'] = 'apvienotu diff'; -$lang['rss_content_o_htmldiff'] = 'HTML formatÄ“tu diff tabula'; +$lang['rss_content_o_htmldiff'] = 'HTML formatÄ“tu diff tabulu'; $lang['rss_content_o_html'] = 'pilnu HTML lapas saturu'; $lang['rss_linkto_o_diff'] = 'atÅ¡Ä·irÄ«bas'; $lang['rss_linkto_o_page'] = 'grozÄ«tÄs lapas'; @@ -157,6 +168,14 @@ $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'nelietot'; +$lang['xsendfile_o_1'] = 'lighttpd (pirms laidiena 1.5) veida galvene'; +$lang['xsendfile_o_2'] = 'Standarta X-Sendfile galvene'; +$lang['xsendfile_o_3'] = 'Nginx X-Accel-Redirect veida galvene'; $lang['showuseras_o_loginname'] = 'Login vÄrds'; $lang['showuseras_o_username'] = 'Pilns lietotÄja vÄrds'; +$lang['showuseras_o_email'] = 'LietotÄja epasta adrese (slÄ“pta ar norÄdÄ«to paņēmienu)'; +$lang['showuseras_o_email_link'] = 'Lietot epasta adreses kÄ mailto: saites'; +$lang['useheading_o_0'] = 'Nekad'; +$lang['useheading_o_navigation'] = 'Tikai navigÄcija'; +$lang['useheading_o_content'] = 'Tikai Wiki saturs'; $lang['useheading_o_1'] = 'VienmÄ“r'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/mr/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/mr/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/mr/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/mr/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -7,4 +7,4 @@ निळà¥à¤¯à¤¾ पारà¥à¤¶à¥à¤µà¤­à¥‚मीमधे दाखवलेले सेटिंग आपोआप सेट होणारà¥à¤¯à¤¾ किमती आहेत आणि पांढरà¥à¤¯à¤¾ पारà¥à¤¶à¥à¤µà¤­à¥‚मीमधे दाखवलेले सेटिंग या इनà¥à¤¸à¥à¤Ÿà¥‰à¤²à¥‡à¤¶à¤¨à¤¸à¤¾à¤ à¥€ ख़ास सेट केलेले आहेत. निळे आणि पांढरे दोनà¥à¤¹à¥€ सेटिंग बदलता येतील. -हà¥à¤¯à¤¾ पानावरून बाहर जाणà¥à¤¯à¤¾à¤†à¤§à¥€ "सà¥à¤°à¤•à¥à¤·à¤¿à¤¤" चे बटन कà¥à¤²à¤¿à¤• करायला विसरू नका नाहीतर सरà¥à¤µ बदल नाहीसे होतील. \ Brak znaku nowej linii na koÅ„cu pliku +हà¥à¤¯à¤¾ पानावरून बाहर जाणà¥à¤¯à¤¾à¤†à¤§à¥€ "Save" चे बटन कà¥à¤²à¤¿à¤• करायला विसरू नका नाहीतर सरà¥à¤µ बदल नाहीसे होतील. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/mr/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/mr/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/mr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/mr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -13,6 +13,9 @@ $lang['nochoice'] = '( इतर काही परà¥à¤¯à¤¾à¤¯ नाहीत )'; $lang['locked'] = 'सेटिंगची फाइल अदà¥à¤¯à¤¯à¤¾à¤µà¤¤ करू शकलो नाही. जर हे सहेतà¥à¤• नसेल तर,
    सेटिंग चà¥à¤¯à¤¾ फाइल चे नाव व तà¥à¤¯à¤¾à¤µà¤°à¥€à¤² परवानगà¥à¤¯à¤¾ बरोबर असलà¥à¤¯à¤¾à¤šà¥€ खातà¥à¤°à¥€ करा.'; +$lang['danger'] = 'सावधान : हा परà¥à¤¯à¤¾à¤¯ बदललà¥à¤¯à¤¾à¤¸ तà¥à¤®à¤šà¥€ विकी आणि तिचे कॉनफिगरेशन निकामी होऊ शकते.'; +$lang['warning'] = 'सावघान: येथील परà¥à¤¯à¤¾à¤¯ बदलà¥à¤¯à¤¾à¤¸, अनपेकà¥à¤·à¥€à¤¤ गोषà¥à¤Ÿà¥€ होऊ शकतात.'; +$lang['security'] = 'सà¥à¤°à¤•à¥à¤·à¤¾ संबंधी सूचना : हा परà¥à¤¯à¤¾à¤¯ बदललà¥à¤¯à¤¾à¤¸ तà¥à¤®à¤šà¥€ साईट असà¥à¤°à¤•à¥à¤·à¤¿à¤¤ होऊ शकते.'; $lang['_configuration_manager'] = 'कॉनà¥à¤«à¤¿à¤—रेशन वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤•'; $lang['_header_dokuwiki'] = 'डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¤¿ सेटिंग'; $lang['_header_plugin'] = 'पà¥à¤²à¤—िन सेटिंग'; @@ -46,11 +49,13 @@ $lang['recent'] = 'अलीकडील बदल'; $lang['breadcrumbs'] = 'बà¥à¤°à¥‡à¤¡à¤•à¥à¤°à¤®à¥à¤¬à¤šà¥€ संखà¥à¤¯à¤¾'; $lang['youarehere'] = 'पà¥à¤°à¤¤à¤µà¤¾à¤° बà¥à¤°à¥‡à¤¡à¤•à¥à¤°à¤®à¥à¤¬'; +$lang['typography'] = 'अनवधानाने à¤à¤¾à¤²à¥‡à¤²à¥à¤¯à¤¾ चà¥à¤•à¤¾ बदला'; $lang['htmlok'] = 'अंतरà¥à¤—त HTML टाकायची परवानगी असू दे'; $lang['phpok'] = 'अंतरà¥à¤—त PHP टाकायची परवानगी असू दे'; $lang['dformat'] = 'दिनांकाची पदà¥à¤§à¤¤ ( PHP चं strftime हे फंकà¥à¤¶à¤¨ पाहा )'; $lang['signature'] = 'हसà¥à¤¤à¤¾à¤•à¥à¤·à¤°'; $lang['toptoclevel'] = 'अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¥‡à¤šà¥€ सरà¥à¤µà¥‹à¤šà¥à¤š पातळी'; +$lang['tocminheads'] = 'कमीत कमी किती शीरà¥à¤·à¤•à¥‡ असलà¥à¤¯à¤¾à¤¸ अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¤¾ बनवावी'; $lang['maxtoclevel'] = 'अनà¥à¤•à¥à¤°à¤®à¤£à¤¿à¤•à¥‡à¤šà¥€ जासà¥à¤¤à¥€à¤¤ जासà¥à¤¤ पातळी '; $lang['maxseclevel'] = 'विभागीय संपादनाची जासà¥à¤¤à¥€à¤¤à¤œà¤¾à¤¸à¥à¤¤ पातळी'; $lang['camelcase'] = 'लिंकसाठी कॅमलकेस वापरा.'; @@ -82,6 +87,8 @@ $lang['sneaky_index'] = 'सूची दृशà¥à¤¯à¤¾à¤®à¤§à¥‡ डिफॉलà¥à¤Ÿ सà¥à¤µà¤°à¥‚पात डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€ सगळे नेमसà¥à¤ªà¥‡à¤¸ दाखवते. हा परà¥à¤¯à¤¾à¤¯ चालू केलà¥à¤¯à¤¾à¤¸ सदसà¥à¤¯à¤¾à¤²à¤¾ वाचणà¥à¤¯à¤¾à¤šà¥€ परवानगी नसलेले नेमसà¥à¤ªà¥‡à¤¸ दिसणार नाहीत. यामà¥à¤³à¥‡ परवानगी असलेले उप - नेमसà¥à¤ªà¥‡à¤¸ न दिसणà¥à¤¯à¤¾à¤šà¥€ शकà¥à¤¯à¤¤à¤¾ आहे. यामà¥à¤³à¥‡ काही विशिषà¥à¤  ACL सेटिंगसाठी सूची वापरता येणà¥à¤¯à¤¾à¤¸à¤¾à¤°à¤–ी राहणार नाही.'; $lang['auth_security_timeout'] = 'अधिकृत करणà¥à¤¯à¤¾à¤šà¥à¤¯à¤¾ पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¥‡à¤šà¥€ कालमरà¥à¤¯à¤¾à¤¦à¤¾'; $lang['securecookie'] = 'HTTPS वापरून सेट केलेले कूकीज बà¥à¤°à¤¾à¤‰à¤œà¤°à¤¨à¥‡ HTTPS दà¥à¤µà¤¾à¤°à¤¾à¤š पाठवले पाहिजेत का? जर तà¥à¤®à¤šà¥à¤¯à¤¾ विकीचं फ़कà¥à¤¤ लॉगिन पानच SSL वापरून सà¥à¤°à¤•à¥à¤·à¤¿à¤¤ केलं असेल व पानांचं बà¥à¤°à¤¾à¤‰à¤œà¤¿à¤‚ग असà¥à¤°à¤•à¥à¤·à¤¿à¤¤ असेल तर हा परà¥à¤¯à¤¾à¤¯ चालू करू नका.'; +$lang['xmlrpc'] = 'XML-RPC इंटरफेस चालू/बंद करा'; +$lang['xmlrpcuser'] = 'XML-RPC सà¥à¤µà¤¿à¤§à¤¾ फ़कà¥à¤¤ इथे सà¥à¤µà¤²à¥à¤ªà¤µà¤¿à¤°à¤¾à¤®à¤¾à¤¨à¥‡ अलग करून दिलेलà¥à¤¯à¤¾ गट किंवा वापरकरà¥à¤¤à¥à¤¯à¤¾à¤²à¤¾ उपलबà¥à¤§ आहेत. सरà¥à¤µà¤¾à¤¨à¤¾ ही सà¥à¤µà¤¿à¤§à¤¾ देणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ ही जागा रिकामी सोडा.'; $lang['updatecheck'] = 'अपडेट आणि सà¥à¤°à¤•à¥à¤·à¤¿à¤¤à¤¤à¥‡à¤µà¤¿à¤¶à¤¯à¥€ सूचनानà¥à¤µà¤° पाळत ठेऊ का? या सà¥à¤µà¤¿à¤§à¥‡à¤¸à¤¾à¤ à¥€ डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€à¤²à¤¾ splitbrain.org शी संपरà¥à¤• साधावा लागेल.'; $lang['userewrite'] = 'छान छान URL वापर'; $lang['useslash'] = 'URL मधे नेमसà¥à¤ªà¥‡à¤¸ अलग करणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ \'/\' चिहà¥à¤¨ वापरा'; @@ -107,7 +114,6 @@ $lang['sitemap'] = 'गूगल साईट-मॅप बनवा'; $lang['broken_iua'] = 'ignore_user_abort फंकà¥à¤¶à¤¨ तà¥à¤®à¤šà¥à¤¯à¤¾ सिसà¥à¤Ÿà¤® वर चालत नाही का? यामà¥à¤³à¥‡ शोध सूची निकामी होऊ शकते. IIS + PHP/CGI वर हे काम करत नाही हे नकà¥à¤•à¥€ à¤à¤¾à¤²à¥‡ आहे. अधिक माहितीसाठी बग ८५२ पहा.'; $lang['xsendfile'] = 'सरà¥à¤µà¤° कडून सà¥à¤¥à¤¿à¤° फाइल पाठवली जाणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ X-Sendfile शीरà¥à¤·à¤• ( header ) वापरू का ? तà¥à¤®à¤šà¥à¤¯à¤¾ वेब सरà¥à¤µà¤° मधे ही सà¥à¤µà¤¿à¤§à¤¾ असली पाहिजे.'; -$lang['xmlrpc'] = 'XML-RPC इंटरफेस चालू/बंद करा'; $lang['renderer_xhtml'] = 'मà¥à¤–à¥à¤¯ ( xhtml ) विकी आउटà¥à¤ªà¥à¤Ÿ साथी वापरायचा चितà¥à¤°à¤• ( renderer )'; $lang['renderer__core'] = '%s (डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€à¤šà¤¾ मूलभूत)'; $lang['renderer__plugin'] = '%s (पà¥à¤²à¤—िन)'; @@ -146,6 +152,7 @@ $lang['deaccent_o_2'] = 'रोमन लिपित बदला'; $lang['gdlib_o_0'] = 'GD Lib उपलबà¥à¤§ नाही'; $lang['gdlib_o_1'] = 'आवृतà¥à¤¤à¥€ १.x'; +$lang['gdlib_o_2'] = 'आपोआप ओळखा'; $lang['rss_type_o_rss'] = 'RSS 0.91'; $lang['rss_type_o_rss1'] = 'RSS 1.0'; $lang['rss_type_o_rss2'] = 'RSS 2.0'; @@ -171,4 +178,6 @@ $lang['showuseras_o_email'] = 'सदसà¥à¤¯à¤¾à¤šà¤¾ ईमेल ( मेल सà¥à¤°à¤•à¥à¤·à¤¿à¤¤à¤¤à¥‡à¤šà¥à¤¯à¤¾ सेटिंग अनà¥à¤¸à¤¾à¤° दà¥à¤°à¥à¤¬à¥‹à¤§ केलेला ) '; $lang['showuseras_o_email_link'] = 'सदसà¥à¤¯à¤¾à¤šà¤¾ ईमेल maito: लिंक सà¥à¤µà¤°à¥‚पात'; $lang['useheading_o_0'] = 'कधीच नाही'; +$lang['useheading_o_navigation'] = 'फ़कà¥à¤¤ मारà¥à¤—दरà¥à¤¶à¤¨'; +$lang['useheading_o_content'] = 'फ़कà¥à¤¤ विकी मजकूर'; $lang['useheading_o_1'] = 'नेहमी'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,12 +8,18 @@ * @author John de Graaff * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
    Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; $lang['updated'] = 'Instellingen met succes opgeslagen.'; $lang['nochoice'] = '(geen andere keuzemogelijkheden)'; $lang['locked'] = 'Het bestand met instellingen kan niet worden gewijzigd. Als dit niet de bedoeling
    is, controleer dan de naam en de permissies voor het lokale installingenbestand.'; +$lang['danger'] = 'Gevaar: Het wijzigen van deze optie kan er voor zorgen dat uw wiki en het configuratiemenu niet langer toegankelijk zijn.'; +$lang['warning'] = 'Waarschuwing: Het wijzigen van deze optie kan onverwachte gedragingen veroorzaken.'; +$lang['security'] = 'Beveiligingswaarschuwing: Het wijzigen van deze optie kan een beveiligingsrisico inhouden.'; $lang['_configuration_manager'] = 'Configuratiemanager'; $lang['_header_dokuwiki'] = 'DokuWiki-instellingen'; $lang['_header_plugin'] = 'Plugin-instellingen'; @@ -85,6 +91,8 @@ $lang['sneaky_index'] = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.'; $lang['auth_security_timeout'] = 'Authenticatiebeveiligings-timeout (seconden)'; $lang['securecookie'] = 'Moeten cookies die via HTTPS gezet zijn alleen via HTTPS verzonden worden door de browser? Zet deze optie uit als alleen het inloggen op de wiki beveiligd is, maar het gebruik verder niet.'; +$lang['xmlrpc'] = 'Inschakelen/uitschakelen XML-RPC interface.'; +$lang['xmlrpcuser'] = 'Beperk XML-RPC toegang tot de lijst met kommagescheiden groepen of gebruikers die hier zijn opgegeven. Laat leeg om iedereen toegang te geven.'; $lang['updatecheck'] = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met splitbrain.org.'; $lang['userewrite'] = 'Gebruik nette URL\'s'; $lang['useslash'] = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s'; @@ -110,7 +118,6 @@ $lang['sitemap'] = 'Genereer Google sitemap (dagen)'; $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.'; -$lang['xmlrpc'] = 'Inschakelen/uitschakelen XML-RPC interface.'; $lang['renderer_xhtml'] = 'Weergavesysteem voor de standaard (xhtml) wiki-uitvoer'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['menu'] = 'Konfigurasjonsinnstillinger'; $lang['error'] = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt. @@ -17,6 +21,11 @@ $lang['locked'] = 'Innstillingene kan ikke oppdateres. Hvis dette ikke er meningen,
    forsikre deg om at fila med de lokale innstillingene har korrekt filnavn
    og tillatelser.'; +$lang['danger'] = 'Advarsel: Endrig av dette valget kan føre til at wiki og konfigurasjon menyen ikke blir tilgjengelig.'; +$lang['warning'] = 'Advarsel: Endring av dette valget kan føre til utilsiktede atferd. + +'; +$lang['security'] = 'Sikkerhets Advarsel: Endring av dette valget kan føre til sikkerhetsrisiko.'; $lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger'; $lang['_header_dokuwiki'] = 'Innstillinger for DokuWiki'; $lang['_header_plugin'] = 'Innstillinger for tillegg'; @@ -25,7 +34,7 @@ $lang['_basic'] = 'Grunnleggende innstillinger'; $lang['_display'] = 'Innstillinger for visning av sider'; $lang['_authentication'] = 'Innstillinger for autentisering'; -$lang['_anti_spam'] = 'Anti-spam-innstillinger'; +$lang['_anti_spam'] = 'Motsøppel-innstillinger'; $lang['_editing'] = 'Innstillinger for redigering'; $lang['_links'] = 'Innstillinger for lenker'; $lang['_media'] = 'Innstillinger for media-filer'; @@ -56,9 +65,10 @@ $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.'; $lang['maxtoclevel'] = 'Maksimalt antall nivåer i innholdsfortegnelse'; $lang['maxseclevel'] = 'Maksimalt nivå for redigering av seksjon'; -$lang['camelcase'] = 'Gjør CamelCase til lenke automatisk'; +$lang['camelcase'] = 'Gjør KamelKasse til lenke automatisk'; $lang['deaccent'] = 'Rensk sidenavn'; $lang['useheading'] = 'Bruk første overskrift som tittel'; $lang['refcheck'] = 'Sjekk referanser før mediafiler slettes'; @@ -69,13 +79,14 @@ $lang['relnofollow'] = 'Bruk rel="nofollow" på eksterne lenker'; $lang['mailguard'] = 'Beskytt e-postadresser'; $lang['iexssprotect'] = 'Sjekk om opplastede filer inneholder skadelig JavaScrips- eller HTML-kode'; +$lang['showuseras'] = 'Hva som skal med når man viser brukeren som sist redigerte en side.'; $lang['useacl'] = 'Bruk lister for adgangskontroll (ACL)'; $lang['autopasswd'] = 'Generer passord automatisk'; $lang['authtype'] = 'Autentiseringsmetode'; $lang['passcrypt'] = 'Metode for kryptering av passord'; $lang['defaultgroup'] = 'Standardgruppe'; -$lang['superuser'] = 'Superbruker - en gruppe eller bruker med full tilgang til alle sider og funksjoner uavhengig av ACL-innstillingene'; -$lang['manager'] = 'Administrator - en gruppe eller bruker med tilgang til visse administratorfunksjoner'; +$lang['superuser'] = 'Superbruker - en gruppe, bruker eller liste (kommaseparert) med full tilgang til alle sider og funksjoner uavhengig av ACL-innstillingene'; +$lang['manager'] = 'Administrator - en gruppe, bruker eller liste (kommaseparert) med tilgang til visse administratorfunksjoner'; $lang['profileconfirm'] = 'Bekreft profilendringer med passord'; $lang['disableactions'] = 'Skru av følgende DokuWiki-kommandoer'; $lang['disableactions_check'] = 'Sjekk'; @@ -86,6 +97,9 @@ $lang['sneaky_index'] = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.'; $lang['auth_security_timeout'] = 'Autentisering utløper etter (sekunder)'; $lang['securecookie'] = 'Skal informasjonskapsler satt via HTTPS kun sendes via HTTPS av nettleseren? Skal ikke velges dersom bare innloggingen til din wiki er sikret med SSL, og annen navigering på wikien er usikret.'; +$lang['xmlrpc'] = 'Slå på/slå av XML-RPC-grensesnitt'; +$lang['xmlrpcuser'] = 'Å tillate XML-RPC-adgang til bestemte grupper eller brukere, sette deres navne (kommaseparert) her. Slik får du tilgang til alle, la feltet tomt. +'; $lang['updatecheck'] = 'Se etter oppdateringer og sikkerhetsadvarsler? Denne funksjonen er avhengig av å kontakte splitbrain.org.'; $lang['userewrite'] = 'Bruk pene URLer'; $lang['useslash'] = 'Bruk / som skilletegn mellom navnerom i URLer'; @@ -111,7 +125,6 @@ $lang['sitemap'] = 'Lag Google-sidekart (dager)'; $lang['broken_iua'] = 'Er funksjonen ignore_user_abort på ditt system ødelagt? Dette kan gjøre at indeksering av søk ikke fungerer. Dette er et kjent problem med IIS+PHP/CGI. Se Bug 852 for mer informasjon.'; $lang['xsendfile'] = 'Bruk X-Sendfile header for å la webserver levere statiske filer? Din webserver må støtte dette.'; -$lang['xmlrpc'] = 'Slå på/slå av XML-RPC-grensesnitt'; $lang['renderer_xhtml'] = 'Renderer til bruk for wiki-output (XHTML)'; $lang['renderer__core'] = '%s (dokuwikikjerne)'; $lang['renderer__plugin'] = '%s (plugin)'; @@ -171,3 +184,11 @@ $lang['xsendfile_o_1'] = 'Proprietær lighttpd header (før release 1.5)'; $lang['xsendfile_o_2'] = 'Standard X-Sendfile header'; $lang['xsendfile_o_3'] = 'Priprietær Nginx X-Accel-Redirect header'; +$lang['showuseras_o_loginname'] = 'Brukernavn'; +$lang['showuseras_o_username'] = 'Brukerens fulle navn'; +$lang['showuseras_o_email'] = 'Brukerens epostadresse (tilpasset i henhold til mailguar-instilling)'; +$lang['showuseras_o_email_link'] = 'Brukerens epost-addresse som "mailto:"-lenke'; +$lang['useheading_o_0'] = 'Aldri'; +$lang['useheading_o_navigation'] = 'Kun navigering'; +$lang['useheading_o_content'] = 'Kun wiki-innhold'; +$lang['useheading_o_1'] = 'Alltid'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,12 +6,16 @@ * @author Grzegorz Żur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author Sławomir Boczek */ $lang['menu'] = 'Ustawienia'; $lang['error'] = 'Ustawienia nie zostały zapisane z powodu błędnych wartości, przejrzyj je i ponów próbę zapisu.
    Niepoprawne wartości są wyróżnione kolorem czerwonym.'; $lang['updated'] = 'Ustawienia zostały zmienione.'; $lang['nochoice'] = '(brak innych możliwości)'; $lang['locked'] = 'Plik ustawień nie mógł zostać zmieniony, upewnij się, czy uprawnienia do pliku są odpowiednie.'; +$lang['danger'] = 'Uwaga: Zmiana tej opcji może uniemożliwić dostęp do twojej wiki oraz konfogiracji.'; +$lang['warning'] = 'Ostrzeżenie: Zmiana tej opcji może spowodować nieporządane skutki.'; +$lang['security'] = 'Alert bezpieczeństwa: Zmiana tej opcji może obniżyć bezpieczeństwo.'; $lang['_configuration_manager'] = 'Menadżer konfiguracji'; $lang['_header_dokuwiki'] = 'Ustawienia DokuWiki'; $lang['_header_plugin'] = 'Ustawienia wtyczek'; @@ -83,6 +87,8 @@ $lang['sneaky_index'] = 'Domyślnie, Dokuwiki pokazuje wszystkie katalogi w indeksie. Włączenie tej opcji ukryje katalogi, do których użytkownik nie ma praw. Może to spowodować ukrycie podkatalogów, do których użytkownik ma prawa. Ta opcja może spowodować błędne działanie indeksu w połączeniu z pewnymi konfiguracjami praw dostępu.'; $lang['auth_security_timeout'] = 'Czas wygaśnięcia uwierzytelnienia (w sekundach)'; $lang['securecookie'] = 'Czy ciasteczka wysłane do przeglądarki przez HTTPS powinny być przez nią odsyłane też tylko przez HTTPS? Odznacz tę opcję tylko wtedy, gdy logowanie użytkowników jest zabezpieczone SSL, ale przeglądanie stron odbywa się bez zabezpieczenia.'; +$lang['xmlrpc'] = 'Włącz/wyłącz interfejs XML-RPC'; +$lang['xmlrpcuser'] = 'Lista użytkowników i grup, którzy mogą korzystać z protokołu XML-RPC. Nazwy grup i użytkowników rozdziel przecinkami, puste pole oznacza dostęp dla wszystkich.'; $lang['updatecheck'] = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem splitbrain.org.'; $lang['userewrite'] = 'Proste adresy URL'; $lang['useslash'] = 'Używanie ukośnika jako separatora w adresie URL'; @@ -108,7 +114,6 @@ $lang['sitemap'] = 'Okres generowania Google Sitemap (w dniach)'; $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.'; -$lang['xmlrpc'] = 'Włącz/wyłącz interfejs XML-RPC'; $lang['renderer_xhtml'] = 'Mechanizm renderowania głównej treści strony (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki)'; $lang['renderer__plugin'] = '%s (wtyczka)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/pt/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/pt/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ +====== Gerenciador de Configurações ====== + +Use esta página para controlar as definições da instalação do seu DokuWiki. Para ajuda acerca dos itens, consulte [[doku>config]]. Para mais detalhes sobre este plugin, veja [[doku>plugin:config]]. + +Definições que apresentem um fundo vermelho claro são protegidas e não podem ser alteradas com este plugin. Definições com um fundo azul são padrão e definições com um fundo branco foram configuradas localmente para essa instalação em particular. Tanto as definições em azul como em branco podem ser alteradas. + +Lembre-se de pressionar o botão **Guardar** antes de sair desta página, caso contrário, as suas definições serão perdidas. \ Brak znaku nowej linii na końcu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,11 +4,18 @@ * * @author José Monteiro * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ -$lang['menu'] = 'Parâmetros de Configuração'; +$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.'; $lang['updated'] = 'Parâmetros de Configuração actualizados com sucesso.'; $lang['nochoice'] = '(não existem outras escolhas disponíveis)'; +$lang['locked'] = 'O ficheiro de configuração não pôde ser actualizado, se isso foi não intencional,
    certifique-se que o nome e as permissões do ficheiro de configuração estejam correctas. +'; +$lang['danger'] = 'Perigo: Alterar esta opção poderá tornar o seu wiki e o menu de configuração inacessíveis.'; +$lang['warning'] = 'Aviso: A alteração desta opção poderá causar comportamento involuntário.'; +$lang['security'] = 'Aviso de segurança: Alterar esta opção pode apresentar um risco de segurança.'; $lang['_configuration_manager'] = 'Gestor de Parâmetros de Configuração'; $lang['_header_dokuwiki'] = 'Parâmetros DokuWiki'; $lang['_header_plugin'] = 'Parâmetros dos Plugins'; @@ -25,6 +32,8 @@ $lang['_network'] = 'Configuração de Rede'; $lang['_plugin_sufix'] = 'Configuração dos Plugins'; $lang['_template_sufix'] = 'Configuração das Templates'; +$lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.'; +$lang['_msg_setting_no_class'] = 'Nenhuma classe definida.'; $lang['_msg_setting_no_default'] = 'Sem valor por omissão.'; $lang['fmode'] = 'Modo de criação de ficheiros.'; $lang['dmode'] = 'Modo de criação de pastas.'; @@ -35,6 +44,7 @@ $lang['start'] = 'Nome da Página Inicial'; $lang['title'] = 'Título deste Wiki'; $lang['template'] = 'Template'; +$lang['license'] = 'Sob que licença o seu conteúdo deverá ser disponibilizado?'; $lang['fullpath'] = 'Revelar caminho completo no rodapé'; $lang['recent'] = 'Alterações recentes'; $lang['breadcrumbs'] = 'Número máximo de breadcrumbs'; @@ -45,31 +55,92 @@ $lang['dformat'] = 'Formato de Data (ver função PHP\'s strftime)'; $lang['signature'] = 'Assinatura'; $lang['toptoclevel'] = 'Nível de topo para a tabela de conteúdo'; +$lang['tocminheads'] = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.'; $lang['maxtoclevel'] = 'Máximo nível para a tabela de conteúdo'; $lang['maxseclevel'] = 'Máximo nível para editar secção'; $lang['camelcase'] = 'Usar CamelCase'; +$lang['deaccent'] = 'Nomes das páginas sem acentos'; +$lang['useheading'] = 'Usar o primeiro cabeçalho para o nome da página'; +$lang['refcheck'] = 'Verificação de referência da media'; +$lang['refshow'] = 'Número de referências de media a exibir'; +$lang['allowdebug'] = 'Permitir depuração desabilite se não for necessário!'; +$lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras (wordlist)'; +$lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; +$lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; +$lang['mailguard'] = 'Obscurecer endereços de email'; +$lang['iexssprotect'] = 'Verificar os arquivos enviados contra possíveis códigos maliciosos em HTML ou JavaScript'; +$lang['showuseras'] = 'O que exibir quando mostrar o utilizador que editou a página pela última vez'; $lang['useacl'] = 'Usar ACL - Listas de Controlo de Acessos'; $lang['autopasswd'] = 'Auto-gerar senhas'; +$lang['authtype'] = 'Método de autenticação'; $lang['passcrypt'] = 'Método de cifragem da senha'; $lang['defaultgroup'] = 'Grupo por omissão'; +$lang['superuser'] = 'Superutilizador - um grupo, utilizador ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tem acesso completo a todas as páginas e funções, independente das definições da ACL'; +$lang['manager'] = 'Gestor - um grupo, utilizador ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tem acesso a certas funções de gestão'; +$lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; $lang['disableactions'] = 'Desactivar acções DokuWiki'; $lang['disableactions_check'] = 'Checar'; $lang['disableactions_subscription'] = 'Subscrever/Não Subscrver'; $lang['disableactions_nssubscription'] = 'Subscrever / Dessubscrever Espaço de Nome'; $lang['disableactions_wikicode'] = 'Ver fonte/Exportar em bruto'; $lang['disableactions_other'] = 'Outras acções (separadas por vírgula)'; +$lang['sneaky_index'] = 'Por norma, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles em que o utilizador não tenha permissão de leitura. Isto pode resultar na omissão de sub-ramos acessíveis, que poderá tornar o índice inútil para certas configurações de ACL.'; +$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['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; +$lang['xmlrpcuser'] = 'Restringir acesso XML-RPC para os grupos separados por vírgula ou utilizadores inseridos aqui. Deixar vazio para dar acesso a todos.'; +$lang['updatecheck'] = 'Verificar por actualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efectuar esta verificação.'; +$lang['userewrite'] = 'Usar URLs SEO'; +$lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; +$lang['usedraft'] = 'Guardar o rascunho automaticamente durante a edição'; +$lang['sepchar'] = 'Separador de palavras no nome da página'; +$lang['canonical'] = 'Usar URLs absolutas (http://servidor/caminho)'; +$lang['autoplural'] = 'Verificar formas plurais nos links'; $lang['compression'] = 'Método de compressão para histórico'; $lang['cachetime'] = 'Idade máxima para cache (seg.)'; $lang['locktime'] = 'Idade máxima para locks (seg.)'; +$lang['fetchsize'] = 'Tamanho máximo (bytes) que o fetch.php pode transferir do exterior'; +$lang['notify'] = 'Enviar notificações de mudanças para este endereço de email'; +$lang['registernotify'] = 'Enviar informações de utilizadores registados para este endereço de email'; +$lang['mailfrom'] = 'Endereço de email a ser utilizado para mensagens automáticas'; +$lang['gzip_output'] = 'Usar "Content-Encoding" do gzip para o código xhtml'; $lang['gdlib'] = 'Versão GD Lib'; +$lang['im_convert'] = 'Caminho para a ferramenta "convert" do ImageMagick'; $lang['jpg_quality'] = 'Compressão/Qualidade JPG (0-100)'; +$lang['subscribers'] = 'Habilitar o suporte a subscrição de páginas '; +$lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; +$lang['hidepages'] = 'Esconder páginas correspondentes (expressões regulares)'; +$lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; $lang['sitemap'] = 'Gerar Sitemap Google (dias)'; +$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.'; +$lang['renderer_xhtml'] = 'Renderizador a ser utilizado para a saída principal do wiki (xhtml)'; +$lang['renderer__core'] = '%s (núcleo dokuwiki)'; $lang['renderer__plugin'] = '%s (plugin)'; +$lang['rememberme'] = 'Permitir cookies de autenticação permanentes (Memorizar?)'; $lang['rss_type'] = 'Tipo de feed XML'; $lang['rss_linkto'] = 'Links de feed XML ara'; +$lang['rss_content'] = 'O que deve ser exibido nos itens do alimentador XML?'; +$lang['rss_update'] = 'Intervalo de actualização do alimentador XML (seg)'; +$lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas? (dias)'; +$lang['rss_show_summary'] = 'Resumo de exibição do alimentador XML no título'; +$lang['target____wiki'] = 'Parâmetro "target" para links internos'; +$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['proxy____host'] = 'Nome do servidor proxy'; $lang['proxy____port'] = 'Porta de Proxy'; $lang['proxy____user'] = 'Nome de utilizador Proxy'; $lang['proxy____pass'] = 'Password de Proxy '; +$lang['proxy____ssl'] = 'Usar SSL para conectar ao proxy'; +$lang['safemodehack'] = 'Habilitar modo de segurança'; +$lang['ftp____host'] = 'Servidor FTP para o modo de segurança'; +$lang['ftp____port'] = 'Porta de FTP para o modo de segurança'; +$lang['ftp____user'] = 'Nome do utilizador FTP para o modo de segurança'; +$lang['ftp____pass'] = 'Senha do utilizador FTP para o modo de segurança'; +$lang['ftp____root'] = 'Directoria raiz do FTP para o modo de segurança'; +$lang['license_o_'] = 'Nenhuma escolha'; $lang['typography_o_0'] = 'nenhum'; $lang['typography_o_1'] = 'Apenas entre aspas'; $lang['typography_o_2'] = 'Entre aspas e apóstrofes'; @@ -78,6 +149,8 @@ $lang['userewrite_o_2'] = 'interno (DokuWiki)'; $lang['deaccent_o_0'] = 'desligado'; $lang['deaccent_o_1'] = 'remover acentos'; +$lang['deaccent_o_2'] = 'romanizar'; +$lang['gdlib_o_0'] = 'A GD Lib não está disponível'; $lang['gdlib_o_1'] = 'Versão 1.x'; $lang['gdlib_o_2'] = 'Auto-detecção'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -87,6 +160,8 @@ $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Abstracto'; $lang['rss_content_o_diff'] = 'Diferenças Unificadas'; +$lang['rss_content_o_htmldiff'] = 'Tabela de diff formatada em HTML'; +$lang['rss_content_o_html'] = 'Conteúdo completo da página em HTML'; $lang['rss_linkto_o_diff'] = 'vista de diferenças'; $lang['rss_linkto_o_page'] = 'página revista'; $lang['rss_linkto_o_rev'] = 'lista de revisões'; @@ -94,3 +169,15 @@ $lang['compression_o_0'] = 'Sem Compressão'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; +$lang['xsendfile_o_0'] = 'não usar'; +$lang['xsendfile_o_1'] = 'Cabeçalho proprietário lighttpd (anterior à versão 1.5)'; +$lang['xsendfile_o_2'] = 'Cabeçalho "X-Sendfile" padrão'; +$lang['xsendfile_o_3'] = 'Cabeçalho proprietário "Nginx X-Accel-Redirect"'; +$lang['showuseras_o_loginname'] = 'Nome de utilizador'; +$lang['showuseras_o_username'] = 'Nome completo do utilizador'; +$lang['showuseras_o_email'] = 'Endereço email do utilizador (ofuscado de acordo com a configuração mailguard)'; +$lang['showuseras_o_email_link'] = 'Endereço de e-mail de usuário como um link "mailto:"'; +$lang['useheading_o_0'] = 'Nunca'; +$lang['useheading_o_navigation'] = 'Apenas Navegação'; +$lang['useheading_o_content'] = 'Apenas Conteúdo Wiki'; +$lang['useheading_o_1'] = 'Sempre'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/pt-br/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt-br/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/pt-br/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt-br/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ ====== Gerenciador de Configurações ====== -Use essa página para controlar as definições da instalação do seu DokuWiki. Para ajuda acerca dos itens, consulte [[doku>config]]. Para mais detalhes sobre esse "plugin", veja [[doku>plugin:config]]. +Use essa página para controlar as configurações da instalação do seu DokuWiki. Para ajuda acerca dos itens, consulte [[doku>config]]. Para mais detalhes sobre esse plug-in, veja [[doku>plugin:config]]. -Definições que apresentem um fundo vermelho claro são protegidas e não podem ser alteradas com esse "plugin". Definições com um fundo azul são padrão e com um fundo branco foram configuradas localmente para essa instalação em particular. Tanto as definições em azul quanto em branco podem ser alteradas. +Definições que apresentem um fundo vermelho claro são protegidas e não podem ser alteradas com esse plug-in. As definições com um fundo azul são o padrão e as com um fundo branco foram configuradas localmente para essa instalação em particular. Tanto as definições em azul quanto as em branco podem ser alteradas. -Lembre-se de pressionar o botão **Salvar** antes de sair dessa página, caso contrário, suas definições serão perdidas. \ Brak znaku nowej linii na końcu pliku +Lembre-se de pressionar o botão **Salvar** antes de sair dessa página, caso contrário, suas configurações serão perdidas. \ Brak znaku nowej linii na końcu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,16 +11,19 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ $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.'; +$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.'; $lang['updated'] = 'As configurações foram atualizadas com sucesso.'; $lang['nochoice'] = '(nenhuma outra opção disponível)'; -$lang['locked'] = ' -The settings file can not be updated, if this is unintentional,
    -O arquivo de configurações não pode ser atualizado. Se isso
    -não for intencional, certifique-se de que o nome e as permissões
    -do arquivo de configurações estejam corretos.'; +$lang['locked'] = 'Não foi possível atualizar o arquivo de configurações. Se isso
    +não for intencional, certifique-se de que o nome do arquivo e as
    +e as suas permissões estejam corretos.'; +$lang['danger'] = 'Perigo: Alterar esta opção poderá tornar o seu wiki e menu de configuração inacessíveis.'; +$lang['warning'] = 'Aviso: A alteração desta opção pode causar um comportamento indesejável.'; +$lang['security'] = 'Aviso de segurança: A alteração desta opção pode representar um risco de segurança.'; $lang['_configuration_manager'] = 'Gerenciador de configurações'; $lang['_header_dokuwiki'] = 'Configurações do DokuWiki'; $lang['_header_plugin'] = 'Configurações de plug-ins'; @@ -61,53 +64,54 @@ $lang['signature'] = 'Assinatura'; $lang['toptoclevel'] = 'Nível mais alto para a tabela de conteúdos'; $lang['tocminheads'] = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.'; -$lang['maxtoclevel'] = 'Nível máximo para a tabela de conteúdos'; -$lang['maxseclevel'] = 'Nível máximo da seção para edição'; -$lang['camelcase'] = 'Usar WikiWords para links'; -$lang['deaccent'] = 'Nomes das páginas "limpo"'; -$lang['useheading'] = 'Usar o primeiro cabeçalho para nome da página'; -$lang['refcheck'] = 'Checagem de referência da mídia'; +$lang['maxtoclevel'] = 'Nível máximo para entrar na tabela de conteúdos'; +$lang['maxseclevel'] = 'Nível máximo para gerar uma seção de edição'; +$lang['camelcase'] = 'Usar CamelCase para links'; +$lang['deaccent'] = '"Limpar" os nomes das páginas'; +$lang['useheading'] = 'Usar o primeiro cabeçalho como nome da página'; +$lang['refcheck'] = 'Verificação de referência da mídia'; $lang['refshow'] = 'Número de referências de mídia a exibir'; -$lang['allowdebug'] = 'Permitir depuração (desabilite se não for necessário!)'; +$lang['allowdebug'] = 'Habilitar a depuração (desabilite se não for necessário!)'; $lang['usewordblock'] = 'Bloquear spam baseado em lista de palavras'; $lang['indexdelay'] = 'Tempo de espera antes da indexação (seg)'; $lang['relnofollow'] = 'Usar rel="nofollow" em links externos'; $lang['mailguard'] = 'Obscurecer endereços de e-mail'; -$lang['iexssprotect'] = 'Checar os arquivos enviados contra possíveis códigos maliciosos em HTML ou JavaScript'; +$lang['iexssprotect'] = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados'; $lang['showuseras'] = 'O que exibir quando mostrar o usuário que editou a página pela última vez'; $lang['useacl'] = 'Usar listas de controle de acesso'; $lang['autopasswd'] = 'Gerar senhas automaticamente'; $lang['authtype'] = 'Método de autenticação'; $lang['passcrypt'] = 'Método de criptografia da senha'; $lang['defaultgroup'] = 'Grupo padrão'; -$lang['superuser'] = 'Superusuário - um grupo, usuário ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tenha acesso completo a todas as páginas e funções, independente das definições da ACL'; -$lang['manager'] = 'Gerente - um grupo, usuário ou uma lista separada por vírgulas usuário1,@grupo1,usuário2 que tenha acesso a certas funções de gerenciamento'; +$lang['superuser'] = 'Superusuário - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso completo a todas as páginas e funções, independente das definições da ACL'; +$lang['manager'] = 'Gerente - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso a certas funções de gerenciamento'; $lang['profileconfirm'] = 'Confirmar mudanças no perfil com a senha'; $lang['disableactions'] = 'Desabilitar as ações do DokuWiki'; $lang['disableactions_check'] = 'Verificação'; $lang['disableactions_subscription'] = 'Monitoramento'; -$lang['disableactions_nssubscription'] = 'Monitorar/Não monitorar espaços de nomes'; -$lang['disableactions_wikicode'] = 'Visualização da fonte/Exportação bruta'; +$lang['disableactions_nssubscription'] = 'Monitoramento do espaços de nomes'; +$lang['disableactions_wikicode'] = 'Visualização da fonte/Exportação sem processamento'; $lang['disableactions_other'] = 'Outras ações (separadas por vírgula)'; -$lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de sub-ramos acessíveis, tornando o índice inútil para certas configurações de ACL.'; +$lang['sneaky_index'] = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.'; $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)'; -$lang['securecookie'] = 'Os cookies definidos via HTTPS dever 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['updatecheck'] = 'Checar por atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; +$lang['securecookie'] = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.'; +$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; +$lang['updatecheck'] = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.'; $lang['userewrite'] = 'Usar URLs "limpas"'; $lang['useslash'] = 'Usar a barra como separador de espaços de nomes nas URLs'; $lang['usedraft'] = 'Salvar o rascunho automaticamente durante a edição'; $lang['sepchar'] = 'Separador de palavras no nome da página'; $lang['canonical'] = 'Usar URLs absolutas (http://servidor/caminho)'; -$lang['autoplural'] = 'Checar por formas plurais nos links'; +$lang['autoplural'] = 'Verificar formas plurais nos links'; $lang['compression'] = 'Método de compressão para arquivos antigos'; $lang['cachetime'] = 'Tempo máximo para o cache (seg)'; $lang['locktime'] = 'Tempo máximo para o bloqueio de arquivos (seg)'; -$lang['fetchsize'] = 'Tamanho máximo (bytes) que o "fetch.php" pode transferir do exterior'; +$lang['fetchsize'] = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior'; $lang['notify'] = 'Enviar notificações de mudança para esse endereço de e-mail'; $lang['registernotify'] = 'Enviar informações de usuários registrados para esse endereço de e-mail'; $lang['mailfrom'] = 'Endereço de e-mail a ser utilizado para mensagens automáticas'; -$lang['gzip_output'] = 'Usar "Content-Encoding" do "gzip" para o código "xhtml"'; -$lang['gdlib'] = 'Versão da biblioteca GD Lib'; +$lang['gzip_output'] = 'Usar "Content-Encoding" do gzip para o código xhtml'; +$lang['gdlib'] = 'Versão da biblioteca "GD Lib"'; $lang['im_convert'] = 'Caminho para a ferramenta de conversão ImageMagick'; $lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; $lang['subscribers'] = 'Habilitar o suporte a monitoramento de páginas'; @@ -116,20 +120,19 @@ $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; $lang['sitemap'] = 'Gerar Google Sitemap (dias)'; $lang['broken_iua'] = 'A função "ignore_user_abort" está com defeito no seu sistema? Isso pode causar um índice de busca defeituoso. IIS+PHP/CGI reconhecidamente possui esse erro. Veja o bug 852 para mais informações.'; -$lang['xsendfile'] = 'Usar o cabeçalho "X-Sendfile" para permitir ao servidor de internet encaminhar arquivos estáticos? Seu servidor de internet precisa ter suporte a isso.'; -$lang['xmlrpc'] = 'Habilitar/desabilitar interface XML-RPC.'; -$lang['renderer_xhtml'] = 'Renderizador a ser utilizado para a saída principal do wiki (xhtml)'; -$lang['renderer__core'] = '%s (núcleo DokuWiki)'; -$lang['renderer__plugin'] = '%s ("plugin")'; +$lang['xsendfile'] = 'Usar o cabeçalho "X-Sendfile" para permitir que o servidor web encaminhe arquivos estáticos? Seu servidor web precisa ter suporte a isso.'; +$lang['renderer_xhtml'] = 'Renderizador a ser utilizado para a saída principal (xhtml) do wiki'; +$lang['renderer__core'] = '%s (núcleo do DokuWiki)'; +$lang['renderer__plugin'] = '%s ("plug-in")'; $lang['rememberme'] = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")'; -$lang['rss_type'] = 'Tipo de alimentador XML'; -$lang['rss_linkto'] = 'Links do alimentador XML para'; -$lang['rss_content'] = 'O que deve ser exibido nos itens do alimentador XML?'; -$lang['rss_update'] = 'Intervalo de atualização do alimentador XML (seg)'; +$lang['rss_type'] = 'Tipo de fonte XML'; +$lang['rss_linkto'] = 'Os links da fonte XML apontam para'; +$lang['rss_content'] = 'O que deve ser exibido nos itens da fonte XML?'; +$lang['rss_update'] = 'Intervalo de atualização da fonte XML (seg)'; $lang['recent_days'] = 'Quantas mudanças recentes devem ser mantidas (dias)?'; -$lang['rss_show_summary'] = 'Resumo de exibição do alimentador XML no título'; +$lang['rss_show_summary'] = 'Resumo de exibição da fonte XML no título'; $lang['target____wiki'] = 'Parâmetro "target" para links internos'; -$lang['target____interwiki'] = 'Parâmetro "target" para links entre "wikis"'; +$lang['target____interwiki'] = 'Parâmetro "target" para links interwiki'; $lang['target____extern'] = 'Parâmetro "target" para links externos'; $lang['target____media'] = 'Parâmetro "target" para links de mídia'; $lang['target____windows'] = 'Parâmetro "target" para links do Windows'; @@ -138,7 +141,7 @@ $lang['proxy____user'] = 'Nome de usuário do proxy'; $lang['proxy____pass'] = 'Senha do proxy'; $lang['proxy____ssl'] = 'Usar SSL para conectar ao proxy'; -$lang['safemodehack'] = 'Habilitar contorno de segurança'; +$lang['safemodehack'] = 'Habilitar o contorno de segurança'; $lang['ftp____host'] = 'Servidor FTP para o contorno de segurança'; $lang['ftp____port'] = 'Porta do FTP para o contorno de segurança'; $lang['ftp____user'] = 'Nome do usuário FTP para o contorno de segurança'; @@ -154,7 +157,7 @@ $lang['deaccent_o_0'] = 'não'; $lang['deaccent_o_1'] = 'remover acentos'; $lang['deaccent_o_2'] = 'romanizar'; -$lang['gdlib_o_0'] = 'a GD Lib não está disponível'; +$lang['gdlib_o_0'] = 'a "GD Lib" não está disponível'; $lang['gdlib_o_1'] = 'versão 1.x'; $lang['gdlib_o_2'] = 'detecção automática'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -167,9 +170,9 @@ $lang['rss_content_o_htmldiff'] = 'tabela de diff formatada em HTML'; $lang['rss_content_o_html'] = 'conteúdo completo da página em HTML'; $lang['rss_linkto_o_diff'] = 'visualização das diferenças'; -$lang['rss_linkto_o_page'] = 'a página revisada'; +$lang['rss_linkto_o_page'] = 'página revisada'; $lang['rss_linkto_o_rev'] = 'lista de revisões'; -$lang['rss_linkto_o_current'] = 'a página atual'; +$lang['rss_linkto_o_current'] = 'página atual'; $lang['compression_o_0'] = 'nenhum'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; @@ -179,9 +182,9 @@ $lang['xsendfile_o_3'] = 'cabeçalho proprietário "Nginx X-Accel-Redirect"'; $lang['showuseras_o_loginname'] = 'nome de usuário'; $lang['showuseras_o_username'] = 'nome completo do usuário'; -$lang['showuseras_o_email'] = 'endereço de e-mail do usuário (ofuscado segundo a definição anterior)'; +$lang['showuseras_o_email'] = 'endereço de e-mail do usuário (obscurecido segundo a definição anterior)'; $lang['showuseras_o_email_link'] = 'endereço de e-mail de usuário como um link "mailto:"'; -$lang['useheading_o_0'] = 'Nunca'; +$lang['useheading_o_0'] = 'nunca'; $lang['useheading_o_navigation'] = 'somente a navegação'; $lang['useheading_o_content'] = 'somente o conteúdo do wiki'; $lang['useheading_o_1'] = 'sempre'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,12 +5,18 @@ * @author Sergiu Baltariu * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric Andrași + * @author Emanuel-Emeric Andraşi + * @author Emanuel-Emeric Andrasi */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
    Valorile incorecte vor apărea într-un chenar roÅŸu.'; $lang['updated'] = 'Setările au fost actualizate cu succes.'; $lang['nochoice'] = '(nici o altă opÅ£iune nu este disponibilă)'; $lang['locked'] = 'FiÅŸierul de setări nu poate fi actualizat. Dacă nu s-a dorit aceasta, asiguraÅ£i-vă că numele ÅŸi drepturile de acces ale fiÅŸierului de setări localizate sunt corecte.'; +$lang['danger'] = 'Pericol: Modificarea aceastei opÈ›iuni poate conduce la imposibilitatea accesării wiki-ului È™i a meniului de configurare!'; +$lang['warning'] = 'AtenÈ›ie: Modificarea aceastei opÈ›iuni poate duce la evenimente nedorite!'; +$lang['security'] = 'Alertă de securitate: Modificarea acestei opÈ›iuni poate prezenta un risc de securitate!'; $lang['_configuration_manager'] = 'Manager Configurare'; $lang['_header_dokuwiki'] = 'Setări DokuWiki'; $lang['_header_plugin'] = 'Setări Plugin-uri'; @@ -82,6 +88,8 @@ $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['xmlrpc'] = 'Activează/dezactivează interfaÅ£a XML-RPC'; +$lang['xmlrpcuser'] = 'RestricÅ£ionaÅ£i accesul XML-RPC la grupurile sau utilizatorii separaÅ£i prin virgulă daÅ£i aici. LasaÅ£i gol pentru a da acces tuturor.'; $lang['updatecheck'] = 'Verificare actualizări ÅŸi avertismente privind securitatea? DokuWiki trebuie să contacteze splitbrain.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'; @@ -107,7 +115,6 @@ $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['xmlrpc'] = 'Activează/dezactivează interfaÅ£a XML-RPC'; $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)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['menu'] = 'ÐаÑтройки Вики'; $lang['error'] = 'ÐаÑтройки не были Ñохранены из-за ошибки в одном из значений. ПожалуйÑта, проверьте ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ попробуйте еще раз. @@ -16,6 +20,9 @@ $lang['nochoice'] = '(нет других вариантов)'; $lang['locked'] = 'Файл наÑтройки недоÑтупен Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. ЕÑли Ñто не Ñпециально,
    убедитеÑÑŒ, что файл локальной наÑтройки имеет правильное Ð¸Ð¼Ñ Ð¸ права доÑтупа.'; +$lang['danger'] = 'Внимание: изменение Ñтой опции может Ñделать вашу вики и меню конфигурации недоÑтупными.'; +$lang['warning'] = 'ПредоÑтережение: изменение Ñтой опции может вызвать непредÑказуемое поведение.'; +$lang['security'] = 'ПредоÑтережение по безопаÑноÑти: изменение Ñтой опции может вызвать риÑк, ÑвÑзанный Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑтью.'; $lang['_configuration_manager'] = 'ÐаÑтройки Вики'; $lang['_header_dokuwiki'] = 'Параметры DokuWiki'; $lang['_header_plugin'] = 'Параметры плагинов'; @@ -87,6 +94,8 @@ $lang['sneaky_index'] = 'По умолчанию, DokuWiki показывает в индекÑе Ñтраниц вÑе проÑтранÑтва имен. Включение Ñтой опции Ñкроет проÑтранÑтва имен, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… пользователь не имеет прав чтениÑ. Это может привеÑти к Ñкрытию доÑтупных вложенных проÑтранÑтв имен и потере функциональноÑти индекÑа Ñтраниц при некоторых конфигурациÑÑ… прав доÑтупа.'; $lang['auth_security_timeout'] = 'Интервал Ð´Ð»Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти авторизации (Ñек.)'; $lang['securecookie'] = 'Должны ли cookies, выÑтавленные через HTTPS, отправлÑÑ‚ÑŒÑÑ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð¾Ð¼ только через HTTPS. Отключите Ñту опцию в Ñлучае, когда только логин вашей вики передаётÑÑ Ñ‡ÐµÑ€ÐµÐ· SSL, а обычный проÑмотр оÑущеÑтвлÑетÑÑ Ð² небезопаÑном режиме.'; +$lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейÑ.'; +$lang['xmlrpcuser'] = 'Запретить XML-RPC доÑтуп Ð´Ð»Ñ ÑпиÑка групп и пользователей, перечиÑленных через запÑтую. ОÑтавьте пуÑтым, еÑли хотите оÑтавить доÑтуп вÑем.'; $lang['updatecheck'] = 'ПроверÑÑ‚ÑŒ наличие обновлений и предупреждений о безопаÑноÑти? Ð”Ð»Ñ Ñтого DokuWiki потребуетÑÑ ÑвÑзыватьÑÑ Ñо splitbrain.org.'; $lang['userewrite'] = 'Удобочитаемые адреÑа (URL)'; $lang['useslash'] = 'ИÑпользовать ÑлÑш'; @@ -112,10 +121,9 @@ $lang['sitemap'] = 'Карта Ñайта Ð´Ð»Ñ Google (дни)'; $lang['broken_iua'] = 'Возможно, Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ ignore_user_abort не работает в вашей ÑиÑтеме? Это может привеÑти к потере функциональноÑти индекÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð¸Ñка. Эта проблема приÑутÑтвует, например, в IIS+PHP/CGI. Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации Ñмотрите баг 852.'; $lang['xsendfile'] = 'ИÑпользуете заголовок X-Sendfile Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ файлов на вебÑервер? Ваш вебÑервер должен поддерживать Ñто.'; -$lang['xmlrpc'] = 'Включить/выключить XML-RPC интерфейÑ.'; $lang['renderer_xhtml'] = 'Обработчик оÑновного (xhtml) вывода вики'; -$lang['renderer__core'] = '% (Ñдро dokuwiki)'; -$lang['renderer__plugin'] = '% (плагин)'; +$lang['renderer__core'] = '%s (Ñдро dokuwiki)'; +$lang['renderer__plugin'] = '%s (плагин)'; $lang['rememberme'] = 'Разрешить перманентные cookies Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ð° (запомнить менÑ)'; $lang['rss_type'] = 'Тип RSS'; $lang['rss_linkto'] = 'СÑылки в RSS'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/sk/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/sk/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/sk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/sk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -12,6 +12,9 @@ $lang['nochoice'] = '(žiadne ÄalÅ¡ie dostupné voľby)'; $lang['locked'] = 'Súbor s nastaveniami nemôže byÅ¥ aktualizovaný, ak toto nie je zámerom,
    uistite sa, že názov a práva lokálneho súboru sú správne.'; +$lang['danger'] = 'NebezpeÄie: Zmeny tohto nastavenia môžu spôsobiÅ¥ nedostupnosÅ¥ wiki a nastavovacieho menu.'; +$lang['warning'] = 'Varovanie: Zmena tohto nastavenia môže viesÅ¥ neželanému správaniu.'; +$lang['security'] = 'BezpeÄnostné riziko: Zmenou tohto nastavenie môže vzniknúť bezpeÄnostné riziko.'; $lang['_configuration_manager'] = 'Správa konfigurácie'; $lang['_header_dokuwiki'] = 'Nastavenia DokuWiki'; $lang['_header_plugin'] = 'Nastavenia plug-inov'; @@ -28,6 +31,8 @@ $lang['_network'] = 'Nastavenia siete'; $lang['_plugin_sufix'] = 'Nastavenia plug-inu'; $lang['_template_sufix'] = 'Nastavenia Å¡ablóny'; +$lang['_msg_setting_undefined'] = 'Nenastavené metadata.'; +$lang['_msg_setting_no_class'] = 'Nenastavená trieda.'; $lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.'; $lang['fmode'] = 'Spôsob vytvárania súborov'; $lang['dmode'] = 'Spôsob vytvárania adresárov'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,8 +3,10 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ $lang['lang'] = 'Jezik'; +$lang['template'] = 'Predloga'; $lang['recent'] = 'Zadnje spremembe'; $lang['signature'] = 'Podpis'; $lang['defaultgroup'] = 'Privzeta skupina'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,12 +3,16 @@ * Serbian language file * * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['menu'] = 'Подешавања'; $lang['error'] = 'Подешавања ниÑу прихваћена јер поÑтоји вредноÑÑ‚ Ñа грешком, проверите измене које Ñте извршили и поновите Ñлање.
    ВредноÑÑ‚(и) Ñа грешком Ñу приказане Ñа црвеним оквиром.'; $lang['updated'] = 'Измене Ñу Ñачуване.'; $lang['nochoice'] = '(не поÑтоји други избор)'; $lang['locked'] = 'Датотека Ñа подешавањима не може да Ñе ажурира, ако вам то није намера проверите да ли Ñу дозволе иÑправно поÑтављене.'; +$lang['danger'] = 'ОпаÑно: Променом ове опције може Ñе деÑити да ваш вики и мени за подешавања буде недоÑтупан.'; +$lang['warning'] = 'Упозорење: Промена ове опције може проузроковати нежељене ефекте.'; +$lang['security'] = 'СигурноÑно упозорење: Промена ове опције може да проузрокује ÑигурноÑни ризик.'; $lang['_configuration_manager'] = 'Управљач подешавањима'; $lang['_header_dokuwiki'] = 'Подешавања Dokuwiki-ја'; $lang['_header_plugin'] = 'Подешавања за додатке'; @@ -37,6 +41,7 @@ $lang['start'] = 'Ðазив почетне Ñтранице'; $lang['title'] = 'Ðазив викија'; $lang['template'] = 'Шаблон'; +$lang['license'] = 'Под којом лиценцом желите да ваш материјал буде објављен?'; $lang['fullpath'] = 'Објави целу путању Ñтранице у заглављу на дну Ñтране'; $lang['recent'] = 'ПоÑледње промене'; $lang['breadcrumbs'] = 'Број пређених корака (Ñтраница)'; @@ -47,6 +52,7 @@ $lang['dformat'] = 'Облик датума (погледајте ПХПову strftime функцију)'; $lang['signature'] = 'ПотпиÑ'; $lang['toptoclevel'] = 'Ðајвиши ниво за Ñадржај'; +$lang['tocminheads'] = 'Минималан број наÑлова који одређују да ли ће Садржај бити направљен'; $lang['maxtoclevel'] = 'МакÑимални ниво за Ñадржај'; $lang['maxseclevel'] = 'МакÑималан број Ñекција које Ñе мењају'; $lang['camelcase'] = 'КориÑти CamelCase за линкове'; @@ -58,7 +64,9 @@ $lang['usewordblock'] = 'Блокирај Ñпам на оÑнову лиÑте речи'; $lang['indexdelay'] = 'Одлагање индекÑирања (Ñекунде)'; $lang['relnofollow'] = 'КориÑти rel="nofollow" за Ñпољне линкове'; +$lang['mailguard'] = 'Замутити Е-адреÑе'; $lang['iexssprotect'] = 'Провера потенцијално малициозног кода у ЈаваÑкрипт или ХТМЛ коду'; +$lang['showuseras'] = 'Шта приказати за иÑпиÑивање кориÑника који је поÑледњи вршио измене'; $lang['useacl'] = 'КориÑти лиÑту права приÑтупа'; $lang['autopasswd'] = 'ÐутогенериÑане лозинки'; $lang['authtype'] = 'ПозадинÑки ÑиÑтем аутентификације'; @@ -75,7 +83,8 @@ $lang['disableactions_other'] = 'ОÑтале наредбе (раздвојене зарезом)'; $lang['sneaky_index'] = 'По инÑталацији DokuWiki ће у индекÑу приказати Ñве именÑке проÑторе. Укључивањем ове опције именÑки проÑтори у којима кориÑник нема право читања ће бити Ñакривени. КонÑеквенца је да ће и доÑтупни подпроÑтори бити Ñакривени. Ово доводи до неупотребљивоÑти Права приÑтупа у неким поÑтавкама.'; $lang['auth_security_timeout'] = 'ВременÑка пауза у аутентификацији (Ñекунде)'; -$lang['updatecheck'] = 'Провера надоградњи и ÑигурнпоÑних упозорења? Dokuwiki мора да контактира splitbrain.org ради добијања информација.'; +$lang['securecookie'] = 'Да ли колачићи који Ñу поÑтављени преко ХТТПС треба Ñлати веб читачу Ñамо преко ХТТПС? ИÑкључите ову опцију Ñамо ако је пријављивање на вики заштићено ССЛом а оÑтали део викија незаштићен.'; +$lang['updatecheck'] = 'Провера надоградњи и ÑигурноÑних упозорења? Dokuwiki мора да контактира splitbrain.org ради добијања информација.'; $lang['userewrite'] = 'Ðаправи леп УРЛ'; $lang['useslash'] = 'КориÑти коÑу црту у УРЛу за раздвајање именÑких проÑтора '; $lang['usedraft'] = 'ÐутоматÑки Ñачувај Ñкицу у току пиÑања измена'; @@ -101,8 +110,10 @@ $lang['broken_iua'] = 'Да ли је функција ignore_user_abort function не ради на вашем ÑиÑтему? Ово може проузроковати неиндекÑирање података за претрагу. ИИС+ПХП/ЦГИ је чеÑто ван функције. Погледајте баг 852 за више информација.'; $lang['xsendfile'] = 'КориÑти заглавље X-Sendfile да би веб Ñервер могао да иÑпоручује Ñтатичке датотеке? Веб Ñервер треба да подржава ову функцију.'; $lang['xmlrpc'] = 'Укључи/иÑкључи ИкÑМЛ-РПЦ прикључак'; +$lang['renderer_xhtml'] = 'ИÑцртавање кориÑти главни (xhtml) вики иÑпиÑ'; $lang['renderer__core'] = '%s (dokuwiki језгро)'; $lang['renderer__plugin'] = '%s (додатак)'; +$lang['rememberme'] = 'Дозволи Ñтални колачић за пријављивање (запамти ме)'; $lang['rss_type'] = 'Ð’Ñ€Ñта ИкÑМЛ довода'; $lang['rss_linkto'] = 'ИкÑМЛ довод линкује на'; $lang['rss_content'] = 'Шта треба приказати у ИкÑМЛ доводу?'; @@ -125,6 +136,7 @@ $lang['ftp____user'] = 'ФТП кориÑничко име за безбедни режим'; $lang['ftp____pass'] = 'ФТП лозинка за безбедни режим'; $lang['ftp____root'] = 'ФТП оÑновна фаÑцикла за безбедни режим'; +$lang['license_o_'] = 'Ðије одабрано'; $lang['typography_o_0'] = 'не'; $lang['typography_o_1'] = 'Само дупли наводници'; $lang['typography_o_2'] = 'Сви наводници (неће увек радити)'; @@ -157,3 +169,11 @@ $lang['xsendfile_o_1'] = 'ВлаÑничко lighttpd заглавље (пре верзије 1.5)'; $lang['xsendfile_o_2'] = 'Стандардно заглавље X-Sendfile'; $lang['xsendfile_o_3'] = 'ВлаÑничко заглавље Nginx X-Accel-Redirect'; +$lang['showuseras_o_loginname'] = 'КориÑничко име'; +$lang['showuseras_o_username'] = 'Име и презиме кориÑника'; +$lang['showuseras_o_email'] = 'Е-адреÑа (замућено по подешавањима mailguard-а)'; +$lang['showuseras_o_email_link'] = 'КориÑничка Е-адреÑа као mailto: веза'; +$lang['useheading_o_0'] = 'Ðикада'; +$lang['useheading_o_navigation'] = 'Сами навигација'; +$lang['useheading_o_content'] = 'Само за Ñадржај викија'; +$lang['useheading_o_1'] = 'Увек'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/sv/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/sv/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/sv/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/sv/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,6 @@ Inställningar med en rosa bakgrund är skyddade och kan inte ändras med den här insticksmodulen. Inställningar med en blÃ¥ bakgrund är standardvärden, och inställningar som visas med en vit bakgrund har ändrats i den här installationen. BÃ¥de blÃ¥a och vita inställningar kan ändras. -Kom i hÃ¥g att trycka pÃ¥ knappen **Spara** innan du lämnar den här sidan, annars gÃ¥r ändringarna förlorade. +Kom i hÃ¥g att trycka pÃ¥ knappen **Spara** innan du lämnar den här sidan, annars kommer ändringarna att gÃ¥ förlorade. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ $lang['menu'] = 'Hantera inställningar'; $lang['error'] = 'Inställningarna uppdaterades inte pÃ¥ grund av ett felaktigt värde. Titta igenom dina ändringar och försök sedan spara igen. @@ -18,6 +23,9 @@ $lang['nochoice'] = '(inga andra val tillgängliga)'; $lang['locked'] = 'Filen med inställningar kan inte uppdateras. Om det inte är meningen att det ska vara sÃ¥,
    kontrollera att filen med lokala inställningar har rätt namn och filskydd.'; +$lang['danger'] = 'Risk: Denna förändring kan göra wikin och inställningarna otillgängliga.'; +$lang['warning'] = 'Varning: Denna förändring kan orsaka icke Ã¥syftade resultat.'; +$lang['security'] = 'Säkerhetsvarning: Denna förändring kan innebära en säkerhetsrisk.'; $lang['_configuration_manager'] = 'Hantera inställningar'; $lang['_header_dokuwiki'] = 'Inställningar för DokuWiki'; $lang['_header_plugin'] = 'Inställningar för insticksmoduler'; @@ -78,7 +86,7 @@ $lang['passcrypt'] = 'Metod för kryptering av lösenord'; $lang['defaultgroup'] = 'Förvald grupp'; $lang['superuser'] = 'Huvudadministratör - en grupp eller en användare med full tillgÃ¥ng till alla sidor och funktioner, oavsett behörighetsinställningars'; -$lang['manager'] = 'Administratör - en grupp eller användare med tillgÃ¥ng till vissa administrativa funktioner.'; +$lang['manager'] = 'Administratör -- en grupp eller användare med tillgÃ¥ng till vissa administrativa funktioner.'; $lang['profileconfirm'] = 'Bekräfta ändringarna i profilen med lösenordet'; $lang['disableactions'] = 'Stäng av funktioner i DokuWiki'; $lang['disableactions_check'] = 'Kontroll'; @@ -89,6 +97,8 @@ $lang['sneaky_index'] = 'Som standard visar DokuWiki alla namnrymder pÃ¥ indexsidan. Genom att aktivera det här valet döljer man namnrymder som användaren inte har behörighet att läsa. Det kan leda till att man döljer Ã¥tkomliga undernamnrymder, och gör indexet oanvändbart med vissa ACL-inställningar.'; $lang['auth_security_timeout'] = 'Autentisieringssäkerhets timeout (sekunder)'; $lang['securecookie'] = 'Skall cookies som sätts via HTTPS endast skickas via HTTPS frÃ¥n webbläsaren? Avaktivera detta alternativ endast om inloggningen till din wiki är säkrad med SSL men läsning av wikin är osäkrad.'; +$lang['xmlrpc'] = 'Aktivera/avaktivera XML-RPC-gränssnitt'; +$lang['xmlrpcuser'] = 'Begränsa XML-RPC tillträde till komma separerade grupper eller användare som ges här. Lämna tomt för att ge tillgÃ¥ng till alla.'; $lang['updatecheck'] = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta splitbrain.org för den här funktionen.'; $lang['userewrite'] = 'Använd rena webbadresser'; $lang['useslash'] = 'Använd snedstreck för att separera namnrymder i webbadresser'; @@ -97,9 +107,9 @@ $lang['canonical'] = 'Använd fullständiga webbadresser'; $lang['autoplural'] = 'Leta efter pluralformer av länkar'; $lang['compression'] = 'Metod för komprimering av gamla versioner'; -$lang['cachetime'] = 'Max livslängd för cache (sek)'; -$lang['locktime'] = 'Max livslängd för fillÃ¥sning (sek)'; -$lang['fetchsize'] = 'Max storlek (bytes) som fetch.php fÃ¥r ladda ned externt'; +$lang['cachetime'] = 'Maximal livslängd för cache (sek)'; +$lang['locktime'] = 'Maximal livslängd för fillÃ¥sning (sek)'; +$lang['fetchsize'] = 'Maximal storlek (bytes) som fetch.php fÃ¥r ladda ned externt'; $lang['notify'] = 'Skicka meddelande om ändrade sidor till den här e-postadressen'; $lang['registernotify'] = 'Skicka meddelande om nyregistrerade användare till en här e-postadressen'; $lang['mailfrom'] = 'Avsändaradress i automatiska e-postmeddelanden'; @@ -114,7 +124,6 @@ $lang['sitemap'] = 'Skapa Google sitemap (dagar)'; $lang['broken_iua'] = 'Är funktionen ignore_user_abort trasig pÃ¥ ditt system? Det kan i sÃ¥ fall leda till att indexering av sökningar inte fungerar. Detta är ett känt problem med IIS+PHP/CGI. Se Bug 852 för mer info.'; $lang['xsendfile'] = 'Använd X-Sendfile huvudet för att lÃ¥ta webservern leverera statiska filer? Din webserver behöver stöd för detta.'; -$lang['xmlrpc'] = 'Aktivera/Avaktivera XML-RPC-gränssnitt'; $lang['renderer_xhtml'] = 'Generera för användning i huvudwikipresentation (xhtml)'; $lang['renderer__core'] = '%s (dokuwiki core)'; $lang['renderer__plugin'] = '%s (plugin)'; @@ -143,8 +152,8 @@ $lang['ftp____root'] = 'FTP-rotkatalog för safemode hack'; $lang['license_o_'] = 'Ingen vald'; $lang['typography_o_0'] = 'Inga'; -$lang['typography_o_1'] = 'Citat tecken enbart'; -$lang['typography_o_2'] = 'All citeringar (fungerar inte alltid)'; +$lang['typography_o_1'] = 'enbart dubbla citattecken'; +$lang['typography_o_2'] = 'bÃ¥de dubbla och enkla citattecken (fungerar inte alltid)'; $lang['userewrite_o_0'] = 'av'; $lang['userewrite_o_1'] = '.htaccess'; $lang['userewrite_o_2'] = 'DokuWiki internt'; @@ -167,12 +176,12 @@ $lang['rss_linkto_o_page'] = 'den reviderade sidan'; $lang['rss_linkto_o_rev'] = 'lista över ändringar'; $lang['rss_linkto_o_current'] = 'den aktuella sidan'; -$lang['compression_o_0'] = 'none'; +$lang['compression_o_0'] = 'ingen'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'använd ej'; -$lang['xsendfile_o_1'] = 'Proprietär lighttpd header (before release 1.5)'; -$lang['xsendfile_o_2'] = 'Standard X-Sendfile huvud'; +$lang['xsendfile_o_1'] = 'Proprietär lighttpd-header (före version 1.5)'; +$lang['xsendfile_o_2'] = 'Standard X-Sendfile-huvud'; $lang['xsendfile_o_3'] = 'Proprietär Nginx X-Accel-Redirect header'; $lang['showuseras_o_loginname'] = 'Användarnamn'; $lang['showuseras_o_username'] = 'Namn'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,19 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Arthit Suriyawongkul + * @author Kittithat Arnontavilas + */ +$lang['typography_o_0'] = 'ไม่มี'; +$lang['userewrite_o_0'] = 'ไม่มี'; +$lang['deaccent_o_0'] = 'ปิด'; +$lang['xsendfile_o_0'] = 'ไม่ใช้'; +$lang['showuseras_o_loginname'] = 'ชื่อผู้ใช้'; +$lang['showuseras_o_username'] = 'ชื่อ-นามสà¸à¸¸à¸¥'; +$lang['useheading_o_0'] = 'ไม่เลย'; +$lang['useheading_o_navigation'] = 'เฉพาะตัวนำทาง'; +$lang['useheading_o_content'] = 'เฉพาะเนื้อหาวิà¸à¸´'; +$lang['useheading_o_1'] = 'เสมอ'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['menu'] = 'Site Ayarları'; $lang['error'] = 'Ayarlar yanlış bir deÄŸer girildiÄŸi için güncellenemedi. Lütfen deÄŸiÅŸikliklerinizi gözden geçirin ve tekrar gönderin. @@ -14,6 +15,9 @@ $lang['nochoice'] = '(baÅŸka seçim bulunmamaktadır)'; $lang['locked'] = 'Ayar dosyası güncellenemedi.
    dosya adı ve yetkilerininin doÄŸru olduÄŸuna emin olun.'; +$lang['danger'] = 'Tehlike: Bu özelliÄŸi deÄŸiÅŸtirirseniz, wiki\'nize ve konfigürasyon menunüze ulaÅŸamayabilirsiniz.'; +$lang['warning'] = 'Uyarı: Bu özelliÄŸi deÄŸiÅŸtirmek istenmeyen davranışa sebep olabilir.'; +$lang['security'] = 'Güvenlik Uyarısı: Bu özelliÄŸi deÄŸiÅŸtirmek güvenlik riski çıkartabilir.'; $lang['_configuration_manager'] = 'Site Ayarları Yönetimi'; $lang['_header_dokuwiki'] = 'DokuWiki Ayarları'; $lang['_header_plugin'] = 'Eklenti Ayarları'; @@ -30,6 +34,8 @@ $lang['_network'] = 'AÄŸ Ayarları'; $lang['_plugin_sufix'] = 'Eklenti Ayarları'; $lang['_template_sufix'] = 'Åžablon (Template) Ayarları'; +$lang['_msg_setting_undefined'] = 'Ayar üstverisi yok.'; +$lang['_msg_setting_no_class'] = 'Ayar sınıfı yok.'; $lang['_msg_setting_no_default'] = 'Varsayılan deÄŸer yok.'; $lang['fmode'] = 'Dosya oluÅŸturma yetkisi'; $lang['dmode'] = 'Klasör oluÅŸturma yetkisi'; @@ -40,7 +46,12 @@ $lang['start'] = 'Ana sayfa adı'; $lang['title'] = 'Wiki baÅŸlığı'; $lang['template'] = 'Åžablon (Template)'; +$lang['license'] = 'İçeriÄŸinizi hangi lisans altında yayınlansın?'; +$lang['fullpath'] = 'sayfaların tüm patikasını (full path) göster'; $lang['recent'] = 'En son deÄŸiÅŸtirilenler'; +$lang['breadcrumbs'] = 'Ekmek kırıntıların sayısı'; +$lang['youarehere'] = 'hiyerarÅŸik ekmek kırıntıları'; +$lang['typography'] = 'Tipografik deÄŸiÅŸtirmeleri yap'; $lang['htmlok'] = 'Gömülü HTML koduna izin ver'; $lang['phpok'] = 'Gömülü PHP koduna izin ver'; $lang['dformat'] = 'Tarih biçimi (PHP\'nin strftime fonksiyonuna bakın)'; @@ -48,18 +59,78 @@ $lang['toptoclevel'] = 'İçindekiler için en üst seviye'; $lang['tocminheads'] = 'İçindekilerin oluÅŸturulması için gereken (en az) baÅŸlık sayısı'; $lang['maxtoclevel'] = 'İçindekiler için en fazla seviye'; +$lang['maxseclevel'] = 'Bölümün azami düzenleme düzeyi'; +$lang['camelcase'] = 'Linkler için CamelCase kullan'; +$lang['deaccent'] = 'Sayfa adlarınız temizle'; $lang['useheading'] = 'Sayfa isimleri için ilk baÅŸlığı kullan'; +$lang['refcheck'] = 'Araç kaynak denetimi'; +$lang['refshow'] = 'Gösterilecek araç kaynağı sayısı'; +$lang['allowdebug'] = 'Yanlış ayıklamasına izin ver lazım deÄŸilse etkisiz kıl!'; +$lang['usewordblock'] = 'Wordlistesine göre spam engelle'; +$lang['indexdelay'] = 'Indekslemeden evvel zaman gecikmesi (saniye)'; +$lang['relnofollow'] = 'Dışsal linkler rel="nofollow" kullan'; +$lang['mailguard'] = 'Email adreslerini karart'; +$lang['iexssprotect'] = 'YüklenmiÅŸ dosyaları muhtemel kötu niyetli JavaScript veya HTML koduna kontrol et'; +$lang['showuseras'] = 'Bir sayfayı en son düzenleyen kullanıcıya ne gösterilsin'; $lang['useacl'] = 'EriÅŸim kontrol listesini kullan'; +$lang['autopasswd'] = 'Parolaları otamatikmen üret'; +$lang['authtype'] = 'Kimlik denetleme arka uç'; $lang['passcrypt'] = 'Parola ÅŸifreleme metodu'; $lang['defaultgroup'] = 'Varsayılan grup'; +$lang['disableactions'] = 'DokuWiki eylemlerini etkisiz kıl'; +$lang['disableactions_check'] = 'Kontrol et'; +$lang['disableactions_subscription'] = 'Abone ol/Abonelikten vazgeç'; +$lang['canonical'] = 'Tamolarak kurallara uygun URL\'leri kullan'; $lang['mailfrom'] = 'Otomatik e-postalar için kullanılacak e-posta adresi'; $lang['gdlib'] = 'GD Lib sürümü'; +$lang['jpg_quality'] = 'JPG sıkıştırma kalitesi [0-100]'; $lang['sitemap'] = 'Google site haritası oluÅŸtur (gün)'; -$lang['proxy____user'] = 'Proxy kullanıcı adı'; +$lang['renderer__core'] = '%s (dokuwiki çekirdeÄŸi)'; +$lang['renderer__plugin'] = '%s (eklenti)'; +$lang['rss_content'] = 'XML beslemesinde ne gösterilsin?'; +$lang['rss_update'] = 'XML beslemesini güncelleme aralığı'; +$lang['rss_show_summary'] = 'XML beslemesinde özeti baÅŸlıkta göster'; +$lang['proxy____host'] = 'Proxy sunucu adı'; +$lang['proxy____user'] = 'Proxy kullanıcı adı'; $lang['proxy____pass'] = 'Proxy ÅŸifresi'; +$lang['proxy____ssl'] = 'Proxy ile baÄŸlanırken ssl kullan'; +$lang['safemodehack'] = 'Safemod hackını etkili kıl'; +$lang['ftp____host'] = 'Safemod hackı için kullanılacak FTP suncusu'; +$lang['ftp____user'] = 'Safemod hackı için kullanılacak FTP kullanıcı adı'; +$lang['ftp____pass'] = 'Safemod hackı için kullanılacak FTP parolası'; +$lang['license_o_'] = 'Seçilmedi'; +$lang['typography_o_0'] = 'Yok'; $lang['userewrite_o_0'] = 'hiçbiri'; $lang['userewrite_o_1'] = '.htaccess'; +$lang['userewrite_o_2'] = 'DokuWiki dahili'; +$lang['deaccent_o_0'] = 'Kapalı'; +$lang['deaccent_o_1'] = 'aksan iÅŸaretlerini kaldır'; +$lang['deaccent_o_2'] = 'roman harfleri kullan'; +$lang['gdlib_o_0'] = 'GD Lib mevcut deÄŸil'; +$lang['gdlib_o_1'] = 'Versiyon 1.x'; +$lang['gdlib_o_2'] = 'Otomatik tesbit'; +$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'] = 'Soyut'; +$lang['rss_content_o_diff'] = 'BirleÅŸtirilmiÅŸ Diff'; +$lang['rss_content_o_htmldiff'] = 'HTML biçimlendirilmiÅŸ diff tablosu'; +$lang['rss_content_o_html'] = 'Tüm HTML sayfa içeriÄŸi'; +$lang['rss_linkto_o_diff'] = 'görünümü deÄŸiÅŸtir'; +$lang['rss_linkto_o_page'] = 'gözden geçirilmiÅŸ sayfa'; +$lang['rss_linkto_o_rev'] = 'sürümlerin listesi'; +$lang['rss_linkto_o_current'] = 'Șu anki sayfa'; $lang['compression_o_0'] = 'hiçbiri'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'kullanma'; +$lang['showuseras_o_loginname'] = 'Kullanıcı adı'; +$lang['showuseras_o_username'] = 'Kullanıcının tam adı'; +$lang['showuseras_o_email'] = 'Kullanıcının mail adresi (mailguard ayarlarına göre karartılıyor)'; +$lang['showuseras_o_email_link'] = 'Kullanıcının mail adresi mailto: linki ÅŸeklinde'; +$lang['useheading_o_0'] = 'Hiçbir zaman'; +$lang['useheading_o_navigation'] = 'Sadece Navigasyon'; +$lang['useheading_o_content'] = 'Sadece Wiki içeriÄŸi'; +$lang['useheading_o_1'] = 'Her zaman'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/uk/intro.txt dokuwiki-rc2009-12-02/lib/plugins/config/lang/uk/intro.txt --- dokuwiki-2009-02-14/lib/plugins/config/lang/uk/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/uk/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ -====== Ð£Ð¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ”ÑŽ ====== +====== ÐаÑтройка конфігурації ====== -ВикориÑтовуйте цю Ñторінку, щоб налагодити Вашу ДокуВікі. Ð”Ð»Ñ Ð´Ð¾Ð²Ñ–Ð´Ð¾Ðº по конкретних опціÑÑ… дивітьÑÑ [[doku>config]]. Ð”Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної інформації про цій доданок дивітьÑÑ [[doku>plugin:config]]. +ВикориÑтовуйте цю Ñторінку Ð´Ð»Ñ Ð½Ð°Ñтройки ДокуВікі. Ð”Ð»Ñ Ð´Ð¾Ð²Ñ–Ð´Ð¾Ðº щодо конкретних параметрів дивітьÑÑ [[doku>config]]. Ð”Ð»Ñ Ð±Ñ–Ð»ÑŒÑˆ детальної інформації про цей доданок дивітьÑÑ [[doku>plugin:config]]. -Параметри, що виділені червоним коліром тла захищені та не можуть бути змінені за допомогою цього доданка. Параметри, з Ñинім коліром тла мають Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾ замовчуванню, а параметри з білим тлом були вÑтановлені Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— локальної інÑталÑції. Сині та білі параметри можуть бути змінені. +Параметри, що виділені червоним кольором тла захищені та не можуть бути змінені за допомогою цього доданка. Параметри, з Ñинім кольором тла мають Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾ замовчуванню, а параметри з білим тлом були вÑтановлені Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— локальної інÑталÑції. Сині та білі параметри можуть бути змінені. -Ðе забувайте натиÑкати кнокпу **ЗБЕРЕГТИ** до того, Ñк покинути цю Ñторінку, інакше вÑÑ– зміни буде втрачено. +Ðе забувайте натиÑкати кнопку **ЗБЕРЕГТИ** до того, Ñк покинути цю Ñторінку, інакше вÑÑ– зміни буде втрачено. diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,14 +5,20 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Oleksiy Voronin * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ -$lang['menu'] = 'ÐÐ°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—'; -$lang['error'] = 'Параметри не збережені через помилкові значеннÑ. Будь лаÑка, переглÑньте ваші зміни та Ñпробуйте ще раз -
    Помилкові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ виділені червоною рамкою.'; -$lang['updated'] = 'Параметри уÑпішно збережені.'; +$lang['menu'] = 'ÐаÑтройка конфігурації'; +$lang['error'] = 'Параметри не збережено через помилкові значеннÑ. Будь лаÑка, переглÑньте ваші зміни та Ñпробуйте ще раз +
    Помилкові Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ виділені червоною рамкою.'; +$lang['updated'] = 'Параметри уÑпішно збережено.'; $lang['nochoice'] = '(інших варіантів не Ñ–Ñнує)'; -$lang['locked'] = 'Ðеможливо запиÑати файл параметрів налагодженнÑ, Ñкщо це не Ñпеціально
    - переконайтеÑÑ, що ім\'Ñ Ñ‚Ð° права доÑтупу Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ файла Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ñ–Ñ€Ð½Ñ–'; +$lang['locked'] = 'Ðеможливо запиÑати файл наÑтройки. ПереконайтеÑÑ,
    +що ім\'Ñ Ñ‚Ð° права доÑтупу Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ файлу вказано правильно.'; +$lang['danger'] = 'УВÐГÐ! Зміна цього параметру може призвеÑти до недоÑтупноÑÑ‚Ñ– вашої Вікі та меню конфігурації.'; +$lang['warning'] = 'УВÐГÐ! Зміна цього параметру може призвеÑти до непередбачуваних наÑлідків.'; +$lang['security'] = 'УВÐГÐ! Зміна цього параметру може призвеÑти до поÑÐ»Ð°Ð±Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ вашої Вікі.'; $lang['_configuration_manager'] = 'Ð£Ð¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ”ÑŽ'; $lang['_header_dokuwiki'] = 'ÐаÑтройки ДокуВікі'; $lang['_header_plugin'] = 'ÐаÑтройки Доданків'; @@ -21,54 +27,57 @@ $lang['_basic'] = 'Базові наÑтройки'; $lang['_display'] = 'ÐаÑтройки диÑплеÑ'; $lang['_authentication'] = 'ÐаÑтройки автентифікації'; -$lang['_anti_spam'] = 'ÐаÑтройки ÐнтиÑпаму'; +$lang['_anti_spam'] = 'ÐаÑтройки Ðнти-Ñпаму'; $lang['_editing'] = 'ÐаÑтройки редагуваннÑ'; $lang['_links'] = 'ÐаÑтройки поÑилань'; $lang['_media'] = 'ÐаÑтройки медіа'; -$lang['_advanced'] = 'Продвинуті наÑтройки'; +$lang['_advanced'] = 'Розширені наÑтройки'; $lang['_network'] = 'ÐаÑтройки мережі'; -$lang['_plugin_sufix'] = 'наÑтройки (доданок)'; -$lang['_template_sufix'] = 'наÑтройки (шаблон)'; +$lang['_plugin_sufix'] = 'ÐаÑтройки (доданок)'; +$lang['_template_sufix'] = 'ÐаÑтройки (шаблон)'; $lang['_msg_setting_undefined'] = 'Ðемає метаданих параметру.'; $lang['_msg_setting_no_class'] = 'Ðемає клаÑу параметру.'; -$lang['_msg_setting_no_default'] = 'Ðемає Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾ завмовчуванню.'; +$lang['_msg_setting_no_default'] = 'Ðемає Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм.'; $lang['fmode'] = 'Права Ð´Ð»Ñ Ñтворених файлів'; -$lang['dmode'] = 'Права Ð´Ð»Ñ Ñтворених тек'; +$lang['dmode'] = 'Права Ð´Ð»Ñ Ñтворених папок'; $lang['lang'] = 'Мова'; -$lang['basedir'] = 'Коренева тека'; +$lang['basedir'] = 'Коренева папка'; $lang['baseurl'] = 'Кореневий URL'; -$lang['savedir'] = 'Тека Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…'; +$lang['savedir'] = 'Папка Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ…'; $lang['start'] = 'Ðазва Ñтартової Ñторінки'; $lang['title'] = 'Ðазва Вікі'; $lang['template'] = 'Шаблон'; +$lang['license'] = 'Під Ñкою ліцензією Ñлід публікувати вміÑÑ‚?'; $lang['fullpath'] = 'Повний шлÑÑ… до документу'; $lang['recent'] = 'ОÑтанні зміни'; $lang['breadcrumbs'] = 'Ви відвідали (кількіÑÑ‚ÑŒ Ñторінок, що показуєтьÑÑ)'; $lang['youarehere'] = 'Показувати "Ви тут"'; -$lang['typography'] = 'ЗамінÑти типографічні Ñимволи'; +$lang['typography'] = 'Замінювати типографÑькі Ñимволи'; $lang['htmlok'] = 'Дозволити HTML'; $lang['phpok'] = 'Дозволити PHP'; $lang['dformat'] = 'Формат дати (дивітьÑÑ Ñ„ÑƒÐ½ÐºÑ†Ñ–ÑŽ strftime PHP)'; $lang['signature'] = 'ПідпиÑ'; $lang['toptoclevel'] = 'Мінімальний рівень Ð´Ð»Ñ Ð·Ð¼Ñ–Ñту'; -$lang['maxtoclevel'] = 'МакÑимальний рівень Ð´Ð»Ñ Ð·Ð¼Ñ–Ñту'; +$lang['tocminheads'] = 'Мінімальна кількіÑÑ‚ÑŒ заголовків, необхідна Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– зміÑту'; +$lang['maxtoclevel'] = 'МакÑимальний рівень Ð´Ð»Ñ Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñ– зміÑту'; $lang['maxseclevel'] = 'МакÑимальний рівень Ñекції Ð´Ð»Ñ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ'; $lang['camelcase'] = 'ВикориÑтовувати CamelCase'; $lang['deaccent'] = 'ТранÑÐ»Ñ–Ñ‚ÐµÑ€Ð°Ñ†Ñ–Ñ Ð² іменах Ñторінок'; $lang['useheading'] = 'Першій заголовок заміÑÑ‚ÑŒ імені'; $lang['refcheck'] = 'ПеревірÑти поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° медіа-файлі'; $lang['refshow'] = 'Показувати кількіÑÑ‚ÑŒ медіа-поÑилань'; -$lang['allowdebug'] = 'Дозволити Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½Ñ–Ñ‚ÑŒ, Ñкщо не потрібно!'; +$lang['allowdebug'] = 'Дозволити Ð²Ñ–Ð´Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½Ñ–Ñ‚ÑŒ, Ñкщо не потрібно!'; $lang['usewordblock'] = 'Блокувати Ñпам по ÑпиÑку Ñлів'; $lang['indexdelay'] = 'Затримка перед індекÑацією'; $lang['relnofollow'] = 'ВикориÑтовувати rel="nofollow"'; -$lang['mailguard'] = 'Кодувати адреÑи email'; +$lang['mailguard'] = 'Кодувати адреÑи e-mail'; $lang['iexssprotect'] = 'Перевірте оновлені файли на можливі заборонені Javascript чи HTML коди'; +$lang['showuseras'] = 'Що вказувати при відображенні кориÑтувача, Ñкий воÑтаннє редагував Ñторінку'; $lang['useacl'] = 'ВикориÑтовувати ACL'; -$lang['autopasswd'] = 'Ðвтоматичне ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹'; +$lang['autopasswd'] = 'Ðвтоматичне ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð²'; $lang['authtype'] = 'ÐутентифікаціÑ'; -$lang['passcrypt'] = 'Метод ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¹'; -$lang['defaultgroup'] = 'Група завмовчки'; +$lang['passcrypt'] = 'Метод ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð²'; +$lang['defaultgroup'] = 'Група за замовчуваннÑм'; $lang['superuser'] = 'СуперкориÑтувач'; $lang['manager'] = 'Менеджер - група, кориÑтувач чи розділений комами ÑпиÑок user1,@group1,user2 з правами до певних функцій керуваннÑ'; $lang['profileconfirm'] = 'Підтверджувати зміни профілю паролем'; @@ -78,8 +87,11 @@ $lang['disableactions_nssubscription'] = 'ПідпиÑатиÑÑ/ВідпиÑатиÑÑ Ð½Ð° проÑÑ‚Ñ–Ñ€ імен'; $lang['disableactions_wikicode'] = 'ПереглÑнути код/ЕкÑпорт'; $lang['disableactions_other'] = 'Інші дії (розділені комами)'; -$lang['sneaky_index'] = 'По замовчуванню, ДокуВікі показує вÑÑ– проÑтори імен в зміÑÑ‚Ñ–. ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ Ñ†Ñ–Ñ”Ñ— опції Ñховає Ñ‚Ñ– проÑтори, де кориÑтувач не має прав на читаннÑ. Результатом може бути неможливіÑÑ‚ÑŒ доÑтупу до певних відкритих проÑторів імен. Це зробить неможливим викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту при певних конфігураціÑÑ….'; +$lang['sneaky_index'] = 'За замовчуваннÑм, ДокуВікі показує вÑÑ– проÑтори імен в зміÑÑ‚Ñ–. ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ Ñ†Ñ–Ñ”Ñ— опції Ñховає Ñ‚Ñ– проÑтори, де кориÑтувач не має прав на читаннÑ. Результатом може бути неможливіÑÑ‚ÑŒ доÑтупу до певних відкритих проÑторів імен. Це зробить неможливим викориÑÑ‚Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ñту при певних конфігураціÑÑ….'; $lang['auth_security_timeout'] = 'Таймаут аутентифікації (в Ñекундах)'; +$lang['securecookie'] = 'Чи повинен браузер надÑилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, Ñкщо вхід до Вікі захищено SSL, але переглÑд Ñторінок відбуваєтьÑÑ Ñƒ незахищеному режимі.'; +$lang['xmlrpc'] = 'Дозволити/заборонити XML-RPC інтерфейÑ'; +$lang['xmlrpcuser'] = 'Заборонити XML-RPC доÑтуп до кориÑтувачів або груп поданих тут та розділених комою. Залишіть поле незаповненим, щоб дозволити доÑтуп уÑім.'; $lang['updatecheck'] = 'Перевірити наÑвніÑÑ‚ÑŒ оновлень чи попереджень безпеки? Ð”Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ДокуВікі необхідно зв\'ÑзатиÑÑ Ð·Ñ– splitbrain.org.'; $lang['userewrite'] = 'КраÑиві URL'; $lang['useslash'] = 'Слеш, Ñк розділювач проÑторів імен в URL'; @@ -88,12 +100,12 @@ $lang['canonical'] = 'Канонічні URL'; $lang['autoplural'] = 'ПеревірÑти множину у поÑиланнÑÑ…'; $lang['compression'] = 'Метод ÑтиÑÐ½ÐµÐ½Ð½Ñ attic файлів'; -$lang['cachetime'] = 'МакÑимальний від Ð´Ð»Ñ ÐºÐµÑˆÐ° (Ñек)'; +$lang['cachetime'] = 'МакÑимальний вік кешу (Ñек)'; $lang['locktime'] = 'Ð§Ð°Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ (Ñек)'; $lang['fetchsize'] = 'МакÑимальний розмір (в байтах), що fetch.php може завантажувати з зовні'; -$lang['notify'] = 'Email Ð´Ð»Ñ Ñповіщень'; +$lang['notify'] = 'E-mail Ð´Ð»Ñ Ñповіщень'; $lang['registernotify'] = 'ÐадÑилати інформацію про нових кориÑтувачів на цю адреÑу'; -$lang['mailfrom'] = 'Email Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ñ… повідомлень'; +$lang['mailfrom'] = 'E-mail Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ñ… повідомлень'; $lang['gzip_output'] = 'ВикориÑтовувати gzip, Ñк Content-Encoding Ð´Ð»Ñ xhtml'; $lang['gdlib'] = 'ВерÑÑ–Ñ GD Lib'; $lang['im_convert'] = 'ШлÑÑ… до ImageMagick'; @@ -103,12 +115,12 @@ $lang['hidepages'] = 'Ховати Ñторінки (regular expressions)'; $lang['send404'] = 'ÐадÑилати "HTTP 404/Сторінка не знайдена " Ð´Ð»Ñ Ð½ÐµÑ–Ñнуючих Ñторінок'; $lang['sitemap'] = 'Створювати мапу Ñайту Ð´Ð»Ñ Google (дні)'; -$lang['broken_iua'] = 'Ðа вашій ÑиÑтемі зіпÑута Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ ignore_user_abort? Це може зіпÑувати пошукову ÑиÑтему. IIS+PHP/CGI зіпÑуто. ДивітьÑÑ Bug 852 Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації'; +$lang['broken_iua'] = 'У вашій ÑиÑтемі зіпÑована Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ ignore_user_abort? Це може зіпÑувати пошукову ÑиÑтему. IIS+PHP/CGI не працює. ДивітьÑÑ Bug 852 Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації'; $lang['xsendfile'] = 'ВикориÑтовувати заголовок X-Sendfile Ð´Ð»Ñ Ð´Ð¾Ñтавки Ñтатичних файлів веб Ñервером? Ваш веб Ñервер повинен підтримувати цю функцію.'; -$lang['xmlrpc'] = 'Дозволити/заборонити XML-RPC інтерфейÑ'; $lang['renderer_xhtml'] = 'ТранÑлÑтор (Renderer) Ð´Ð»Ñ Ð¾Ñновного виводу wiki (xhtml)'; -$lang['renderer__core'] = '%s (Ñдро докувікі)'; +$lang['renderer__core'] = '%s (Ñдро докуВікі)'; $lang['renderer__plugin'] = '%s (доданок)'; +$lang['rememberme'] = 'Дозволити поÑтійні файли cookies Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ (Запам\'Ñтати мене)'; $lang['rss_type'] = 'тип RSS'; $lang['rss_linkto'] = 'поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð² RSS'; $lang['rss_content'] = 'Що відображати в пунктах XML-feed'; @@ -116,21 +128,22 @@ $lang['recent_days'] = 'Скільки оÑтанніх змін пам\'Ñтати (дні)'; $lang['rss_show_summary'] = 'Показувати підÑумки змін в заголовку XML-feed'; $lang['target____wiki'] = 'Target Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ–Ñ… поÑилань'; -$lang['target____interwiki'] = 'Target Ð´Ð»Ñ Ñ–Ð½Ñ‚ÐµÑ€Ð²Ñ–ÐºÑ–-поÑилань'; +$lang['target____interwiki'] = 'Target Ð´Ð»Ñ Ñ–Ð½Ñ‚ÐµÑ€Ð’Ñ–ÐºÑ–-поÑилань'; $lang['target____extern'] = 'Target Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ–Ñ… поÑилань'; $lang['target____media'] = 'Target Ð´Ð»Ñ Ð¼ÐµÐ´Ñ–Ð°-поÑилань'; -$lang['target____windows'] = 'Target Ð´Ð»Ñ Ð¿Ð¾Ñилань на мережеві теки'; +$lang['target____windows'] = 'Target Ð´Ð»Ñ Ð¿Ð¾Ñилань на мережеві папки'; $lang['proxy____host'] = 'ÐдреÑа Proxy'; $lang['proxy____port'] = 'Порт Proxy'; $lang['proxy____user'] = 'КориÑтувач Proxy'; $lang['proxy____pass'] = 'Пароль Proxy'; -$lang['proxy____ssl'] = 'викориÑтовувати ssl Ð´Ð»Ñ Ð·\'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Proxy'; -$lang['safemodehack'] = 'включити хак safemode'; -$lang['ftp____host'] = 'FTP-Ñервер Ð´Ð»Ñ Ñ…Ð°ÐºÐ° safemode'; -$lang['ftp____port'] = 'FTP-порт Ð´Ð»Ñ Ñ…Ð°ÐºÐ° safemode'; -$lang['ftp____user'] = 'КориÑтувач FTP Ð´Ð»Ñ Ñ…Ð°ÐºÐ° safemode'; -$lang['ftp____pass'] = 'Пароль FTP Ð´Ð»Ñ Ñ…Ð°ÐºÐ° safemode'; -$lang['ftp____root'] = 'Коренева тека FTP Ð´Ð»Ñ Ñ…Ð°ÐºÐ° safemode'; +$lang['proxy____ssl'] = 'ВикориÑтовувати ssl Ð´Ð»Ñ Ð·\'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· Proxy'; +$lang['safemodehack'] = 'Увімкнути хак safemode'; +$lang['ftp____host'] = 'FTP-Ñервер Ð´Ð»Ñ Ñ…Ð°ÐºÑƒ safemode'; +$lang['ftp____port'] = 'FTP-порт Ð´Ð»Ñ Ñ…Ð°ÐºÑƒ safemode'; +$lang['ftp____user'] = 'КориÑтувач FTP Ð´Ð»Ñ Ñ…Ð°ÐºÑƒ safemode'; +$lang['ftp____pass'] = 'Пароль FTP Ð´Ð»Ñ Ñ…Ð°ÐºÑƒ safemode'; +$lang['ftp____root'] = 'Коренева папка FTP Ð´Ð»Ñ Ñ…Ð°ÐºÑƒ safemode'; +$lang['license_o_'] = 'не вибрано'; $lang['typography_o_0'] = 'жодного'; $lang['typography_o_1'] = 'Лише подвійні лапки'; $lang['typography_o_2'] = 'Ð’ÑÑ– лапки (може не завжди працювати)'; @@ -149,7 +162,7 @@ $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_diff'] = 'Уніфіковані зміни (diff)'; $lang['rss_content_o_htmldiff'] = 'Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð·Ð¼Ñ–Ð½ у форматі HTML'; $lang['rss_content_o_html'] = 'Повний зміÑÑ‚ Ñторінки HTML'; $lang['rss_linkto_o_diff'] = 'переглÑд відмінноÑтей'; @@ -160,6 +173,14 @@ $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'не викориÑтовувати'; -$lang['xsendfile_o_1'] = 'Пропрієтарний lighthttpd заголовок (до верÑÑ–Ñ— 1.5)'; +$lang['xsendfile_o_1'] = 'Фірмовий заголовок lighthttpd (до верÑÑ–Ñ— 1.5)'; $lang['xsendfile_o_2'] = 'Стандартний X-Sendfile заголовок'; -$lang['xsendfile_o_3'] = 'Пропрієтарний Nginx X-Accel-Redirect заголовок'; +$lang['xsendfile_o_3'] = 'Фірмовий заголовок Nginx X-Accel-Redirect'; +$lang['showuseras_o_loginname'] = 'Логін'; +$lang['showuseras_o_username'] = 'Повне Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача'; +$lang['showuseras_o_email'] = 'E-mail кориÑтувача (прихована відповідно до наÑтройок)'; +$lang['showuseras_o_email_link'] = 'E-mail кориÑтувача Ñк поÑÐ¸Ð»Ð°Ð½Ð½Ñ mailto:'; +$lang['useheading_o_0'] = 'Ðіколи'; +$lang['useheading_o_navigation'] = 'Лише Ð´Ð»Ñ Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ñ—'; +$lang['useheading_o_content'] = 'Лише у зміÑÑ‚Ñ–'; +$lang['useheading_o_1'] = 'Завжди'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -2,10 +2,12 @@ /** * Chinese(Simplified) language file * - * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * @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 + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['menu'] = 'é…置设置'; $lang['error'] = '由于éžæ³•å‚数，设置没有更新。请检查您åšçš„改动并é‡æ–°æ交。 @@ -14,6 +16,9 @@ $lang['nochoice'] = '（没有其他å¯ç”¨é€‰é¡¹ï¼‰'; $lang['locked'] = '设置文件无法更新。如果这是您没有æ„料到的，
    请确ä¿æœ¬åœ°è®¾ç½®æ–‡ä»¶çš„å称和æƒé™è®¾ç½®æ­£ç¡®ã€‚'; +$lang['danger'] = 'å±é™©ï¼šæ›´æ”¹è¿™ä¸ªé€‰é¡¹å¯èƒ½ä¼šä½¿ç”¨ä½ çš„Wiki页é¢å’Œé…ç½®èœå•æ— æ³•è¿›å…¥ã€‚'; +$lang['warning'] = '注æ„：更改这个选项å¯èƒ½ä¼šé€ æˆæœªçŸ¥ç»“果。'; +$lang['security'] = '安全æ示：更改这个选项å¯èƒ½ä¼šæœ‰å®‰å…¨éšæ‚£ã€‚'; $lang['_configuration_manager'] = 'é…置管ç†å™¨'; $lang['_header_dokuwiki'] = 'DokuWiki 设置'; $lang['_header_plugin'] = 'æ’件设置'; @@ -67,6 +72,7 @@ $lang['relnofollow'] = '对外部链接使用 rel="nofollow" 标签'; $lang['mailguard'] = '弄乱邮件地å€ï¼ˆä¿æŠ¤ç”¨æˆ·çš„邮件地å€ï¼‰'; $lang['iexssprotect'] = '检验上传的文件以é¿å…å¯èƒ½å­˜åœ¨çš„æ¶æ„ JavaScript 或 HTML 代ç '; +$lang['showuseras'] = '显示用户为'; $lang['useacl'] = '使用访问控制列表（ACL）'; $lang['autopasswd'] = '自动生æˆå¯†ç '; $lang['authtype'] = '认è¯åŽå°ç®¡ç†æ–¹å¼'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/config/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/config/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['menu'] = '系統é…置設定'; $lang['error'] = '設定因為ä¸åˆæ³•çš„值而失敗，請檢查您的改變並é‡æ–°é€å‡ºã€‚ @@ -13,6 +14,9 @@ $lang['nochoice'] = '(無其他é¸é …å¯é¸)'; $lang['locked'] = '設定檔無法被更新, 如果這ä¸æ˜¯æ•…æ„çš„,
    請確定設定檔å以åŠæ¬Šé™æ˜¯æ­£ç¢ºçš„.'; +$lang['danger'] = 'å±éšªï¼šæ”¹è®Šæ­¤é¸é …å¯èƒ½ä½¿å¾—您的 wiki 以åŠå…¶è¨­å®šé¸å–®ç„¡æ³•å­˜å–。'; +$lang['warning'] = '警告：改變此é¸é …å¯èƒ½å°Žè‡´æœªé æœŸçš„行為。'; +$lang['security'] = '安全性警告：改變此é¸é …å¯èƒ½é€ æˆå®‰å…¨ä¸Šçš„å±éšªã€‚'; $lang['_configuration_manager'] = '設定管ç†'; $lang['_header_dokuwiki'] = 'DokuWiki 設定'; $lang['_header_plugin'] = '外掛設定'; @@ -41,6 +45,7 @@ $lang['start'] = '開始é é¢çš„å稱'; $lang['title'] = 'Wiki 標題'; $lang['template'] = '樣æ¿'; +$lang['license'] = '您希望您的內容為何種授權方å¼ï¼Ÿ'; $lang['fullpath'] = '顯示完整的路徑於é é¢åº•éƒ¨'; $lang['recent'] = '最近更新'; $lang['breadcrumbs'] = '显示“足迹â€çš„æ•°é‡'; @@ -51,10 +56,11 @@ $lang['dformat'] = '日期格å¼(請見 PHP\'s strftime function)'; $lang['signature'] = 'ç°½å'; $lang['toptoclevel'] = '本é ç›®éŒ„的最高層級'; +$lang['tocminheads'] = '決定是å¦å»ºç«‹æœ¬é ç›®éŒ„的最少標題數é‡'; $lang['maxtoclevel'] = '本é ç›®éŒ„顯示的最大層級'; $lang['maxseclevel'] = 'å¯ç·¨è¼¯æ®µè½çš„最大層級'; $lang['camelcase'] = 'å°éˆæŽ¥ä½¿ç”¨ CamelCase'; -$lang['deaccent'] = '清ç†é¡µé¢å称'; +$lang['deaccent'] = '清ç†é é¢å稱'; $lang['useheading'] = '使用第一個標題作為é é¢å稱'; $lang['refcheck'] = '媒體連çµæª¢æŸ¥'; $lang['refshow'] = '媒體連çµçš„顯示數é‡'; @@ -64,6 +70,7 @@ $lang['relnofollow'] = '使用 rel="nofollow" 於外部連çµ'; $lang['mailguard'] = '暗化E-mailä½å€'; $lang['iexssprotect'] = '檢查上傳的檔案中是å¦éš±å«æƒ¡æ„çš„ JavaScript 或 HTML 碼'; +$lang['showuseras'] = '在顯示最近修改é é¢ï¼Œå°‡ä½¿ç”¨è€…顯示為：'; $lang['useacl'] = '使用存å–控制åå–®'; $lang['autopasswd'] = '自動產生密碼'; $lang['authtype'] = '认è¯åŽå°ç®¡ç†æ–¹å¼'; @@ -80,6 +87,7 @@ $lang['disableactions_other'] = '其他功能(以逗號分隔)'; $lang['sneaky_index'] = '默èªæƒ…æ³ä¸‹ï¼ŒDokuWiki 在索引é æœƒé¡¯ç¤ºæ‰€æœ‰ namespace。啟用該é¸é …能隱è—那些用戶沒有權é™é–±è®€çš„é é¢ã€‚但也å¯èƒ½å°‡ç”¨æˆ¶èƒ½å¤ é–±è®€çš„å­é é¢ä¸€ä¸¦éš±è—。這有å¯èƒ½å°Žè‡´åœ¨ç‰¹å®š ACL 設置下，索引功能ä¸å¯ç”¨ã€‚'; $lang['auth_security_timeout'] = 'èªè­‰ç¢ºå®šçš„ Timeout (秒)'; +$lang['securecookie'] = '「cookies set via HTTPSã€æ˜¯å¦åªèƒ½ç”±ç€è¦½å™¨ç¶“ HTTPS 傳é€ï¼Ÿç•¶ä½ ç™»å…¥ wiki 是被 SSL 所ä¿è­·ä½†ç€è¦½ wiki 是沒有被ä¿è­·æ™‚，å–消此é¸é …。'; $lang['updatecheck'] = '檢查更新與安全性警告? 使用此功能, DokuWiki 需è¦è¯ç¹« splitbrain.org.'; $lang['userewrite'] = '使用更整潔的 URL'; $lang['useslash'] = '在 URL 中使用斜æ ä½œä¸ºå‘½å空间的分隔符'; @@ -132,6 +140,7 @@ $lang['ftp____user'] = 'Safemode Hack çš„ FTP 用戶å'; $lang['ftp____pass'] = 'Safemode Hack çš„ FTP 密碼'; $lang['ftp____root'] = 'Safemode Hack çš„ FTP 根路徑'; +$lang['license_o_'] = '未é¸æ“‡'; $lang['typography_o_0'] = 'ç„¡'; $lang['typography_o_1'] = 'ä»…é™åŒå¼•å·'; $lang['typography_o_2'] = '所有引號（ä¸ä¸€å®šèƒ½æ­£å¸¸é‹è¡Œï¼‰'; @@ -166,3 +175,9 @@ $lang['xsendfile_o_3'] = '專有 Nginx X-Accel-Redirect é ­'; $lang['showuseras_o_loginname'] = '登入å稱'; $lang['showuseras_o_username'] = '完整姓å'; +$lang['showuseras_o_email'] = '使用者的 email ä½å€ (根據郵件監控設定來暗化)'; +$lang['showuseras_o_email_link'] = '使用者的 eamil ä½å€æ¨™ç¤ºæˆ mailto: link'; +$lang['useheading_o_0'] = 'æ°¸ä¸'; +$lang['useheading_o_navigation'] = 'åªæœ‰å°Žè¦½'; +$lang['useheading_o_content'] = 'åªæœ‰ Wiki 內容'; +$lang['useheading_o_1'] = '總是'; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/settings/config.class.php dokuwiki-rc2009-12-02/lib/plugins/config/settings/config.class.php --- dokuwiki-2009-02-14/lib/plugins/config/settings/config.class.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/settings/config.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -340,6 +340,12 @@ var $_error = false; // only used by those classes which error check var $_input = NULL; // only used by those classes which error check + var $_cautionList = array( + 'basedir' => 'danger', 'baseurl' => 'danger', 'savedir' => 'danger', 'useacl' => 'danger', 'authtype' => 'danger', 'superuser' => 'danger', 'userewrite' => 'danger', + 'start' => 'warning', 'camelcase' => 'warning', 'deaccent' => 'warning', 'sepchar' => 'warning', 'compression' => 'warning', 'xsendfile' => 'warning', 'renderer_xhtml' => 'warning', + 'allowdebug' => 'security', 'htmlok' => 'security', 'phpok' => 'security', 'iexssprotect' => 'security', 'xmlrpc' => 'security' + ); + function setting($key, $params=NULL) { $this->_key = $key; @@ -439,9 +445,21 @@ function is_default() { return !$this->is_protected() && is_null($this->_local); } function error() { return $this->_error; } - function _out_key($pretty=false) { + function caution() { + if (!array_key_exists($this->_key, $this->_cautionList)) return false; + return $this->_cautionList[$this->_key]; + } + + function _out_key($pretty=false,$url=false) { if($pretty){ - return str_replace(CM_KEYMARKER,"»",$this->_key); + $out = str_replace(CM_KEYMARKER,"»",$this->_key); + if ($url && !strstr($out,'»')) {//provide no urls for plugins, etc. + if ($out == 'start') //one exception + return ''.$out.''; + else + return ''.$out.''; + } + return $out; }else{ return str_replace(CM_KEYMARKER,"']['",$this->_key); } @@ -510,8 +528,44 @@ } if (!class_exists('setting_email')) { + + require_once(DOKU_INC.'inc/mail.php'); + if (!defined('SETTING_EMAIL_PATTERN')) define('SETTING_EMAIL_PATTERN','<^'.PREG_PATTERN_VALID_EMAIL.'$>'); + class setting_email extends setting_string { - var $_pattern = '#^\s*(([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)(,\s*([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))*)?\s*$#i'; + var $_pattern = SETTING_EMAIL_PATTERN; // no longer required, retained for backward compatibility - FIXME, may not be necessary + var $_multiple = false; + + /** + * update setting with user provided value $input + * if value fails error check, save it + * + * @return true if changed, false otherwise (incl. on error) + */ + function update($input) { + if (is_null($input)) return false; + if ($this->is_protected()) return false; + + $value = is_null($this->_local) ? $this->_default : $this->_local; + if ($value == $input) return false; + + if ($this->_multiple) { + $mails = array_filter(array_map('trim', split(',', $input))); + } else { + $mails = array($input); + } + + foreach ($mails as $mail) { + if (!mail_isvalid($mail)) { + $this->_error = true; + $this->_input = $input; + return false; + } + } + + $this->_local = $input; + return true; + } } } @@ -545,7 +599,7 @@ $addr = $test; } - if ($this->_pattern && !preg_match($this->_pattern,$addr)) { + if (!mail_isvalid($addr)) { $this->_error = true; $this->_input = $input; return false; diff -Naur dokuwiki-2009-02-14/lib/plugins/config/settings/config.metadata.php dokuwiki-rc2009-12-02/lib/plugins/config/settings/config.metadata.php --- dokuwiki-2009-02-14/lib/plugins/config/settings/config.metadata.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/settings/config.metadata.php 2009-12-02 19:50:12.000000000 +0100 @@ -119,7 +119,7 @@ $meta['useacl'] = array('onoff'); $meta['autopasswd'] = array('onoff'); $meta['authtype'] = array('authtype'); -$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411')); +$meta['passcrypt'] = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','crypt','mysql','my411','kmd5')); $meta['defaultgroup']= array('string'); $meta['superuser'] = array('string'); $meta['manager'] = array('string'); @@ -132,6 +132,8 @@ $meta['sneaky_index'] = array('onoff'); $meta['auth_security_timeout'] = array('numeric'); $meta['securecookie'] = array('onoff'); +$meta['xmlrpc'] = array('onoff'); +$meta['xmlrpcuser'] = array('string'); $meta['_anti_spam'] = array('fieldset'); $meta['usewordblock']= array('onoff'); @@ -144,7 +146,7 @@ $meta['usedraft'] = array('onoff'); $meta['htmlok'] = array('onoff'); $meta['phpok'] = array('onoff'); -$meta['notify'] = array('email'); +$meta['notify'] = array('email', '_multiple' => true); $meta['subscribers'] = array('onoff'); $meta['locktime'] = array('numeric'); $meta['cachetime'] = array('numeric'); @@ -184,7 +186,6 @@ $meta['rss_show_summary'] = array('onoff'); $meta['broken_iua'] = array('onoff'); $meta['xsendfile'] = array('multichoice','_choices' => array(0,1,2,3)); -$meta['xmlrpc'] = array('onoff'); $meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml')); $meta['_network'] = array('fieldset'); diff -Naur dokuwiki-2009-02-14/lib/plugins/config/settings/extra.class.php dokuwiki-rc2009-12-02/lib/plugins/config/settings/extra.class.php --- dokuwiki-2009-02-14/lib/plugins/config/settings/extra.class.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/settings/extra.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -170,7 +170,7 @@ } } } - return parent::html($plugin, $echo); + return parent::html($plugin, $echo); } } } diff -Naur dokuwiki-2009-02-14/lib/plugins/config/style.css dokuwiki-rc2009-12-02/lib/plugins/config/style.css --- dokuwiki-2009-02-14/lib/plugins/config/style.css 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/config/style.css 2009-12-02 19:50:12.000000000 +0100 @@ -4,7 +4,7 @@ #config__manager div.info { background-position: 0.5em; padding: 0.5em; - text-align:center; + text-align: center; } #config__manager fieldset { @@ -30,7 +30,7 @@ } #config__manager fieldset td.value { /* fixed data column width */ - width: 30em; + width: 31em; } #config__manager td.label { @@ -39,9 +39,14 @@ } #config__manager td.label label { - clear: both; + clear: left; display: block; } +#config__manager td.label img { + padding: 0 10px; + vertical-align: middle; + float: right; +} #config__manager td.label span.outkey { font-size: 70%; @@ -59,6 +64,9 @@ #config__manager td input.edit { width: 30em; } +#config__manager td .input { + width: 30.8em; +} #config__manager td select.edit { } #config__manager td textarea.edit { width: 27.5em; @@ -91,7 +99,7 @@ color: #000 !important; } -#config__manager td.error { background-color: red; color: #000;} +#config__manager td.error { background-color: red; color: #000; } #config__manager .selection { width: 14.8em; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/admin.php dokuwiki-rc2009-12-02/lib/plugins/plugin/admin.php --- dokuwiki-2009-02-14/lib/plugins/plugin/admin.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/admin.php 2009-12-02 19:50:12.000000000 +0100 @@ -15,15 +15,16 @@ if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/'); require_once(DOKU_PLUGIN.'admin.php'); +require_once(DOKU_PLUGIN."/plugin/classes/ap_manage.class.php"); - //--------------------------[ GLOBALS ]------------------------------------------------ - // note: probably should be dokuwiki wide globals, where they can be accessed by pluginutils.php - // global $plugin_types; - // $plugin_types = array('syntax', 'admin'); - - // plugins that are an integral part of dokuwiki, they shouldn't be disabled or deleted - global $plugin_protected; - $plugin_protected = array('acl','plugin','config','info','usermanager','revert'); +//--------------------------[ GLOBALS ]------------------------------------------------ +// note: probably should be dokuwiki wide globals, where they can be accessed by pluginutils.php +// global $plugin_types; +// $plugin_types = array('syntax', 'admin'); + +// plugins that are an integral part of dokuwiki, they shouldn't be disabled or deleted +global $plugin_protected; +$plugin_protected = array('acl','plugin','config','info','usermanager','revert'); /** * All DokuWiki plugins to extend the admin function @@ -44,745 +45,109 @@ var $error = ''; function admin_plugin_plugin() { - global $conf; - $this->disabled = (isset($conf['pluginmanager']) && ($conf['pluginmanager'] == 0)); + global $conf; + $this->disabled = (isset($conf['pluginmanager']) && ($conf['pluginmanager'] == 0)); } /** * return some info */ function getInfo(){ - $disabled = ($this->disabled) ? '(disabled)' : ''; + $disabled = ($this->disabled) ? '(disabled)' : ''; - return array( - 'author' => 'Christopher Smith', - 'email' => 'chris@jalakai.co.uk', - 'date' => '2005-08-10', - 'name' => 'Plugin Manager', - 'desc' => "Manage Plugins, including automated plugin installer $disabled", - 'url' => 'http://dokuwiki.org/plugin:plugin', - ); + return array( + 'author' => 'Christopher Smith', + 'email' => 'chris@jalakai.co.uk', + 'date' => '2009-11-11', + 'name' => 'Plugin Manager', + 'desc' => "Manage Plugins, including automated plugin installer $disabled", + 'url' => 'http://www.dokuwiki.org/plugin:plugin', + ); } - /** - * return prompt for admin menu - */ - function getMenuText($language) { - - if (!$this->disabled) - return parent::getMenuText($language); - - return ''; - } /** * return sort order for position in admin menu */ function getMenuSort() { - return 20; + return 20; } /** * handle user request */ function handle() { + // enable direct access to language strings + $this->setupLocale(); - if ($this->disabled) return; - - // enable direct access to language strings - $this->setupLocale(); - -// $this->plugin = $_REQUEST['plugin']; -// $this->cmd = $_REQUEST['fn']; -// if (is_array($this->cmd)) $this->cmd = key($this->cmd); - - $fn = $_REQUEST['fn']; - if (is_array($fn)) { - $this->cmd = key($fn); - $this->plugin = is_array($fn[$this->cmd]) ? key($fn[$this->cmd]) : null; - } else { - $this->cmd = $fn; - $this->plugin = null; - } - - $this->_get_plugin_list(); - - // verify $_REQUEST vars - if (in_array($this->cmd, $this->commands)) { - $this->plugin = ''; - } else if (!in_array($this->cmd, $this->functions) || !in_array($this->plugin, $this->plugin_list)) { - $this->cmd = 'manage'; - $this->plugin = ''; - } - - if(($this->cmd != 'manage' || $this->plugin != '') && !checkSecurityToken()){ - $this->cmd = 'manage'; - $this->plugin = ''; - } - - // create object to handle the command - $class = "ap_".$this->cmd; - if (!class_exists($class)) $class = 'ap_manage'; - - $this->handler = & new $class($this, $this->plugin); - $this->msg = $this->handler->process(); - - } - - /** - * output appropriate html - */ - function html() { - - if ($this->disabled) return; - - // enable direct access to language strings - $this->setupLocale(); - $this->_get_plugin_list(); - - if ($this->handler === NULL) $this->handler = & new ap_manage($this, $this->plugin); - - ptln('
    '); - $this->handler->html(); - ptln('
    '); - } - - function _get_plugin_list() { - if (empty($this->plugin_list)) { - $list = plugin_list('',true); // all plugins, including disabled ones - sort($list); - trigger_event('PLUGIN_PLUGINMANAGER_PLUGINLIST',$list); - $this->plugin_list = $list; - } - return $this->plugin_list; - } - -} - -class ap_manage { - - var $manager = NULL; - var $lang = array(); - var $plugin = ''; - var $downloaded = array(); - - function ap_manage(&$manager, $plugin) { - $this->manager = & $manager; - $this->plugin = $plugin; - $this->lang = & $manager->lang; - } - - function process() { - return ''; - } - - function html() { - print $this->manager->locale_xhtml('admin_plugin'); - $this->html_menu(); - } - - // build our standard menu - function html_menu($listPlugins = true) { - global $ID; - - ptln('
    '); - - ptln('
    '); - ptln('

    '.$this->lang['download'].'

    '); - ptln('
    '); - ptln(' '); - ptln('
    '); - ptln(' '.$this->lang['download'].''); - ptln(' '); - ptln(' '); - ptln('
    '); - ptln('
    '); - ptln('
    '); - - if ($listPlugins) { - ptln('

    '.$this->lang['manage'].'

    '); - - ptln('
    '); -// ptln('
    '); - - ptln(' '); - - $this->html_pluginlist(); - - ptln('
    '); - ptln(' '); - ptln('
    '); - -// ptln('
    '); - ptln('
    '); - } - - ptln('
    '); - } - - function html_pluginlist() { - global $ID; - global $plugin_protected; - - foreach ($this->manager->plugin_list as $plugin) { - - $disabled = plugin_isdisabled($plugin); - $protected = in_array($plugin,$plugin_protected); - - $checked = ($disabled) ? '' : ' checked="checked"'; - $check_disabled = ($protected) ? ' disabled="disabled"' : ''; - - // determine display class(es) - $class = array(); - if (in_array($plugin, $this->downloaded)) $class[] = 'new'; - if ($disabled) $class[] = 'disabled'; - if ($protected) $class[] = 'protected'; - - $class = count($class) ? ' class="'.join(' ', $class).'"' : ''; - - ptln(' '); - ptln(' '.$plugin.''); - ptln(' '); - ptln('

    '.$plugin.'

    '); - - $this->html_button($plugin, 'info', false, 6); - if (in_array('settings', $this->manager->functions)) { - $this->html_button($plugin, 'settings', !@file_exists(DOKU_PLUGIN.$plugin.'/settings.php'), 6); - } - $this->html_button($plugin, 'update', !$this->plugin_readlog($plugin, 'url'), 6); - $this->html_button($plugin, 'delete', $protected, 6); - - ptln(' '); - } - } - - function html_button($plugin, $btn, $disabled=false, $indent=0) { - $disabled = ($disabled) ? 'disabled="disabled"' : ''; - ptln('',$indent); - } - - /** - * Refresh plugin list - */ - function refresh() { - global $MSG,$config_cascade; - - //are there any undisplayed messages? keep them in session for display - if (isset($MSG) && count($MSG)){ - //reopen session, store data and close session again - @session_start(); - $_SESSION[DOKU_COOKIE]['msg'] = $MSG; - session_write_close(); - } - - // expire dokuwiki caches - // touching local.php expires wiki page, JS and CSS caches - @touch(reset($config_cascade['main']['local'])); - - // update latest plugin date - FIXME - header('Location: '.wl($ID).'?do=admin&page=plugin'); - exit(); - } - - function download($url, $overwrite=false) { - global $lang; - - // check the url - $matches = array(); - if (!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) { - $this->manager->error = $this->lang['error_badurl']."\n"; - return false; - } - - $file = $matches[0]; - - if (!($tmp = io_mktmpdir())) { - $this->manager->error = $this->lang['error_dircreate']."\n"; - return false; - } - - if (!$file = io_download($url, "$tmp/", true, $file)) { - $this->manager->error = sprintf($this->lang['error_download'],$url)."\n"; - } - - if (!$this->manager->error && !ap_decompress("$tmp/$file", $tmp)) { - $this->manager->error = sprintf($this->lang['error_decompress'],$file)."\n"; - } - - // search $tmp for the folder(s) that has been created - // move the folder(s) to lib/plugins/ - if (!$this->manager->error) { - if ($dh = @opendir("$tmp/")) { - while (false !== ($f = readdir($dh))) { - if ($f == '.' || $f == '..' || $f == 'tmp') continue; - if (!is_dir("$tmp/$f")) continue; - - // check to make sure we aren't overwriting anything - if (!$overwrite && @file_exists(DOKU_PLUGIN.$f)) { - // remember our settings, ask the user to confirm overwrite, FIXME - continue; - } - - $instruction = @file_exists(DOKU_PLUGIN.$f) ? 'update' : 'install'; - - if (ap_copy("$tmp/$f", DOKU_PLUGIN.$f)) { - $this->downloaded[] = $f; - $this->plugin_writelog($f, $instruction, array($url)); - } else { - $this->manager->error .= sprintf($this->lang['error_copy']."\n", $f); - } - } - closedir($dh); - } else { - $this->manager->error = $this->lang['error']."\n"; - } - } - - // cleanup - if ($tmp) ap_delete($tmp); - - if (!$this->manager->error) { - msg('Plugin package ('.count($this->downloaded).' plugin'.(count($this->downloaded) != 1?'s':'').': '.join(',',$this->downloaded).') successfully installed.',1); - $this->refresh(); - return true; - } - - return false; - } - - // log - function plugin_writelog($plugin, $cmd, $data) { - - $file = DOKU_PLUGIN.$plugin.'/manager.dat'; - - switch ($cmd) { - case 'install' : - $url = $data[0]; - $date = date('r'); - if (!$fp = @fopen($file, 'w')) return; - fwrite($fp, "installed=$date\nurl=$url\n"); - fclose($fp); - break; - - case 'update' : - $date = date('r'); - if (!$fp = @fopen($file, 'a')) return; - fwrite($fp, "updated=$date\n"); - fclose($fp); - break; - } - } - - function plugin_readlog($plugin, $field) { - static $log = array(); - $file = DOKU_PLUGIN.plugin_directory($plugin).'/manager.dat'; - - if (!isset($log[$plugin])) { - $tmp = @file_get_contents($file); - if (!$tmp) return ''; - $log[$plugin] = & $tmp; - } - - if ($field == 'ALL') { - return $log[$plugin]; - } - - $match = array(); - if (preg_match_all('/'.$field.'=(.*)$/m',$log[$plugin], $match)) - return implode("\n", $match[1]); - - return ''; - } - } - - class ap_download extends ap_manage { - - var $overwrite = false; - - function process() { - global $lang; - - $plugin_url = $_REQUEST['url']; - $this->download($plugin_url, $this->overwrite); - return ''; - } - - function html() { - parent::html(); - - ptln('
    '); - ptln('

    '.$this->lang['downloading'].'

    '); - - if ($this->manager->error) { - ptln('
    '.str_replace("\n","
    ",$this->manager->error).'
    '); - } else if (count($this->downloaded) == 1) { - ptln('

    '.sprintf($this->lang['downloaded'],$this->downloaded[0]).'

    '); - } else if (count($this->downloaded)) { // more than one plugin in the download - ptln('

    '.$this->lang['downloads'].'

    '); - ptln('
      '); - foreach ($this->downloaded as $plugin) { - ptln('
    • '.$plugin.'
      • ',2); - } - ptln('
    '); - } else { // none found in download - ptln('

    '.$this->lang['download_none'].'

    '); - } - ptln('
    '); - } - - } - - class ap_delete extends ap_manage { - function process() { - - if (!ap_delete(DOKU_PLUGIN.plugin_directory($this->manager->plugin))) { - $this->manager->error = sprintf($this->lang['error_delete'],$this->manager->plugin); - } else { - msg("Plugin {$this->manager->plugin} successfully deleted."); - $this->refresh(); - } - } - - function html() { - parent::html(); - - ptln('
    '); - ptln('

    '.$this->lang['deleting'].'

    '); - - if ($this->manager->error) { - ptln('
    '.str_replace("\n","
    ",$this->manager->error).'
    '); - } else { - ptln('

    '.sprintf($this->lang['deleted'],$this->plugin).'

    '); - } - ptln('
    '); - } - } - - class ap_info extends ap_manage { - - var $plugin_info = array(); // the plugin itself - var $details = array(); // any component plugins - - function process() { - - // sanity check - if (!$this->manager->plugin) { return; } - - $component_list = ap_plugin_components($this->manager->plugin); - usort($component_list, 'ap_component_sort'); - - foreach ($component_list as $component) { - if ($obj = & plugin_load($component['type'],$component['name']) === NULL) continue; - - $this->details[] = array_merge($obj->getInfo(), array('type' => $component['type'])); - unset($obj); - } - - // review details to simplify things - foreach($this->details as $info) { - foreach($info as $item => $value) { - if (!isset($this->plugin_info[$item])) { $this->plugin_info[$item] = $value; continue; } - if ($this->plugin_info[$item] != $value) $this->plugin_info[$item] = ''; - } - } - } - - function html() { - - // output the standard menu stuff - parent::html(); - - // sanity check - if (!$this->manager->plugin) { return; } - - ptln('
    '); - ptln("

    ".$this->manager->getLang('plugin')." {$this->manager->plugin}

    "); - - // collect pertinent information from the log - $installed = $this->plugin_readlog($this->manager->plugin, 'installed'); - $source = $this->plugin_readlog($this->manager->plugin, 'url'); - $updated = $this->plugin_readlog($this->manager->plugin, 'updated'); - if (strrpos($updated, "\n") !== false) $updated = substr($updated, strrpos($updated, "\n")+1); - - ptln("
    ",2); - ptln("
    ".$this->manager->getLang('source').'
    '.($source ? $source : $this->manager->getLang('unknown'))."
    ",4); - ptln("
    ".$this->manager->getLang('installed').'
    '.($installed ? $installed : $this->manager->getLang('unknown'))."
    ",4); - if ($updated) ptln("
    ".$this->manager->getLang('lastupdate').'
    '.$updated."
    ",4); - ptln("
    ",2); - - if (count($this->details) == 0) { - ptln("

    ".$this->manager->getLang('noinfo')."

    ",2); - } else { - - ptln("
    ",2); - if ($this->plugin_info['name']) ptln("
    ".$this->manager->getLang('name')."
    ".$this->out($this->plugin_info['name'])."
    ",4); - if ($this->plugin_info['date']) ptln("
    ".$this->manager->getLang('date')."
    ".$this->out($this->plugin_info['date'])."
    ",4); - if ($this->plugin_info['type']) ptln("
    ".$this->manager->getLang('type')."
    ".$this->out($this->plugin_info['type'])."
    ",4); - if ($this->plugin_info['desc']) ptln("
    ".$this->manager->getLang('desc')."
    ".$this->out($this->plugin_info['desc'])."
    ",4); - if ($this->plugin_info['author']) ptln("
    ".$this->manager->getLang('author')."
    ".$this->manager->email($this->plugin_info['email'], $this->plugin_info['author'])."
    ",4); - if ($this->plugin_info['url']) ptln("
    ".$this->manager->getLang('www')."
    ".$this->manager->external_link($this->plugin_info['url'], '', 'urlextern')."
    ",4); - ptln("
    ",2); - - if (count($this->details) > 1) { - ptln("

    ".$this->manager->getLang('components')."

    ",2); - ptln("
    ",2); - - foreach ($this->details as $info) { - - ptln("
    ",4); - ptln("
    ".$this->manager->getLang('name')."
    ".$this->out($info['name'])."
    ",6); - if (!$this->plugin_info['date']) ptln("
    ".$this->manager->getLang('date')."
    ".$this->out($info['date'])."
    ",6); - if (!$this->plugin_info['type']) ptln("
    ".$this->manager->getLang('type')."
    ".$this->out($info['type'])."
    ",6); - if (!$this->plugin_info['desc']) ptln("
    ".$this->manager->getLang('desc')."
    ".$this->out($info['desc'])."
    ",6); - if (!$this->plugin_info['author']) ptln("
    ".$this->manager->getLang('author')."
    ".$this->manager->email($info['email'], $info['author'])."
    ",6); - if (!$this->plugin_info['url']) ptln("
    ".$this->manager->getLang('www')."
    ".$this->manager->external_link($info['url'], '', 'urlextern')."
    ",6); - ptln("
    ",4); - - } - ptln("
    ",2); - } - } - ptln("
    "); - } - - // simple output filter, make html entities safe and convert new lines to
    - function out($text) { - return str_replace("\n",'
    ',htmlspecialchars($text)); - } - - } - - //--------------[ to do ]--------------------------------------- - class ap_update extends ap_manage { - - var $overwrite = true; - - function process() { - global $lang; - - $plugin_url = $this->plugin_readlog($this->plugin, 'url'); - $this->download($plugin_url, $this->overwrite); - return ''; + $fn = $_REQUEST['fn']; + if (is_array($fn)) { + $this->cmd = key($fn); + $this->plugin = is_array($fn[$this->cmd]) ? key($fn[$this->cmd]) : null; + } else { + $this->cmd = $fn; + $this->plugin = null; } + $this->_get_plugin_list(); - function html() { - parent::html(); - - ptln('
    '); - ptln('

    '.$this->lang['updating'].'

    '); - - if ($this->manager->error) { - ptln('
    '.str_replace("\n","
    ", $this->manager->error).'
    '); - } else if (count($this->downloaded) == 1) { - ptln('

    '.sprintf($this->lang['updated'],$this->downloaded[0]).'

    '); - } else if (count($this->downloaded)) { // more than one plugin in the download - ptln('

    '.$this->lang['updates'].'

    '); - ptln('
      '); - foreach ($this->downloaded as $plugin) { - ptln('
    • '.$plugin.'
      • ',2); - } - ptln('
    '); - } else { // none found in download - ptln('

    '.$this->lang['update_none'].'

    '); - } - ptln('
    '); + // verify $_REQUEST vars + if (in_array($this->cmd, $this->commands)) { + $this->plugin = ''; + } else if (!in_array($this->cmd, $this->functions) || !in_array($this->plugin, $this->plugin_list)) { + $this->cmd = 'manage'; + $this->plugin = ''; } - } - class ap_settings extends ap_manage {} - class ap_enable extends ap_manage { - - var $enabled = array(); - - function process() { - global $plugin_protected; - $count_enabled = $count_disabled = 0; - - $this->enabled = isset($_REQUEST['enabled']) ? $_REQUEST['enabled'] : array(); - - foreach ($this->manager->plugin_list as $plugin) { - if (in_array($plugin, $plugin_protected)) continue; - - $new = in_array($plugin, $this->enabled); - $old = !plugin_isdisabled($plugin); - - if ($new != $old) { - switch ($new) { - // enable plugin - case true : - if(plugin_enable($plugin)){ - msg(sprintf($this->lang['enabled'],$plugin),1); - $count_enabled++; - }else{ - msg(sprintf($this->lang['notenabled'],$plugin),-1); - } - break; - case false: - if(plugin_disable($plugin)){ - msg(sprintf($this->lang['disabled'],$plugin),1); - $count_disabled++; - }else{ - msg(sprintf($this->lang['notdisabled'],$plugin),-1); - } - break; - } - } + if(($this->cmd != 'manage' || $this->plugin != '') && !checkSecurityToken()){ + $this->cmd = 'manage'; + $this->plugin = ''; } - // refresh plugins, including expiring any dokuwiki cache(s) - if ($count_enabled || $count_disabled) { - $this->refresh(); + // create object to handle the command + $class = "ap_".$this->cmd; + @require_once(DOKU_PLUGIN."/plugin/classes/$class.class.php"); + if (!class_exists($class)){ + $class = 'ap_manage'; } - } - - } - - //--------------[ utilities ]----------------------------------- - function is_css($f) { return (substr($f, -4) == '.css'); } + $this->handler = & new $class($this, $this->plugin); + $this->msg = $this->handler->process(); - // generate an admin plugin href - function apl($pl, $fn) { - global $ID; - return wl($ID,"do=admin&page=plugin".($pl?"&plugin=$pl":"").($fn?"&fn=$fn":"")); } - // decompress wrapper - function ap_decompress($file, $target) { - global $conf; - - // decompression library doesn't like target folders ending in "/" - if (substr($target, -1) == "/") $target = substr($target, 0, -1); - $ext = substr($file, strrpos($file,'.')+1); - - // .tar, .tar.bz, .tar.gz, .tgz - if (in_array($ext, array('tar','bz','bz2','gz','tgz'))) { - - require_once(DOKU_INC."inc/TarLib.class.php"); - - if (strpos($ext, 'bz') !== false) $compress_type = COMPRESS_BZIP; - else if (strpos($ext,'gz') !== false) $compress_type = COMPRESS_GZIP; - else $compress_type = COMPRESS_NONE; - - $tar = new TarLib($file, $compress_type); - if($tar->_initerror < 0){ - if($conf['allowdebug']){ - msg('TarLib Error: '.$tar->TarErrorStr($tar->_initerror),-1); - } - return false; - } - $ok = $tar->Extract(FULL_ARCHIVE, $target, '', 0777); - - if($ok<1){ - if($conf['allowdebug']){ - msg('TarLib Error: '.$tar->TarErrorStr($ok),-1); - } - return false; - } - return true; - } else if ($ext == 'zip') { - - require_once(DOKU_INC."inc/ZipLib.class.php"); - - $zip = new ZipLib(); - $ok = $zip->Extract($file, $target); - - // FIXME sort something out for handling zip error messages meaningfully - return ($ok==-1?false:true); - - } else if ($ext == "rar") { - // not yet supported -- fix me - return false; - } - - // unsupported file type - return false; + /** + * output appropriate html + */ + function html() { + // enable direct access to language strings + $this->setupLocale(); + $this->_get_plugin_list(); + + if ($this->handler === NULL) $this->handler = & new ap_manage($this, $this->plugin); + + ptln('
    '); + $this->handler->html(); + ptln('
    '); } - // copy with recursive sub-directory support - function ap_copy($src, $dst) { - global $conf; - - if (is_dir($src)) { - if (!$dh = @opendir($src)) return false; - - if ($ok = io_mkdir_p($dst)) { - while ($ok && (false !== ($f = readdir($dh)))) { - if ($f == '..' || $f == '.') continue; - $ok = ap_copy("$src/$f", "$dst/$f"); - } - } - - closedir($dh); - return $ok; - - } else { - $exists = @file_exists($dst); - - if (!@copy($src,$dst)) return false; - if (!$exists && !empty($conf['fperm'])) chmod($dst, $conf['fperm']); - @touch($dst,filemtime($src)); + /** + * Returns a list of all plugins, including the disabled ones + */ + function _get_plugin_list() { + if (empty($this->plugin_list)) { + $list = plugin_list('',true); // all plugins, including disabled ones + sort($list); + trigger_event('PLUGIN_PLUGINMANAGER_PLUGINLIST',$list); + $this->plugin_list = $list; } - - return true; + return $this->plugin_list; } - // delete, with recursive sub-directory support - function ap_delete($path) { - - if (!is_string($path) || $path == "") return false; - - if (is_dir($path)) { - if (!$dh = @opendir($path)) return false; +} - while ($f = readdir($dh)) { - if ($f == '..' || $f == '.') continue; - ap_delete("$path/$f"); - } - closedir($dh); - return @rmdir($path); - } else { - return @unlink($path); - } - return false; - } - // return a list (name & type) of all the component plugins that make up this plugin - // can this move to pluginutils? - function ap_plugin_components($plugin) { - - global $plugin_types; - - $components = array(); - $path = DOKU_PLUGIN.plugin_directory($plugin).'/'; - - foreach ($plugin_types as $type) { - if (@file_exists($path.$type.'.php')) { $components[] = array('name'=>$plugin, 'type'=>$type); continue; } - - if ($dh = @opendir($path.$type.'/')) { - while (false !== ($cp = readdir($dh))) { - if ($cp == '.' || $cp == '..' || strtolower(substr($cp,-4)) != '.php') continue; - $components[] = array('name'=>$plugin.'_'.substr($cp, 0, -4), 'type'=>$type); - } - closedir($dh); - } - } - return $components; - } - function ap_component_sort($a, $b) { - if ($a['name'] == $b['name']) return 0; - return ($a['name'] < $b['name']) ? -1 : 1; - } diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_delete.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_delete.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_delete.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_delete.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,28 @@ +dir_delete(DOKU_PLUGIN.plugin_directory($this->manager->plugin))) { + $this->manager->error = sprintf($this->lang['error_delete'],$this->manager->plugin); + } else { + msg("Plugin {$this->manager->plugin} successfully deleted."); + $this->refresh(); + } + } + + function html() { + parent::html(); + + ptln('
    '); + ptln('

    '.$this->lang['deleting'].'

    '); + + if ($this->manager->error) { + ptln('
    '.str_replace("\n","
    ",$this->manager->error).'
    '); + } else { + ptln('

    '.sprintf($this->lang['deleted'],$this->plugin).'

    '); + } + ptln('
    '); + } +} + diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_download.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_download.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_download.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_download.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,297 @@ +download($plugin_url, $this->overwrite); + return ''; + } + + /** + * Print results of the download + */ + function html() { + parent::html(); + + ptln('
    '); + ptln('

    '.$this->lang['downloading'].'

    '); + + if ($this->manager->error) { + ptln('
    '.str_replace("\n","
    ",$this->manager->error).'
    '); + } else if (count($this->downloaded) == 1) { + ptln('

    '.sprintf($this->lang['downloaded'],$this->downloaded[0]).'

    '); + } else if (count($this->downloaded)) { // more than one plugin in the download + ptln('

    '.$this->lang['downloads'].'

    '); + ptln('
      '); + foreach ($this->downloaded as $plugin) { + ptln('
    • '.$plugin.'
      • ',2); + } + ptln('
    '); + } else { // none found in download + ptln('

    '.$this->lang['download_none'].'

    '); + } + ptln('
    '); + } + + /** + * Process the downloaded file + */ + function download($url, $overwrite=false) { + global $lang; + // check the url + $matches = array(); + if (!preg_match("/[^\/]*$/", $url, $matches) || !$matches[0]) { + $this->manager->error = $this->lang['error_badurl']."\n"; + return false; + } + + $file = $matches[0]; + + if (!($tmp = io_mktmpdir())) { + $this->manager->error = $this->lang['error_dircreate']."\n"; + return false; + } + + if (!$file = io_download($url, "$tmp/", true, $file)) { + $this->manager->error = sprintf($this->lang['error_download'],$url)."\n"; + } + + if (!$this->manager->error && !$this->decompress("$tmp/$file", $tmp)) { + $this->manager->error = sprintf($this->lang['error_decompress'],$file)."\n"; + } + + // search $tmp for the folder(s) that has been created + // move the folder(s) to lib/plugins/ + if (!$this->manager->error) { + $result = array('old'=>array(), 'new'=>array()); + if($this->find_folders($result,$tmp)){ + // choose correct result array + if(count($result['new'])){ + $install = $result['new']; + }else{ + $install = $result['old']; + } + + // now install all found items + foreach($install as $item){ + // where to install? + if($item['type'] == 'template'){ + $target = DOKU_INC.'lib/tpl/'.$item['base']; + }else{ + $target = DOKU_INC.'lib/plugins/'.$item['base']; + } + + // check to make sure we aren't overwriting anything + if (!$overwrite && @file_exists($target)) { + // remember our settings, ask the user to confirm overwrite, FIXME + continue; + } + + $instruction = @file_exists($target) ? 'update' : 'install'; + + // copy action + if ($this->dircopy($item['tmp'], $target)) { + $this->downloaded[] = $item['base']; + $this->plugin_writelog($target, $instruction, array($url)); + } else { + $this->manager->error .= sprintf($this->lang['error_copy']."\n", $item['base']); + } + } + + } else { + $this->manager->error = $this->lang['error']."\n"; + } + } + + // cleanup + if ($tmp) $this->dir_delete($tmp); + + if (!$this->manager->error) { + msg('Plugin package ('.count($this->downloaded).' plugin'.(count($this->downloaded) != 1?'s':'').': '.join(',',$this->downloaded).') successfully installed.',1); + $this->refresh(); + return true; + } + + return false; + } + + /** + * Find out what was in the extracted directory + * + * Correct folders are searched recursively using the "*.info.txt" configs + * as indicator for a root folder. When such a file is found, it's base + * setting is used (when set). All folders found by this method are stored + * in the 'new' key of the $result array. + * + * For backwards compatibility all found top level folders are stored as + * in the 'old' key of the $result array. + * + * When no items are found in 'new' the copy mechanism should fall back + * the 'old' list. + * + * @author Andreas Gohr + * @param arrayref $result - results are stored here + * @param string $base - the temp directory where the package was unpacked to + * @param string $dir - a subdirectory. do not set. used by recursion + * @return bool - false on error + */ + function find_folders(&$result,$base,$dir=''){ + $dh = @opendir("$base/$dir"); + if(!$dh) return false; + while (false !== ($f = readdir($dh))) { + if ($f == '.' || $f == '..' || $f == 'tmp') continue; + + if(!is_dir("$base/$dir/$f")){ + // it's a file -> check for config + if($f == 'plugin.info.txt'){ + $info = array(); + $info['type'] = 'plugin'; + $info['tmp'] = "$base/$dir"; + $conf = confToHash("$base/$dir/$f"); + $info['base'] = basename($conf['base']); + if(!$info['base']) $info['base'] = basename("$base/$dir"); + $result['new'][] = $info; + }elseif($f == 'template.info.txt'){ + $info = array(); + $info['type'] = 'template'; + $info['tmp'] = "$base/$dir"; + $conf = confToHash("$base/$dir/$f"); + $info['base'] = basename($conf['base']); + if(!$info['base']) $info['base'] = basename("$base/$dir"); + $result['new'][] = $info; + } + }else{ + // it's a directory -> add to dir list for old method, then recurse + if(!$dir){ + $info = array(); + $info['type'] = 'plugin'; + $info['tmp'] = "$base/$dir/$f"; + $info['base'] = $f; + $result['old'][] = $info; + } + $this->find_folders($result,$base,"$dir/$f"); + } + } + closedir($dh); + return true; + } + + + /** + * Decompress a given file to the given target directory + * + * Determines the compression type from the file extension + */ + function decompress($file, $target) { + global $conf; + + // decompression library doesn't like target folders ending in "/" + if (substr($target, -1) == "/") $target = substr($target, 0, -1); + + $ext = $this->guess_archive($file); + if (in_array($ext, array('tar','bz','gz'))) { + require_once(DOKU_INC."inc/TarLib.class.php"); + + switch($ext){ + case 'bz': + $compress_type = COMPRESS_BZIP; + break; + case 'gz': + $compress_type = COMPRESS_GZIP; + break; + default: + $compress_type = COMPRESS_NONE; + } + + $tar = new TarLib($file, $compress_type); + if($tar->_initerror < 0){ + if($conf['allowdebug']){ + msg('TarLib Error: '.$tar->TarErrorStr($tar->_initerror),-1); + } + return false; + } + $ok = $tar->Extract(FULL_ARCHIVE, $target, '', 0777); + + if($ok<1){ + if($conf['allowdebug']){ + msg('TarLib Error: '.$tar->TarErrorStr($ok),-1); + } + return false; + } + return true; + } else if ($ext == 'zip') { + require_once(DOKU_INC."inc/ZipLib.class.php"); + + $zip = new ZipLib(); + $ok = $zip->Extract($file, $target); + + // FIXME sort something out for handling zip error messages meaningfully + return ($ok==-1?false:true); + + } + + // unsupported file type + return false; + } + + /** + * Determine the archive type of the given file + * + * Reads the first magic bytes of the given file for content type guessing, + * if neither bz, gz or zip are recognized, tar is assumed. + * + * @author Andreas Gohr + * @returns false if the file can't be read, otherwise an "extension" + */ + function guess_archive($file){ + $fh = fopen($file,'rb'); + if(!$fh) return false; + $magic = fread($fh,5); + fclose($fh); + + if(strpos($magic,"\x42\x5a") === 0) return 'bz'; + if(strpos($magic,"\x1f\x8b") === 0) return 'gz'; + if(strpos($magic,"\x50\x4b\x03\x04") === 0) return 'zip'; + return 'tar'; + } + + /** + * Copy with recursive sub-directory support + */ + function dircopy($src, $dst) { + global $conf; + + if (is_dir($src)) { + if (!$dh = @opendir($src)) return false; + + if ($ok = io_mkdir_p($dst)) { + while ($ok && (false !== ($f = readdir($dh)))) { + if ($f == '..' || $f == '.') continue; + $ok = $this->dircopy("$src/$f", "$dst/$f"); + } + } + + closedir($dh); + return $ok; + + } else { + $exists = @file_exists($dst); + + if (!@copy($src,$dst)) return false; + if (!$exists && !empty($conf['fperm'])) chmod($dst, $conf['fperm']); + @touch($dst,filemtime($src)); + } + + return true; + } + + +} + diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_enable.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_enable.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_enable.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_enable.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,49 @@ +enabled = isset($_REQUEST['enabled']) ? $_REQUEST['enabled'] : array(); + + foreach ($this->manager->plugin_list as $plugin) { + if (in_array($plugin, $plugin_protected)) continue; + + $new = in_array($plugin, $this->enabled); + $old = !plugin_isdisabled($plugin); + + if ($new != $old) { + switch ($new) { + // enable plugin + case true : + if(plugin_enable($plugin)){ + msg(sprintf($this->lang['enabled'],$plugin),1); + $count_enabled++; + }else{ + msg(sprintf($this->lang['notenabled'],$plugin),-1); + } + break; + case false: + if(plugin_disable($plugin)){ + msg(sprintf($this->lang['disabled'],$plugin),1); + $count_disabled++; + }else{ + msg(sprintf($this->lang['notdisabled'],$plugin),-1); + } + break; + } + } + } + + // refresh plugins, including expiring any dokuwiki cache(s) + if ($count_enabled || $count_disabled) { + $this->refresh(); + } + } + +} + diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_info.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_info.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_info.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_info.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,129 @@ +manager->plugin) { return; } + + $component_list = $this->get_plugin_components($this->manager->plugin); + usort($component_list, array($this,'component_sort')); + + foreach ($component_list as $component) { + if ($obj = & plugin_load($component['type'],$component['name']) === NULL) continue; + + $this->details[] = array_merge($obj->getInfo(), array('type' => $component['type'])); + unset($obj); + } + + // review details to simplify things + foreach($this->details as $info) { + foreach($info as $item => $value) { + if (!isset($this->plugin_info[$item])) { $this->plugin_info[$item] = $value; continue; } + if ($this->plugin_info[$item] != $value) $this->plugin_info[$item] = ''; + } + } + } + + function html() { + + // output the standard menu stuff + parent::html(); + + // sanity check + if (!$this->manager->plugin) { return; } + + ptln('
    '); + ptln("

    ".$this->manager->getLang('plugin')." {$this->manager->plugin}

    "); + + // collect pertinent information from the log + $installed = $this->plugin_readlog($this->manager->plugin, 'installed'); + $source = $this->plugin_readlog($this->manager->plugin, 'url'); + $updated = $this->plugin_readlog($this->manager->plugin, 'updated'); + if (strrpos($updated, "\n") !== false) $updated = substr($updated, strrpos($updated, "\n")+1); + + ptln("
    ",2); + ptln("
    ".$this->manager->getLang('source').'
    '.($source ? $source : $this->manager->getLang('unknown'))."
    ",4); + ptln("
    ".$this->manager->getLang('installed').'
    '.($installed ? $installed : $this->manager->getLang('unknown'))."
    ",4); + if ($updated) ptln("
    ".$this->manager->getLang('lastupdate').'
    '.$updated."
    ",4); + ptln("
    ",2); + + if (count($this->details) == 0) { + ptln("

    ".$this->manager->getLang('noinfo')."

    ",2); + } else { + + ptln("
    ",2); + if ($this->plugin_info['name']) ptln("
    ".$this->manager->getLang('name')."
    ".$this->out($this->plugin_info['name'])."
    ",4); + if ($this->plugin_info['date']) ptln("
    ".$this->manager->getLang('date')."
    ".$this->out($this->plugin_info['date'])."
    ",4); + if ($this->plugin_info['type']) ptln("
    ".$this->manager->getLang('type')."
    ".$this->out($this->plugin_info['type'])."
    ",4); + if ($this->plugin_info['desc']) ptln("
    ".$this->manager->getLang('desc')."
    ".$this->out($this->plugin_info['desc'])."
    ",4); + if ($this->plugin_info['author']) ptln("
    ".$this->manager->getLang('author')."
    ".$this->manager->email($this->plugin_info['email'], $this->plugin_info['author'])."
    ",4); + if ($this->plugin_info['url']) ptln("
    ".$this->manager->getLang('www')."
    ".$this->manager->external_link($this->plugin_info['url'], '', 'urlextern')."
    ",4); + ptln("
    ",2); + + if (count($this->details) > 1) { + ptln("

    ".$this->manager->getLang('components')."

    ",2); + ptln("
    ",2); + + foreach ($this->details as $info) { + + ptln("
    ",4); + ptln("
    ".$this->manager->getLang('name')."
    ".$this->out($info['name'])."
    ",6); + if (!$this->plugin_info['date']) ptln("
    ".$this->manager->getLang('date')."
    ".$this->out($info['date'])."
    ",6); + if (!$this->plugin_info['type']) ptln("
    ".$this->manager->getLang('type')."
    ".$this->out($info['type'])."
    ",6); + if (!$this->plugin_info['desc']) ptln("
    ".$this->manager->getLang('desc')."
    ".$this->out($info['desc'])."
    ",6); + if (!$this->plugin_info['author']) ptln("
    ".$this->manager->getLang('author')."
    ".$this->manager->email($info['email'], $info['author'])."
    ",6); + if (!$this->plugin_info['url']) ptln("
    ".$this->manager->getLang('www')."
    ".$this->manager->external_link($info['url'], '', 'urlextern')."
    ",6); + ptln("
    ",4); + + } + ptln("
    ",2); + } + } + ptln("
    "); + } + + // simple output filter, make html entities safe and convert new lines to
    + function out($text) { + return str_replace("\n",'
    ',htmlspecialchars($text)); + } + + + /** + * return a list (name & type) of all the component plugins that make up this plugin + * + * @todo can this move to pluginutils? + */ + function get_plugin_components($plugin) { + + global $plugin_types; + + $components = array(); + $path = DOKU_PLUGIN.plugin_directory($plugin).'/'; + + foreach ($plugin_types as $type) { + if (@file_exists($path.$type.'.php')) { $components[] = array('name'=>$plugin, 'type'=>$type); continue; } + + if ($dh = @opendir($path.$type.'/')) { + while (false !== ($cp = readdir($dh))) { + if ($cp == '.' || $cp == '..' || strtolower(substr($cp,-4)) != '.php') continue; + $components[] = array('name'=>$plugin.'_'.substr($cp, 0, -4), 'type'=>$type); + } + closedir($dh); + } + } + return $components; + } + + /** + * usort callback to sort plugin components + */ + function component_sort($a, $b) { + if ($a['name'] == $b['name']) return 0; + return ($a['name'] < $b['name']) ? -1 : 1; + } +} diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_manage.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_manage.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_manage.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_manage.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,205 @@ +manager = & $manager; + $this->plugin = $plugin; + $this->lang = & $manager->lang; + } + + function process() { + return ''; + } + + function html() { + print $this->manager->locale_xhtml('admin_plugin'); + $this->html_menu(); + } + + // build our standard menu + function html_menu($listPlugins = true) { + global $ID; + + ptln('
    '); + + ptln('
    '); + ptln('

    '.$this->lang['download'].'

    '); + ptln('
    '); + ptln(' '); + ptln('
    '); + ptln(' '.$this->lang['download'].''); + ptln(' '); + ptln(' '); + ptln('
    '); + ptln('
    '); + ptln('
    '); + + if ($listPlugins) { + ptln('

    '.$this->lang['manage'].'

    '); + + ptln('
    '); + + ptln(' '); + + $this->html_pluginlist(); + + ptln('
    '); + ptln(' '); + ptln('
    '); + + // ptln('
    '); + ptln(''); + } + + ptln(''); + } + + function html_pluginlist() { + global $ID; + global $plugin_protected; + + foreach ($this->manager->plugin_list as $plugin) { + + $disabled = plugin_isdisabled($plugin); + $protected = in_array($plugin,$plugin_protected); + + $checked = ($disabled) ? '' : ' checked="checked"'; + $check_disabled = ($protected) ? ' disabled="disabled"' : ''; + + // determine display class(es) + $class = array(); + if (in_array($plugin, $this->downloaded)) $class[] = 'new'; + if ($disabled) $class[] = 'disabled'; + if ($protected) $class[] = 'protected'; + + $class = count($class) ? ' class="'.join(' ', $class).'"' : ''; + + ptln(' '); + ptln(' '.$plugin.''); + ptln(' '); + ptln('

    '.$plugin.'

    '); + + $this->html_button($plugin, 'info', false, 6); + if (in_array('settings', $this->manager->functions)) { + $this->html_button($plugin, 'settings', !@file_exists(DOKU_PLUGIN.$plugin.'/settings.php'), 6); + } + $this->html_button($plugin, 'update', !$this->plugin_readlog($plugin, 'url'), 6); + $this->html_button($plugin, 'delete', $protected, 6); + + ptln(' '); + } + } + + function html_button($plugin, $btn, $disabled=false, $indent=0) { + $disabled = ($disabled) ? 'disabled="disabled"' : ''; + ptln('',$indent); + } + + /** + * Refresh plugin list + */ + function refresh() { + global $MSG,$config_cascade; + + //are there any undisplayed messages? keep them in session for display + if (isset($MSG) && count($MSG)){ + //reopen session, store data and close session again + @session_start(); + $_SESSION[DOKU_COOKIE]['msg'] = $MSG; + session_write_close(); + } + + // expire dokuwiki caches + // touching local.php expires wiki page, JS and CSS caches + @touch(reset($config_cascade['main']['local'])); + + // update latest plugin date - FIXME + header('Location: '.wl($ID).'?do=admin&page=plugin'); + exit(); + } + + /** + * Write a log entry to the given target directory + */ + function plugin_writelog($target, $cmd, $data) { + + $file = $target.'/manager.dat'; + + switch ($cmd) { + case 'install' : + $url = $data[0]; + $date = date('r'); + if (!$fp = @fopen($file, 'w')) return; + fwrite($fp, "installed=$date\nurl=$url\n"); + fclose($fp); + break; + + case 'update' : + $date = date('r'); + if (!$fp = @fopen($file, 'a')) return; + fwrite($fp, "updated=$date\n"); + fclose($fp); + break; + } + } + + function plugin_readlog($plugin, $field) { + static $log = array(); + $file = DOKU_PLUGIN.plugin_directory($plugin).'/manager.dat'; + + if (!isset($log[$plugin])) { + $tmp = @file_get_contents($file); + if (!$tmp) return ''; + $log[$plugin] = & $tmp; + } + + if ($field == 'ALL') { + return $log[$plugin]; + } + + $match = array(); + if (preg_match_all('/'.$field.'=(.*)$/m',$log[$plugin], $match)) + return implode("\n", $match[1]); + + return ''; + } + + /** + * delete, with recursive sub-directory support + */ + function dir_delete($path) { + if (!is_string($path) || $path == "") return false; + + if (is_dir($path)) { + if (!$dh = @opendir($path)) return false; + + while ($f = readdir($dh)) { + if ($f == '..' || $f == '.') continue; + $this->dir_delete("$path/$f"); + } + + closedir($dh); + return @rmdir($path); + } else { + return @unlink($path); + } + + return false; + } + + +} diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_update.class.php dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_update.class.php --- dokuwiki-2009-02-14/lib/plugins/plugin/classes/ap_update.class.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/classes/ap_update.class.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,38 @@ +plugin_readlog($this->plugin, 'url'); + $this->download($plugin_url, $this->overwrite); + return ''; + } + + function html() { + parent::html(); + + ptln('
    '); + ptln('

    '.$this->lang['updating'].'

    '); + + if ($this->manager->error) { + ptln('
    '.str_replace("\n","
    ", $this->manager->error).'
    '); + } else if (count($this->downloaded) == 1) { + ptln('

    '.sprintf($this->lang['updated'],$this->downloaded[0]).'

    '); + } else if (count($this->downloaded)) { // more than one plugin in the download + ptln('

    '.$this->lang['updates'].'

    '); + ptln('
      '); + foreach ($this->downloaded as $plugin) { + ptln('
    • '.$plugin.'
      • ',2); + } + ptln('
    '); + } else { // none found in download + ptln('

    '.$this->lang['update_none'].'

    '); + } + ptln('
    '); + } +} + diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,13 @@ + */ +$lang['btn_delete'] = 'حذÙ'; +$lang['btn_settings'] = 'خيارات'; +$lang['btn_download'] = 'تحميل'; +$lang['btn_enable'] = 'Ø­Ùظ'; +$lang['url'] = 'رابط'; +$lang['source'] = 'مصدر'; +$lang['unknown'] = 'غير معروÙ'; +$lang['updating'] = 'يتم التحديث ...'; +$lang['update_none'] = 'لم يتم العثور على تحديثات'; +$lang['deleting'] = 'يتم الحذ٠... '; +$lang['downloading'] = 'يتم التحميل .. '; +$lang['name'] = 'الاسم :'; +$lang['date'] = 'التاريخ :'; +$lang['type'] = 'النوع :'; +$lang['desc'] = 'الوص٠:'; +$lang['author'] = 'الكاتب :'; +$lang['www'] = 'شبكة :'; +$lang['error'] = 'ظهر خطأ غير معرو٠.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/bg/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,43 +6,43 @@ * @author Nikolay Vladimirov * @author Nikolay Vladimirof */ -$lang['menu'] = 'Управление на приÑтавките'; -$lang['download'] = 'СвалÑне и инÑталиране на нова приÑтавка'; -$lang['manage'] = 'ИнÑталирани приÑтавки'; -$lang['btn_info'] = 'информациÑ'; -$lang['btn_update'] = 'обновÑване'; -$lang['btn_delete'] = 'изтриване'; -$lang['btn_settings'] = 'наÑтройки'; -$lang['btn_download'] = 'СвалÑне'; -$lang['btn_enable'] = 'ЗапиÑ'; -$lang['url'] = 'URL'; -$lang['installed'] = 'ИнÑталирани:'; -$lang['lastupdate'] = 'ПоÑледно обновени:'; -$lang['source'] = 'Източник:'; -$lang['unknown'] = 'непознат'; -$lang['updating'] = 'Качване ...'; -$lang['updated'] = 'Качването на приÑтавката %s бе упешно.'; -$lang['updates'] = 'ОбновÑването на Ñледните приÑтавки бе уÑпешно'; -$lang['update_none'] = 'Ðе бÑха намерени нови верÑии.'; -$lang['deleting'] = 'Изтриване ...'; -$lang['deleted'] = 'Изтриването на приÑтавката %s бе уÑпешно.'; -$lang['downloading'] = 'СвалÑне ...'; -$lang['downloaded'] = 'ИнÑталирането на приÑтавката %s бе уÑпешно '; -$lang['downloads'] = 'ИнÑталирането на Ñледните приÑтавки бе уÑпешно:'; -$lang['download_none'] = 'Ðе бÑха намерени приÑтавки или е имало грешка при ÑвалÑнето и инÑталирането.'; -$lang['plugin'] = 'ПриÑтавки:'; -$lang['components'] = 'Компоненти'; -$lang['noinfo'] = 'Тази приÑтавка не върна информациÑ, може да е повредена.'; -$lang['name'] = 'Име:'; -$lang['date'] = 'Дата:'; -$lang['type'] = 'Тип:'; -$lang['desc'] = 'ОпиÑание:'; -$lang['author'] = 'Ðвтор:'; -$lang['www'] = 'Сайт:'; -$lang['error'] = 'Имаше непозната грешка.'; -$lang['error_download'] = 'СвалÑнето на приÑтавката %s бе невъзможно.'; -$lang['error_badurl'] = 'Предполагаем грешен Ð°Ð´Ñ€ÐµÑ - не може да Ñе определи име на файла от адреÑа(url)'; -$lang['error_dircreate'] = 'Създаването на временна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° ÑвалÑне е невъзможно.'; -$lang['error_decompress'] = 'Разархивирането на ÑвалениÑÑ‚ файл е невъзможно.Това може да е резултат от грешно ÑвалÑне, в такъв Ñлучай Ñ‚Ñ€Ñбва да опитате отново; или формата на компреÑÐ¸Ñ Ðµ непознат, в този Ñлучай Ñ‚Ñ€Ñбва даÑвалите и инÑталирате приÑтавката ръчно.'; -$lang['error_copy'] = 'Имаше грешка при копирането на файл по време на инÑталациÑта на приÑтавката %s: диÑкът е пълен или правата за доÑтъп до файловете Ñа грешни.Това може да е довело до чаÑтично инÑталирана приÑтавка и оÑтавÑне на неÑтабилна инÑталациÑна уикито ви.'; -$lang['error_delete'] = 'Имаше грешка при изтриването на приÑтавката %s. Ðай-вероÑтната причина е недоÑтатъчна права за доÑтъп до файл или директориÑ'; +$lang['menu'] = 'Управление на приÑтавките'; +$lang['download'] = 'СвалÑне и инÑталиране на нова приÑтавка'; +$lang['manage'] = 'ИнÑталирани приÑтавки'; +$lang['btn_info'] = 'информациÑ'; +$lang['btn_update'] = 'обновÑване'; +$lang['btn_delete'] = 'изтриване'; +$lang['btn_settings'] = 'наÑтройки'; +$lang['btn_download'] = 'СвалÑне'; +$lang['btn_enable'] = 'ЗапиÑ'; +$lang['url'] = 'URL'; +$lang['installed'] = 'ИнÑталирани:'; +$lang['lastupdate'] = 'ПоÑледно обновени:'; +$lang['source'] = 'Източник:'; +$lang['unknown'] = 'непознат'; +$lang['updating'] = 'Качване ...'; +$lang['updated'] = 'Качването на приÑтавката %s бе упешно.'; +$lang['updates'] = 'ОбновÑването на Ñледните приÑтавки бе уÑпешно'; +$lang['update_none'] = 'Ðе бÑха намерени нови верÑии.'; +$lang['deleting'] = 'Изтриване ...'; +$lang['deleted'] = 'Изтриването на приÑтавката %s бе уÑпешно.'; +$lang['downloading'] = 'СвалÑне ...'; +$lang['downloaded'] = 'ИнÑталирането на приÑтавката %s бе уÑпешно '; +$lang['downloads'] = 'ИнÑталирането на Ñледните приÑтавки бе уÑпешно:'; +$lang['download_none'] = 'Ðе бÑха намерени приÑтавки или е имало грешка при ÑвалÑнето и инÑталирането.'; +$lang['plugin'] = 'ПриÑтавки:'; +$lang['components'] = 'Компоненти'; +$lang['noinfo'] = 'Тази приÑтавка не върна информациÑ, може да е повредена.'; +$lang['name'] = 'Име:'; +$lang['date'] = 'Дата:'; +$lang['type'] = 'Тип:'; +$lang['desc'] = 'ОпиÑание:'; +$lang['author'] = 'Ðвтор:'; +$lang['www'] = 'Сайт:'; +$lang['error'] = 'Имаше непозната грешка.'; +$lang['error_download'] = 'СвалÑнето на приÑтавката %s бе невъзможно.'; +$lang['error_badurl'] = 'Предполагаем грешен Ð°Ð´Ñ€ÐµÑ - не може да Ñе определи име на файла от адреÑа(url)'; +$lang['error_dircreate'] = 'Създаването на временна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° ÑвалÑне е невъзможно.'; +$lang['error_decompress'] = 'Разархивирането на ÑвалениÑÑ‚ файл е невъзможно.Това може да е резултат от грешно ÑвалÑне, в такъв Ñлучай Ñ‚Ñ€Ñбва да опитате отново; или формата на компреÑÐ¸Ñ Ðµ непознат, в този Ñлучай Ñ‚Ñ€Ñбва даÑвалите и инÑталирате приÑтавката ръчно.'; +$lang['error_copy'] = 'Имаше грешка при копирането на файл по време на инÑталациÑта на приÑтавката %s: диÑкът е пълен или правата за доÑтъп до файловете Ñа грешни.Това може да е довело до чаÑтично инÑталирана приÑтавка и оÑтавÑне на неÑтабилна инÑталациÑна уикито ви.'; +$lang['error_delete'] = 'Имаше грешка при изтриването на приÑтавката %s. Ðай-вероÑтната причина е недоÑтатъчна права за доÑтъп до файл или директориÑ'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-va/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-va/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-va/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-va/admin_plugin.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -====== Gestor de plúgins ====== - -Des d'esta pàgina pot gestionar tot lo relacionat en els [[doku>wiki:plugins|plúgins]] de DokuWiki. -Per a poder descarregar i instalar un plúgin, el servidor web deu -poder escriure en la carpeta de plúgins. - diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ - - */ - -$lang['menu'] = 'Gestor de plúgins'; - -// custom language strings for the plugin -$lang['download'] = "Descarregar i instalar un nou plúgin"; -$lang['manage'] = "Plúgins instalats"; - -$lang['btn_info'] = 'info'; -$lang['btn_update'] = 'actualisar'; -$lang['btn_delete'] = 'borrar'; -$lang['btn_settings'] = 'ajusts'; -$lang['btn_download'] = 'Descarregar'; -$lang['btn_enable'] = 'Guardar'; - -$lang['url'] = 'URL'; - -$lang['installed'] = 'Instalat:'; -$lang['lastupdate'] = 'Última actualisació:'; -$lang['source'] = 'Font:'; -$lang['unknown'] = 'desconegut'; - -// ..ing = header message -// ..ed = success message - -$lang['updating'] = 'Actualisant ...'; -$lang['updated'] = 'Plúgin %s actualisat correctament'; -$lang['updates'] = 'Els següents plúgins s\'han actualisat correctament:'; -$lang['update_none'] = 'No s\'han trobat actualisacions.'; - -$lang['deleting'] = 'Borrant ...'; -$lang['deleted'] = 'Plúgin %s borrat.'; - -$lang['downloading'] = 'Descarregant ...'; -$lang['downloaded'] = 'Plúgin %s instalat correctament'; -$lang['downloads'] = 'Els següents plúgins s\'han instalat correctament:'; -$lang['download_none'] = 'No s\'han trobat plúgins o ha hagut algun problema descarregant i instalant.'; - -// info titles -$lang['plugin'] = 'Plúgin:'; -$lang['components'] = 'Components'; -$lang['noinfo'] = 'Este plúgin no ha tornat informació, pot ser invàlit.'; -$lang['name'] = 'Nom:'; -$lang['date'] = 'Data:'; -$lang['type'] = 'Tipo:'; -$lang['desc'] = 'Descripció:'; -$lang['author'] = 'Autor:'; -$lang['www'] = 'Web:'; - -// error messages -$lang['error'] = 'Ha ocorregut un erro desconegut.'; -$lang['error_download'] = 'No es pot descarregar l\'archiu del plúgin: %s'; -$lang['error_badurl'] = 'Possible URL roïn - no es pot determinar el nom de l\'archiu de la URL'; -$lang['error_dircreate'] = 'No es pot crear la carpeta temporal per a rebre descàrregues'; -$lang['error_decompress'] = 'El gestor de plúgins no ha pogut descomprimir l\'archiu descarregat. '. - 'Açò pot ser degut a una descàrrega fallida, en eixe cas deuria intentar-ho de nou; '. - 'o el format de compressió pot ser desconegut, en eixe cas necessitarà '. - 'descarregar i instalar el plúgin manualment.'; -$lang['error_copy'] = 'Ha ocorregut un erro en la còpia de l\'archiu instalant archius del plugin '. - '%s: el disc podria estar ple o els permissos d\'accés a l\'archiu estan mal. '. - 'Açò podria haver deixat el plúgin parcialment instalat i deixar el wiki inestable.'; -$lang['error_delete'] = 'Ha ocorregut un erro intentant borrar el plúgin %s. '. - 'La causa més provable és que els permissos d\'accés a l\'archiu o el directori no siguen suficients'; - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +====== Gestió de connectors ====== + +En esta pàgina podeu gestionar tot allò referent als [[doku>plugins|connectors]] de Dokuwiki. Per a baixar i instal·lar connectors, cal que el servidor web tinga permís d'escriptura en la carpeta de connectors. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-valencia/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ca-valencia/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ca-valencia/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,51 @@ + + * @author Bernat Arlandis + */ +$lang['menu'] = 'Gestió de connectors'; +$lang['download'] = 'Baixa i instal·la un nou connector'; +$lang['manage'] = 'Connectors instal·lats'; +$lang['btn_info'] = 'informació'; +$lang['btn_update'] = 'actualitza'; +$lang['btn_delete'] = 'suprimeix'; +$lang['btn_settings'] = 'paràmetres'; +$lang['btn_download'] = 'Baixa'; +$lang['btn_enable'] = 'Alça'; +$lang['url'] = 'URL'; +$lang['installed'] = 'Instal·lació:'; +$lang['lastupdate'] = 'Darrera actualitació:'; +$lang['source'] = 'Font:'; +$lang['unknown'] = 'desconegut'; +$lang['updating'] = 'S\'està actualitzant...'; +$lang['updated'] = 'El connector %s s\'ha actualitzat amb èxit.'; +$lang['updates'] = 'Els connectors següents s\'han actualitzat amb èxit'; +$lang['update_none'] = 'No s\'han trobat actualitzacions.'; +$lang['deleting'] = 'S\'està suprimint...'; +$lang['deleted'] = 'S\'ha suprimit el connector %s.'; +$lang['downloading'] = 'S\'està baixant...'; +$lang['downloaded'] = 'El connector %s s\'ha instal·lat amb èxit'; +$lang['downloads'] = 'Els connectors següents s\'han instal·lat amb èxit:'; +$lang['download_none'] = 'No s\'han trobat connectors, o hi ha hagut un problema desconegut durant el procés de baixada i instal·lació.'; +$lang['plugin'] = 'Connector:'; +$lang['components'] = 'Components'; +$lang['noinfo'] = 'Este connector no ha retornat informació. Potser no és vàlid.'; +$lang['name'] = 'Nom:'; +$lang['date'] = 'Data:'; +$lang['type'] = 'Tipus:'; +$lang['desc'] = 'Descripció:'; +$lang['author'] = 'Autor:'; +$lang['www'] = 'Web:'; +$lang['error'] = 'S\'ha produït un error desconegut.'; +$lang['error_download'] = 'No s\'ha pogut baixar el fitxer del connector: %s'; +$lang['error_badurl'] = 'L\'URL no sembla vàlid: no permet determinar el nom del fitxer'; +$lang['error_dircreate'] = 'No s\'ha pogut crear una carpeta temporal per rebre la baixada'; +$lang['error_decompress'] = 'El gestor de connectors no ha pogut descomprimir el fitxer baixat. Potser no s\'ha baixat correctament, en el qual cas podríeu tornar a intentar-ho. O el format de compressió podria ser desconegut, en el qual cas hauríeu de baixar i instal·lar el connector manualment.'; +$lang['error_copy'] = 'S\'ha produït un error de còpia de fitxers quan s\'estaven instal·lant els fitxers del connector %s: potser el disc està ple o els permisos d\'accés són incorrectes. Això pot haver causat una instal·lació incompleta del connector i per tant el vostre wiki pot haver quedat en un estat inestable.'; +$lang['error_delete'] = 'S\'ha produït un error quan s\'intentava suprimir el connector %s. La causa més probable d\'això són uns permisos d\'accés insuficients al fitxer o al directori. '; +$lang['enabled'] = 'S\'ha habilitat el connector %s.'; +$lang['notenabled'] = 'No s\'ha pogut habilitar el connector %s. Comproveu els permisos dels fitxers.'; +$lang['disabled'] = 'S\'ha inhabilitat el connector %s.'; +$lang['notdisabled'] = 'No s\'ha pogut inhabilitar el connector %s. Comproveu els permisos dels fitxers.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Tomas Valenta * @author Zbynek Krivka * @author Bohumir Zamecnik + * @author tomas@valenta.cz */ $lang['menu'] = 'Správa pluginů'; $lang['download'] = 'Stáhnout a instalovat plugin'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/da/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/da/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/da/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/da/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,5 +1,5 @@ -====== Pluginstyring ====== +====== Udvidelsesstyring ====== -PÃ¥ denne side kan du kontrollere alle Dokuwikis [[doku>plugins|plugins]]. For at downloade og installere et plugin, mÃ¥ din plugin mappe kunne skrives til af webserveren. +PÃ¥ denne side kan du kontrollere alle Dokuwikis [[doku>plugins|udvidelser]]. For at hente og opsætte en udvidelse, mÃ¥ din udvidelsesmappe kunne skrives til af serveren. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,34 +6,37 @@ * @author Lars Næsbye Christensen * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ -$lang['menu'] = 'HÃ¥ndter plugins'; -$lang['download'] = 'Download og installer nyt plugin'; -$lang['manage'] = 'Installerede plugins'; -$lang['btn_info'] = 'info'; +$lang['menu'] = 'HÃ¥ndter udvidelser'; +$lang['download'] = 'Hent og tilføj ny udvidelse'; +$lang['manage'] = 'Tilføjede udvidelser'; +$lang['btn_info'] = 'oplysninger'; $lang['btn_update'] = 'opdater'; $lang['btn_delete'] = 'slet'; $lang['btn_settings'] = 'indstillinger'; -$lang['btn_download'] = 'Download'; +$lang['btn_download'] = 'Hent'; $lang['btn_enable'] = 'Gem'; -$lang['url'] = 'URL'; -$lang['installed'] = 'Installeret:'; +$lang['url'] = 'URL-adresse'; +$lang['installed'] = 'Tliføjet:'; $lang['lastupdate'] = 'Sidst opdateret:'; $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukendt'; $lang['updating'] = 'Opdaterer ...'; -$lang['updated'] = 'Plugin %s blev korrekt opdateret'; -$lang['updates'] = 'De følgende plugins blev opdateret korrekt:'; +$lang['updated'] = 'Udvidelse %s blev korrekt opdateret'; +$lang['updates'] = 'De følgende udvidelser blev opdateret korrekt:'; $lang['update_none'] = 'Ingen opdateringer fundet.'; $lang['deleting'] = 'Sletter ...'; -$lang['deleted'] = 'Plugin %s slettet.'; -$lang['downloading'] = 'Downloader ...'; -$lang['downloaded'] = 'Plugin %s blev korrekt installeret'; -$lang['downloads'] = 'De følgende plugins blev installeret korrekt:'; -$lang['download_none'] = 'Ingen plugins blev fundet, eller en ukendt fejl opstod under download og installering.'; -$lang['plugin'] = 'Plugin:'; +$lang['deleted'] = 'Udvidelsen %s slettet.'; +$lang['downloading'] = 'Henter ...'; +$lang['downloaded'] = 'Udvidelse %s blev korrekt installeret'; +$lang['downloads'] = 'De følgende udvidelser blev installeret korrekt:'; +$lang['download_none'] = 'Ingen udvidelser blev fundet, eller en ukendt fejl opstod under hentning og opsætning'; +$lang['plugin'] = 'Udvidelse:'; $lang['components'] = 'Komponenter'; -$lang['noinfo'] = 'Dette plugin gav ingen information, det kan være fejlagtigt.'; +$lang['noinfo'] = 'Denne udvidelse videregav ingen oplysninger. Den kan være fejlagtig.'; $lang['name'] = 'Navn:'; $lang['date'] = 'Dato:'; $lang['type'] = 'Type:'; @@ -41,9 +44,13 @@ $lang['author'] = 'Programmør:'; $lang['www'] = 'Web:'; $lang['error'] = 'En ukendt fejl opstod.'; -$lang['error_download'] = 'Kunne ikke downloade plugin filen: %s'; -$lang['error_badurl'] = 'Muligvis dÃ¥rlig webadresse - kunne ikke hente filnavn fra adressen'; -$lang['error_dircreate'] = 'Kunne ikke oprette midlertidig mappe til download'; -$lang['error_decompress'] = 'PluginhÃ¥ndtering kunne ikke dekomprimere den downloadede fil. Det kan skyldes et fejlagtigt download, og i sÃ¥ fald sÃ¥ prøv igen; eller komprimeringsformatet kan være ukendt, sÃ¥ du er nødt til at downloade og installere plugin\'et manuelt.'; -$lang['error_copy'] = 'Der opstod en filkopieringsfejl under forsøget pÃ¥ at installere filerne til plugin %s: disken kan være fuld eller filadgangsrettighederne kan være forkert sat. Dette kan have ført til et delvist installeret plugin og efterladt din wiki installation ustabil.'; -$lang['error_delete'] = 'Der opstod en fejl ved forsøget pÃ¥ at slette plugin %s. Dette skyldes sandsynligvis utilstrækkelig adgang til filer eller mapper.'; +$lang['error_download'] = 'Kunne ikke hente udvidelsesfilen: %s'; +$lang['error_badurl'] = 'Muligvis dÃ¥rlig netadresse; kunne ikke hente filnavn fra adressen.'; +$lang['error_dircreate'] = 'Kunne ikke oprette midlertidig mappe til hentning'; +$lang['error_decompress'] = 'UdvidelseshÃ¥ndtering kunne ikke udpakke den hentede fil. Det kan skyldes et fejlagtigt download, i hvilket fald du mÃ¥ prøve igen. Komprimeringsformatet kan ogsÃ¥ være ukendt, hvorved du du vil være nødt til at hente og opsætte udvidelsen manuelt.'; +$lang['error_copy'] = 'Der opstod en filkopieringsfejl under forsøget pÃ¥ at installere filerne til udvidelsen %s: Disken kan være fuld eller filadgangsrettighederne kan være forkert sat. Dette kan have ført til en delvist installeret udvidelse og efterladt din wiki-opsætning ustabil.'; +$lang['error_delete'] = 'Der opstod en fejl ved forsøget pÃ¥ at slette udvidelsen %s. Dette skyldes sandsynligvis utilstrækkelig adgang til filer eller mapper.'; +$lang['enabled'] = 'Udvidelsen %s blev aktiveret.'; +$lang['notenabled'] = 'Udvidelsen %s kunne ikke aktiveres. Kontroller filtilladelser.'; +$lang['disabled'] = 'Udvidelsen %s blev ikke aktiveret.'; +$lang['notdisabled'] = 'Udvidelsen %s kunne ikke aktiveres. Kontroller filtilladelser.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,9 @@ * @author Florian Anderiasch * @author Robin Kluth * @author Arne Pelka + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Neues Plugin herunterladen und installieren'; @@ -48,8 +51,8 @@ $lang['error_download'] = 'Konnte das Plugin %s nicht installieren'; $lang['error_badurl'] = 'Wahrscheinlich ungültige URL, konnte keinen Dateinamen ausfindig machen'; $lang['error_dircreate'] = 'Konnte keinen temporären Ordner für die Downloads erstellen'; -$lang['error_decompress'] = 'Der Plugin Manager konnte das Plugin archiv nicht entpacken. Entweder ist der Download fehlerhaft oder das Komprimierungsverfahren wird nicht unterstützt. Bitte versuchen Sie es erneut oder downloaden und installieren Sie das Plugin manuell'; -$lang['error_copy'] = 'Beim kopieren der Dateien des Plugins trat ein Fehler auf %s: möglicherweise ist die Festplatte voll oder die Dateiberechtigungen falsch. Möglicherweise wurde das Plugin nur teilweise installiert, sie sollten das Plugin manuell entfernen um Instabilitäten zu vermeiden.'; +$lang['error_decompress'] = 'Der Plugin Manager konnte das Plugin-Archiv nicht entpacken. Entweder ist der Download fehlerhaft oder das Komprimierungsverfahren wird nicht unterstützt. Bitte versuchen Sie es erneut oder downloaden und installieren Sie das Plugin manuell.'; +$lang['error_copy'] = 'Beim Kopieren der Dateien des Plugins trat ein Fehler auf %s: möglicherweise ist die Festplatte voll oder die Dateiberechtigungen falsch. Möglicherweise wurde das Plugin nur teilweise installiert. Sie sollten das Plugin manuell entfernen um Instabilitäten zu vermeiden.'; $lang['error_delete'] = 'Es gab einem Fehler beim Versuch das Plugin zu löschen %s. Dies liegt warscheinlich an fehlenden Dateiberechtigungen.'; $lang['enabled'] = 'Plugin %s wurde aktiviert.'; $lang['notenabled'] = 'Plugin %s konnte nicht aktiviert werden, überprüfen Sie die Dateirechte.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/de-informal/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de-informal/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/de-informal/admin_plugin.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de-informal/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +===== Erweiterungsmanagement ===== + +Auf dieser Seite kannst du alles anpassen was mit DokuWiki zu tun hat [[doku>plugins|plugins]]. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,51 @@ + + * @author Juergen Schwarzer + */ +$lang['menu'] = 'Plugins verwalten'; +$lang['download'] = 'Herunterladen und installieren eines neuen Plugins'; +$lang['manage'] = 'Installierte Plugins'; +$lang['btn_info'] = 'Information'; +$lang['btn_update'] = 'aktualisieren'; +$lang['btn_delete'] = 'löschen'; +$lang['btn_settings'] = 'Einstellungen'; +$lang['btn_download'] = 'Herunterladen'; +$lang['btn_enable'] = 'Speichern'; +$lang['url'] = 'URL'; +$lang['installed'] = 'Installiert:'; +$lang['lastupdate'] = 'Letzte Aktualisierung:'; +$lang['source'] = 'Quellen:'; +$lang['unknown'] = 'unbekannt'; +$lang['updating'] = 'Aktualisiere...'; +$lang['updated'] = 'Erweiterung %s wurde erfolgreich aktualisiert.'; +$lang['updates'] = 'Die folgenden Erweiterungen wurden erfolgreich aktualisiert.'; +$lang['update_none'] = 'Keine Aktualisierungen gefunden.'; +$lang['deleting'] = 'Loesche...'; +$lang['deleted'] = 'Erweiterung %s wurde gelöscht.'; +$lang['downloading'] = 'Herunterladen...'; +$lang['downloaded'] = 'Erweiterung %s wurde erfolgreich installiert'; +$lang['downloads'] = 'Die folgenden Erweiterungen wurden erfolgreich installiert:'; +$lang['download_none'] = 'Keine Erweiterungen gefunden oder es trat ein unbekanntest Problem beim Herunterladen und Installieren auf.'; +$lang['plugin'] = 'Plugin:'; +$lang['components'] = 'Komponenten'; +$lang['noinfo'] = 'Diese Erweiterung gab keine Information zurück - es könnte ungültig sein.'; +$lang['name'] = 'Name:'; +$lang['date'] = 'Datum:'; +$lang['type'] = 'Typ:'; +$lang['desc'] = 'Beschreibung:'; +$lang['author'] = 'Autor:'; +$lang['www'] = 'Internet:'; +$lang['error'] = 'Es ist ein unbekannter Fehler aufgetreten.'; +$lang['error_download'] = 'Nicht möglich die Erweiterung herunterzuladen: %s'; +$lang['error_badurl'] = 'Vermute schlechte URL - nicht möglich den Dateinamen aus der URL zu ermitteln'; +$lang['error_dircreate'] = 'Nicht möglich einen temporären Ordner zu erstellen um den Download zu empfangen.'; +$lang['error_decompress'] = 'Dem Erweiterungsmanager war es nicht möglich die heruntergeladene Datei zu dekomprimieren. Dies kann an einem defekten Download liegen, in diesem Fall sollten Sie es erneut versuchen; oder das Format mit dem die Datei komprimiert ist, ist unbekannt, da müssen Sie die Erweiterung manuell herunterladen und installieren. '; +$lang['error_copy'] = 'Es trat ein Dateifehler beim Kopieren der Installationsdateien für Plugn %s auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einem teilweise installierten Plugin und belässt dein Wiki in einem instabilen Zustand.'; +$lang['error_delete'] = 'Es trat ein Fehler beim Löschen des Plugins %s auf. Die whrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.'; +$lang['enabled'] = 'Erweiterung %s aktiviert.'; +$lang['notenabled'] = 'Erweiterung %s konnte nicht aktiviert werden. Ãœberprüfen sie die Zugriffsberechtigung der Datei.'; +$lang['disabled'] = 'Erweiterung %s deaktiviert.'; +$lang['notdisabled'] = 'Erweiterung %s konnte nicht deaktiviert werden - überprüfe Dateiberechtigungen'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/el/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/el/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/el/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/el/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,5 +1,5 @@ ====== ΔιαχείÏιση Επεκτάσεων ====== -Σε αυτή την σελίδα μποÏείτε να διαχειÏιστείτε τις [[doku>plugins|επεκτάσεις]] του Dokuwiki σας. Για να μποÏέσετε να εγκαταστήσετε νέες επεκτάσεις, ο αντίστοιχος φάκελος συστήματος θα Ï€Ïέπει να είναι εγγÏάψιμος από τον χÏήστη κάτω από τον οποίο εκτελείται η εφαÏμογή του webserver σας. +Σε αυτή την σελίδα μποÏείτε να διαχειÏιστείτε τις [[doku>plugins|επεκτάσεις]] του Dokuwiki σας. Για να μποÏέσετε να εγκαταστήσετε νέες επεκτάσεις, ο αντίστοιχος φάκελος συστήματος θα Ï€Ïέπει να είναι εγγÏάψιμος από τον χÏήστη κάτω από τον οποίο εκτελείται η εφαÏμογή του εξυπηÏετητή σας. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/el/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,7 @@ * @author Christopher Smith * @author Thanos Massias * @author Αθανάσιος Îταής + * @author Konstantinos Koryllos */ $lang['menu'] = 'ΔιαχείÏιση Επεκτάσεων'; $lang['download'] = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)'; @@ -48,5 +49,9 @@ $lang['error_badurl'] = 'Το URL είναι μάλλον λανθασμένο - είναι αδÏνατον να εξαχθεί το όνομα αÏχείου από αυτό το URL'; $lang['error_dircreate'] = 'Δεν είναι δυνατή η δημιουÏγία ενός Ï€ÏοσωÏÎ¹Î½Î¿Ï Ï†Î±ÎºÎ­Î»Î¿Ï… αποθήκευσης των μεταφοÏτώσεων'; $lang['error_decompress'] = 'Δεν είναι δυνατή η αποσυμπίεση των μεταφοÏτώσεων. Αυτό μποÏεί να οφείλεται σε μεÏική λήψη των μεταφοÏτώσεων, οπότε θα Ï€Ïέπει να επαναλάβετε την διαδικασία ή το σÏστημά σας δεν μποÏεί να διαχειÏιστεί το συγκεκÏιμένο είδος συμπίεσης, οπότε θα Ï€Ïέπει να εγκαταστήσετε την επέκταση χειÏοκίνητα.'; -$lang['error_copy'] = 'Εμφανίστηκε ένα σφάλμα αντιγÏαφής αÏχείων κατά την διάÏκεια εγκατάστασης της επέκτασης %s: ο δίσκος μποÏεί να είναι γεμάτος ή να μην είναι σωστά Ïυθμισμένα τα δικαιώματα Ï€Ïόσβασης. Αυτό το γεγονός μποÏεί να οδήγησε σε μεÏική εγκατάσταση της επέκτασης και άÏα η DokuWiki εγκατάστασή σαςνα εμφανίσει Ï€Ïοβλήματα σταθεÏότητας.'; +$lang['error_copy'] = 'Εμφανίστηκε ένα σφάλμα αντιγÏαφής αÏχείων κατά την διάÏκεια εγκατάστασης της επέκτασης %s: ο δίσκος μποÏεί να είναι γεμάτος ή να μην είναι σωστά Ïυθμισμένα τα δικαιώματα Ï€Ïόσβασης. Αυτό το γεγονός μποÏεί να οδήγησε σε μεÏική εγκατάσταση της επέκτασης και άÏα η DokuWiki εγκατάστασή σας να εμφανίσει Ï€Ïοβλήματα σταθεÏότητας.'; $lang['error_delete'] = 'Εμφανίστηκε ένα σφάλμα κατά την διαδικασία διαγÏαφής της επέκτασης %s. Η πιθανότεÏη αιτία είναι να μην είναι σωστά Ïυθμισμένα τα δικαιώματα Ï€Ïόσβασης.'; +$lang['enabled'] = 'Η επέκταση %s ενεÏγοποιήθηκε.'; +$lang['notenabled'] = 'Η επέκταση %s δεν μποÏεί να ενεÏγοποιηθεί. Ελέγξτε τα δικαιώματα Ï€Ïόσβασης.'; +$lang['disabled'] = 'Η επέκταση %s απενεÏγοποιήθηκε.'; +$lang['notdisabled'] = 'Η επέκταση %s δεν μποÏεί να απενεÏγοποιηθεί. Ελέγξτε τα δικαιώματα Ï€Ïόσβασης.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,10 +6,14 @@ * @author Felipe Castro * @author Felipe Castro * @author Felipo Kastro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ $lang['menu'] = 'Administri Kromaĵojn'; $lang['download'] = 'ElÅuti kaj instali novan kromaĵon'; -$lang['manage'] = 'Instalitaj Kromaĵoj'; +$lang['manage'] = 'Instalitaj kromaĵoj'; $lang['btn_info'] = 'info'; $lang['btn_update'] = 'Äisdatigo'; $lang['btn_delete'] = 'forigi'; @@ -44,8 +48,8 @@ $lang['error_download'] = 'Maleblas elÅuti la kromaĵan dosieron: %s'; $lang['error_badurl'] = 'Suspektinda malbona URL - maleblas difini la dosieran nomon el la URL'; $lang['error_dircreate'] = 'Maleblas krei provizoran dosierujon por ricevi elÅutaĵon'; -$lang['error_decompress'] = 'La administrilo de kromaĵoj ne kapablis malkompakti la elÅutitan dosieron. Tio povas esti pro malkompleta elÅuto, tiaokaze vi devus provi refoje; aÅ­ eble la kompakta formato ne estas konata, tiaokaze vi bezonos elÅuti kaj instali la kromaĵon malaÅ­tomate.'; -$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo %s: la disko povus esti plenplena aux aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabilan.'; +$lang['error_decompress'] = 'La administrilo de kromaĵoj ne kapablis malkompakti la elÅutitan dosieron. Tio povas esti pro malkompleta elÅuto, tiaokaze vi devus provi refoje; aÅ­ eble la kompakta formato ne estas konata, tiaokaze vi bezonos elÅuti kaj instali la kromaĵon permane.'; +$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo %s: la disko povus esti plenplena aÅ­ aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabila.'; $lang['error_delete'] = 'Okazis eraro dum provo forigi la kromaĵon %s. Plejprobable tio sekvas de nesufiĉa rajto por aliri la dosieron aÅ­ ties ujon.'; $lang['enabled'] = 'La kromaĵo %s estas ebligita.'; $lang['notenabled'] = 'La kromaĵo %s ne povis esti ebligita, kontrolu dosier-permesojn.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,12 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ $lang['menu'] = 'Administración de Plugins'; $lang['download'] = 'Descargar e instalar un nuevo plugin'; @@ -27,14 +33,14 @@ $lang['source'] = 'Origen:'; $lang['unknown'] = 'desconocido'; $lang['updating'] = 'Actualizando ...'; -$lang['updated'] = 'El plugin %s ha sido actualizado con exito'; -$lang['updates'] = 'Los siguientes plugins han sido actualizados con exito:'; +$lang['updated'] = 'El plugin %s ha sido actualizado con éxito'; +$lang['updates'] = 'Los siguientes plugins han sido actualizados con éxito'; $lang['update_none'] = 'No se encontraron actualizaciones.'; $lang['deleting'] = 'Eliminando ...'; $lang['deleted'] = 'El plugin %s ha sido eliminado.'; $lang['downloading'] = 'Descargando ...'; -$lang['downloaded'] = 'El plugin %s ha sido descargado con exito'; -$lang['downloads'] = 'Los siguientes plugins han sido descargados con exito:'; +$lang['downloaded'] = 'El plugin %s ha sido instalado con éxito'; +$lang['downloads'] = 'Los siguientes plugins han sido instalados con éxito:'; $lang['download_none'] = 'No se han encontrado plugins, o hubo algún problema durante la descarga o la instalación.'; $lang['plugin'] = 'Plugin:'; $lang['components'] = 'Componentes'; @@ -49,7 +55,7 @@ $lang['error_download'] = 'Incapaz de descargar el archivo del plugin: %s'; $lang['error_badurl'] = 'Se sospecha que la URL es incorrecta - incapaz de determinar el nombre del archivo a partir de la URL.'; $lang['error_dircreate'] = 'Incapaz de crear el directorio temporal para la descarga'; -$lang['error_decompress'] = 'El administrador de plugin fue incapaz de descomprimir el fichero descargado esto puede ser por una descarga errónea, en ese caso debieras intentar nuevamente; o el formato de compresión es desconocido, en este caso deberás descargar e instalar el plugin manualmente.'; +$lang['error_decompress'] = 'El administrador de plugins fue incapaz de descomprimir el fichero descargado. Esto puede ser por una descarga errónea, en cuyo caso debieras intentar nuevamente; o el formato de compresión es desconocido, en este caso deberás descargar e instalar el plugin manualmente.'; $lang['error_copy'] = 'Hubo un error al copiar el fichero mientras se intentaban instalar ficheros para el plugin %s: el disco puede estar lleno o los permisos del fichero pueden ser incorrectos. Esto puede haber terminado con una instalación parcial del plugin y haber dejado la instalación del wiki en una situación inestable'; $lang['error_delete'] = 'Hubo un error al intentar eliminar el plugin %s. La causa más probable es que no se cuente con los permisos necesarios en el fichero o en el directorio'; $lang['enabled'] = 'Plugin %s habilitado.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['menu'] = 'مدیریت اÙزونه‌ها'; $lang['download'] = 'دریاÙت Ùˆ نصب اÙزونه'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * * @author otto@valjakko.net * @author Otto Vainio + * @author Teemu Mattila */ $lang['menu'] = 'Ylläpidä liitännäisiä'; $lang['download'] = 'Lataa ja asenna uusi liitännäinen'; @@ -40,7 +41,7 @@ $lang['www'] = 'Web:'; $lang['error'] = 'Tapahtui tuntematon virhe.'; $lang['error_download'] = 'Liitännäistiedoston %s latauksessa tapahtui tuntematon virhe.'; -$lang['error_badurl'] = 'Url näyttää olleen väärä. Ei pystytty päättelemään tiedoston nimeä siitä.'; +$lang['error_badurl'] = 'URL vaikuttaa olleen virheellinen. Siitä ei pystytty päättelemään tiedoston nimeä'; $lang['error_dircreate'] = 'Ei pystytty luomaan väliaikaista hakemistoa latausta varten'; $lang['error_decompress'] = 'Liitännäishallinta ei pystynyt purkamaan ladattua tiedostoa. Lataus voi olla epäonnistunut. Siinä tapauksessa voit yrittää uudestaan. Pakkaustapa voi myös olla tuntematon. Siinä tapauksessa sinun pitää ladata ja asentaa liitännäinen käsin.'; $lang['error_copy'] = 'Tiedoston kopioinnissa tapahtui liitännäisen %s asennuksen aikana virhe. Levy voi olla täynnä tai kansioiden oikeudet voivat olla väärin. Liitännäinen voi olla osittain asennettu ja tämä voi jättää wikiasennukseesi epävakaaseen tilaan.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,9 +9,12 @@ * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ -$lang['menu'] = 'Gestion des plugins'; -$lang['download'] = 'Télécharger et installer un nouveau plugin'; +$lang['menu'] = 'Gestion des module externes'; +$lang['download'] = 'Télécharger et installer un nouveau module'; $lang['manage'] = 'Plugins installés'; $lang['btn_info'] = 'info'; $lang['btn_update'] = 'rafraîchir'; @@ -26,17 +29,17 @@ $lang['unknown'] = 'inconnu'; $lang['updating'] = 'Mise à jour...'; $lang['updated'] = 'Plugin %s mis à jour avec succès'; -$lang['updates'] = 'Les plugins suivants ont été mis à jour avec succès'; +$lang['updates'] = 'Les modules suivants ont été mis à jour avec succès'; $lang['update_none'] = 'Aucune mise à jour n\'a été trouvée.'; $lang['deleting'] = 'Suppression...'; $lang['deleted'] = 'Plugin %s supprimé.'; $lang['downloading'] = 'Téléchargement...'; $lang['downloaded'] = 'Plugin %s installé avec succès'; -$lang['downloads'] = 'Les plugins suivants ont été installés avec succès :'; -$lang['download_none'] = 'Aucun plugin trouvé, ou un problème inconnu est survenu durant le téléchargement et l\'installation.'; +$lang['downloads'] = 'Les modules suivants ont été installés avec succès :'; +$lang['download_none'] = 'Aucun module n\'était trouvé, ou un problème inconnu est survenu durant le téléchargement et l\'installation.'; $lang['plugin'] = 'Plugin :'; $lang['components'] = 'Composants'; -$lang['noinfo'] = 'Ce plugin n\'a transmis aucune information, il pourrait être invalide.'; +$lang['noinfo'] = 'Ce module externe n\'a transmis aucune information, il pourrait être invalide.'; $lang['name'] = 'Nom :'; $lang['date'] = 'Date :'; $lang['type'] = 'Type :'; @@ -49,8 +52,8 @@ $lang['error_dircreate'] = 'Impossible de créer le répertoire temporaire pour réceptionner le téléchargement'; $lang['error_decompress'] = 'Le gestionnaire de plugin a été incapable de décompresser le fichier téléchargé. Ceci peut être le résultat d\'un mauvais téléchargement, auquel cas vous devriez réessayer ; ou bien le format de compression est inconnu, auquel cas vous devez télécharger et installer le plugin manuellement.'; $lang['error_copy'] = 'Une erreur de copie est survenue lors de l\'installation des fichiers du plugin %s: votre disque est peut-être plein ou les droits d\'accès au fichier sont incorrects. Il a pu en résulter une installation partielle du plugin rendant votre installation du wiki instable.'; -$lang['error_delete'] = 'Une erreur est survenue à la suppression du plugin %s. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire'; -$lang['enabled'] = 'Plugin %s activé'; +$lang['error_delete'] = 'Une erreur est survenue à la suppression du plugin %s. La raison la plus probable est l\'insuffisance des droits sur les fichiers ou le répertoire.'; +$lang['enabled'] = 'Plugin %s activé.'; $lang['notenabled'] = 'Le plugin %s n\'a pas pu être activé, vérifiez le fichier des permissions.'; -$lang['disabled'] = 'Plugin %s désactivé'; +$lang['disabled'] = 'Plugin %s désactivé.'; $lang['notdisabled'] = 'Le plugin %s n\'a pas pu être désactivé, vérifiez le fichier des permissions.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/gl/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/gl/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/gl/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/gl/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ -====== Xestión de Plugins ====== +====== Xestión de plugins ====== -Nesta páxina podes xestionar todas as accións posibles cos [[doku>plugins|plugins]] do DokuWiki. Para poder descargar e instalar un plugin, o teu cartafol de plugins debe ser escribible polo servidor web. +Nesta páxina pode xestionar todas as accións posíbeis cos [[doku>plugins|plugins]] do DokuWiki. Para poder descargar e instalar un plugin, o seu cartafol de plugins debe ser escribíbel polo servidor web. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,11 +3,13 @@ * Galicianlanguage file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['menu'] = 'Xestionar Plugins'; -$lang['download'] = 'Descargar e instalar un novo plugin'; -$lang['manage'] = 'Plugins Instalados'; -$lang['btn_info'] = 'info'; +$lang['menu'] = 'Xestionar os plugins'; +$lang['download'] = 'Descargar e instalar un plugin novo'; +$lang['manage'] = 'Plugins instalados'; +$lang['btn_info'] = 'información'; $lang['btn_update'] = 'actualización'; $lang['btn_delete'] = 'eliminar'; $lang['btn_settings'] = 'configuración'; @@ -21,16 +23,16 @@ $lang['updating'] = 'Actualizando...'; $lang['updated'] = 'Actualizouse correctamente o plugin %s'; $lang['updates'] = 'Actualizáronse correctamente os seguintes plugins'; -$lang['update_none'] = 'Non se atoparon actualizacións.'; +$lang['update_none'] = 'Non se encontraron actualizacións.'; $lang['deleting'] = 'Eliminando...'; $lang['deleted'] = 'Eliminado o plugin %s.'; $lang['downloading'] = 'Descargando...'; $lang['downloaded'] = 'Instalouse correctamente o plugin %s'; $lang['downloads'] = 'Instaláronse correctamente os seguintes plugins:'; -$lang['download_none'] = 'Non se atoparon plugins, ou aconteceu un problema descoñecido durante a descarga e instalación.'; +$lang['download_none'] = 'Non se encontraron plugins ou aconteceu un problema descoñecido durante a descarga e instalación.'; $lang['plugin'] = 'Plugin:'; $lang['components'] = 'Compoñentes'; -$lang['noinfo'] = 'Este plugin non devolveu información ningunha, pode que non sexa válido.'; +$lang['noinfo'] = 'Este plugin non devolveu información ningunha; pode que non sexa válido.'; $lang['name'] = 'Nome:'; $lang['date'] = 'Data:'; $lang['type'] = 'Tipo:'; @@ -38,13 +40,13 @@ $lang['author'] = 'Autor:'; $lang['www'] = 'Web:'; $lang['error'] = 'Houbo un erro descoñecido.'; -$lang['error_download'] = 'Non se puido descargar o arquivo de plugin: %s'; -$lang['error_badurl'] = 'URL posiblemente incorrecto - non se puido determinar o nome do arquivo mediante o URL'; +$lang['error_download'] = 'Non se puido descargar o ficheiro de plugin: %s'; +$lang['error_badurl'] = 'O URL é posibelmente incorrecto - non se puido determinar o nome do ficheiro mediante o URL'; $lang['error_dircreate'] = 'Non se puido crear un cartafol temporal para recibir a descarga'; -$lang['error_decompress'] = 'O xestor de plugins non foi quen de descomprimir o arquivo descargado. Isto podería ser causado por unha descarga corrupta, polo que, en tal caso, podes tentalo de novo; ou pode que o formato de compresión sexa descoñecido, co que precisarás descargar e instalar o plugin de xeito manual.'; -$lang['error_copy'] = 'Houbo un erro de copia de arquivo ao tentar instalar o plugin %s: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial do plugin e facer que a túa instalación do wiki se volva inestable.'; -$lang['error_delete'] = 'Houbo un erro ao tentar eliminar o plugin %s. O máis probable é que sexa causado por permisos de acceso ao arquivo ou directorio insuficientes.'; -$lang['enabled'] = 'Complemento %s activado.'; -$lang['notenabled'] = 'O complemento %s non puido ser activado, comproba os permisos de arquivo.'; -$lang['disabled'] = 'Complemento %s desactivado.'; -$lang['notdisabled'] = 'O complemento %s non puido ser desactivado, comproba os permisos de arquivo.'; +$lang['error_decompress'] = 'O xestor de plugins non foi quen de descomprimir o ficheiro descargado. Isto podería estar causado por unha descarga danada e en tal caso poderíalo tentar de novo; pode tamén que o formato de compresión sexa descoñecido, co que precisará descargar e instalar o plugin de modo manual.'; +$lang['error_copy'] = 'Houbo un erro de copia do ficheiro ao tentar instalar o plugin %s: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial do plugin e facer que a súa instalación do wiki se volva inestábel.'; +$lang['error_delete'] = 'Houbo un erro ao tentar eliminar o plugin %s. O máis probábel é que sexa causado por permisos de acceso insuficientes ao ficheiro ou directorio.'; +$lang['enabled'] = 'O plugin %s foi activado.'; +$lang['notenabled'] = 'O plugin %s non puido ser activado; verifique os permisos do ficheiro.'; +$lang['disabled'] = 'O plugin %s foi desactivado.'; +$lang['notdisabled'] = 'O plugin %s non puido ser desactivado; verifique os permisos do ficheiro.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['menu'] = 'BÅ‘vítménykezelÅ‘'; $lang['download'] = 'Új bÅ‘vítmény letöltése és telepítése'; @@ -44,3 +46,7 @@ $lang['error_decompress'] = 'A BÅ‘vítménykezelÅ‘ nem tudta a letöltött állományt kicsomagolni. Ennek oka lehet hibás letöltés, ebben az esetben újra letöltéssel próbálkozhatsz, esetleg a tömörítés módja ismeretlen, ebben az esetben kézzel kell letölteni és telepíteni a bÅ‘vítményt.'; $lang['error_copy'] = 'Fájl másolási hiba történt a(z) %s bÅ‘vítmény telepítése közben: vagy a lemezterület fogyott el, vagy az állomány hozzáférési jogosultságok nem megfelelÅ‘ek. Emiatt elÅ‘fordulhat, hogy a bÅ‘vítményt csak részben sikerült telepíteni, és a wiki összeomolhat.'; $lang['error_delete'] = 'Hiba történt a(z) %s bÅ‘vítmény eltávolítása közben. A legvalószínűbb ok, hogy a könyvtár vagy állomány hozzáférési jogosultságok nem megfelelÅ‘ek.'; +$lang['enabled'] = 'A(z) %s bÅ‘vítmény bekapcsolva.'; +$lang['notenabled'] = 'A(z) %s bÅ‘vítmény engedélyezése nem sikerült. EllenÅ‘rizze a fájl-hozzáférési engedélyeket.'; +$lang['disabled'] = 'A(z) %s bÅ‘vítmény kikapcsolva.'; +$lang['notdisabled'] = 'A(z) %s bÅ‘vítmény kikapcsolása nem sikerült. EllenÅ‘rizze a fájl-hozzáférési engedélyeket.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,47 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['menu'] = 'Umsýsla viðbóta'; +$lang['download'] = 'Hlaða niður og innsetja viðbót'; +$lang['manage'] = 'Uppsettar viðbætur'; +$lang['btn_info'] = 'upplýsingar'; +$lang['btn_update'] = 'uppfæra'; +$lang['btn_delete'] = 'eyða'; +$lang['btn_settings'] = 'stillingar'; +$lang['btn_download'] = 'Niðurhal'; +$lang['btn_enable'] = 'Vista'; +$lang['url'] = 'Veffang'; +$lang['installed'] = 'Innsett:'; +$lang['lastupdate'] = 'Síðast uppfærð:'; +$lang['source'] = 'Gjafi:'; +$lang['unknown'] = 'óþekkt'; +$lang['updating'] = 'Uppfæri viðbót'; +$lang['updated'] = '%s viðbótin hefur verið uppfærð'; +$lang['updates'] = 'Eftirfarandi viðbætur hafa verið uppfærðar'; +$lang['update_none'] = 'Engar uppfærslur fundust.'; +$lang['deleting'] = 'Eyði viðbót'; +$lang['deleted'] = 'Viðbót %s eytt'; +$lang['downloading'] = 'Hleð viðbót niður ...'; +$lang['downloaded'] = 'Viðbót %s hlóðst inn'; +$lang['downloads'] = 'Eftirfarandi viðbótum hefur verið hlaðið inn:'; +$lang['download_none'] = 'Engin viðbót finnst, hugsanlega hefur komið upp villa við niðurhal eða uppsetningu.'; +$lang['plugin'] = 'Viðbót:'; +$lang['components'] = 'Einingar'; +$lang['noinfo'] = 'Þessi viðbót skilaði ekki upplýsingum og er hugsanlega ónýt.'; +$lang['name'] = 'Nafn:'; +$lang['date'] = 'Dagsetning:'; +$lang['type'] = 'Tegund:'; +$lang['desc'] = 'Lýsing:'; +$lang['author'] = 'Höfundur:'; +$lang['www'] = 'Vefur:'; +$lang['error'] = 'Óskilgreind villa'; +$lang['error_download'] = 'Niðurhal viðbótar %s mistókst'; +$lang['error_decompress'] = 'Viðbótastjórinn gat ekki afþjappað skránna. Þetta gæti verið vegna misheppnaðs niðurhals, ef svo er reyndu niðurhal aftur. Það er einnig mögulegt að skráin sé þjöppuð með aðferð sem að er Dokuwiki óþekkt, í því tilfelli er best að vista viðhengið á tölvunni þinni, afþjappa hana þar og svo hlaða skránum upp handvirkt.'; +$lang['enabled'] = 'Viðbót %s hefur verið ræst.'; +$lang['notenabled'] = 'Ekki var hægt að ræsa %s viðbótina. Athugaðu stillingar á skráaleyfum.'; +$lang['disabled'] = 'Viðbót %s var gerð óvirk'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['menu'] = 'Gestione Plugin'; $lang['download'] = 'Scarica e installa un nuovo plugin'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Yuji Takenaka * @author Christopher Smith * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['menu'] = 'プラグイン管ç†'; $lang['download'] = 'プラグインã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã¨ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ko/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ko/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ko/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ko/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,5 +1,5 @@ ====== í”ŒëŸ¬ê·¸ì¸ ê´€ë¦¬ ====== -ì´ íŽ˜ì´ì§€ì—ì„œ Dokuwiki[[doku>plugins|plugins]]ì— ê´€ë ¨ëœ ëª¨ë“  관리 ìž‘ì—…ì„ í•©ë‹ˆë‹¤. 플러그ì¸ì„ 다운로드하거나 설치하기 위해서 웹서버가 í”ŒëŸ¬ê·¸ì¸ ë””ë ‰í† ë¦¬ì— ëŒ€í•´ 쓰기 ê¶Œí•œì„ ê°€ì§€ê³  있어야 합니다. +ì´ íŽ˜ì´ì§€ì—ì„œ Dokuwiki[[doku>plugins|plugins]]ì— ê´€ë ¨ëœ ëª¨ë“  관리 ìž‘ì—…ì„ í•©ë‹ˆë‹¤. 플러그ì¸ì„ 다운로드하거나 설치하기 위해서 웹서버가 í”ŒëŸ¬ê·¸ì¸ ë””ë ‰í† ë¦¬ì— ëŒ€í•´ 쓰기 ê¶Œí•œì„ ê°€ì§€ê³  있어야 합니다. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/lt/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,13 @@ + + */ +$lang['name'] = 'Vardas:'; +$lang['date'] = 'Data:'; +$lang['type'] = 'Tipas:'; +$lang['desc'] = 'ApraÅ¡as:'; +$lang['author'] = 'Autorius:'; +$lang['www'] = 'Tinklapis:'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/mr/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/mr/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/mr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/mr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -47,3 +47,7 @@ $lang['error_decompress'] = 'पà¥à¤²à¤—िन वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• डाउनलोड केलेली फाइल विसà¥à¤¤à¤¾à¤°à¤¿à¤¤ करू शकला नाही. हे कदाचित डाउनलोड नीट न à¤à¤¾à¤²à¥à¤¯à¤¾à¤®à¥à¤³à¥‡ असावं; असे असलà¥à¤¯à¤¾à¤¸ तà¥à¤®à¤šà¥€ परत डाउनलोड करणà¥à¤¯à¤¾à¤šà¤¾ पà¥à¤°à¤¯à¤¤à¥à¤¨ करू शकता; किंवा पà¥à¤²à¤—िन संकà¥à¤·à¤¿à¤ªà¥à¤¤ करणà¥à¤¯à¤¾à¤¸ वापरलेली पदà¥à¤§à¤¤ अनाकलनीय आहे; तसे असलà¥à¤¯à¤¾à¤¸ तà¥à¤®à¥à¤¹à¤¾à¤²à¤¾ सà¥à¤µà¤¤à¤ƒ पà¥à¤²à¤—िन डाउनलोड व इनà¥à¤¸à¥à¤Ÿà¥‰à¤² करावा लागेल.'; $lang['error_copy'] = '%s पà¥à¤²à¤—िनसाठी फाइल इनà¥à¤¸à¥à¤Ÿà¥‰à¤² करताना फाइल कॉपी करू शकलो नाही : डिसà¥à¤• भरली असेल किंवा फाइल वरील परवानगà¥à¤¯à¤¾ बरोबर नसतील. यामà¥à¤³à¥‡ पà¥à¤²à¤—िन अरà¥à¤§à¤µà¤Ÿ इनà¥à¤¸à¥à¤Ÿà¥‰à¤² जाला असणà¥à¤¯à¤¾à¤šà¥€ व तà¥à¤¯à¤¾à¤®à¥à¤³à¥‡ तà¥à¤®à¤šà¥€ विकी ख़राब होणà¥à¤¯à¤¾à¤šà¥€ शकà¥à¤¯à¤¤à¤¾ आहे.'; $lang['error_delete'] = '%s पà¥à¤²à¤—िन डिलीट करताना काही चूक à¤à¤¾à¤²à¥€ आहे. फाइल किंवा डिरेकà¥à¤Ÿà¤°à¥€ वरील परवानगà¥à¤¯à¤¾ बरोबर नसणे हे याचं मà¥à¤–à¥à¤¯ कारण असू शकतं.'; +$lang['enabled'] = '%s पà¥à¤²à¤—इन चालू केला.'; +$lang['notenabled'] = '%s पà¥à¤²à¤—इन चालू करू शकलो नाही, फाइलचà¥à¤¯à¤¾ परवानगà¥à¤¯à¤¾ तपासा.'; +$lang['disabled'] = '%s पà¥à¤²à¤—इन बंद केला.'; +$lang['notdisabled'] = '%s पà¥à¤²à¤—इन बंद करू शकलो नाही, फाइलचà¥à¤¯à¤¾ परवानगà¥à¤¯à¤¾ तपासा.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,9 @@ * @author John de Graaff * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['menu'] = 'Behandle tillegg'; $lang['download'] = 'Last ned og installer et tillegg'; @@ -35,7 +39,7 @@ $lang['download_none'] = 'Ingen tillegg funnet, eller det har vært et ukjent problem under nedlasting og installering.'; $lang['plugin'] = 'Tillegg:'; $lang['components'] = 'Komponenter'; -$lang['noinfo'] = 'Dette tillegget ga ikke noe informasjon. Det kan være ugyldig.'; +$lang['noinfo'] = 'Tillegget ga ikke noe informasjon. Det kan være ugyldig.'; $lang['name'] = 'Navn:'; $lang['date'] = 'Dato:'; $lang['type'] = 'Type:'; @@ -49,3 +53,7 @@ $lang['error_decompress'] = 'Tilleggsbehandleren klarte ikke Ã¥ dekomprimere den nedlastede filen. Dette kan være pÃ¥ grunn av en feilet nedlasting, i sÃ¥ fall bør du prøve igjen, eller kompresjonsformatet kan være ukjent, i sÃ¥ fall mÃ¥ du laste ned og installere tillegget manuelt.'; $lang['error_copy'] = 'Det skjedde en feil ved kopiering av en fil under installasjonen av %s: disken kan være full eller rettighetene satt feil. Dette kan ha ført til et delvist installert tillegg og gjort wikien ubrukelig.'; $lang['error_delete'] = 'Det skjedde en feil under forsøket pÃ¥ Ã¥ slette tillegget %s. Den mest sannsynlige grunnen er utilstrekkelige rettigheter for filene eller mappene.'; +$lang['enabled'] = 'Tillegget %s aktivert'; +$lang['notenabled'] = 'Plugin %s kunne ikke aktiveres, sjekk filrettighetene.'; +$lang['disabled'] = 'Plugin %s deaktivert'; +$lang['notdisabled'] = 'Plugin %s kunne ikke deaktiveres, sjekk filrettighetene.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,7 @@ * @author Grzegorz Å»ur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author SÅ‚awomir Boczek */ $lang['menu'] = 'Menadżer wtyczek'; $lang['download'] = 'ÅšciÄ…gnij i zainstaluj nowÄ… wtyczkÄ™'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,8 @@ * * @author José Monteiro * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ $lang['menu'] = 'Gerir Plugins'; $lang['download'] = 'Descarregar e instalar um novo plugin'; @@ -42,3 +44,10 @@ $lang['error_download'] = 'Impossível descarregar o ficheiro do plugin: %s'; $lang['error_badurl'] = 'URL suspeito ou errado - impossível determinar o ficheiro a partir do URL'; $lang['error_dircreate'] = 'Impossível criar pasta temporária para receber os ficheiros a descarregar'; +$lang['error_decompress'] = 'O gestor de plugins foi incapaz de descomprimir o ficheiro transferido. Isto pode ter sido causado por uma má transferência, caso no qual você deverá tentar de novo, ou por um formato de compressão desconhecido, caso no qual você deve instalar o plugin manualmente.'; +$lang['error_copy'] = 'Ocorreu um erro na cópia do ficheiro na tentativa de instalar o plugin %s: o disco pode estar cheio ou as permissões de acesso do ficheiro podem estar erradas. Isto pode resultar em um plugin parcialmente instalado e deixar a instalação do seu wiki instável.'; +$lang['error_delete'] = 'Ocorreu um erro na tentativa de remover o plug-in %s. A causa mais provável é a permissão de acesso à directoria ou ao ficheiro insuficiente.'; +$lang['enabled'] = 'Plugin %s habilitado.'; +$lang['notenabled'] = 'Plugin %s não pôde ser habilitado, verifique as permissões.'; +$lang['disabled'] = 'Plugin %s desabilitado.'; +$lang['notdisabled'] = 'Plugin %s não pôde ser desabilitado, verifique as permissões.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt-br/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt-br/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt-br/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt-br/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== Gerenciamento de Plug-ins ====== -Nessa página você pode gerenciar tudo relacionado aos [[doku>plugins|plug-ins]] do DokuWiki. Para você baixar e instalar um plug-in o servidor web deve ter permissão de escrita na pasta onde ficam os plug-ins. +Nesta página você pode gerenciar tudo relacionado aos [[doku>plug-ins|plug-ins]] do DokuWiki. Para você baixar e instalar um plug-in o servidor web deve ter permissão de escrita na pasta onde ficam os plug-ins. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,10 +11,12 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ -$lang['menu'] = 'Gerenciar Plugins'; -$lang['download'] = 'Baixar e instalar um novo plugin'; -$lang['manage'] = 'Plugins instalados'; +$lang['menu'] = 'Gerenciar Plug-ins'; +$lang['download'] = 'Baixar e instalar um novo plug-in'; +$lang['manage'] = 'Plug-ins instalados'; $lang['btn_info'] = 'informações'; $lang['btn_update'] = 'atualizar'; $lang['btn_delete'] = 'excluir'; @@ -50,5 +52,9 @@ $lang['error_badurl'] = 'Suspeita de URL mal formatada - não foi possível determinar o nome do arquivo a partir da URL'; $lang['error_dircreate'] = 'Não foi possível criar a pasta temporária para receber a transferência'; $lang['error_decompress'] = 'O gerenciador de plug-ins não conseguiu descompactar o arquivo transferido. Isso pode ser resultado de: uma corrupção do arquivo durante a transferência, nesse caso, você deve tentar novamente; ou o formato da compactação pode ser desconhecido, nesse caso você deve transferir e instalar o plug-in manualmente.'; -$lang['error_copy'] = 'Ocorreu um erro na cópia do arquivo na tentativa de instalar o plugin %s: o disco pode estar cheio ou as permissões de acesso do arquivo podem estar erradas. Isso pode resultar em um plug-in parcialmente instalado e deixar a instalação do seu wiki instável.'; -$lang['error_delete'] = 'Ocorreu um erro na tentativa de excluir o plug-in %s. A causa mais provável é a permissão de acesso ao diretório ou ao arquivo insuficiente.'; +$lang['error_copy'] = 'Ocorreu um erro de cópia de arquivo na tentativa de instalar o plug-in %s: o disco pode estar cheio ou as permissões de acesso ao arquivo podem estar erradas. Isso pode resultar em um plug-in parcialmente instalado e tornar o seu wiki instável.'; +$lang['error_delete'] = 'Ocorreu um erro na tentativa de excluir o plug-in %s. A causa mais provável é a permissão de acesso insuficiente ao diretório ou ao arquivo.'; +$lang['enabled'] = 'O plug-in %s foi habilitado.'; +$lang['notenabled'] = 'Não foi possível habilitar o plug-in %s. Verifique as permissões de acesso.'; +$lang['disabled'] = 'O plug-in %s foi desabilitado.'; +$lang['notdisabled'] = 'Não foi possível desabilitar o plug-in %s. Verifique as permissões de acesso.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @author Sergiu Baltariu * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric AndraÈ™i + * @author Emanuel-Emeric AndraÅŸi + * @author Emanuel-Emeric Andrasi */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă ÅŸi instalează un nou plugin'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ru/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ru/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ru/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ru/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,5 +1,5 @@ ====== Управление плагинами ====== -ЗдеÑÑŒ вы можете делать вÑе, что ÑвÑзано Ñ [[doku>plugins|плагинами]] DokuWiki. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñкачивать и уÑтанавливать плагины, Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² должна быть доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи веб-Ñервером. +ЗдеÑÑŒ вы можете делать вÑе, что ÑвÑзано Ñ [[doku>plugins|плагинами]] DokuWiki. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñкачивать и уÑтанавливать плагины, Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² должна быть доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи веб-Ñервером. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['menu'] = 'Управление плагинами'; $lang['download'] = 'Скачать и уÑтановить новый плагин'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ $lang['btn_delete'] = 'IzbriÅ¡i'; $lang['btn_settings'] = 'Nastavitve'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Serbian language file * * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['menu'] = 'Управљач додацима'; $lang['download'] = 'Преузми и инÑталирај нови додатак'; @@ -44,3 +45,7 @@ $lang['error_decompress'] = 'Управљач додацима није у могућноÑти да раÑпакује преузету датотеку. Разлог може да буде лошег преузимања, у том Ñлучају пробајте још једном; или је непознат облик компреÑије, у том Ñлучају ручно преузмите и инÑталирајте додатак.'; $lang['error_copy'] = 'Појавила Ñе грешка у копирању у току иÑнталације додатка %s: Ñкладиште је можда пуно или дозволе за упиÑивање ниÑу поÑтављене како треба. Резултат може бити делимично инÑталиран додатак и вики у неÑтабилном Ñтању.'; $lang['error_delete'] = 'Појавила Ñе грешка у покушају бриÑања додатка %s. Ðејчешћи узрок је недоÑтатак потребних дозвола за операције Ñа датотекама или фаÑциклама'; +$lang['enabled'] = 'Додатај %s је укључен.'; +$lang['notenabled'] = 'Додатак %s није могуће укључити, проверите дозволе приÑтупа.'; +$lang['disabled'] = 'Додатај %s је иÑукључен.'; +$lang['notdisabled'] = 'Додатак %s није могуће иÑукључити, проверите дозволе приÑтупа.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ $lang['menu'] = 'Hantera insticksmoduler'; $lang['download'] = 'Ladda ned och installera en ny insticksmodul'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/th/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/th/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/th/admin_plugin.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/th/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +====== ตัวจัดà¸à¸²à¸£à¹‚ปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ ====== + +ในหน้านี้คุณสามารถจัดà¸à¸²à¸£à¸—ุà¸à¹†à¸­à¸¢à¹ˆà¸²à¸‡à¸—ี่จะต้องทำงานà¸à¸±à¸š [[doku>plugins|plugins]]โดà¸à¸¸à¸§à¸´à¸à¸´ เพื่อที่จะสามารถดาวน์โหลดà¹à¸¥à¸°à¸•à¸´à¸”ตั้งโปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ ตัวโฟลเดอร์โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡(plugin) จะต้องสามารถเขียนได้โดยเว็บเซิร์ฟเวอร์ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,49 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Arthit Suriyawongkul + * @author Kittithat Arnontavilas + */ +$lang['menu'] = 'จัดà¸à¸²à¸£à¸›à¸¥à¸±à¹Šà¸à¸­à¸´à¸™'; +$lang['download'] = 'ดาวน์โหลดà¹à¸¥à¸°à¸•à¸´à¸”ตั้งปลั๊à¸à¸­à¸´à¸™à¹ƒà¸«à¸¡à¹ˆ'; +$lang['manage'] = 'ปลั๊à¸à¸­à¸´à¸™à¸—ี่ติดตั้งไว้à¹à¸¥à¹‰à¸§'; +$lang['btn_info'] = 'ข้อมูล'; +$lang['btn_update'] = 'ปรับปรุง'; +$lang['btn_delete'] = 'ลบ'; +$lang['btn_settings'] = 'ตั้งค่า'; +$lang['btn_download'] = 'ดาวน์โหลด'; +$lang['btn_enable'] = 'บันทึà¸'; +$lang['url'] = 'ที่อยู่เว็บ'; +$lang['installed'] = 'ติดตั้งà¹à¸¥à¹‰à¸§:'; +$lang['lastupdate'] = 'ปรับปรุงล่าสุด:'; +$lang['source'] = 'ต้นà¸à¸³à¹€à¸™à¸´à¸”'; +$lang['unknown'] = 'ไม่มีข้อมูล'; +$lang['updating'] = 'à¸à¸³à¸¥à¸±à¸‡à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡ ...'; +$lang['updated'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s ได้รับà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸ªà¸³à¹€à¸£à¹‡à¸ˆà¹à¸¥à¹‰à¸§'; +$lang['updates'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡à¸•à¹ˆà¸­à¹„ปนี้ได้รับà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸ªà¸³à¹€à¸£à¹‡à¸ˆà¹à¸¥à¹‰à¸§'; +$lang['update_none'] = 'ไม่พบà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¹ƒà¸”ๆ'; +$lang['deleting'] = 'à¸à¸³à¸¥à¸±à¸‡à¸¥à¸š ...'; +$lang['deleted'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s ถูà¸à¸¥à¸šà¹à¸¥à¹‰à¸§'; +$lang['downloading'] = 'à¸à¸³à¸¥à¸±à¸‡à¸”าวโหลด ...'; +$lang['downloaded'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s ถูà¸à¸•à¸´à¸”ตั้งสำเร็จà¹à¸¥à¹‰à¸§'; +$lang['downloads'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡à¸•à¹ˆà¸­à¹„ปนี้ได้รับà¸à¸²à¸£à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸ªà¸³à¹€à¸£à¹‡à¸ˆà¹à¸¥à¹‰à¸§:'; +$lang['download_none'] = 'ไม่พบโปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡, หรือมีปัà¸à¸«à¸²à¸šà¸²à¸‡à¸›à¸£à¸°à¸à¸²à¸£à¹€à¸à¸´à¸”ขึ้นระหว่างà¸à¸²à¸£à¸”าวน์โหลด à¹à¸¥à¸°à¸•à¸´à¸”ตั้ง'; +$lang['plugin'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡:'; +$lang['components'] = '่สวนประà¸à¸­à¸š'; +$lang['noinfo'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡à¸™à¸µà¹‰à¹„ม่บอà¸à¸‚้อมูล, มันอาจไม่ใช่โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡à¸ˆà¸£à¸´à¸‡'; +$lang['name'] = 'ชื่อ:'; +$lang['date'] = 'วันที่:'; +$lang['type'] = 'ชนิด:'; +$lang['desc'] = 'รายละเอียด:'; +$lang['author'] = 'ผู้à¹à¸•à¹ˆà¸‡:'; +$lang['www'] = 'เว็บ:'; +$lang['error'] = 'เà¸à¸´à¸”ความผิดพลาดที่ระบุไม่ได้'; +$lang['error_download'] = 'ไม่สามารถดาวน์โหลดไฟล์โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡: %s'; +$lang['error_dircreate'] = 'ไม่สามารถสร้างโฟลเดอร์ชั่วคราวเพื่อที่จะรองรับà¸à¸²à¸£à¸”าวน์โหลด'; +$lang['enabled'] = 'เปิดใช้งานโปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s à¹à¸¥à¹‰à¸§'; +$lang['notenabled'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s ไม่สามารถเปิดใช้งาน, à¸à¸£à¸¸à¸“าตรวจสอบสิทธิ์ของไฟล์'; +$lang['disabled'] = 'ปิดà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹‚ปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s à¹à¸¥à¹‰à¸§'; +$lang['notdisabled'] = 'โปรà¹à¸à¸£à¸¡à¹€à¸ªà¸£à¸´à¸¡ %s ไม่สามารถปิดà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„ด้, à¸à¸£à¸¸à¸“าตรวจสอบสิทธิ์ของไฟล์'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['menu'] = 'Eklenti Yönetimi'; $lang['download'] = 'Yeni bir eklenti indirip kur'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/uk/admin_plugin.txt dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/uk/admin_plugin.txt --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/uk/admin_plugin.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/uk/admin_plugin.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,6 +1,6 @@ ====== ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ð½ÐºÐ°Ð¼Ð¸ ====== -Тут ви можете керувати [[doku>plugins|доданками]] ДокуВікі. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб завантажувати та вÑтановлювати доданки, тека доданків повинна бути доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу веб-Ñервером. +Тут ви можете керувати [[doku>plugins|доданками]] ДокуВікі. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб завантажувати та вÑтановлювати доданки, папка доданків повинна бути доÑтупна Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу веб-Ñервером. diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Oleksiy Voronin (ovoronin@gmail.com) * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ $lang['menu'] = 'ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ð½ÐºÐ°Ð¼Ð¸'; $lang['download'] = 'Завантажити та вÑтановити новий доданок'; @@ -24,8 +27,8 @@ $lang['updated'] = 'Доданок %s уÑпішно оновлено'; $lang['updates'] = 'ÐаÑтупні доданки були уÑпішно оновлені'; $lang['update_none'] = 'ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ знайдено.'; -$lang['deleting'] = 'Ð—Ð½Ð¸Ñ‰ÐµÐ½Ð½Ñ ...'; -$lang['deleted'] = 'Доданок %s вилучено.'; +$lang['deleting'] = 'Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ...'; +$lang['deleted'] = 'Доданок %s видалено.'; $lang['downloading'] = 'Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ ...'; $lang['downloaded'] = 'Доданок %s уÑпішно вÑтановлено'; $lang['downloads'] = 'ÐаÑтупні доданки були уÑпішно вÑтановлені:'; @@ -41,8 +44,12 @@ $lang['www'] = 'Сторінка:'; $lang['error'] = 'Виникла невідома помилка.'; $lang['error_download'] = 'Ðе можу завантажити файл доданка: %s'; -$lang['error_badurl'] = 'Можливо, невірна адреÑа - не можливо визначити ім\'Ñ Ñ„Ð°Ð¹Ð»Ð° з адреÑи'; -$lang['error_dircreate'] = 'Ðе можливо Ñтворити тимчаÑову теку Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ'; +$lang['error_badurl'] = 'Можливо, невірна адреÑа - не можливо визначити ім\'Ñ Ñ„Ð°Ð¹Ð»Ñƒ з адреÑи'; +$lang['error_dircreate'] = 'Ðе можливо Ñтворити тимчаÑову папку Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ'; $lang['error_decompress'] = 'Менеджеру доданків не вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ð°ÐºÑƒÐ²Ð°Ñ‚Ð¸ завантажений файл. Це може бути результатом помилки при завантаженні, в цьому разі ви можете Ñпробувати знову; або ж доданок упакований невідомим архіватором, тоді вам необхідно завантажити та вÑтановити доданок вручну.'; $lang['error_copy'] = 'Виникла помилка ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸ Ñпробі уÑтановки файлів Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð½ÐºÐ° %s: Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð´Ð¸Ñку або невірні права доÑтупу. Це могло привеÑти до чаÑткової уÑтановки доданка и неÑтійкоÑÑ‚Ñ– вашої Вікі.'; $lang['error_delete'] = 'При Ñпробі Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°Ð½ÐºÐ° %s виникла помилка. Ðайбільш вірогідно, що немає необхідних прав доÑтупу до файлів або тек'; +$lang['enabled'] = 'Доданок %s увімкнено.'; +$lang['notenabled'] = 'Ðе вдаєтьÑÑ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ доданок %s. Перевірте права доÑтупу до файлу.'; +$lang['disabled'] = 'Доданок %s вимкнено.'; +$lang['notdisabled'] = 'Ðе вдаєтьÑÑ Ð²Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ доданок %s. Перевірте права доÑтупу до файлу.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,8 @@ * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['menu'] = 'æ’件管ç†å™¨'; $lang['download'] = '下载并安装新的æ’件'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/plugin/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['menu'] = '管ç†å¤–掛(Plugins)'; $lang['download'] = '下載與安è£å¤–掛'; @@ -46,3 +47,7 @@ $lang['error_decompress'] = 'æ’件管ç†å™¨ç„¡æ³•è§£å£“下載的文件。這å¯èƒ½æ˜¯ç”±æ–¼ä¸‹è¼‰å‡ºç¾éŒ¯èª¤ï¼Œé‡åˆ°é€™ç¨®æƒ…æ³ï¼Œè«‹æ‚¨å†æ¬¡å˜—試;或者是壓縮格å¼ç„¡æ³•è­˜åˆ¥ï¼Œé‡åˆ°é€™ç¨®æƒ…æ³ï¼Œæ‚¨éœ€è¦æ‰‹å‹•ä¸‹è¼‰ä¸¦å®‰è£è©²æ’件。'; $lang['error_copy'] = '嘗試安è£æ’件 %s 的相關文件時產生一個復制錯誤：ç£ç›¤ç©ºé–“已滿或文件訪å•æ¬Šé™éŒ¯èª¤ã€‚這å¯èƒ½æ˜¯ç”±æ–¼ä¸€å€‹å®‰è£äº†ä¸€éƒ¨åˆ†çš„æ’件，並使得您的維基系統ä¸ç©©å®šã€‚'; $lang['error_delete'] = '嘗試刪除æ’件 %s 時產生一個錯誤。最有å¯èƒ½çš„情æ³æ˜¯æ–‡ä»¶æˆ–路徑的訪å•æ¬Šé™ä¸å¤ '; +$lang['enabled'] = 'æ’件 %s 已啟動。'; +$lang['notenabled'] = 'æ’件 %s 無法啟動，請檢查檔案權é™ã€‚'; +$lang['disabled'] = 'æ’件 %s å·²åœç”¨ã€‚'; +$lang['notdisabled'] = 'æ’件 %s 無法åœç”¨ï¼Œè«‹æª¢æŸ¥æª”案權é™ã€‚'; diff -Naur dokuwiki-2009-02-14/lib/plugins/plugin/style.css dokuwiki-rc2009-12-02/lib/plugins/plugin/style.css --- dokuwiki-2009-02-14/lib/plugins/plugin/style.css 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/plugin/style.css 2009-12-02 19:50:12.000000000 +0100 @@ -42,9 +42,9 @@ #plugin__manager .plugins fieldset.buttons .button { float: left; } #plugin__manager .pm_info h3 { margin-left: 0; } -#plugin__manager .pm_info dl { margin: 1em 0; padding: 0;} -#plugin__manager .pm_info dt { width: 6em; float: left; clear: left; margin:0; padding: 0;} -#plugin__manager .pm_info dd { margin:0 0 0 7em; padding: 0; background: none;} +#plugin__manager .pm_info dl { margin: 1em 0; padding: 0; } +#plugin__manager .pm_info dt { width: 6em; float: left; clear: left; margin: 0; padding: 0; } +#plugin__manager .pm_info dd { margin: 0 0 0 7em; padding: 0; background: none; } #plugin__manager .plugins .enable { float: left; width: auto; margin-right: 0.5em;} diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/bg/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/ca-va/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ca-va/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/ca-va/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ca-va/intro.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -====== Retroalimentació de popularitat ====== - -Esta ferramenta arreplega senyes anònimes sobre el wiki i permet enviar-les als -desenrolladors de DokuWiki. Açò els ajuda a comprendre com s'utilisa DokuWiki -pels usuaris i assegura que les decissions futures de desenroll estaran recolzades per estadístiques d'us real. - -T'aninem a que repetixques este procés de tant en tant per a mantindre informats -als desenrolladors quan el wiki creixca. Els conjunts de senyes repetits s'identificaran en un ID anònim. - -Les senyes arreplegades contenen informació com la versió del DokuWiki, el número i tamany de les pàgines i els archius, plúgins instalats i informació sobre l'instalació de PHP. - -Les senyes reals que s'enviaran es mostren ací avall. Per favor, utilisa el botó "Enviar senyes" per a transferir l'informació. - - diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ - + * @author Bernat Arlandis + */ +$lang['name'] = 'Retroacció sobre popularitat (pot trigar una mica a carregar)'; +$lang['submit'] = 'Envia dades'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Czech language file * * @author Bohumir Zamecnik + * @author tomas@valenta.cz */ $lang['name'] = 'Průzkum používání (může chviliÄku trvat, než se natáhne)'; $lang['submit'] = 'Odeslat data'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/da/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/da/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/da/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/da/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ +====== Tilbagemelding om popularitet ====== + +Dette værktøj samler anonyme oplysninge rom din wiki og giver dig mulighed for at sende det tilbage til DokuWiki-udviklerne. Dette hjælper dem til at sætte sig ind i, hvordan DokuWiki bruges af dets brugere og sikrer, at fremtidige beslutninger inden for udviklingen har grund i faktiske brugsstatistikker. + +Vi anbefaler dig til at gentage dette trin fra tid til anden for at holde udviklerne underrettede eftersom din wiki vokser. Dine anonyme datasamlinger vil blive tilkendegivet ved et anonymt navn. + +Opsamlede data indeholder oplysninger som eksempelvis din udgave af DokuWiki, antallet og størrelsen af dens sider, tilføjede udvidelse og oplysninger om din PHP-opsætning. + +De egentlige data, som vil blive sendt, er vist herunder. Brug venligst knappen 'Send Data' for at videresende oplysningerne. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,9 @@ * * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ -$lang['name'] = 'Popularitets feedback (vil mÃ¥ske tage en del tid at indlæse)'; +$lang['name'] = 'Tilbagemelding om popularitet (vil mÃ¥ske tage en del tid at indlæse)'; $lang['submit'] = 'Send data'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/de/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/de/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,11 +1,11 @@ ====== Popularitäts-Feedback ====== -Dieses Werkzeug sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Nutzerdaten getroffen werden. +Dieses Werkzeug sammelt verschiedene anonyme Daten über Ihr Wiki und erlaubt es Ihnen, diese an die DokuWiki-Entwickler zurückzusenden. Diese Daten helfen den Entwicklern besser zu verstehen, wie DokuWiki eingesetzt wird und stellt sicher, dass zukünftige, die Weiterentwicklung von DokuWiki betreffende, Entscheidungen auf Basis echter Nutzerdaten getroffen werden. -Bitte wiederholen Sie das Versenden der Daten von Zeit zu Zeit um die Entwickler über das Wachstum Ihres Wikis auf dem Laufenden zu halten. Ihre wiederholten Dateneinsendungen werden über eine anonyme ID identifieziert. +Bitte wiederholen Sie das Versenden der Daten von Zeit zu Zeit, um die Entwickler über das Wachstum Ihres Wikis auf dem Laufenden zu halten. Ihre wiederholten Dateneinsendungen werden über eine anonyme ID identifiziert. -Die gesammelten Daten enthalten Informationen wie Ihre DokuWiki Version, die Anzahl und Größe Ihrer Seiten und Dateien, installierte Plugins und die eingesetzte PHP Installation. +Die gesammelten Daten enthalten Informationen wie Ihre DokuWiki-Version, die Anzahl und Größe Ihrer Seiten und Dateien, installierte Plugins und die eingesetzte PHP-Installation. -Die zu übertragenen Roh-Daten werden in der untenstehenden Box angezeigt. Bitte drücken Sie die "Daten Senden" Schaltfläche um die Information zu übertragen. +Die zu übertragenen Roh-Daten werden in der untenstehenden Box angezeigt. Bitte drücken Sie die "Daten senden" Schaltfläche um die Information zu übertragen. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,9 @@ * @author Robin Kluth * @author Arne Pelka * @author Andreas Gohr + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['name'] = 'Popularitäts-Feedback (Eventuell längere Ladezeit)'; -$lang['submit'] = 'Daten Senden'; +$lang['submit'] = 'Daten senden'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/de-informal/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de-informal/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/de-informal/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de-informal/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ +===== Rückkopplung zur Zufriedenheit ===== + +Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Nutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind. + +Du wirst angehalten diesen Schritt von Zeit zu Zeit erneut zu machen um die Entwickler zu infomieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen ID zugeordnet. + +Die gesammelten Daten enthalten Infomrationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und informationen über deine PHP-Version. + +Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Send Data" Knopf um die Informationen zu übermitteln. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ + + * @author Juergen Schwarzer + */ +$lang['name'] = 'Polularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)'; +$lang['submit'] = 'Sende Daten'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/el/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/el/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/el/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/el/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ +====== ΑναφοÏά Δημοτικότητας ====== + +Το εÏγαλείο αυτό συλλέγει ανώνυμα δεδομένα για το wiki σας και σας επιτÏέπει να τα στείλετε στους δημιουÏγοÏÏ‚ της εφαÏμογής DokuWiki. Αυτό τους βοηθά να καταλάβουν με ποιοÏÏ‚ Ï„Ïόπους χÏησιμοποιείται η εφαÏμογή DokuWiki από τους χÏήστες της και εξασφαλίζει ότι οι μελλοντικές αποφάσεις σχεδίασης θα στηÏίζονται σε Ï€Ïαγματικά δεδομένα χÏήσης. + +Σας Ï€ÏοτÏέπουμε να επαναλαμβάνετε αυτή τη διαδικασία κατά διαστήματα ώστε οι δημιουÏγοί της εφαÏμογής DokuWiki να μένουν ενήμεÏοι όταν το wiki σας μεγαλώνει. Τα διαδοχικά σÏνολα δεδομένων που αποστέλλετε αναγνωÏίζονται από έναν ανώνυμο κωδικό. + +Τα δεδομένα πεÏιέχουν πληÏοφοÏίες όπως η έκδοση του DokuWiki σας, ο αÏιθμός και το μέγεθος των σελίδων και αÏχείων σας, οι εγκατεστημένες επεκτάσεις και στοιχεία για την PHP που χÏησιμοποιείτε. + +Τα ακÏιβή δεδομένα τα οποία θα αποσταλοÏν εμφανίζονται παÏακάτω. ΠαÏακαλοÏμε πατήστε στο κουμπί "Αποστολή Δεδομένων" για να τα αποστείλετε. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/el/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,8 @@ + + */ +$lang['name'] = 'ΑναφοÏά Δημοτικότητας (ίσως αÏγήσει λίγο να εμφανιστεί)'; +$lang['submit'] = 'Αποστολή Δεδομένων'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/eo/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eo/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/eo/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eo/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,9 +1,9 @@ -====== Populareca Esploro ====== +====== Populareca enketo ====== -Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi Äin ree al la kodumantoj de DokuWiki. Tio helpas ke ili komprenu kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviÄaj decidoj estos subtenataj de statistikoj pri reala aplikado. +Tiu ĉi ilo prenas anoniman datenaron pri via vikio kaj ebligas al vi sendi Äin reen al la kodumantoj de DokuWiki. Tio helpas ke ili komprenu kiel DokuWiki estas uzata kaj certigas ke estontaj disvolviÄaj decidoj estos subtenataj de statistikoj pri reala aplikado. Ni instigas vin ripeti tiun agon iam kaj tiam por teni la disvolvigantojn informitaj, dum via vikio kreskas. Viaj resendotaj datenaroj estos identigitaj per anonima ID. La kolektita datenaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paÄoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo. -La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon "Sendi Datenaron" por transÅuti tiun informaron. \ Brak znaku nowej linii na koÅ„cu pliku +La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon "Sendi datenaron" por transÅuti tiun informaron. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,10 @@ * * @author Felipo Kastro * @author Felipe Castro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ -$lang['name'] = 'Populareca Esploro (eble la Åargo prokrastos iomete)'; -$lang['submit'] = 'Sendi Datenaron'; +$lang['name'] = 'Populareca enketo (eble la Åargo prokrastos iomete)'; +$lang['submit'] = 'Sendi datenaron'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/es/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/es/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/es/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/es/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,10 +1,10 @@ ====== Retroalimentación (feedback) del plugin Popularity ====== -Esta herramienta recopila datos anónimos sobre tu wiki y te permite enviarlos a los desarrolladores de Dokuwiki. Esto les ayuda a comprender cómo usan Dokuwiki sus usuarios y asegura que las decisiones del desarrollo futuro del programa estén basadas en las estadísticas de uso del mundo real. +Esta herramienta recopila datos anónimos sobre tu wiki y te permite enviarlos a los desarrolladores de DokuWiki. Esto les ayuda a comprender cómo usan DokuWiki sus usuarios y asegura que las decisiones del desarrollo futuro del programa estén basadas en las estadísticas de uso del mundo real. Te animamos a repetir este paso de vez en cuando para mantener informados a los desarrolladores a medida que tu wiki crece. Tus paquetes repetidos de datos se identifican por un ID anónimo. -Los datos recopilados contienen información como tu versión de Dokuwiki, el número y tamaño de tus páginas y ficheros, plugins instalados e información sobre tu PHP instalado. +Los datos recopilados contienen información como tu versión de DokuWiki, el número y tamaño de tus páginas y ficheros, plugins instalados e información sobre tu instalación de PHP. Los datos que se enviarán se muestran más abajo. Por favor, usa el botón "Enviar Datos" para transferir la información. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,12 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ $lang['name'] = 'Retroinformación (Feedback) plugin Popularity'; $lang['submit'] = 'Enviar datos'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/eu/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eu/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/eu/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/eu/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,6 +1,6 @@ ====== Popularitate Feedback-a ====== -Tresna honek datu anonimoak hartzen ditu zure wiki-ari buruz eta hauek DokuWiki garatzaileei bidaltzea ahalbidetzen dizu. Honek, DokuWiki erabiltzaileek nola erabiltzen duten ulertzen laguntzen die, etorkizuneko garapen erabakiak mundu errealeko erabilpen estatistikekin indartuz. +Tresna honek datu anonimoak hartzen ditu zure wiki-ari buruz eta hauek DokuWiki garatzaileei bidaltzea ahalbidetzen dizu. Honek, DokuWiki erabiltzaileek nola erabiltzen duten ulertzen laguntzen die, etorkizuneko garapen erabakiak mundu errealeko erabilpen estatistikekin indartuz. Pauso hau denboran zehar errepikatzera animatzen zaitugu, modu horretan garatzaileak informatuz zure wiki-a handitzen den ahala. Zure datu bidalketak identifikatzaile anonimo batez identifikatuak izango dira. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['name'] = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)'; $lang['submit'] = 'ارسال اطلاعات'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Finnish language file * * @author Otto Vainio + * @author Teemu Mattila */ $lang['name'] = 'Suosion palaute (voi kestää jonkun aikaa latautua)'; $lang['submit'] = 'Lähetä tiedot'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,9 @@ * @author Guy Brand * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ $lang['name'] = 'Enquête de popularité (peut nécessiter un certain temps pour être chargé)'; $lang['submit'] = 'Envoyer les données'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/gl/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/gl/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/gl/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/gl/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,10 +1,10 @@ -====== Resposta de Popularidade ====== +====== Resposta de popularidade ====== -Esta ferramenta recolle datos anónimos verbo do teu wiki e permíteche enviarllos aos desenvolvedores do DokuWiki. Isto axudaralles a ter unha idea do xeito en que se emprega o DokuWiki por parte dos seus usuarios, e asegura que as decisións de desenvolvemento futuro coincidan coas estatísticas de uso no mundo real. +Esta ferramenta recolle datos anónimos sobre o seu wiki e permítelle envialos ás persoas desenvolvedoras do DokuWiki. Isto axudaralles a ter unha idea do modo en que se emprega o DokuWiki por parte das súas persoas usuarias e garante que as decisións de desenvolvemento futuro coincidan coas estadísticas de uso no mundo real. -Animámoste a levar a cabo este proceso de cando en vez para manter informados aos desenvolvedores a medida que o teu wiki vaia medrando. Os teus xogos de datos repetidos seran identificados por un ID anónimo. +Animámolo a executar este proceso de cando en vez, para manter informadas ás persoas desenvolvedoras a medida que o seu wiki vaia medrando. Os seus conxuntos de datos repetidos seran identificados por un ID anónimo. -Os datos recompilados conteñen información como a versión do teu Dokuwiki, o número e tamaño das túas páxinas e arquivos, os plugins instalados e información verbo da túa instalación do PHP. +Os datos recompilados conteñen informacións do tipo: versión do Dokuwiki, número e tamaño das páxinas e ficheiros, plugins instalados e informacións sobre a súa instalación do PHP. -Os datos en bruto que serán enviados amósanse embaixo. Por favor, emprega o botón "Enviar Datos" para transferir a información. +Os datos en bruto que serán enviados móstranse abaixo. Empregue o botón "Enviar os datos" para transferir a información. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Galician language file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['name'] = 'Resposta de Popularidade (pode demorar un tempo a cargar)'; -$lang['submit'] = 'Enviar Datos'; +$lang['name'] = 'Resposta de popularidade (pode demorar un tempo a cargar)'; +$lang['submit'] = 'Enviar os datos'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['name'] = 'Visszajelzés a DokuWiki használatáról (sok idÅ‘t vehet igénybe a betöltése)'; $lang['submit'] = 'Adatok elküldése'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['submit'] = 'Senda gögn'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['name'] = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)'; $lang['submit'] = 'Invia dati'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Japanese language file * * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['name'] = '利用状æ³èª¿æŸ»ï¼ˆãƒ­ãƒ¼ãƒ‰ã«å°‘ã—時間ãŒæŽ›ã‹ã‚Šã¾ã™ï¼‰'; $lang['submit'] = 'データé€ä¿¡'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/lt/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ + + */ +$lang['name'] = 'Populiarumo apklausa (gali užtrukti pakrovimas)'; +$lang['submit'] = 'Pateikti'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/mr/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/mr/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/mr/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/mr/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,8 @@ +====== लोकपà¥à¤°à¤¿à¤¯à¤¤à¤¾ फीडबॅक ====== +हे टूल तà¥à¤®à¤šà¥à¤¯à¤¾ विकी संबंधी माहिती गà¥à¤ªà¥à¤¤à¤ªà¤£à¥‡ गोळा करते आणि डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€à¤šà¥à¤¯à¤¾ निरà¥à¤®à¤¾à¤¤à¥à¤¯à¤¾à¤¨à¤¾ पाठवते. यादà¥à¤µà¤¾à¤°à¥‡ तà¥à¤¯à¤¾à¤‚ना डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€ पà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤· कशी वापरली जाते व तà¥à¤¯à¤¾à¤¨à¥à¤¸à¤¾à¤° पà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤· माहितीवर आधारित पà¥à¤¢à¥€à¤² सà¥à¤§à¤¾à¤°à¤£à¤¾ करणà¥à¤¯à¤¾à¤¸ मदत होते. + +तà¥à¤®à¥à¤¹à¥€ हे टूल ठराविक अंतराने परत वापरत राहिलà¥à¤¯à¤¾à¤¸ अधिक चांगले ,कारण तà¥à¤®à¤šà¥€ विकी जसजशी वाढेल तसे डेवलपर लोकाना तà¥à¤¯à¤¾à¤¬à¤¦à¥à¤¦à¤² माहिती कळणà¥à¤¯à¤¾à¤¸ मदत होइल. तà¥à¤®à¤šà¤¾ डेटा गà¥à¤ªà¥à¤¤ निरà¥à¤¦à¥‡à¤¶à¤•à¤¾à¤¦à¥à¤µà¤¾à¤°à¥‡ ओळखला जाइल. + +या डेटा मधे पà¥à¤¢à¥€à¤² पà¥à¤°à¤•à¤¾à¤°à¤šà¥€ माहिती असेल : तà¥à¤®à¤šà¥à¤¯à¤¾ डॉकà¥à¤¯à¥à¤µà¤¿à¤•à¥€à¤šà¥€ आवृतà¥à¤¤à¤¿, तà¥à¤¯à¤¾à¤¤à¥€à¤² पानांची संखà¥à¤¯à¤¾ व साइज़, इनà¥à¤¸à¥à¤Ÿà¥‰à¤² केलेले पà¥à¤²à¤—इन आणि तà¥à¤®à¤šà¥à¤¯à¤¾ PHP ची आवृतà¥à¤¤à¤¿. + +जो डेटा पà¥à¤°à¤¤à¥à¤¯à¤•à¥à¤· पाठवला जाइल तो खाली दाखवला आहे. "Send Data" बटन वर कà¥à¤²à¤¿à¤• करून हा डेटा पाठवा. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/mr/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/mr/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/mr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/mr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,3 +7,5 @@ * @author Padmanabh Kulkarni * @author shantanoo@gmail.com */ +$lang['name'] = 'लोकपà¥à¤°à¤¿à¤¯à¤¤à¤¾ फीडबॅक ( लोड होणà¥à¤¯à¤¾à¤¸ थोडा वेळ लागेल )'; +$lang['submit'] = 'माहीती पाठवा'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @author Wouter Schoot * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid Ã¥ laste)'; $lang['submit'] = 'Send data'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Grzegorz Å»ur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author SÅ‚awomir Boczek */ $lang['name'] = 'Informacja o popularnoÅ›ci (Å‚adowanie może zająć dÅ‚uższÄ… chwilÄ™)'; $lang['submit'] = 'WyÅ›lij dane'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,9 @@ +====== Retorno de Popularidade ====== + +Esta ferramenta junta dados anónimos sobre o seu wiki e permite estes sejam enviados para a equipa de desenvolvimento do DokuWiki. Isto ajuda-os a compreender como o DokuWiki é usado pelos seus utilizadores de forma a permitir que desenvolvimentos futuros sejam baseadas em estatísticas de uso real. + +Você é encorajado a repetir este passo regularmente para manter a equipa informada quando o seu wiki crescer. Os seus dados permanecerão sempre anónimos. + +Os dados colectados contêm informação como a versão do DokuWiki que você utiliza, o número e tamanho das suas páginas e ficheiros, os plugins instalados e informação sobre a sua instalação do PHP. + +Os dados que serão enviados são mostrados abaixo. Use o botão "Enviar Dados" para transferir a informação. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,5 +3,8 @@ * Portuguese language file * * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ +$lang['name'] = 'Retorno (feedback) de Popularidade (pode levar algum tempo a carregar)'; $lang['submit'] = 'Enviar Dados'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt-br/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt-br/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt-br/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt-br/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,9 +1,9 @@ ====== Retorno de Popularidade ====== -Essa ferramenta coleta dados anônimos acerca do seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. +Essa ferramenta coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real. -Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki crescer. Seus pacotes de dados repetidos serão identificados por uma identificação anônima. +Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki for alterado. Seus pacotes de dados repetidos serão categorizados por uma identificação anônima. -Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plugins instalados e informações sobre a sua instalação do PHP. +Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plug-ins instalados e informações sobre a sua instalação do PHP. Os dados brutos que serão enviados é mostrado abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,6 +10,8 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ $lang['name'] = 'Retorno de popularidade (pode demorar um pouco para carregar)'; $lang['submit'] = 'Enviar dados'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,9 @@ * Romanian language file * * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric AndraÈ™i + * @author Emanuel-Emeric AndraÅŸi + * @author Emanuel-Emeric Andrasi */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['name'] = 'Сбор информации о популÑрноÑти (Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ может потребоватьÑÑ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ времÑ)'; $lang['submit'] = 'Отправить данные'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,5 +3,6 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ $lang['submit'] = 'PoÅ¡lji'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Serbian language file * * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['name'] = 'Мерење популарноÑти (може потрајати док Ñе не учита)'; $lang['submit'] = 'Пошаљи податке'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,6 +7,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ -$lang['name'] = 'Popularitetsfeedback (det kan ta en stund att ladda sidan)'; +$lang['name'] = 'Popularitets-feedback (det kan ta en stund att ladda sidan)'; $lang['submit'] = 'Sänd data'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,10 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Kittithat Arnontavilas + */ +$lang['name'] = 'ส่งข้อมูลความนิยมà¸à¸¥à¸±à¸š (อาจใช้เวลาในà¸à¸²à¸£à¹‚หลด)'; +$lang['submit'] = 'ส่งข้อมูล'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/tr/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/tr/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/tr/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/tr/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ ====== Popülerlik Geribeslemesi ====== Bu araç wiki'niz hakkında genel bilgileri toplayarak bunları DokuWiki geliÅŸtiricilerine geri göndermenizi saÄŸlar. Böylece geliÅŸtiriciler DokuWiki'nin kullanıcılar tarafından nasıl kullanıldığını anlamalarını saÄŸlar ve ileride gerçek kullanım istatistiklerine göre geliÅŸtirme kararları verebilirler. - + Wiki'nizin büyümesiyle beraber bu bölümü zaman zaman çalıştırmanız geliÅŸtiricileri bilgilendirecektir. Tekrar gönderilen veriler anonim olarak gönderilecektir. Bu veriler DokuWiki sürümünü, sayısını, sayfaların ve dosyalarım büyüklüklerini, yüklü eklentileri ve PHP sürümünü içermektedir. diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['name'] = 'Popülerlik Geribeslemesi (yüklemesi uzun sürebilir)'; $lang['submit'] = 'Verileri Gönder'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/uk/intro.txt dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/uk/intro.txt --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/uk/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/uk/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,6 @@ Ви можете повторно відÑилати відгуки Ñ‡Ð°Ñ Ð²Ñ–Ð´ чаÑу, щоб повідомлÑти розробників про розвиток вашої ДокуВікі. Повторні відгуки будуть ідентифіковані по анонімному ID. -У зібраних даних Ñ” Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ верÑÑ–ÑŽ вошої ДокуВікі, кількіÑÑ‚ÑŒ Ñ– розмір Ñторінок в ній, вÑтановлені додатки Ñ– Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ PHP. +У зібраних даних Ñ” Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ верÑÑ–ÑŽ ДокуВікі, кількіÑÑ‚ÑŒ Ñ– розмір Ñторінок в ній, вÑтановлені додатки Ñ– Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ PHP. -Дані, Ñкі буде надіÑлано показано нижче. Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ– інформації натиÑніть будь-лаÑка кнопкуу "Передати дані" \ Brak znaku nowej linii na koÅ„cu pliku +Дані, Ñкі буде надіÑлано показано нижче. Ð”Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ñ– інформації натиÑніть будь-лаÑка кнопку "Передати дані" \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,9 @@ * Ukrainian language file * * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ -$lang['name'] = 'Відгук популÑрноÑÑ‚Ñ– (може занÑти деÑкий чаÑ)'; +$lang['name'] = 'Відгук популÑрноÑÑ‚Ñ– (може зайнÑти деÑкий чаÑ)'; $lang['submit'] = 'Передати дані'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,8 @@ * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['name'] = '人气å馈（载入å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ï¼‰'; $lang['submit'] = 'å‘é€æ•°æ®'; diff -Naur dokuwiki-2009-02-14/lib/plugins/popularity/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/popularity/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/popularity/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['name'] = '人氣å饋（載入å¯èƒ½éœ€è¦ä¸€äº›æ™‚間）'; -$lang['submit'] = 'å‘é€æ•°æ®'; +$lang['submit'] = '發é€æ•¸æ“š'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,5 @@ + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/bg/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/bg/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/bg/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/bg/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1,4 @@ ====== ВъзÑтановÑване ====== -Тази Ñтраница помага при автоматичното възÑтановÑване от Ñпам-атака. За да намерите ÑпиÑък ÑÑŠÑ Ñпамнати Ñтраници, въведете текÑÑ‚ за Ñ‚ÑŠÑ€Ñене(пр. Ñпам препратка), Ñлед това потвърдете, че намерените Ñтраници Ñа наиÑтина Ñпам и възÑтановете редакциите. +Тази Ñтраница помага при автоматичното възÑтановÑване от Ñпам-атака. За да намерите ÑпиÑък ÑÑŠÑ Ñпамнати Ñтраници, въведете текÑÑ‚ за Ñ‚ÑŠÑ€Ñене(пр. Ñпам препратка), Ñлед това потвърдете, че намерените Ñтраници Ñа наиÑтина Ñпам и възÑтановете редакциите. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/bg/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,12 +4,12 @@ * @author Nikolay Vladimirov * @author Nikolay Vladimirof */ -$lang['menu'] = 'ВъзÑтановÑване'; -$lang['filter'] = 'ТърÑене на Ñпамната Ñтраници'; -$lang['revert'] = 'Избрани Ñтраници за възÑтановÑване'; -$lang['reverted'] = '%s върнат до верÑÐ¸Ñ %s'; -$lang['removed'] = '%s премахнат'; -$lang['revstart'] = 'ПроцеÑÑŠÑ‚ на възÑтановÑване започна. Това може да отнеме много време. Ðко Ñкриптът Ñе проÑрочи преди да завърши, Ñ‚Ñ€Ñбва да възÑтановÑвате на по-малки парчета.'; -$lang['revstop'] = 'ПроцеÑÑŠÑ‚ на възÑтановÑване завърши уÑпешно.'; -$lang['note1'] = 'Забележка:за Ñ‚ÑŠÑ€Ñенето има значение малки/големи букви'; -$lang['note2'] = 'Забележка: Ñтраницата ще бъде възвърната без да Ñъдържа Ñпам терминът %s.'; +$lang['menu'] = 'ВъзÑтановÑване'; +$lang['filter'] = 'ТърÑене на Ñпамната Ñтраници'; +$lang['revert'] = 'Избрани Ñтраници за възÑтановÑване'; +$lang['reverted'] = '%s върнат до верÑÐ¸Ñ %s'; +$lang['removed'] = '%s премахнат'; +$lang['revstart'] = 'ПроцеÑÑŠÑ‚ на възÑтановÑване започна. Това може да отнеме много време. Ðко Ñкриптът Ñе проÑрочи преди да завърши, Ñ‚Ñ€Ñбва да възÑтановÑвате на по-малки парчета.'; +$lang['revstop'] = 'ПроцеÑÑŠÑ‚ на възÑтановÑване завърши уÑпешно.'; +$lang['note1'] = 'Забележка:за Ñ‚ÑŠÑ€Ñенето има значение малки/големи букви'; +$lang['note2'] = 'Забележка: Ñтраницата ще бъде възвърната без да Ñъдържа Ñпам терминът %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-va/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-va/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-va/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-va/intro.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -====== Gestor de reversions ====== - -Esta pàgina ajuda en la reversió automàtica d'atacs de spam. Per a -trobar una llista de pàgines que tinguen spam introduïxca una cadena de busca -(p.e. una URL de spam), confirme que les pàgines trobades tenen realment -spam i revertixca les edicions. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -%s.'; - -//Setup VIM: ex: et ts=4 enc=utf-8 : diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-valencia/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-valencia/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-valencia/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-valencia/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +====== Gestió de reversions ====== + +Esta pàgina vos ajuda a revertir automàticament els canvis que siguen producte d'un atac amb brossa. Per trobar la llista de pàgines atacades, cerqueu una cadena adequada (p. ex. un URL de propaganda), confirmeu que les pàgines trobades contenen realment brossa i llavors revertiu-les a revisions anteriors. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-valencia/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ca-valencia/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ca-valencia/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,16 @@ + + * @author Bernat Arlandis + */ +$lang['menu'] = 'Gestió de reversions'; +$lang['filter'] = 'Cerca pàgines brossa'; +$lang['revert'] = 'Reverteix les pàgines seleccionades'; +$lang['reverted'] = 'S\'ha revertit %s a la revisió %s'; +$lang['removed'] = 'S\'ha suprimit %s'; +$lang['revstart'] = 'S\'ha iniciat el procés de reversió. Això pot trigar una bona estona. Si s\'excedeix el temps d\'espera màxim del servidor, haureu de tornar a intentar-ho per parts.'; +$lang['revstop'] = 'El procés de reversió ha acabat amb èxit.'; +$lang['note1'] = 'Nota: esta cerca distingeix entre majúscules i minúscules.'; +$lang['note2'] = 'Nota: la pàgina es revertirà a la darrera versió que no continga el terme brossa especificat %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * * @author Bohumir Zamecnik * @author Zbynek Krivka + * @author tomas@valenta.cz */ $lang['menu'] = 'Obnova zaspamovaných stránek'; $lang['filter'] = 'Hledat zaspamované stránky'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/da/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/da/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/da/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/da/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ -===== Gendannelses Manager ===== +===== Gendannelsesstyring ===== -Denne side hjælper dig med at automatisk gendande revisioner efter et spam angreb. For at finde en liste af sider med mulig spam sÃ¥ skriv en søge streng (for eksempel. et spam URL), ogsÃ¥ bekræft at de funde sider virkelig er spam og gendan ændringerne. \ Brak znaku nowej linii na koÅ„cu pliku +Denne side hjælper dig med at gendanne sider efter et angreb af uønskede indlæg. For at finde en liste af sider, der muligvis er blevet ændret, sÃ¥ skriv en søgestreng (for eksempel. en uønsket netadresse) og bekræft, at de fundne sider virkeligt er uønskede og gendan ændringerne. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,13 +4,16 @@ * * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ -$lang['menu'] = 'Gendannelses Manager'; -$lang['filter'] = 'Søg efter sider som ligner spam'; +$lang['menu'] = 'Gendannelsesstyring'; +$lang['filter'] = 'Søg efter uønskede sider'; $lang['revert'] = 'Gendan valgte sider'; -$lang['reverted'] = '%s gendandet til revision %s'; +$lang['reverted'] = '%s gendannet til ændring %s'; $lang['removed'] = '%s fjernet'; -$lang['revstart'] = 'Gendannelses processen er startet. Dette kan tage et stykke tid. Hvis scriptet giver time out før processen færdiggøres, skal du gendanne i mindre dele.'; -$lang['revstop'] = 'Gendannelses processen fuldført med success'; -$lang['note1'] = 'Note: der er forkel pÃ¥ store og smÃ¥ bogstaver i søgningen'; -$lang['note2'] = 'Note: denne side vil blive gendandet til den seneste version der ikke indeholder det givne spam udtryk %s.'; +$lang['revstart'] = 'Gendannelsesforløbet er startet. Dette kan tage et stykke tid. Hvis kodefilen giver "time out" før processen færdiggøres, skal du gendanne i mindre dele.'; +$lang['revstop'] = 'Gendannelsesforløbet fuldført uden fejl'; +$lang['note1'] = 'Bemærk: Der er forskel pÃ¥ store og smÃ¥ bogstaver i søgningen'; +$lang['note2'] = 'Bemærk: Denne side vil blive gendannet til den seneste udgave, der ikke indeholder det givne uønskede udtryk %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/de/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/de/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== Seiten wieder herstellen ====== -Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam Angriff. Geben Sie zunächst einen Suchbegriff (z.B. eine Spam URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wieder herstellen. +Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Geben Sie zunächst einen Suchbegriff (z.B. eine Spam URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem Sie sich vergewissert haben, dass die gefundenen Seiten wirklich Spam enthalten, können Sie die Seiten wieder herstellen. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,9 @@ * @author Robin Kluth * @author Arne Pelka * @author Andreas Gohr + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['menu'] = 'Seiten wieder herstellen'; $lang['filter'] = 'Nach betroffenen Seiten suchen'; @@ -17,4 +20,4 @@ $lang['revstart'] = 'Wiederherstellung gestartet. Dies kann einige Zeit dauern. Wenn das Script abbricht, bevor alle Seiten wieder hergestellt wurden, reduzieren Sie die Anzahl der Seiten und wiederholen Sie den Vorgang.'; $lang['revstop'] = 'Wiederherstellung erfolgreich abgeschlossen.'; $lang['note1'] = 'Anmerkung: diese Suche unterscheidet Groß- und Kleinschreibung'; -$lang['note2'] = 'Anmerkung: die Seite wird zur letzten Version die nicht den angegebenen Spam Begriff %s enthält wieder hergestellt.'; +$lang['note2'] = 'Anmerkung: die Seite wird zur letzten Version, die nicht den angegebenen Spam Begriff %s enthält, wieder hergestellt.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,14 @@ + + * @author Juergen Schwarzer + */ +$lang['menu'] = 'Zurückstellungsmanager'; +$lang['revert'] = 'Stelle ausgewählte Seiten zurück.'; +$lang['removed'] = '%s entfernt'; +$lang['revstart'] = 'Zurückstellungsprozess gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stopt, sollten Sie es in kleineren Stücken versuchen.'; +$lang['revstop'] = 'Zurückstellungsprozess erfolgreich beendet.'; +$lang['note1'] = 'Beachte: Diese Suche berücksichtigt Gross- und Kleinschreibung'; +$lang['note2'] = 'Beachte: Diese Seite wid zurückgestellt auf die letzte Version, die nicht den Spam-Ausdruck %s enthält.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/el/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,15 +7,14 @@ * * @author Thanos Massias * @author Αθανάσιος Îταής + * @author Konstantinos Koryllos */ $lang['menu'] = 'Αποκατάσταση κακόβουλων αλλαγών σελίδων'; $lang['filter'] = 'Αναζήτηση σελίδων που πεÏιέχουν spam'; $lang['revert'] = 'ΕπαναφοÏά παλαιότεÏων εκδόσεων των επιλεγμένων σελίδων'; $lang['reverted'] = 'Η σελίδα %s επεναφέÏθηκε στην έκδοση %s'; $lang['removed'] = 'Η σελίδα %s διαγÏάφηκε'; -$lang['revstart'] = 'Η διαδικασία αποκατάστασης άÏχισε. Αυτό ίσως πάÏει αÏκετό χÏόνο. - Εάν η εφαÏμογή υπεÏβεί το διαθέσιμο χÏονικό ÏŒÏιο και τεÏματιστεί - Ï€Ïιν τελειώσει, θα χÏειαστεί να επαναλάβετε αυτή τη διαδικασία για μικÏότεÏα τμήματα.'; +$lang['revstart'] = 'Η διαδικασία αποκατάστασης άÏχισε. Αυτό ίσως πάÏει αÏκετό χÏόνο. Εάν η εφαÏμογή υπεÏβεί το διαθέσιμο χÏονικό ÏŒÏιο και τεÏματιστεί Ï€Ïιν τελειώσει, θα χÏειαστεί να επαναλάβετε αυτή τη διαδικασία για μικÏότεÏα τμήματα.'; $lang['revstop'] = 'Η διαδικασία αποκατάστασης ολοκληÏώθηκε με επιτυχία.'; $lang['note1'] = '
    Σημείωση: η αναζήτηση επηÏεάζεται από το εάν οι χαÏακτήÏες είναι πεζοί ή κεφαλαίοι'; $lang['note2'] = '
    Σημείωση: η σελίδα θα επαναφεÏθεί στην πλέον Ï€Ïόσφατη έκδοση που δεν πεÏιέχει τον ÏŒÏο %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/eo/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/eo/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/eo/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/eo/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== Administro de Restarigo ====== -Tiu cxi paÄo helpas vin pri aÅ­tomata restarigo el spama atako. Por trovi liston de spamecaj paÄoj, unue mendu serĉan liter-ĉenon (ekz. spama URL), do konfirmu, ke la trovitaj pagxoj fakte estas spamaj kaj restarigu la antaÅ­ajn versiojn bonajn. +Tiu ĉi paÄo helpas vin pri aÅ­tomata restarigo el spama atako. Por trovi liston de spamecaj paÄoj, unue mendu serĉan liter-ĉenon (ekz. spama URL), do konfirmu, ke la trovitaj paÄoj fakte estas spamaj kaj restarigu la antaÅ­ajn versiojn bonajn. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,8 +6,12 @@ * @author Felipe Castro * @author Felipe Castro * @author Felipo Kastro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ -$lang['menu'] = 'Administrado de Restarigo'; +$lang['menu'] = 'Administrado de restarigo'; $lang['filter'] = 'Serĉi spamecajn paÄojn'; $lang['revert'] = 'Restarigi la elektitajn paÄojn'; $lang['reverted'] = '%s estas restarigita al revizio %s'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,12 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ $lang['menu'] = 'Restaurador'; $lang['filter'] = 'Buscar páginas con spam'; @@ -17,5 +23,5 @@ $lang['removed'] = '%s borrado'; $lang['revstart'] = 'El proceso de restaurado ha comenzado. Puede llevar bastante tiempo. Si el script se para antes de acabar, deberías restaurar cadenas más pequeñas.'; $lang['revstop'] = 'El proceso de restaurado ha finalizado satisfactoriamente.'; -$lang['note1'] = 'Nota: la búsqueda diferencia mayúsculas de minúsculas (case sensitive)'; +$lang['note1'] = 'Nota: la búsqueda diferencia entre mayúsculas y minúsculas.'; $lang['note2'] = 'Nota: la página será restaurada a la última versión que no tenga el término de spam dado %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['menu'] = 'مدیریت برگشت‌ها'; $lang['filter'] = 'جستجوی صÙحات اسپم شده'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * * @author otto@valjakko.net * @author Otto Vainio + * @author Teemu Mattila */ $lang['menu'] = 'Palautuksenhallinta'; $lang['filter'] = 'Etsi spammattyjä sivuja'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -7,8 +7,11 @@ * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ -$lang['menu'] = 'Gestion des réversions'; +$lang['menu'] = 'Gestionnaire de réversions'; $lang['filter'] = 'Trouver les pages spammées '; $lang['revert'] = 'Annuler les éditions sélectionnées'; $lang['reverted'] = '%s restauré à la révision %s'; @@ -16,4 +19,4 @@ $lang['revstart'] = 'Processus de réversion démarré. Ceci peut prendre longtemps. Si le script dépasse le délai avant de terminer, vous devrez restaurer de plus petits groupes de pages.'; $lang['revstop'] = 'Processus de réversion terminé avec succès.'; $lang['note1'] = 'Note : cette recherche est insensible à la casse'; -$lang['note2'] = 'Note: cette page sera révisée à la version précédente ne contenant pas le terme spammeur %s'; +$lang['note2'] = 'Note: cette page sera révisée à la version précédente ne contenant pas le terme spammeur %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/gl/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/gl/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/gl/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/gl/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ -====== Xestor de Reversión ====== +====== Xestor de recuperación ====== -Esta páxina axudarache a revertir automaticamente un ataque de spam. Para atopar unha lista de páxina que conteñan spam, primeiro debes inserir unha cadea de procura (p.e. un URL de spam), e logo confirmar que as páxinas atopadas conteñen realmente spam e reverter as edicións. \ Brak znaku nowej linii na koÅ„cu pliku +Esta páxina axudarao a se recuperar automaticamente dun ataque de spam. Para encontrar unha listaxe de páxinas que conteñan spam, primeiro debe inserir unha cadea de procura (por ex. un URL de spam) e despois confirmar que as páxinas encontradas conteñen realmente spam, antes de reverter as edicións. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,13 +3,15 @@ * Galicianlanguage file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['menu'] = 'Xestor de Reversión'; +$lang['menu'] = 'Xestor de recuperación'; $lang['filter'] = 'Procurar páxinas con spam'; -$lang['revert'] = 'Revertir as páxinas seleccionadas'; -$lang['reverted'] = '%s revertido á revisión %s'; -$lang['removed'] = '%s eliminado'; -$lang['revstart'] = 'Proceso de reversión iniciado. Isto podería demorar un anaco longo. Se o script falla por superar o seu límite de tempo denantes de rematar, terás que facer a reversión en anacos máis pequenos.'; -$lang['revstop'] = 'O proceso de reversión rematou correctamente.'; -$lang['note1'] = 'Nota: esta procura distingue entre maiúsculas e minúsculas'; -$lang['note2'] = 'Nota: a páxina revertirase á última versión que non conteña o termo de spam %s indicado.'; +$lang['revert'] = 'Recuperar as páxinas seleccionadas'; +$lang['reverted'] = '%s foi revertida á revisión %s'; +$lang['removed'] = '%s foi eliminada'; +$lang['revstart'] = 'O proceso de recuperación foi iniciado. Isto podería demorar un certo tempo. Se o script falla por ter superado o seu límite de tempo antes de rematar, terá que efectuar a recuperación sobre fragmentos máis pequenos.'; +$lang['revstop'] = 'O proceso de recuperación rematou correctamente.'; +$lang['note1'] = 'Nota: Esta procura distingue entre maiúsculas e minúsculas'; +$lang['note2'] = 'Nota: A páxina será revertida á última versión que non conteña o termo de spam %s indicado.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,8 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['menu'] = 'Visszaállítás kezelÅ‘ (anti-SPAM)'; $lang['filter'] = 'SPAM tartalmú oldalak keresése'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,10 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['removed'] = '%s eytt'; +$lang['note1'] = 'Athugaðu að þegar leitað er þá skiftir stafsetur máli, það að segja leitarvélin gerir mun á hástöfum og lágstöfum'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['menu'] = 'Gestore di ripristini'; $lang['filter'] = 'Cerca pagine con spam'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * japanese language file * @author Yuji Takenaka * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['menu'] = '復元管ç†'; $lang['filter'] = 'スパムをå—ã‘ãŸãƒšãƒ¼ã‚¸ã‚’検索'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ko/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ko/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ko/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ko/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== 복구 ê´€ë¦¬ìž ====== -스팸 공격으로 부터 ìžë™ìœ¼ë¡œ ë³µêµ¬í•˜ëŠ”ë° ì´íŽ˜ì´ì§€ëŠ” ë„ì›€ì´ ë  ìˆ˜ 있습니다. 스팸 ê³µê²©ë°›ì€ íŽ˜ì´ì§€ 목ë¡ì„ 찾으려면 문ìžì—´ì„ 입력하기 ë°”ëžë‹ˆë‹¤(예. 스팸 URL), ê·¸ 후 ê²€ìƒ‰ëœ íŽ˜ì´ì§€ë“¤ì´ 스팸 공격받았는지 확ì¸í•˜ê³  복구합니다. +스팸 공격으로 부터 ìžë™ìœ¼ë¡œ ë³µêµ¬í•˜ëŠ”ë° ì´íŽ˜ì´ì§€ëŠ” ë„ì›€ì´ ë  ìˆ˜ 있습니다. 스팸 ê³µê²©ë°›ì€ íŽ˜ì´ì§€ 목ë¡ì„ 찾으려면 문ìžì—´ì„ 입력하기 ë°”ëžë‹ˆë‹¤(예. 스팸 URL), ê·¸ 후 ê²€ìƒ‰ëœ íŽ˜ì´ì§€ë“¤ì´ 스팸 공격받았는지 확ì¸í•˜ê³  복구합니다. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/lt/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/lv/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/lv/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/lv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/lv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -12,4 +12,4 @@ $lang['revstart'] = 'AtjaunoÅ¡ana uzsÄkta. Tas var aizņemt ilgÄku laiku. Ja darbÄ«ba pÄrtrÅ«kst noilguma dēļ, atjaunoÅ¡ana jÄveic pa mazÄkÄm porcijÄm.'; $lang['revstop'] = 'AtjaunoÅ¡ana veiksmÄ«gi pabeigta. '; $lang['note1'] = 'IevÄ“ro: MeklÄ“Å¡ana atÅ¡Ä·ir lielos un mazos burtus.'; -$lang['note2'] = 'IevÄ“ro: LApu atjaunos ar pÄ“dÄ“jo verisjau, kas nesatur uzdoto spama vÄrdu %s.'; +$lang['note2'] = 'IevÄ“ro: Lapu atjaunos ar pÄ“dÄ“jo versiju, kas nesatur uzdoto spama vÄrdu %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/mr/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/mr/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/mr/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/mr/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,5 +1,5 @@ ====== फेरबदल वà¥à¤¯à¤µà¤¸à¥à¤¥à¤¾à¤ªà¤• ====== हà¥à¤¯à¤¾ पानादà¥à¤µà¤¾à¤°à¥‡ तà¥à¤®à¥à¤¹à¥€ भंकस हलà¥à¤²à¥à¤¯à¤¾à¤¦à¥à¤µà¤¾à¤°à¥‡ à¤à¤¾à¤²à¥‡à¤²à¥‡ बदल आपोआप फेरबदल करू शकता. -भंकस पानांची यादी बनवणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ पà¥à¤°à¤¥à¤® à¤à¤–ादा शबà¥à¤¦à¤¸à¤®à¥‚ह टाका ( उदा. à¤à¤–ादं भंकस URL ), +भंकस पानांची यादी बनवणà¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ पà¥à¤°à¤¥à¤® à¤à¤–ादा शबà¥à¤¦à¤¸à¤®à¥‚ह टाका ( उदा. à¤à¤–ादं भंकस URL ), मग जी पाने सापडतील टी भंकस असलà¥à¤¯à¤¾à¤šà¥‡ नकà¥à¤•à¥€ करा आणि तà¥à¤¯à¤¾à¤¤à¥€à¤² बदल रदà¥à¤¦ करा. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,9 @@ * @author John de Graaff * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * @author Grzegorz Å»ur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author SÅ‚awomir Boczek */ $lang['menu'] = 'Menadżer przywracania'; $lang['filter'] = 'Wyszukaj uszkodzone strony'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,8 @@ * * @author José Monteiro * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ $lang['menu'] = 'Gestor de Reversões'; $lang['filter'] = 'Pesquisar por páginas "spammy"'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,8 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ $lang['menu'] = 'Gerenciador de reversões'; $lang['filter'] = 'Procura por páginas com spam'; @@ -19,5 +21,5 @@ $lang['removed'] = '% removida'; $lang['revstart'] = 'O processo de reversão foi iniciado. Isso pode levar muito tempo. Se o tempo de execução do script expirar antes dele encerrar, você deverá tentar novamente usando blocos menores.'; $lang['revstop'] = 'O processo de reversão terminou com sucesso.'; -$lang['note1'] = 'Nota: a busca diferencia maiúsculas/minúsculas'; +$lang['note1'] = 'Nota: esta busca diferencia maiúsculas/minúsculas'; $lang['note2'] = 'Nota: a página será revertida para a última versão que não contém o termo de spam %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @author Sergiu Baltariu * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric AndraÈ™i + * @author Emanuel-Emeric AndraÅŸi + * @author Emanuel-Emeric Andrasi */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ru/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ru/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ru/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ru/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== Менеджер откаток ====== -Эта Ñтраница поможет вам в автоматичеÑкой откатке изменений поÑле Ñпам-атаки. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы найти Ñпам-Ñтраницы, введите ключевые Ñлова и произведите поиÑк (например, по URL Ñпаммера). Затем убедитеÑÑŒ, что найденные Ñтраницы дейÑтвительно Ñодержат Ñпам, и Ñделайте откатку изменений. +Эта Ñтраница поможет вам в автоматичеÑкой откатке изменений поÑле Ñпам-атаки. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы найти Ñпам-Ñтраницы, введите ключевые Ñлова и произведите поиÑк (например, по URL Ñпаммера). Затем убедитеÑÑŒ, что найденные Ñтраницы дейÑтвительно Ñодержат Ñпам, и Ñделайте откатку изменений. diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['menu'] = 'Менеджер откаток'; $lang['filter'] = 'ПоиÑк Ñпам-Ñтраниц'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,4 +3,5 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Serbian language file * * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['menu'] = 'Управљач за враћање'; $lang['filter'] = 'Претрага Ñпам Ñтраница'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ $lang['menu'] = 'Hantera Ã¥terställningar'; $lang['filter'] = 'Sök efter spamsidor'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/th/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/th/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/th/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/th/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,3 @@ +====== ตัวจัดà¸à¸²à¸£à¸à¸¹à¹‰à¸„ืนสภาพเอà¸à¸ªà¸²à¸£ ====== + +หน้านี้จะช่วยคุณด้วยà¸à¸²à¸£à¸à¸¹à¹‰à¸„ืนหน้าที่ถูà¸à¹à¸ªà¸›à¸¡à¹‚ดยอัตโนมัติ เพื่อที่จะค้นหารายà¸à¸²à¸£à¸«à¸™à¹‰à¸²à¸—ี่ถูà¸à¸ªà¹à¸›à¸¡ อันดับà¹à¸£à¸à¹ƒà¸«à¹‰à¸à¸£à¸­à¸à¸‚้อความสืบค้น (เช่น URL เว็บโฆษณาที่มาสà¹à¸›à¸¡à¹„ว้), จาà¸à¸™à¸±à¹‰à¸™à¹ƒà¸«à¹‰à¸¢à¸·à¸™à¸¢à¸±à¸™à¸§à¹ˆà¸²à¹€à¸žà¸ˆà¸—ี่พบนั้นถูà¸à¸ªà¹à¸›à¸¡à¸ˆà¸£à¸´à¸‡à¹† à¹à¸¥à¹‰à¸§à¸ˆà¸¶à¸‡à¸ªà¸±à¹ˆà¸‡à¸„ืนสภาพต้นฉบับ \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,18 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Arthit Suriyawongkul + * @author Kittithat Arnontavilas + */ +$lang['menu'] = 'ตัวจัดà¸à¸²à¸£à¸„ืนสภาพเอà¸à¸ªà¸²à¸£à¸‰à¸šà¸±à¸šà¹€à¸”ิม'; +$lang['filter'] = 'ค้นหาเพจที่ถูà¸à¹à¸ªà¸›à¸¡'; +$lang['revert'] = 'คืนสภาพเพจที่เลือà¸à¹„ว้'; +$lang['reverted'] = 'คืนสภาพ %s à¸à¸¥à¸±à¸šà¹„ปเป็นฉบับ %s'; +$lang['removed'] = 'ถอดทิ้ง %s'; +$lang['revstart'] = 'à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¸„ืนสภาพได้เริ่มต้นà¹à¸¥à¹‰à¸§ นี่อาจต้องใช้เวลานาน ถ้าหมดเวลาที่à¸à¸³à¸«à¸™à¸”สำหรับสคริปต์à¸à¹ˆà¸­à¸™à¸—ี่จะสำเร็จ คุณต้องไปทำà¸à¸²à¸£à¹à¸šà¹ˆà¸‡à¸‚้อมูลให้เล็à¸à¸¥à¸‡à¹€à¸žà¸·à¹ˆà¸­à¸à¸²à¸£à¸„ืนสภาพทีละส่วน'; +$lang['revstop'] = 'à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¸„ืนสภาพสำเร็จเรียบร้อย'; +$lang['note1'] = 'คำเตือน: à¸à¸²à¸£à¸„้นนี้นับตัวพิมพ์ใหà¸à¹ˆà¹€à¸¥à¹‡à¸ (case sensitive)'; +$lang['note2'] = 'คำเตือน: เพจจะถูà¸à¸„ืนสภาพไปยังรุ่นล่าสุดที่ไม่มีประโยคสà¹à¸›à¸¡à¸™à¸µà¹‰ %s.'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['menu'] = 'Eskiye Döndürme'; $lang['filter'] = 'Spam bulunan sayfaları ara'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/uk/intro.txt dokuwiki-rc2009-12-02/lib/plugins/revert/lang/uk/intro.txt --- dokuwiki-2009-02-14/lib/plugins/revert/lang/uk/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/uk/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1,3 +1,3 @@ ====== Менеджер Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ====== -Ð¦Ñ Ñторінка дозволÑÑ” вам автоматично відновлюватиÑÑ Ð¿Ñ–ÑÐ»Ñ ÑпамерÑьких атак. Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑпиÑку зіпÑутих Ñторінок Ñпочатку введіть Ñ€Ñдок (напр. ÑпамерÑьку ÑÑилку), а потім підтвердіть, що знайдена Ñторінка дійÑно Ñ” Ñпамом Ñ– відновіть редагуваннÑ. \ Brak znaku nowej linii na koÅ„cu pliku +Ð¦Ñ Ñторінка дозволÑÑ” вам автоматично відновлюватиÑÑ Ð¿Ñ–ÑÐ»Ñ ÑпамерÑьких атак. Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑпиÑку зіпÑутих Ñторінок Ñпочатку введіть Ñ€Ñдок (напр. ÑпамерÑьке поÑиланнÑ), а потім підтвердіть, що знайдена Ñторінка дійÑно Ñ” Ñпамом Ñ– відновіть редагуваннÑ. \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,9 @@ * Ukrainian language file * * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ $lang['menu'] = 'Менеджер відновленнÑ'; $lang['filter'] = 'Пошук Ñпамних Ñторінок'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,8 @@ * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['menu'] = '还原管ç†å™¨'; $lang['filter'] = 'æœç´¢åŒ…å«åžƒåœ¾ä¿¡æ¯çš„页é¢'; diff -Naur dokuwiki-2009-02-14/lib/plugins/revert/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/revert/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/revert/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/revert/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['menu'] = '還原管ç†'; $lang['filter'] = 'æœç´¢åŒ…å«åžƒåœ¾ä¿¡æ¯çš„é é¢'; diff -Naur dokuwiki-2009-02-14/lib/plugins/syntax.php dokuwiki-rc2009-12-02/lib/plugins/syntax.php --- dokuwiki-2009-02-14/lib/plugins/syntax.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/syntax.php 2009-12-02 19:50:12.000000000 +0100 @@ -36,7 +36,10 @@ * url - Website with more information on the plugin (eg. syntax description) */ function getInfo(){ - trigger_error('getType() not implemented in '.get_class($this), E_USER_WARNING); + $parts = explode('_',get_class($this)); + $info = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt'; + if(@file_exists($info)) return confToHash($info); + trigger_error('getInfo() not implemented in '.get_class($this).' and '.$info.' not found', E_USER_WARNING); } /** diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/admin.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/admin.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/admin.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/admin.php 2009-12-02 19:50:12.000000000 +0100 @@ -323,14 +323,16 @@ $disabled = $cando ? '' : ' disabled="disabled"'; echo str_pad('',$indent); + $fieldtype = ($name == "userpass") ? 'password' : 'text'; + echo ""; echo ""; echo ""; if($cando){ - echo ""; + echo ""; }else{ echo ""; - echo ""; + echo ""; } echo ""; echo ""; @@ -356,16 +358,43 @@ list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(); if (empty($user)) return false; - if (empty($pass)){ - if(!empty($_REQUEST['usernotify'])){ - $pass = auth_pwgen(); - } else { + + if ($this->_auth->canDo('modPass')){ + if (empty($pass)){ + if(!empty($_REQUEST['usernotify'])){ + $pass = auth_pwgen(); + } else { + msg($this->lang['add_fail'], -1); + return false; + } + } + } else { + if (!empty($pass)){ + msg($this->lang['add_fail'], -1); return false; } } - if (empty($name) || empty($mail)){ - msg($this->lang['add_fail'], -1); - return false; + + if ($this->_auth->canDo('modName')){ + if (empty($name)){ + msg($this->lang['add_fail'], -1); + return false; + } + } else { + if (!empty($name)){ + return false; + } + } + + if ($this->_auth->canDo('modMail')){ + if (empty($mail)){ + msg($this->lang['add_fail'], -1); + return false; + } + } else { + if (!empty($mail)){ + return false; + } } if ($ok = $this->_auth->triggerUserMod('create', array($user,$pass,$name,$mail,$grps))) { diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/af/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/af/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/af/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/af/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,14 @@ + */ +$lang['user_id'] = 'اسم المستخدم'; +$lang['user_pass'] = 'كلمة السر'; +$lang['user_name'] = 'الاسم الحقيقي'; +$lang['user_mail'] = 'البريد الالكتروني'; +$lang['user_groups'] = 'المجموعات'; +$lang['field'] = 'حقل'; +$lang['value'] = 'القيمة'; +$lang['add'] = 'إضاÙØ©'; +$lang['delete'] = 'حذÙ'; +$lang['delete_selected'] = 'حذ٠المختار'; +$lang['edit'] = 'تحرير'; +$lang['modify'] = 'Ø­Ùظ التعديلات'; +$lang['search'] = 'بحث'; +$lang['update_exists'] = 'لقد Ùشل تغيير اسم المستخدم , اسم المستخدم المحدد (%s) غير متاح . ( سيتم تطبيق أي تغييرات أخرى )'; +$lang['start'] = 'ابدأ'; +$lang['prev'] = 'السابق'; +$lang['next'] = 'التالي'; +$lang['last'] = 'الأخير'; +$lang['add_ok'] = 'تم بنجاح ضاÙØ© الحساب'; +$lang['add_fail'] = 'Ùشلت إضاÙØ© الحساب'; +$lang['notify_ok'] = 'تم إرسال رسالة الإشعار'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/bg/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/bg/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/bg/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/bg/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,43 +5,43 @@ * @author Nikolay Vladimirov * @author Nikolay Vladimirof */ -$lang['menu'] = 'Управление на потребителите'; -$lang['noauth'] = '(идентифицирането на потребителите е недоÑтъпно)'; -$lang['nosupport'] = '(не Ñе поддържа управление на потребители)'; -$lang['badauth'] = 'невалиден механизъм при идентификациÑ'; -$lang['user_id'] = 'Потребител'; -$lang['user_pass'] = 'Парола'; -$lang['user_name'] = 'ИÑтинÑко име'; -$lang['user_mail'] = 'E-поща'; -$lang['user_groups'] = 'Група'; -$lang['field'] = 'Поле'; -$lang['value'] = 'СтойноÑÑ‚'; -$lang['add'] = 'ДобавÑне'; -$lang['delete'] = 'Изтриване'; -$lang['delete_selected'] = 'Изтриване на избраните'; -$lang['edit'] = 'Редактиране'; -$lang['edit_prompt'] = 'Редактиране на потребителÑ'; -$lang['modify'] = 'Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° промените'; -$lang['search'] = 'ТърÑене'; -$lang['search_prompt'] = 'ТърÑене'; -$lang['clear'] = 'ОбновÑване на Ñ‚ÑŠÑ€Ñенето'; -$lang['filter'] = 'Филтър'; -$lang['summary'] = 'Показване на потребители %1$d-%2$d от %3$d намерени. %4$d потребители общо.'; -$lang['nonefound'] = 'ÐÑма намерени потребители. %d потребители общо'; -$lang['delete_ok'] = '%d потребители изтрити'; -$lang['delete_fail'] = '%d не бÑха изтрити'; -$lang['update_ok'] = 'ОбновÑването на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ уÑпешно'; -$lang['update_fail'] = 'ОбновÑването на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ неуÑпешно'; -$lang['update_exists'] = 'СмÑната на потребителÑкото име бе невъзможна,оказаното потребителÑко име (%s) вече ÑъщеÑтвува (вÑÑкакви други промени ще бъдат приложени).'; -$lang['start'] = 'начало'; -$lang['prev'] = 'предно'; -$lang['next'] = 'Ñледващо'; -$lang['last'] = 'поÑледно'; -$lang['edit_usermissing'] = 'ИзбраниÑÑ‚ потребител не бе намерен, оказаното потребителÑко име може да е изтрито или променено другаде.'; -$lang['user_notify'] = 'ОÑведомÑване на потребителÑ'; -$lang['note_notify'] = 'ОÑведомителната e-поща Ñе праща Ñамо, ако на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ðµ дадена нова парола.'; -$lang['note_group'] = 'Ðовите потребители ще бъдат добавÑни към групата (%s) ако не бъде поÑочена друга.'; -$lang['add_ok'] = 'ДобавÑнето на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ уÑпешно'; -$lang['add_fail'] = 'ДобавÑнето на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ неуÑпешно'; -$lang['notify_ok'] = 'ОÑведомително е-пиÑмо бе пратено'; -$lang['notify_fail'] = 'Пращането на оÑведомително е-пиÑмо е невъзможно'; +$lang['menu'] = 'Управление на потребителите'; +$lang['noauth'] = '(идентифицирането на потребителите е недоÑтъпно)'; +$lang['nosupport'] = '(не Ñе поддържа управление на потребители)'; +$lang['badauth'] = 'невалиден механизъм при идентификациÑ'; +$lang['user_id'] = 'Потребител'; +$lang['user_pass'] = 'Парола'; +$lang['user_name'] = 'ИÑтинÑко име'; +$lang['user_mail'] = 'E-поща'; +$lang['user_groups'] = 'Група'; +$lang['field'] = 'Поле'; +$lang['value'] = 'СтойноÑÑ‚'; +$lang['add'] = 'ДобавÑне'; +$lang['delete'] = 'Изтриване'; +$lang['delete_selected'] = 'Изтриване на избраните'; +$lang['edit'] = 'Редактиране'; +$lang['edit_prompt'] = 'Редактиране на потребителÑ'; +$lang['modify'] = 'Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° промените'; +$lang['search'] = 'ТърÑене'; +$lang['search_prompt'] = 'ТърÑене'; +$lang['clear'] = 'ОбновÑване на Ñ‚ÑŠÑ€Ñенето'; +$lang['filter'] = 'Филтър'; +$lang['summary'] = 'Показване на потребители %1$d-%2$d от %3$d намерени. %4$d потребители общо.'; +$lang['nonefound'] = 'ÐÑма намерени потребители. %d потребители общо'; +$lang['delete_ok'] = '%d потребители изтрити'; +$lang['delete_fail'] = '%d не бÑха изтрити'; +$lang['update_ok'] = 'ОбновÑването на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ уÑпешно'; +$lang['update_fail'] = 'ОбновÑването на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ неуÑпешно'; +$lang['update_exists'] = 'СмÑната на потребителÑкото име бе невъзможна,оказаното потребителÑко име (%s) вече ÑъщеÑтвува (вÑÑкакви други промени ще бъдат приложени).'; +$lang['start'] = 'начало'; +$lang['prev'] = 'предно'; +$lang['next'] = 'Ñледващо'; +$lang['last'] = 'поÑледно'; +$lang['edit_usermissing'] = 'ИзбраниÑÑ‚ потребител не бе намерен, оказаното потребителÑко име може да е изтрито или променено другаде.'; +$lang['user_notify'] = 'ОÑведомÑване на потребителÑ'; +$lang['note_notify'] = 'ОÑведомителната e-поща Ñе праща Ñамо, ако на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ðµ дадена нова парола.'; +$lang['note_group'] = 'Ðовите потребители ще бъдат добавÑни към групата (%s) ако не бъде поÑочена друга.'; +$lang['add_ok'] = 'ДобавÑнето на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ уÑпешно'; +$lang['add_fail'] = 'ДобавÑнето на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð±Ðµ неуÑпешно'; +$lang['notify_ok'] = 'ОÑведомително е-пиÑмо бе пратено'; +$lang['notify_fail'] = 'Пращането на оÑведомително е-пиÑмо е невъзможно'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/add.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/add.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/add.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/add.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -===== Afegir usuari ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/delete.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/delete.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -===== Borrar usuari ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/edit.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/edit.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -===== Editar usuari ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/intro.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -====== Gestor d'usuaris ====== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/lang.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ - - */ - -$lang['menu'] = 'Gestor d\'usuaris'; - -// custom language strings for the plugin -$lang['noauth'] = '(autenticació d\'usuaris no està disponible)'; -$lang['nosupport'] = '(gestió d\'usuaris no admesa)'; - -$lang['badauth'] = 'mecanisme d\'autenticació no vàlit'; // should never be displayed! - -$lang['user_id'] = 'Usuari'; -$lang['user_pass'] = 'Contrasenya'; -$lang['user_name'] = 'Nom real'; -$lang['user_mail'] = 'Email'; -$lang['user_groups'] = 'Grups'; - -$lang['field'] = 'Camp'; -$lang['value'] = 'Valor'; -$lang['add'] = 'Afegir'; -$lang['delete'] = 'Borrar'; -$lang['delete_selected'] = 'Borrar seleccionats'; -$lang['edit'] = 'Editar'; -$lang['edit_prompt'] = 'Editar est usuari'; -$lang['modify'] = 'Guardar canvis'; -$lang['search'] = 'Buscar'; -$lang['search_prompt'] = 'Començar busca'; -$lang['clear'] = 'Reiniciar filtre de busques'; -$lang['filter'] = 'Filtre'; - -$lang['summary'] = 'Mostrant usuaris %1$d-%2$d de %3$d trobats. %4$d usuaris totals.'; -$lang['nonefound'] = 'No s\'han trobat usuaris. %d usuaris totals.'; -$lang['delete_ok'] = '%d usuaris borrats'; -$lang['delete_fail'] = 'Erro borrant %d.'; -$lang['update_ok'] = 'Usuari actualisat correctament'; -$lang['update_fail'] = 'Erro actualisant usuari'; -$lang['update_exists'] = 'Erro canviant el nom de l\'usuari, el nom d\'usuari que ha donat ya existix (els demés canvis s\'aplicaran).'; - -$lang['start'] = 'primera'; -$lang['prev'] = 'anterior'; -$lang['next'] = 'següent'; -$lang['last'] = 'última'; - -// added after 2006-03-09 release -$lang['edit_usermissing'] = 'L\'usuari seleccionat no existix, pot haver segut borrat o modificat des d\'un atre lloc.'; -$lang['user_notify'] = 'Notificar a l\'usuari'; -$lang['note_notify'] = 'Els emails de notificació només s\'envien si li s\'assigna una contrasenya nova.'; -$lang['note_group'] = 'Els usuaris nous s\'afegiran al grup predeterminat (%s) si no se n\'especifica atre.'; -$lang['add_ok'] = 'L\'usuari s\'ha afegit correctament'; -$lang['add_fail'] = 'Erro afegint usuari'; -$lang['notify_ok'] = 'Correu de notificació enviat'; -$lang['notify_fail'] = 'Erro enviant el correu de notificació'; - diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/list.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/list.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-va/list.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-va/list.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -===== Llista d'usuaris ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/add.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/add.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/add.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/add.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Nou usuari ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/delete.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Supressió d'usuari ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/edit.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/edit.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Edició d'usuari ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +======= Gestió d'usuaris ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,48 @@ + + * @author Bernat Arlandis + */ +$lang['menu'] = 'Gestió d\'usuaris'; +$lang['noauth'] = '(l\'autenticació d\'usuaris no està disponible)'; +$lang['nosupport'] = '(la gestió d\'usuaris no funciona)'; +$lang['badauth'] = 'el mecanisme d\'autenticació no és vàlid'; +$lang['user_id'] = 'Usuari'; +$lang['user_pass'] = 'Contrasenya'; +$lang['user_name'] = 'Nom real'; +$lang['user_mail'] = 'Correu electrònic'; +$lang['user_groups'] = 'Grups'; +$lang['field'] = 'Camp'; +$lang['value'] = 'Valor'; +$lang['add'] = 'Afig'; +$lang['delete'] = 'Suprimeix'; +$lang['delete_selected'] = 'Suprimeix els seleccionats'; +$lang['edit'] = 'Edita'; +$lang['edit_prompt'] = 'Edita este usuari'; +$lang['modify'] = 'Alça els canvis'; +$lang['search'] = 'Cerca'; +$lang['search_prompt'] = 'Fes la cerca'; +$lang['clear'] = 'Reinicia el filtre de cerca'; +$lang['filter'] = 'Filtre'; +$lang['summary'] = 'Visualització d\'usuaris %1$d-%2$d de %3$d trobats. %4$d usuaris en total.'; +$lang['nonefound'] = 'No s\'han trobat usuaris. %d usuaris en total.'; +$lang['delete_ok'] = 'S\'han suprimit %d usuaris'; +$lang['delete_fail'] = 'No s\'han pogut suprimir %d.'; +$lang['update_ok'] = 'L\'usuari ha estat actualitzat amb èxit'; +$lang['update_fail'] = 'Ha fallat l\'actualització de l\'usuari'; +$lang['update_exists'] = 'No s\'ha pogut canviar el nom de l\'usuari. El nom d\'usuari especificat (%s) ja existeix (qualsevol altre canvi sí que serà efectiu).'; +$lang['start'] = 'inici'; +$lang['prev'] = 'anterior'; +$lang['next'] = 'següent'; +$lang['last'] = 'final'; +$lang['edit_usermissing'] = 'L\'usuari seleccionat no s\'ha pogut trobar. Potser el nom d\'usuari especificat s\'ha suprimit o modificat des d\'un altre lloc.'; +$lang['user_notify'] = 'Notificació a l\'usuari'; +$lang['note_notify'] = 'Els correus de notificació només s\'envien si es canvia la contrasenya de l\'usuari.'; +$lang['note_group'] = 'Els nous usuaris s\'afegeixen al grup per defecte (%s) si no s\'especifica un altre grup.'; +$lang['note_pass'] = 'La contrasenya es generarà automàticament si el camp es deixa en blanc i les notificacions estan habilitades per a este usuari.'; +$lang['add_ok'] = 'L\'usuari s\'ha afegit amb èxit'; +$lang['add_fail'] = 'No s\'ha pogut afegir l\'usuari'; +$lang['notify_ok'] = 'S\'ha enviat el correu de notificació'; +$lang['notify_fail'] = 'No s\'ha pogut enviar el correu de notificació'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/list.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/list.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ca-valencia/list.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ca-valencia/list.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Llista d'usuaris ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/cs/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/cs/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/cs/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/cs/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Tomas Valenta * @author Zbynek Krivka * @author Bohumir Zamecnik + * @author tomas@valenta.cz */ $lang['menu'] = 'Správa uživatelů'; $lang['noauth'] = '(autentizace uživatelů není k dispozici)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/da/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/da/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/da/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/da/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,11 +5,14 @@ * @author Lars Næsbye Christensen * @author Kalle Sommer Nielsen * @author Esben Laursen + * @author Harith + * @author Daniel Ejsing-Duun + * @author Erik Bjørn Pedersen */ $lang['menu'] = 'Brugerstyring'; -$lang['noauth'] = '(brugervalidering er ikke tilgængelig)'; -$lang['nosupport'] = '(brugerstyring er ikke understøttet)'; -$lang['badauth'] = 'ugyldig valideringsmekanisme'; +$lang['noauth'] = '(Brugervalidering er ikke tilgængelig)'; +$lang['nosupport'] = '(Brugerstyring er ikke understøttet)'; +$lang['badauth'] = 'Ugyldig brugerbekræftelsesfunktion'; $lang['user_id'] = 'Bruger'; $lang['user_pass'] = 'Adgangskode'; $lang['user_name'] = 'Navn'; @@ -34,16 +37,16 @@ $lang['update_ok'] = 'Bruger opdateret korrekt'; $lang['update_fail'] = 'Brugeropdatering mislykkedes'; $lang['update_exists'] = 'Ændring af brugernavn mislykkedes, det valgte brugernavn (%s) er allerede optaget (andre ændringer vil blive udført).'; -$lang['start'] = 'start'; +$lang['start'] = 'begynde'; $lang['prev'] = 'forrige'; $lang['next'] = 'næste'; $lang['last'] = 'sidste'; -$lang['edit_usermissing'] = 'Den valgte bruger blev ikke fundet, brugernavnet kan være slettet eller ændret andetsteds.'; +$lang['edit_usermissing'] = 'Den valgte bruger blev ikke fundet. Brugernavnet kan være slettet eller ændret andetsteds.'; $lang['user_notify'] = 'Meddel bruger'; -$lang['note_notify'] = 'Meddelelses emails er kun sendt hvis brugeren er givet et nyt kodeord.'; -$lang['note_group'] = 'Nye brugere vil blive tilføjet til standard gruppen (%s) hvis ingen gruppe er opgivet.'; -$lang['note_pass'] = 'Adgangskoden vil blive autogenereret hvis feltet er tomt og underretning af brugeren er aktiveret.'; -$lang['add_ok'] = 'Bruger succesfuldt tilføjet'; -$lang['add_fail'] = 'Bruger tilføjelse mislykkedes'; -$lang['notify_ok'] = 'Meddelelses email sendt'; -$lang['notify_fail'] = 'Meddelelses email kunne ikke sendes'; +$lang['note_notify'] = 'Meddelelser bliver kun sendt, hvis brugeren fÃ¥r givet et nyt adgangskode.'; +$lang['note_group'] = 'Nye brugere vil blive tilføjet til standardgruppen (%s), hvis ingen gruppe er opgivet.'; +$lang['note_pass'] = 'Adgangskoden vil blive dannet automatisk, hvis feltet er tomt og underretning af brugeren er aktiveret.'; +$lang['add_ok'] = 'Bruger tilføjet uden fejl.'; +$lang['add_fail'] = 'Tilføjelse af bruger mislykkedes'; +$lang['notify_ok'] = 'Meddelelse sendt'; +$lang['notify_fail'] = 'Meddelelse kunne ikke sendes'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -====== Benutzer pflegen... ====== +====== Benutzer-Manager ====== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,9 @@ * @author Florian Anderiasch * @author Robin Kluth * @author Arne Pelka + * @author Dirk Einecke + * @author Blitzi94@gmx.de + * @author Robert Bogenschneider */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; @@ -44,9 +47,9 @@ $lang['last'] = 'Ende'; $lang['edit_usermissing'] = 'Der ausgewählte Nutzer wurde nicht gefunden. Möglicherweise wurde er gelöscht oder der Nutzer wurde anderswo geändert.'; $lang['user_notify'] = 'Nutzer benachrichtigen'; -$lang['note_notify'] = 'Benachrichtigungsmails werden nur versandt wenn ein neues Passwort vergeben wurde.'; +$lang['note_notify'] = 'Benachrichtigungs-E-Mails werden nur versandt, wenn ein neues Passwort vergeben wurde.'; $lang['note_group'] = 'Neue Nutzer werden der Standard-Gruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wurde.'; -$lang['note_pass'] = 'Das Password wird automatisch generiert wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.'; +$lang['note_pass'] = 'Das Password wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.'; $lang['add_ok'] = 'Nutzer erfolgreich angelegt'; $lang['add_fail'] = 'Nutzer konnte nicht angelegt werden'; $lang['notify_ok'] = 'Benachrichtigungsmail wurde versandt'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/add.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/add.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/add.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/add.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Benutzer hinzufügen ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/delete.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Benutzer gelöscht ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/edit.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/edit.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Benutzer bearbeiten ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Benutzerverwaltung ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,48 @@ + + * @author Juergen Schwarzer + */ +$lang['menu'] = 'Benutzerverwalter'; +$lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; +$lang['nosupport'] = '(Benutzerverwaltung wird nicht unterstützt)'; +$lang['badauth'] = 'Ungültige Authentifizerung'; +$lang['user_id'] = 'Benutzer'; +$lang['user_pass'] = 'Passwort'; +$lang['user_name'] = 'Echter Name'; +$lang['user_mail'] = 'Email'; +$lang['user_groups'] = 'Gruppen'; +$lang['field'] = 'Feld'; +$lang['value'] = 'Wert'; +$lang['add'] = 'Zufügen'; +$lang['delete'] = 'Löschen'; +$lang['delete_selected'] = 'Lösche ausgewähltes'; +$lang['edit'] = 'Editieren'; +$lang['edit_prompt'] = 'Editiere den Benutzer'; +$lang['modify'] = 'Änderungen speichern'; +$lang['search'] = 'Suchen'; +$lang['search_prompt'] = 'Suche ausführen'; +$lang['clear'] = 'Suchfilter zurücksetzen'; +$lang['filter'] = 'Filter'; +$lang['summary'] = 'Zeige Benutzer %1$d-%2$d von %3$d gefundenen. %4$d Benutzer insgesamt.'; +$lang['nonefound'] = 'Keinen Benutzer gefunden. Insgesamt %d Benutzer.'; +$lang['delete_ok'] = '%d Benutzer wurden gelöscht'; +$lang['delete_fail'] = '%d konnte nicht gelöscht werden'; +$lang['update_ok'] = 'Benutzer wurde erfolgreich aktualisiert'; +$lang['update_fail'] = 'Aktualisierung des Benutzers ist fehlgeschlagen'; +$lang['update_exists'] = 'Benutzername konnte nicht geändert werden, der angegebene Benutzername (%s) existiert bereits (alle anderen Änderungen werden angewandt).'; +$lang['start'] = 'Start'; +$lang['prev'] = 'vorige'; +$lang['next'] = 'nächste'; +$lang['last'] = 'letzte'; +$lang['edit_usermissing'] = 'Der gewählte Benutzer wurde nicht gefunden. Der angegebene Benutzername könnte gelöscht oder an anderer Stelle geändert worden sein.'; +$lang['user_notify'] = 'Benutzer benachrichtigen'; +$lang['note_notify'] = 'Benachrichtigungsemails werden nur versandt, wenn der Benutzer ein neues Kennwort erhält.'; +$lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wird.'; +$lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.'; +$lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt'; +$lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen'; +$lang['notify_ok'] = 'Benachrichtigungsemail wurde versendet'; +$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/list.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/list.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/de-informal/list.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/de-informal/list.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Benutzerliste ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/el/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/el/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/el/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/el/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,7 @@ * @author Chris Smith * @author Thanos Massias * @author Αθανάσιος Îταής + * @author Konstantinos Koryllos */ $lang['menu'] = 'ΔιαχείÏιση ΧÏηστών'; $lang['noauth'] = '(η είσοδος χÏηστών δεν είναι δυνατή)'; @@ -45,6 +46,7 @@ $lang['user_notify'] = 'Ειδοποίηση χÏήστη'; $lang['note_notify'] = 'Τα ενημεÏωτικά e-mails στέλνονται μόνο όταν δίνεται νέος κωδικός στον χÏήστη.'; $lang['note_group'] = 'Οι νέοι χÏήστες θα ανήκουν στην ομάδα (%s) αν δεν οÏιστεί άλλη ομάδα.'; +$lang['note_pass'] = 'Ο κωδικός θα δημιουÏγηθεί αυτόματα εάν το πεδίο μείνει κενό και έχει επιλεγεί η αποστολή ειδοποίησης χÏήστη.'; $lang['add_ok'] = 'Επιτυχημένη εγγÏαφή χÏήστη'; $lang['add_fail'] = 'Η εγγÏαφή του χÏήστη απέτυχε'; $lang['notify_ok'] = 'Εστάλη ενημεÏωτικό e-mail'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/eo/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/eo/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/eo/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/eo/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,33 +6,37 @@ * @author Felipe Castro * @author Felipe Castro * @author Felipo Kastro + * @author Robert Bogenschneider + * @author Erik Pedersen + * @author Erik Pedersen + * @author Robert Bogenschneider */ $lang['menu'] = 'Administrado de Uzantoj'; $lang['noauth'] = '(identiÄo de uzantoj ne disponeblas)'; -$lang['nosupport'] = '(admnistro de uzantoj ne estas subtenata)'; -$lang['badauth'] = 'tiu identigxa procezo ne validas'; +$lang['nosupport'] = '(administro de uzantoj ne estas subtenata)'; +$lang['badauth'] = 'tiu identiÄa procezo ne validas'; $lang['user_id'] = 'Uzanto'; $lang['user_pass'] = 'Pasvorto'; -$lang['user_name'] = 'Vera Nomo'; +$lang['user_name'] = 'Vera nomo'; $lang['user_mail'] = 'Retadreso'; $lang['user_groups'] = 'Grupoj'; $lang['field'] = 'Kampo'; $lang['value'] = 'Valoro'; $lang['add'] = 'Aldoni'; $lang['delete'] = 'Forigi'; -$lang['delete_selected'] = 'Forigi Elektiton'; +$lang['delete_selected'] = 'Forigi elektitan'; $lang['edit'] = 'Modifi'; -$lang['edit_prompt'] = 'Modifi tiun ĉi uzulon'; -$lang['modify'] = 'Registri Modifojn'; +$lang['edit_prompt'] = 'Modifi tiun ĉi uzanton'; +$lang['modify'] = 'Registri modifojn'; $lang['search'] = 'Serĉi'; $lang['search_prompt'] = 'Fari serĉon'; -$lang['clear'] = 'Reekigi Serĉan Filtron'; +$lang['clear'] = 'Refari serĉan filtron'; $lang['filter'] = 'Filtro'; $lang['summary'] = 'MontriÄas uzantoj %1$d-%2$d el %3$d trovitaj. %4$d uzantoj entute.'; -$lang['nonefound'] = 'Neniu uzantoj trovigxas. %d uzantoj entute.'; +$lang['nonefound'] = 'Neniu uzantoj troviÄas. %d uzantoj entute.'; $lang['delete_ok'] = '%d uzantoj estis forigitaj'; $lang['delete_fail'] = '%d malsukcesis esti forigitaj.'; -$lang['update_ok'] = 'Tiu uzulo estis sukcese Äisdatigita'; +$lang['update_ok'] = 'Tiu uzanto estis sukcese Äisdatigita'; $lang['update_fail'] = 'Malsukceso okazis por Äisdatigi tiun uzanton'; $lang['update_exists'] = 'Malsukceso okazis por ÅanÄi la nomon de tiu uzanto: la enmetita nomo (%s) jam ekzistas (ĉiuj aliaj ÅanÄoj estos aplikitaj)'; $lang['start'] = 'Ekigi'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/es/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/es/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/es/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/es/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -10,9 +10,15 @@ * @author Manuel Meco * @author VictorCastelan * @author Jordan Mero hack.jord@gmail.com + * @author Felipe Martinez + * @author Javier Aranda + * @author Zerial + * @author Marvin Ortega + * @author Daniel Castro Alvarado + * @author Fernando J. Gómez */ $lang['menu'] = 'Administración de usuarios'; -$lang['noauth'] = '(la autentiación de usuariosuser no está disponible)'; +$lang['noauth'] = '(la autenticación de usuarios no está disponible)'; $lang['nosupport'] = '(la administración de usuarios no está habilitada)'; $lang['badauth'] = 'Mecanismo de autenticación inválido'; $lang['user_id'] = 'Usuario'; @@ -48,7 +54,7 @@ $lang['note_notify'] = 'El correo electrónico de notificación sólo será enviado si se actualizo la contraseña del usuario.'; $lang['note_group'] = 'Si no se especifica ningún grupo, los nuevos usuarios serán agregados al grupo por defecto (%s).'; $lang['note_pass'] = 'Se generará una clave automáticamente si el campo izquierdo es vacío y se esta activo la notificación de usuario. '; -$lang['add_ok'] = 'El usuario fue creado exitosamente.'; +$lang['add_ok'] = 'El usuario fue creado exitosamente'; $lang['add_fail'] = 'Falló la creación del usuario'; $lang['notify_ok'] = 'Se envió la notificación por correo electrónico'; $lang['notify_fail'] = 'No se pudo enviar la notificación por correo electrónico'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fa/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fa/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fa/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fa/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Mohsen Firoozmandan * @author omidmr@gmail.com * @author Omid Mottaghi + * @author Mohammad Reza Shoaei */ $lang['menu'] = 'مدیریت کاربر'; $lang['noauth'] = '(معتبرسازی کاربر ممکن نیست)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fi/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fi/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fi/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * * @author otto@valjakko.net * @author Otto Vainio + * @author Teemu Mattila */ $lang['menu'] = 'Käyttäjähallinta'; $lang['noauth'] = '(autentikointi ei ole käytössä)'; @@ -32,7 +33,7 @@ $lang['delete_fail'] = '%d poistoa epäonnistui'; $lang['update_ok'] = 'Käyttäjän päivitys onnistui'; $lang['update_fail'] = 'Käyttäjän päivitys epäonnistui'; -$lang['update_exists'] = 'Käyttäjän nimen vaihto epäonnistui. Nimi (%s) on jo olemassa (muut muutokset ok)'; +$lang['update_exists'] = 'Käyttäjän nimen vaihto epäonnistui. Nimi (%s) on jo olemassa (muut muutokset onnistuivat)'; $lang['start'] = 'alku'; $lang['prev'] = 'edellinen'; $lang['next'] = 'seuraava'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fr/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fr/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/fr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/fr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,9 @@ * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri + * @author Erik Pedersen + * @author olivier duperray + * @author Vincent Feltz */ $lang['menu'] = 'Gestion des utilisateurs'; $lang['noauth'] = '(authentification utilisateur non disponible)'; @@ -45,7 +48,7 @@ $lang['user_notify'] = 'Notifier l\'utilisateur '; $lang['note_notify'] = 'Envoi de notification par courriel uniquement lorsqu\'un nouveau mot de passe est attribué à l\'utilisateur.'; $lang['note_group'] = 'Les nouveaux utilisateurs seront ajoutés au groupe par défaut (%s) si aucun groupe n\'est spécifié.'; -$lang['note_pass'] = 'Le mot de passe sera généré automatiquement si le champ est laissé vide et si la notification de l\'utilisateur est activée'; +$lang['note_pass'] = 'Le mot de passe sera généré automatiquement si le champ est laissé vide et si la notification de l\'utilisateur est activée.'; $lang['add_ok'] = 'Utilisateur ajouté avec succès'; $lang['add_fail'] = 'Échec de l\'ajout de l\'utilisateur'; $lang['notify_ok'] = 'Courriel de notification expédié'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/add.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/add.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/add.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/add.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Engadir usuario ===== \ Brak znaku nowej linii na koÅ„cu pliku +===== Engadir unha persoa usuaria ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/delete.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Eliminar usuario ===== \ Brak znaku nowej linii na koÅ„cu pliku +===== Eliminar unha persoa usuaria ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/edit.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/edit.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Editar usuario ===== \ Brak znaku nowej linii na koÅ„cu pliku +===== Editar unha persoa usuaria ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/intro.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -====== Xestor de Usuarios ====== \ Brak znaku nowej linii na koÅ„cu pliku +====== Xestor de persoas usuarias ====== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,45 +3,47 @@ * Galicianlanguage file * * @author CiberIrmandade da Fala + * @author Tagen Ata + * @author Leandro Regueiro */ -$lang['menu'] = 'Xestor de Usuarios'; -$lang['noauth'] = '(autenticación de usuarios non dispoñible)'; -$lang['nosupport'] = '(xestión de usuarios non soportada)'; -$lang['badauth'] = 'mecanismo de autenticación non válido'; -$lang['user_id'] = 'Usuario'; +$lang['menu'] = 'Xestor de persoas usuarias'; +$lang['noauth'] = '(a autenticación de persoas usuarias non está dispoñíbel)'; +$lang['nosupport'] = '(a xestión de persoas usuarias non está soportada)'; +$lang['badauth'] = 'o mecanismo de autenticación non é válido'; +$lang['user_id'] = 'Usuaria/o'; $lang['user_pass'] = 'Contrasinal'; -$lang['user_name'] = 'Nome Real'; -$lang['user_mail'] = 'Correo-e'; +$lang['user_name'] = 'Nome real'; +$lang['user_mail'] = 'Correo'; $lang['user_groups'] = 'Grupos'; $lang['field'] = 'Campo'; $lang['value'] = 'Valor'; $lang['add'] = 'Engadir'; $lang['delete'] = 'Eliminar'; -$lang['delete_selected'] = 'Eliminar Seleccionados'; +$lang['delete_selected'] = 'Eliminar as seleccionadas'; $lang['edit'] = 'Editar'; -$lang['edit_prompt'] = 'Editar este usuario'; -$lang['modify'] = 'Gardar Trocos'; +$lang['edit_prompt'] = 'Editar esta persoa usuaria'; +$lang['modify'] = 'Gardar os cambios'; $lang['search'] = 'Procurar'; -$lang['search_prompt'] = 'Facer procura'; -$lang['clear'] = 'Reiniciar Filtro de Procura'; +$lang['search_prompt'] = 'Facer unha procura'; +$lang['clear'] = 'Reiniciar o filtro de procura'; $lang['filter'] = 'Filtro'; -$lang['summary'] = 'Amosando usuarios %1$d-%2$d de %3$d atopados. %4$d usuarios en total.'; -$lang['nonefound'] = 'Non se atoparon usuarios. %d usuarios en total.'; -$lang['delete_ok'] = '%d usuarios eliminados'; -$lang['delete_fail'] = '%d non puideron ser eliminados.'; -$lang['update_ok'] = 'Usuario actualizado correctamente'; -$lang['update_fail'] = 'Non se puido actualizar o usuario'; -$lang['update_exists'] = 'Non se puido mudar o nome do usuario, xa que o nome especificado (%s) xa existe (o resto de trocos aplicaranse sen problemas).'; +$lang['summary'] = 'A mostrar as persoas usuarias %1$d-%2$d de %3$d encontradas. %4$d persoas usuarias en total.'; +$lang['nonefound'] = 'Non se encontraron persoas usuarias. %d persoas usuarias en total.'; +$lang['delete_ok'] = '%d persoas usuarias foron eliminadas'; +$lang['delete_fail'] = '%d non puideron ser eliminadas.'; +$lang['update_ok'] = 'A persoa usuaria foi actualizada correctamente'; +$lang['update_fail'] = 'Non se puido actualizar a persoa usuaria'; +$lang['update_exists'] = 'Non se puido mudar o nome da persoa usuaria; o nome especificado (%s) xa existe (o resto de cambios aplicaranse sen problemas).'; $lang['start'] = 'comezo'; $lang['prev'] = 'anterior'; $lang['next'] = 'seguinte'; -$lang['last'] = 'derradeiro'; -$lang['edit_usermissing'] = 'Non se atopou o usuario seleccionado, pode que o nome de usuario fose eliminado ou mudado nalgún intre.'; -$lang['user_notify'] = 'Notificar ao usuario'; -$lang['note_notify'] = 'Os correos-e de notificación envíanse só se o usuario obtén un novo contrasinal.'; -$lang['note_group'] = 'Os novos usuarios serán engadidos ao grupo por defecto (%s) se non se especifica outro.'; -$lang['note_pass'] = 'Se deixas o campo baleiro e a notificación ao usuario está activada xerarase automaticamente o contrasinal.'; -$lang['add_ok'] = 'Usuario engadido correctamente'; -$lang['add_fail'] = 'Non se puido engadir o usuario'; -$lang['notify_ok'] = 'Correo-e de notificación enviado'; -$lang['notify_fail'] = 'Non se puido enviar o correo-e de notificación'; +$lang['last'] = 'última'; +$lang['edit_usermissing'] = 'Non se encontrou a persoa usuaria seleccionada; pode que o nome de usuaria/o teña sido eliminado ou alterado nalgún momento.'; +$lang['user_notify'] = 'Notificar á/ao usuaria/o'; +$lang['note_notify'] = 'Os correos de notificación envíanse só se a persoa usuaria obtén un contrasinal novo.'; +$lang['note_group'] = 'As persoas usuarias novas serán engadidas ao grupo predeterminado (%s) se non se especifica outro.'; +$lang['note_pass'] = 'Se deixa o campo baleiro e a notificación á/ao usuaria/o está activada, xerarase automaticamente o contrasinal.'; +$lang['add_ok'] = 'A persoa usuaria foi engadida correctamente'; +$lang['add_fail'] = 'Non se puido engadir a/o usuaria/o'; +$lang['notify_ok'] = 'O correo de notificación foi enviado'; +$lang['notify_fail'] = 'Non se puido enviar o correo de notificación'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/list.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/list.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/gl/list.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/gl/list.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Lista de Usuarios ===== \ Brak znaku nowej linii na koÅ„cu pliku +===== Listaxe de persoas usuarias ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hi/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hi/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hi/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hi/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,6 @@ + + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hr/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hr/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hr/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,7 @@ + + * @author Dražen OdobaÅ¡ić + */ diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hu/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hu/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/hu/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/hu/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,11 +3,13 @@ * Hungarian language file * * @author Sandor TIHANYI + * @author Siaynoq Mage + * @author schilling.janos@gmail.com */ $lang['menu'] = 'Felhasználók kezelése'; $lang['noauth'] = '(A felhasználói azonosítás nem működik.)'; $lang['nosupport'] = '(A felhasználók kezelése nem támogatott.)'; -$lang['badauth'] = 'nem érvényes authentikációs technika'; +$lang['badauth'] = 'nem érvényes autentikációs technika'; $lang['user_id'] = 'Felhasználó azonosító'; $lang['user_pass'] = 'Jelszó'; $lang['user_name'] = 'Név'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/is/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/is/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/is/delete.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/is/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +===== Eyða notanda ===== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/is/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/is/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/is/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/is/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,18 @@ + + * @author Ólafur Gunnlaugsson + * @author Erik Bjørn Pedersen + */ +$lang['user_id'] = 'Notandi'; +$lang['user_pass'] = 'Aðgangsorð'; +$lang['user_name'] = 'Raunnafn'; +$lang['user_groups'] = 'Hópar'; +$lang['field'] = 'Svæði'; +$lang['delete'] = 'Eyða'; +$lang['add_ok'] = 'Notandinn var bætt við'; +$lang['add_fail'] = 'Bæta við nýjum notanda mistókst'; +$lang['notify_ok'] = 'Tilkynning var sendast með tölvupósti'; +$lang['notify_fail'] = 'Ekki hægt að senda tilkynning með tölvupósti'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/it/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/it/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/it/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/it/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,8 @@ * @author Diego Pierotto ita.translations@tiscali.it * @author ita.translations@tiscali.it * @author Lorenzo Breda + * @author snarchio@alice.it + * @author robocap */ $lang['menu'] = 'Gestione Utenti'; $lang['noauth'] = '(autenticazione non disponibile)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ja/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ja/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ja/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ja/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,7 @@ * @author Yuji Takenaka * @author Chris Smith * @author Ikuo Obataya + * @author Daniel Dupriest */ $lang['menu'] = 'ユーザー管ç†'; $lang['noauth'] = '（ユーザーèªè¨¼ãŒç„¡åŠ¹ã§ã™ï¼‰'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/lt/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/lt/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/lt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/lt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,55 +3,46 @@ * Lithuanian language file * * @author grawity + * @author audrius.klevas@gmail.com + * @author Arunas Vaitekunas */ - -$lang['menu'] = 'Vartotojų administravimas'; - -// custom language strings for the plugin -$lang['noauth'] = '(vartotojų autentifikacija neprieinama)'; -$lang['nosupport'] = '(vartotojų administravimas nepalaikomas)'; - -$lang['badauth'] = 'neteisingas autentifikacijos bÅ«das'; -// should never be displayed! - -$lang['user_id'] = 'Vartotojas'; -$lang['user_pass'] = 'Slaptažodis'; -$lang['user_name'] = 'Vardas'; -$lang['user_mail'] = 'El.paÅ¡tas'; -$lang['user_groups'] = 'GrupÄ—s'; - -$lang['field'] = 'Laukas'; -$lang['value'] = 'Turinys'; -$lang['add'] = 'PridÄ—ti'; -$lang['delete'] = 'PaÅ¡alinti'; -$lang['delete_selected'] = 'PaÅ¡alinti pažymÄ—tus'; -$lang['edit'] = 'Redaguoti'; -$lang['edit_prompt'] = 'Redaguoti šį vartotojÄ…'; -$lang['modify'] = 'IÅ¡saugoti'; -$lang['search'] = 'PaieÅ¡ka'; -$lang['search_prompt'] = 'IeÅ¡koti'; -$lang['clear'] = 'Panaikinti filtrÄ…'; -$lang['filter'] = 'Filtras'; - -$lang['summary'] = 'Rodomi vartotojai %1$d-%2$d iÅ¡ %3$d rastų. IÅ¡ viso %4$d vartotojų.'; -$lang['nonefound'] = 'Vartotojų nerasta. IÅ¡ viso %d vartotojų.'; -$lang['delete_ok'] = 'PaÅ¡alinta %d vartotojų'; -$lang['delete_fail'] = '%d nepavyko paÅ¡alinti.'; -$lang['update_ok'] = 'Vartotojas sÄ—kmingai pakeistas'; -$lang['update_fail'] = 'Vartotojo pakeitimas nepavyko'; -$lang['update_exists'] = 'Vartotojo vardo pakeitimas nepavyko, nes nurodytas vartotojo vardas (%s) jau yra (kiti pakeitimai įvykdyti).'; - -$lang['start'] = 'pradžia'; -$lang['prev'] = 'atgal'; -$lang['next'] = 'pirmyn'; -$lang['last'] = 'pabaiga'; - -// added after 2006-03-09 release -$lang['edit_usermissing'] = 'Pasirinktas vartotojas nerastas, nurodytas vartotojo vardas galÄ—jo bÅ«ti paÅ¡alintas ar pakeistas kitur.'; -$lang['user_notify'] = 'Ä®spÄ—ti vartotojÄ…'; -$lang['note_notify'] = 'Ä®spÄ—jimas siunÄiamas tik tada, kai vartotojui priskiriamas naujas slaptažodis.'; -$lang['note_group'] = 'Jei grupÄ— nenurodyta, nauji vartotojai pridedami į pagrindinÄ™ grupÄ™ (%s).'; -$lang['add_ok'] = 'Vartotojas sÄ—kmingai pridÄ—tas'; -$lang['add_fail'] = 'Vartotojo pridÄ—jimas nepavyko'; -$lang['notify_ok'] = 'Ä®spÄ—jimo el.laiÅ¡kas iÅ¡siųstas'; -$lang['notify_fail'] = 'Ä®spÄ—jimo el.laiÅ¡ko iÅ¡siųsti nepavyko'; +$lang['menu'] = 'Vartotojų administravimas'; +$lang['noauth'] = '(vartotojų autentifikacija neprieinama)'; +$lang['nosupport'] = '(vartotojų administravimas nepalaikomas)'; +$lang['badauth'] = 'neteisingas autentifikacijos bÅ«das'; +$lang['user_id'] = 'Vartotojas'; +$lang['user_pass'] = 'Slaptažodis'; +$lang['user_name'] = 'Vardas'; +$lang['user_mail'] = 'El.paÅ¡tas'; +$lang['user_groups'] = 'GrupÄ—s'; +$lang['field'] = 'Laukas'; +$lang['value'] = 'Turinys'; +$lang['add'] = 'PridÄ—ti'; +$lang['delete'] = 'PaÅ¡alinti'; +$lang['delete_selected'] = 'PaÅ¡alinti pažymÄ—tus'; +$lang['edit'] = 'Redaguoti'; +$lang['edit_prompt'] = 'Redaguoti šį vartotojÄ…'; +$lang['modify'] = 'IÅ¡saugoti'; +$lang['search'] = 'PaieÅ¡ka'; +$lang['search_prompt'] = 'IeÅ¡koti'; +$lang['clear'] = 'Panaikinti filtrÄ…'; +$lang['filter'] = 'Filtras'; +$lang['summary'] = 'Rodomi vartotojai %1$d-%2$d iÅ¡ %3$d rastų. IÅ¡ viso %4$d vartotojų.'; +$lang['nonefound'] = 'Vartotojų nerasta. IÅ¡ viso %d vartotojų.'; +$lang['delete_ok'] = 'PaÅ¡alinta %d vartotojų'; +$lang['delete_fail'] = '%d nepavyko paÅ¡alinti.'; +$lang['update_ok'] = 'Vartotojas sÄ—kmingai pakeistas'; +$lang['update_fail'] = 'Vartotojo pakeitimas nepavyko'; +$lang['update_exists'] = 'Vartotojo vardo pakeitimas nepavyko, nes nurodytas vartotojo vardas (%s) jau yra (kiti pakeitimai įvykdyti).'; +$lang['start'] = 'pradžia'; +$lang['prev'] = 'atgal'; +$lang['next'] = 'pirmyn'; +$lang['last'] = 'pabaiga'; +$lang['edit_usermissing'] = 'Pasirinktas vartotojas nerastas, nurodytas vartotojo vardas galÄ—jo bÅ«ti paÅ¡alintas ar pakeistas kitur.'; +$lang['user_notify'] = 'Ä®spÄ—ti vartotojÄ…'; +$lang['note_notify'] = 'Ä®spÄ—jimas siunÄiamas tik tada, kai vartotojui priskiriamas naujas slaptažodis.'; +$lang['note_group'] = 'Jei grupÄ— nenurodyta, nauji vartotojai pridedami į pagrindinÄ™ grupÄ™ (%s).'; +$lang['add_ok'] = 'Vartotojas sÄ—kmingai pridÄ—tas'; +$lang['add_fail'] = 'Vartotojo pridÄ—jimas nepavyko'; +$lang['notify_ok'] = 'Ä®spÄ—jimo el.laiÅ¡kas iÅ¡siųstas'; +$lang['notify_fail'] = 'Ä®spÄ—jimo el.laiÅ¡ko iÅ¡siųsti nepavyko'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/nl/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/nl/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/nl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/nl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,9 @@ * @author John de Graaff * @author Niels Schoot * @author Dion Nicolaas + * @author Danny Rotsaert + * @author Marijn Hofstra hofstra.m@gmail.com + * @author Matthias Carchon webmaster@c-mattic.be */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; @@ -34,7 +37,7 @@ $lang['delete_fail'] = '%d kon niet worden verwijderd.'; $lang['update_ok'] = 'Gebruiker succesvol gewijzigd'; $lang['update_fail'] = 'Gebruiker wijzigen mislukt'; -$lang['update_exists'] = 'Gebruikersnaam veranderen mislukt, de opgegeven gebruikersnaam (%s) bestaat reeds (overige aanpassen worden wel doorgevoerd).'; +$lang['update_exists'] = 'Gebruikersnaam veranderen mislukt, de opgegeven gebruikersnaam (%s) bestaat reeds (overige aanpassingen worden wel doorgevoerd).'; $lang['start'] = 'start'; $lang['prev'] = 'vorige'; $lang['next'] = 'volgende'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/no/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/no/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/no/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/no/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Rune M. Andersen * @author Jakob Vad Nielsen (me@jakobnielsen.net) * @author Kjell Tore Næsgaard + * @author Knut Staring + * @author Lisa Ditlefsen + * @author Erik Pedersen + * @author Erik Bjørn Pedersen */ $lang['menu'] = 'Behandle brukere'; $lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pl/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pl/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,7 @@ * @author Grzegorz Å»ur * @author Mariusz Kujawski * @author Maciej Kurczewski + * @author SÅ‚awomir Boczek */ $lang['menu'] = 'Menadżer użytkowników'; $lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pt/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pt/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pt/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pt/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -4,6 +4,8 @@ * * @author José Monteiro * @author Enrico Nicoletto + * @author Fil + * @author André Neves */ $lang['menu'] = 'Gestor de Perfis'; $lang['noauth'] = '(autenticação indisponível)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pt-br/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pt-br/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/pt-br/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/pt-br/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,8 @@ * @author jair.henrique@gmail.com * @author Luis Dantas * @author Frederico Guimarães + * @author Jair Henrique + * @author Luis Dantas */ $lang['menu'] = 'Gerenciamento de Usuários'; $lang['noauth'] = '(o gerenciamento de usuários não está disponível)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ro/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ro/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ro/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ro/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,9 @@ * @author Sergiu Baltariu * @author s_baltariu@yahoo.com * @author Emanuel-Emeric Andrasi + * @author Emanuel-Emeric AndraÈ™i + * @author Emanuel-Emeric AndraÅŸi + * @author Emanuel-Emeric Andrasi */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ru/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ru/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/ru/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/ru/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -8,6 +8,10 @@ * @author Змей ЭтерийÑкий evil_snake@eternion.ru * @author Hikaru Nakajima * @author Alexei Tereschenko + * @author Irina Ponomareva irinaponomareva@webperfectionist.com + * @author Alexander Sorkin + * @author Kirill Krasnov + * @author Vlad Tsybenko */ $lang['menu'] = 'Управление пользователÑми'; $lang['noauth'] = '(Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ недоÑтупна)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sl/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sl/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sl/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sl/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Slovenian language file * * @author Dejan Levec + * @author BoÅ¡tjan SeniÄar */ $lang['user_id'] = 'Uporabnik'; $lang['user_pass'] = 'Geslo'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sr/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sr/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -3,6 +3,7 @@ * Serbian language file * * @author Иван Петровић petrovicivan@ubuntusrbija.org + * @author Ivan Petrovic */ $lang['menu'] = 'Управљач кориÑницима'; $lang['noauth'] = '(кориÑничка провера није доÑтупна)'; @@ -40,6 +41,7 @@ $lang['user_notify'] = 'ОбавеÑти кориÑника'; $lang['note_notify'] = 'Потврдна порука ће бити поÑлата једино ако је кориÑнику додељена нова лозинка.'; $lang['note_group'] = 'Ðови кориÑници ће бити додељени подразумеваној групи (%s) ако није другачије назначено.'; +$lang['note_pass'] = 'Ðко Ñте оÑтавили поље празно и укључили обавештавање кориÑника лозинка ће бити аутоматÑки генериÑана.'; $lang['add_ok'] = 'КориÑник је уÑпешно додат'; $lang['add_fail'] = 'Додавање кориÑника није уÑпело'; $lang['notify_ok'] = 'Порука Ñа обавештењен је поÑлата'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sv/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sv/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/sv/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/sv/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -9,6 +9,11 @@ * @author Tormod Otter Johansson * @author emil@sys.nu * @author Pontus Bergendahl + * @author Tormod Johansson tormod.otter.johansson@gmail.com + * @author Emil Lind + * @author Bogge Bogge + * @author Peter Ã…ström + * @author HÃ¥kan Sandell */ $lang['menu'] = 'Hantera användare'; $lang['noauth'] = '(användarautentisering ej tillgänlig)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/add.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/add.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/add.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/add.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +====== เพิ่มผู้ใช้ ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/delete.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +====== ลบผู้ใช้ ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/edit.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/edit.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +====== à¹à¸à¹‰à¹„ขผู้ใช้ ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/intro.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/intro.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/intro.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/intro.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +====== ตัวจัดà¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/lang.php 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,46 @@ + + * @author Kittithat Arnontavilas mrtomyum@gmail.com + * @author Kittithat Arnontavilas + */ +$lang['menu'] = 'ตัวจัดà¸à¸²à¸£à¸šà¸±à¸à¸Šà¸µà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰'; +$lang['user_id'] = 'ผู้ใช้'; +$lang['user_pass'] = 'รหัสผ่าน'; +$lang['user_name'] = 'ชื่อจริง'; +$lang['user_mail'] = 'อีเมล'; +$lang['user_groups'] = 'à¸à¸¥à¸¸à¹ˆà¸¡'; +$lang['field'] = 'ฟิลด์'; +$lang['value'] = 'ค่า'; +$lang['add'] = 'เพิ่ม'; +$lang['delete'] = 'ลบ'; +$lang['delete_selected'] = 'ลบที่เลือà¸'; +$lang['edit'] = 'à¹à¸à¹‰à¹„ข'; +$lang['edit_prompt'] = 'à¹à¸à¹‰à¹„ขผู้ใช้คนนี้'; +$lang['modify'] = 'บันทึà¸à¸à¸²à¸£à¹à¸à¹‰à¹„ข'; +$lang['search'] = 'สืบค้น'; +$lang['search_prompt'] = 'ทำà¸à¸²à¸£à¸ªà¸·à¸šà¸„้น'; +$lang['clear'] = 'รีเซ็ทตัวà¸à¸£à¸­à¸‡à¸„ำค้น'; +$lang['filter'] = 'ตัวà¸à¸£à¸­à¸‡'; +$lang['summary'] = 'à¹à¸ªà¸”งผู้ใช้ %1$d-%2$d จาà¸à¸—ี่พบ %3$d คน, จาà¸à¸—ั้งหมด %4$d คน'; +$lang['nonefound'] = 'ไม่พบผู้ใช้ จาà¸à¸—ั้งหมด %d คน'; +$lang['delete_ok'] = 'ลบชื่อผู้ใช้ %d คน'; +$lang['delete_fail'] = 'ไม่สามารถลบได้ %d คน'; +$lang['update_ok'] = 'ปรับปรุงข้อมูลผู้ใช้ สำเร็จ'; +$lang['update_fail'] = 'ปรับปรุงข้อมูลผู้ใช้ **ไม่สำเร็จ**'; +$lang['update_exists'] = 'ไม่สามารถเปลี่นชื่อผู้ใช้ได้ ชื่อผู้ใช้ที่ระบุ (%s) มีอยู่à¹à¸¥à¹‰à¸§ (à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸™à¸™à¹à¸›à¸¥à¸‡à¸­à¸·à¹ˆà¸™à¹† ยังคงทำได้)'; +$lang['start'] = 'เริ่ม'; +$lang['prev'] = 'à¸à¹ˆà¸­à¸™à¸«à¸™à¹‰à¸²'; +$lang['next'] = 'ถัดไป'; +$lang['last'] = 'สุดท้าย'; +$lang['edit_usermissing'] = 'หาผู้ใช้ที่เลือà¸à¹„ม่พบ, ชื่อผุ้ใช้ที่ระบุอาจจะถูà¸à¸¥à¸š หรือเปลี่ยนเป็นอย่างอื่น'; +$lang['user_notify'] = 'à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰'; +$lang['note_notify'] = 'จดหมายà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¸–ูà¸à¸ªà¹ˆà¸‡à¸à¹‡à¸•à¹ˆà¸­à¹€à¸¡à¸·à¹ˆà¸­à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹„ด้รับมอบรหัสผ่านใหม่'; +$lang['note_group'] = 'ผู้ใช้ใหม่จะถูà¸à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸‚้าไปยังà¸à¸¥à¸¸à¹ˆà¸¡à¸›à¸£à¸´à¸¢à¸²à¸¢ (%s) หาà¸à¸¡à¸´à¹„ด้ระบุà¸à¸¥à¸¸à¹ˆà¸¡à¹€à¸­à¸²à¹„ว้'; +$lang['note_pass'] = 'รหัสผ่านจะถูà¸à¸ªà¸£à¹‰à¸²à¸‡à¹‚ดยอัตโนมัติ ถ้าเว้นว่างช่องà¸à¸£à¸­à¸ à¹à¸¥à¸°à¹€à¸›à¸´à¸”à¸à¸²à¸£à¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹€à¸­à¸²à¹„ว้'; +$lang['add_ok'] = 'à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸ªà¸³à¹€à¸£à¹‡à¸ˆ'; +$lang['add_fail'] = 'à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§'; +$lang['notify_ok'] = 'ส่งจดหมายà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™à¹„ปà¹à¸¥à¹‰à¸§'; +$lang['notify_fail'] = 'ไม่สามารถส่งจดหมายà¹à¸ˆà¹‰à¸‡à¹€à¸•à¸·à¸­à¸™'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/list.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/list.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/th/list.txt 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/th/list.txt 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1 @@ +====== รายชื่อผู้ใช้ ====== \ Brak znaku nowej linii na koÅ„cu pliku diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/tr/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/tr/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/tr/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/tr/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Aydın CoÅŸkuner * @author yavuzselim@gmail.com * @author Cihan Kahveci kahvecicihan@gmail.com + * @author Yavuz Selim */ $lang['menu'] = 'Kullanıcı Yönetimi'; $lang['noauth'] = '(kullanıcı onaylaması yoktur)'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/delete.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/delete.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/delete.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/delete.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Вилучити кориÑтувача ===== +===== Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/edit.txt dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/edit.txt --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/edit.txt 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/edit.txt 2009-12-02 19:50:12.000000000 +0100 @@ -1 +1 @@ -===== Редагувати кориÑтувача ===== +===== Змінити кориÑтувача ===== diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/uk/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/uk/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,44 +5,48 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Oleksiy Voronin * @author serg_stetsuk@ukr.net + * @author okunia@gmail.com + * @author Oleksandr Kunytsia + * @author Uko uko@uar.net */ $lang['menu'] = 'ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами'; $lang['noauth'] = '(Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів не доÑтупна)'; $lang['nosupport'] = '(ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами не підтримуєтьÑÑ)'; $lang['badauth'] = 'невірний механізм автентифікації'; -$lang['user_id'] = 'Ім\'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача'; +$lang['user_id'] = 'Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача'; $lang['user_pass'] = 'Пароль'; -$lang['user_name'] = 'Повне ім\'Ñ'; +$lang['user_name'] = 'Повне ім’Ñ'; $lang['user_mail'] = 'E-mail'; $lang['user_groups'] = 'Групи'; $lang['field'] = 'Поле'; $lang['value'] = 'ЗначеннÑ'; $lang['add'] = 'Додати'; -$lang['delete'] = 'Вилучити'; -$lang['delete_selected'] = 'Вилучити обрані'; -$lang['edit'] = 'Редагувати'; -$lang['edit_prompt'] = 'Редагувати цього кориÑтувача'; +$lang['delete'] = 'Видалити'; +$lang['delete_selected'] = 'Видалити вибраних'; +$lang['edit'] = 'Змінити'; +$lang['edit_prompt'] = 'Змінити цього кориÑтувача'; $lang['modify'] = 'Зберегти зміни'; $lang['search'] = 'Пошук'; $lang['search_prompt'] = 'Шукати'; -$lang['clear'] = 'СброÑити фільтр пошуку'; +$lang['clear'] = 'ОчиÑтити фільтр пошуку'; $lang['filter'] = 'Фільтр'; -$lang['summary'] = 'Показані кориÑтувачі %1$d-%2$d з %3$d знайдених. Ð’Ñього кориÑтувачів: %4$d.'; -$lang['nonefound'] = 'Ðе знайдено жодного кориÑтувача. Ð’Ñьог кориÑтувачів: %d.'; -$lang['delete_ok'] = 'Вилучено кориÑтувачів: %d'; -$lang['delete_fail'] = 'Ðе вдалоÑÑ Ð²Ð¸Ð»ÑƒÑ‡Ð¸Ñ‚Ð¸ %d.'; -$lang['update_ok'] = 'Дані кориÑтувача уÑпішно оновлені'; +$lang['summary'] = 'Показано кориÑтувачі %1$d-%2$d з %3$d знайдених. Ð’Ñього кориÑтувачів: %4$d.'; +$lang['nonefound'] = 'Ðе знайдено жодного кориÑтувача. Ð’Ñього кориÑтувачів: %d.'; +$lang['delete_ok'] = 'Видалено кориÑтувачів: %d'; +$lang['delete_fail'] = 'Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %d.'; +$lang['update_ok'] = 'Дані кориÑтувача оновлено'; $lang['update_fail'] = 'Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ дані кориÑтувача'; -$lang['update_exists'] = 'Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ ім\'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, такий кориÑтувач (%s) вже Ñ–Ñнує (вÑÑ– інші зміни будуть заÑтоÑовані).'; +$lang['update_exists'] = 'Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ñ–Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, такий кориÑтувач (%s) вже Ñ–Ñнує (вÑÑ– інші зміни будуть заÑтоÑовані).'; $lang['start'] = 'на початок'; $lang['prev'] = 'назад'; $lang['next'] = 'вперед'; $lang['last'] = 'в кінець'; $lang['edit_usermissing'] = 'Обраного кориÑтувача не знайдено, можливо його було вилучено або змінено ще деÑÑŒ.'; $lang['user_notify'] = 'Повідомити кориÑтувача'; -$lang['note_notify'] = 'ЛиÑти з повідомленнÑми відÑилаютьÑÑ Ð»Ð¸ÑˆÐµ у випадку видачі нового паролю кориÑтувачеві'; -$lang['note_group'] = 'Якщо не визначено групи, то нові кориÑтувачі будуть автоматично додані до групи по заповчуванню (%s).'; -$lang['add_ok'] = 'КориÑтувача уÑпішно додано'; +$lang['note_notify'] = 'ЛиÑти з повідомленнÑми відÑилаютьÑÑ Ð»Ð¸ÑˆÐµ у випадку видачі нового Ð¿Ð°Ñ€Ð¾Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачу.'; +$lang['note_group'] = 'Якщо не визначено групи, то нові кориÑтувачі будуть автоматично додані до групи за замовчуваннÑм (%s).'; +$lang['note_pass'] = 'Пароль буде згенеровано автоматично, Ñкщо поле Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½Ðµ заповнено Ñ– увімкнено прапорець "повідомити кориÑтувача".'; +$lang['add_ok'] = 'КориÑтувача додано'; $lang['add_fail'] = 'Ðеможливо додати кориÑтувача'; -$lang['notify_ok'] = 'ЛиÑта з повідомленнÑм виÑлано'; +$lang['notify_ok'] = 'ЛиÑта з повідомленнÑм надіÑлано'; $lang['notify_fail'] = 'Ðеможливо виÑлати лиÑта з повідомленнÑм'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/zh/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/zh/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/zh/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/zh/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -5,6 +5,8 @@ * @author ZDYX * @author http://www.chinese-tools.com/tools/converter-tradsimp.html * @author George Sheraton guxd@163.com + * @author Simon zhan + * @author mr.jinyi@gmail.com */ $lang['menu'] = '用户管ç†å™¨'; $lang['noauth'] = '（用户认è¯ä¸å¯ç”¨ï¼‰'; diff -Naur dokuwiki-2009-02-14/lib/plugins/usermanager/lang/zh-tw/lang.php dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/zh-tw/lang.php --- dokuwiki-2009-02-14/lib/plugins/usermanager/lang/zh-tw/lang.php 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/plugins/usermanager/lang/zh-tw/lang.php 2009-12-02 19:50:12.000000000 +0100 @@ -6,6 +6,7 @@ * @author Li-Jiun Huang * @author http://www.chinese-tools.com/tools/converter-simptrad.html * @author Wayne San + * @author Li-Jiun Huang */ $lang['menu'] = '帳號管ç†å“¡(User Manager)'; $lang['noauth'] = '(帳號èªè­‰å°šæœªé–‹æ”¾)'; diff -Naur dokuwiki-2009-02-14/lib/scripts/drag.js dokuwiki-rc2009-12-02/lib/scripts/drag.js --- dokuwiki-2009-02-14/lib/scripts/drag.js 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/drag.js 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,99 @@ +/** + * Makes a DOM object draggable + * + * This is currently for movable DOM dialogs only. If needed it could be + * extended to execute callbacks on special events... + * + * @link http://nofunc.org/Drag_Drop/ + */ +var drag = { + obj: null, + handle: null, + oX: 0, // object X position + oY: 0, // object Y position + eX: 0, // event X delta + eY: 0, // event Y delta + + /** + * Attaches the needed handlers to the given object + * + * This can be called for multiple objects, the right one is later + * determined from the event itself. The handle is optional + * + * @param DOMObject obj The object that should be draggable + * @param DOMObject handle A handle on which the obj can be dragged + */ + attach: function (obj,handle) { + if(handle){ + handle.dragobject = obj; + addEvent($(handle),'mousedown',drag.start); + }else{ + addEvent($(obj),'mousedown',drag.start); + } + }, + + /** + * Starts the dragging operation + */ + start: function (e){ + drag.handle = e.target; + if(drag.handle.dragobject){ + drag.obj = drag.handle.dragobject; + }else{ + drag.obj = drag.handle; + } + + drag.handle.className += ' ondrag'; + drag.obj.className += ' ondrag'; + + drag.oX = parseInt(drag.obj.style.left); + drag.oY = parseInt(drag.obj.style.top); + drag.eX = drag.evX(e); + drag.eY = drag.evY(e); + + addEvent(document,'mousemove',drag.drag); + addEvent(document,'mouseup',drag.stop); + + e.preventDefault(); + e.stopPropagation(); + return false; + }, + + /** + * Ends the dragging operation + */ + stop: function(){ + drag.handle.className = drag.handle.className.replace(/ ?ondrag/,''); + drag.obj.className = drag.obj.className.replace(/ ?ondrag/,''); + removeEvent(document,'mousemove',drag.drag); + removeEvent(document,'mouseup',drag.stop); + drag.obj = null; + drag.handle = null; + }, + + /** + * Moves the object during the dragging operation + */ + drag: function(e) { + if(drag.obj) { + drag.obj.style.top = (drag.evY(e)+drag.oY-drag.eY+'px'); + drag.obj.style.left = (drag.evX(e)+drag.oX-drag.eX+'px'); + } + }, + + /** + * Returns the X position of the given event. + */ + evX: function(e){ + return (e.pageX) ? e.pageX : e.clientX + document.body.scrollTop; //fixme shouldn't this be scrollLeft? + }, + + /** + * Returns the Y position of the given event. + */ + evY: function(e){ + return (e.pageY) ? e.pageY : e.clientY + document.body.scrollTop; + } + +}; + diff -Naur dokuwiki-2009-02-14/lib/scripts/edit.js dokuwiki-rc2009-12-02/lib/scripts/edit.js --- dokuwiki-2009-02-14/lib/scripts/edit.js 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/edit.js 2009-12-02 19:50:12.000000000 +0100 @@ -1,7 +1,7 @@ /** * Functions for text editing (toolbar stuff) * - * @todo I'm no JS guru please help if you know how to improve + * @todo most of the stuff in here should be revamped and then moved to toolbar.js * @author Andreas Gohr */ @@ -49,25 +49,33 @@ * 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 * @author Andreas Gohr */ -function createPicker(id,list,icobase,edid){ - var cnt = list.length; - - var picker = document.createElement('div'); - picker.className = 'picker'; - picker.id = id; - picker.style.position = 'absolute'; - picker.style.display = 'none'; +function createPicker(id,props,edid){ + var icobase = props['icobase']; + var list = props['list']; + + // create the wrapping div + var picker = document.createElement('div'); + picker.className = 'picker'; + if(props['class']){ + picker.className += ' '+props['class']; + } + picker.id = id; + picker.style.position = 'absolute'; + picker.style.marginLeft = '-10000px'; // no display:none, to keep access keys working for(var key in list){ if (!list.hasOwnProperty(key)) continue; - var btn = document.createElement('button'); - - btn.className = 'pickerbutton'; - // associative array? if(isNaN(key)){ + // associative array -> treat as image/value pairs + var btn = document.createElement('button'); + btn.className = 'pickerbutton'; var ico = document.createElement('img'); if(list[key].substr(0,1) == '/'){ ico.src = list[key]; @@ -76,22 +84,27 @@ } btn.title = key; btn.appendChild(ico); - eval("btn.onclick = function(){pickerInsert('"+id+"','"+ - jsEscape(key)+"','"+ - jsEscape(edid)+"');return false;}"); - }else{ + addEvent(btn,'click',bind(pickerInsert,key,edid)); + picker.appendChild(btn); + }else if(isString(list[key])){ + // a list of text -> treat as text picker + var btn = document.createElement('button'); + btn.className = 'pickerbutton'; var txt = document.createTextNode(list[key]); btn.title = list[key]; btn.appendChild(txt); - eval("btn.onclick = function(){pickerInsert('"+id+"','"+ - jsEscape(list[key])+"','"+ - jsEscape(edid)+"');return false;}"); + addEvent(btn,'click',bind(pickerInsert,list[key],edid)); + picker.appendChild(btn); + }else{ + // a list of lists -> treat it as subtoolbar + initToolbar(picker,edid,list); + break; // all buttons handled already } - picker.appendChild(btn); } var body = document.getElementsByTagName('body')[0]; body.appendChild(picker); + return picker; } /** @@ -99,103 +112,9 @@ * * @author Andreas Gohr */ -function pickerInsert(pickerid,text,edid){ - // insert +function pickerInsert(text,edid){ insertAtCarret(edid,text); - // close picker - pobj = document.getElementById(pickerid); - pobj.style.display = 'none'; -} - -/** - * Show a previosly created picker window - * - * @author Andreas Gohr - */ -function showPicker(pickerid,btn){ - var picker = document.getElementById(pickerid); - var x = findPosX(btn); - var y = findPosY(btn); - if(picker.style.display == 'none'){ - picker.style.display = 'block'; - picker.style.left = (x+3)+'px'; - picker.style.top = (y+btn.offsetHeight+3)+'px'; - }else{ - picker.style.display = 'none'; - } -} - -/** - * Create a toolbar - * - * @param string tbid ID of the element where to insert the toolbar - * @param string edid ID of the editor textarea - * @param array tb Associative array defining the buttons - * @author Andreas Gohr - */ -function initToolbar(tbid,edid,tb){ - var toolbar = $(tbid); - if(!toolbar) return; - - //empty the toolbar area: - toolbar.innerHTML=''; - - var cnt = tb.length; - for(var i=0; i - */ -function addBtnActionFormat(btn, props, edid) -{ - var sample = props['title']; - if(props['sample']){ sample = props['sample']; } - eval("btn.onclick = function(){insertTags('"+ - jsEscape(edid)+"','"+ - jsEscape(props['open'])+"','"+ - jsEscape(props['close'])+"','"+ - jsEscape(sample)+ - "');return false;}"); - - return true; -} - -/** - * Add button action for insert buttons - * - * @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 - * @author Gabriel Birke - */ -function addBtnActionInsert(btn, props, edid) -{ - eval("btn.onclick = function(){insertAtCarret('"+ - jsEscape(edid)+"','"+ - jsEscape(props['insert'])+ - "');return false;}"); - return true; + pickerClose(); } /** @@ -207,192 +126,114 @@ * @return boolean If button should be appended * @author Gabriel Birke */ -function addBtnActionSignature(btn, props, edid) -{ +function addBtnActionSignature(btn, props, edid) { if(typeof(SIG) != 'undefined' && SIG != ''){ - eval("btn.onclick = function(){insertAtCarret('"+ - jsEscape(edid)+"','"+ - jsEscape(SIG)+ - "');return false;}"); + addEvent(btn,'click',bind(insertAtCarret,edid,SIG)); return true; } return false; } /** - * Add button action for picker buttons and create picker element - * - * @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 - * @param int id Unique number of the picker - * @return boolean If button should be appended - * @author Gabriel Birke - */ -function addBtnActionPicker(btn, props, edid, id) -{ - createPicker('picker'+id, - props['list'], - props['icobase'], - edid); - eval("btn.onclick = function(){showPicker('picker"+id+ - "',this);return false;}"); - return true; -} - -/** - * Add button action for the mediapopup button + * Make intended formattings easier to handle * - * @param DOMElement btn Button element to add the action to - * @param array props Associative array of button properties - * @return boolean If button should be appended - * @author Gabriel Birke - */ -function addBtnActionMediapopup(btn, props) -{ - eval("btn.onclick = function(){window.open('"+ - jsEscape(props['url']+encodeURIComponent(NS))+"','"+ - jsEscape(props['name'])+"','"+ - jsEscape(props['options'])+ - "');return false;}"); - return true; -} - -/** - * Format selection + * Listens to all key inputs and handle indentions + * of lists and code blocks * - * Apply tagOpen/tagClose to selection in textarea, use sampleText instead - * of selection if there is none. Copied and adapted from phpBB + * Currently handles space, backspce and enter presses * - * @author phpBB development team - * @author MediaWiki development team * @author Andreas Gohr - * @author Jim Raynor + * @fixme handle tabs */ -function insertTags(edid,tagOpen, tagClose, sampleText) { - var txtarea = document.getElementById(edid); - // IE - if(document.selection && !is_gecko) { - var theSelection = document.selection.createRange().text; - var replaced = true; - if(!theSelection){ - replaced = false; - theSelection=sampleText; - } - txtarea.focus(); - - // This has change - var text = theSelection; - if(theSelection.charAt(theSelection.length - 1) == " "){// exclude ending space char, if any - theSelection = theSelection.substring(0, theSelection.length - 1); - r = document.selection.createRange(); - r.text = tagOpen + theSelection + tagClose + " "; - } else { - r = document.selection.createRange(); - r.text = tagOpen + theSelection + tagClose; - } - if(!replaced){ - r.moveStart('character',-text.length-tagClose.length); - r.moveEnd('character',-tagClose.length); - } - r.select(); - // Mozilla - } else if(txtarea.selectionStart || txtarea.selectionStart == '0') { - replaced = false; - var startPos = txtarea.selectionStart; - var endPos = txtarea.selectionEnd; - if(endPos - startPos){ replaced = true; } - var scrollTop=txtarea.scrollTop; - var myText = (txtarea.value).substring(startPos, endPos); - if(!myText) { myText=sampleText;} - if(myText.charAt(myText.length - 1) == " "){ // exclude ending space char, if any - subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " "; - } else { - subst = tagOpen + myText + tagClose; - } - txtarea.value = txtarea.value.substring(0, startPos) + subst + - txtarea.value.substring(endPos, txtarea.value.length); - txtarea.focus(); - - //set new selection - if(replaced){ - var cPos=startPos+(tagOpen.length+myText.length+tagClose.length); - txtarea.selectionStart=cPos; - txtarea.selectionEnd=cPos; - }else{ - txtarea.selectionStart=startPos+tagOpen.length; - txtarea.selectionEnd=startPos+tagOpen.length+myText.length; - } - txtarea.scrollTop=scrollTop; - // All others - } else { - var copy_alertText=alertText; - var re1=new RegExp("\\$1","g"); - var re2=new RegExp("\\$2","g"); - copy_alertText=copy_alertText.replace(re1,sampleText); - copy_alertText=copy_alertText.replace(re2,tagOpen+sampleText+tagClose); - - if (sampleText) { - text=prompt(copy_alertText); - } else { - text=""; - } - if(!text) { text=sampleText;} - text=tagOpen+text+tagClose; - //append to the end - txtarea.value += "\n"+text; - - // in Safari this causes scrolling - if(!is_safari) { - txtarea.focus(); +function keyHandler(e){ + if(e.keyCode != 13 && + e.keyCode != 8 && + e.keyCode != 32) return; + var field = e.target; + var selection = getSelection(field); + var search = "\n"+field.value.substr(0,selection.start); + var linestart = Math.max(search.lastIndexOf("\n"), + search.lastIndexOf("\r")); //IE workaround + search = search.substr(linestart); + + + if(e.keyCode == 13){ // Enter + // keep current indention for lists and code + var match = search.match(/(\n +([\*-] ?)?)/); + if(match){ + var scroll = field.scrollHeight; + insertAtCarret(field.id,match[1]); + field.scrollTop += (field.scrollHeight - scroll); + e.preventDefault(); // prevent enter key + return false; + } + }else if(e.keyCode == 8){ // Backspace + // unindent lists + var match = search.match(/(\n +)([*-] ?)$/); + if(match){ + var spaces = match[1].length-1; + + if(spaces > 3){ // unindent one level + field.value = field.value.substr(0,linestart)+ + field.value.substr(linestart+2); + selection.start = selection.start - 2; + selection.end = selection.start; + }else{ // delete list point + field.value = field.value.substr(0,linestart)+ + field.value.substr(selection.start); + selection.start = linestart; + selection.end = linestart; + } + setSelection(selection); + e.preventDefault(); // prevent backspace + return false; + } + }else if(e.keyCode == 32){ // Space + // intend list item + var match = search.match(/(\n +)([*-] )$/); + if(match){ + field.value = field.value.substr(0,linestart)+' '+ + field.value.substr(linestart); + selection.start = selection.start + 2; + selection.end = selection.start; + setSelection(selection); + e.preventDefault(); // prevent space + return false; + } } - - } - // reposition cursor if possible - if (txtarea.createTextRange){ - txtarea.caretPos = document.selection.createRange().duplicate(); - } } -/* - * Insert the given value at the current cursor position - * - * @see http://www.alexking.org/index.php?content=software/javascript/content.php - */ -function insertAtCarret(edid,value){ - var field = document.getElementById(edid); +//FIXME consolidate somewhere else +addInitEvent(function(){ + var field = $('wiki__text'); + if(!field) return; + addEvent(field,'keydown',keyHandler); +}); + +/** + * Determine the current section level while editing + * + * @author Andreas Gohr + */ +function currentHeadlineLevel(textboxId){ + var field = $(textboxId); + var selection = getSelection(field); + var search = "\n"+field.value.substr(0,selection.start); + var lasthl = search.lastIndexOf("\n=="); + if(lasthl == -1 && field.form.prefix){ + // we need to look in prefix context + search = field.form.prefix.value; + lasthl = search.lastIndexOf("\n=="); + } + search = search.substr(lasthl+1,6); + + if(search == '======') return 1; + if(search.substr(0,5) == '=====') return 2; + if(search.substr(0,4) == '====') return 3; + if(search.substr(0,3) == '===') return 4; + if(search.substr(0,2) == '==') return 5; - //IE support - if (document.selection) { - field.focus(); - sel = document.selection.createRange(); - sel.text = value; - - //MOZILLA/NETSCAPE support - }else if (field.selectionStart || field.selectionStart == '0') { - var startPos = field.selectionStart; - var endPos = field.selectionEnd; - var scrollTop = field.scrollTop; - field.value = field.value.substring(0, startPos) + - value + - field.value.substring(endPos, field.value.length); - - field.focus(); - var cPos=startPos+(value.length); - field.selectionStart=cPos; - field.selectionEnd=cPos; - field.scrollTop=scrollTop; - } else { - field.value += "\n"+value; - } - // reposition cursor if possible - if (field.createTextRange){ - field.caretPos = document.selection.createRange().duplicate(); - } - if(value){ - window.textChanged = true; - summaryCheck(); - } + return 0; } @@ -433,9 +274,15 @@ * JSnocheck class), add handlers to monitor changes * * Sets focus to the editbox as well + * + * @fixme this is old and crappy code. needs to be redone */ function initChangeCheck(msg){ - if(!document.getElementById){ return false; } + var edit_text = document.getElementById('wiki__text'); + if(!edit_text) return; + if(edit_text.readOnly) return; + if(!$('dw__editform')) return; + // add change check for links var links = document.getElementsByTagName('a'); for(var i=0; i < links.length; i++){ @@ -466,12 +313,10 @@ btn_prev.onclick = function(){ textChanged = false; }; // add change memory setter - var edit_text = document.getElementById('wiki__text'); edit_text.onchange = function(){ textChanged = true; //global var summaryCheck(); }; - edit_text.onkeyup = summaryCheck; var summary = document.getElementById('edit__summary'); addEvent(summary, 'change', summaryCheck); addEvent(summary, 'keyup', summaryCheck); @@ -526,7 +371,7 @@ locktimer.sack.onCompletion = locktimer.refreshed; // register refresh event - addEvent($('dw__editform').elements.wikitext,'keyup',function(){locktimer.refresh();}); + addEvent($('dw__editform').elements.wikitext,'keypress',function(){locktimer.refresh();}); // start timer locktimer.reset(); diff -Naur dokuwiki-2009-02-14/lib/scripts/events.js dokuwiki-rc2009-12-02/lib/scripts/events.js --- dokuwiki-2009-02-14/lib/scripts/events.js 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/events.js 2009-12-02 19:50:12.000000000 +0100 @@ -156,4 +156,21 @@ } } - +/** + * Bind variables to a function call creating a closure + * + * Use this to circumvent variable scope problems when creating closures + * inside a loop + * + * @author Adrian Lang + * @link http://www.cosmocode.de/en/blog/gohr/2009-10/15-javascript-fixing-the-closure-scope-in-loops + * @param functionref fnc - the function to be called + * @param mixed - any arguments to be passed to the function + * @returns functionref + */ +function bind (fnc) { + var args = Array.prototype.slice.call(arguments, 1); + return function() { + return fnc.apply(this, args); + } +} diff -Naur dokuwiki-2009-02-14/lib/scripts/linkwiz.js dokuwiki-rc2009-12-02/lib/scripts/linkwiz.js --- dokuwiki-2009-02-14/lib/scripts/linkwiz.js 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/linkwiz.js 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,277 @@ +/** + * The Link Wizard + * + * @author Andreas Gohr + */ +var linkwiz = { + wiz: null, + entry: null, + result: null, + timer: null, + sack: null, + textArea: null, + selected: -1, + + /** + * Initialize the linkwizard by creating the needed HTML + * and attaching the eventhandlers + */ + init: function(textArea){ + // prepare AJAX object + linkwiz.sack = new sack(DOKU_BASE + 'lib/exe/ajax.php'); + linkwiz.sack.AjaxFailedAlert = ''; + linkwiz.sack.encodeURIString = false; + + // create HTML Structure + linkwiz.wiz = document.createElement('div'); + linkwiz.wiz.id = 'link__wiz'; + linkwiz.wiz.className = 'picker'; + linkwiz.wiz.style.top = (findPosY(textArea)+20)+'px'; + linkwiz.wiz.style.left = (findPosX(textArea)+80)+'px'; + linkwiz.wiz.style.marginLeft = '-10000px'; + + linkwiz.wiz.innerHTML = + '
    '+ + ''+ + LANG['linkwiz']+'
    '+ + '
    '+LANG['linkto']+'
    '+ + '
    '; + textArea.form.parentNode.appendChild(linkwiz.wiz); + linkwiz.textArea = textArea; + linkwiz.result = $('link__wiz_result'); + linkwiz.entry = $('link__wiz_entry'); + + // attach event handlers + var obj; + obj = $('link__wiz_close'); + obj.onclick = linkwiz.hide; + + linkwiz.sack.elementObj = linkwiz.result; + addEvent(linkwiz.entry,'keyup',linkwiz.onEntry); + addEvent(linkwiz.result,'click',linkwiz.onResultClick); + drag.attach(linkwiz.wiz,$('link__wiz_header')); + }, + + /** + * handle all keyup events in the entry field + */ + onEntry: function(e){ + if(e.keyCode == 37 || e.keyCode == 39){ //left/right + return true; //ignore + } + if(e.keyCode == 27){ + linkwiz.hide(); + e.preventDefault(); + e.stopPropagation(); + return false; + } + if(e.keyCode == 38){ //Up + linkwiz.select(linkwiz.selected -1); + e.preventDefault(); + e.stopPropagation(); + return false; + } + if(e.keyCode == 40){ //Down + linkwiz.select(linkwiz.selected +1); + e.preventDefault(); + e.stopPropagation(); + return false; + } + if(e.keyCode == 13){ //Enter + if(linkwiz.selected > -1){ + var obj = linkwiz.getResult(linkwiz.selected); + if(obj){ + var a = obj.getElementsByTagName('A')[0]; + linkwiz.resultClick(a); + } + }else if(linkwiz.entry.value){ + linkwiz.insertLink(linkwiz.entry.value); + } + + e.preventDefault(); + e.stopPropagation(); + return false; + } + linkwiz.autocomplete(); + }, + + /** + * Get one of the result by index + * + * @param int result div to return + * @returns DOMObject or null + */ + getResult: function(num){ + var obj; + var childs = linkwiz.result.getElementsByTagName('DIV'); + obj = childs[num]; + if(obj){ + return obj; + }else{ + return null; + } + }, + + /** + * Select the given result + */ + select: function(num){ + if(num < 0){ + linkwiz.deselect(); + return; + } + + var obj = linkwiz.getResult(num); + if(obj){ + linkwiz.deselect(); + obj.className += ' selected'; + + // make sure the item is viewable in the scroll view + // FIXME check IE compatibility + if(obj.offsetTop > linkwiz.result.scrollTop + linkwiz.result.clientHeight){ + linkwiz.result.scrollTop += obj.clientHeight; + }else if(obj.offsetTop - linkwiz.result.clientHeight < linkwiz.result.scrollTop){ // this works but isn't quite right, fixes welcome + linkwiz.result.scrollTop -= obj.clientHeight; + } + // now recheck - if still not in view, the user used the mouse to scroll + if( (obj.offsetTop > linkwiz.result.scrollTop + linkwiz.result.clientHeight) || + (obj.offsetTop < linkwiz.result.scrollTop) ){ + obj.scrollIntoView(); + } + + linkwiz.selected = num; + } + }, + + /** + * deselect a result if any is selected + */ + deselect: function(){ + if(linkwiz.selected > -1){ + var obj = linkwiz.getResult(linkwiz.selected); + if(obj){ + obj.className = obj.className.replace(/ ?selected/,''); + } + } + linkwiz.selected = -1; + }, + + /** + * Handle clicks in the result set an dispatch them to + * resultClick() + */ + onResultClick: function(e){ + if(e.target.tagName != 'A') return; + e.stopPropagation(); + e.preventDefault(); + linkwiz.resultClick(e.target); + return false; + }, + + /** + * Handles the "click" on a given result anchor + */ + resultClick: function(a){ + var id = a.title; + if(id == '' || id.substr(id.length-1) == ':'){ + linkwiz.entry.value = id; + linkwiz.autocomplete_exec(); + }else{ + linkwiz.entry.value = id; + if(a.nextSibling && a.nextSibling.tagName == 'SPAN'){ + linkwiz.insertLink(a.nextSibling.innerHTML); + }else{ + linkwiz.insertLink(''); + } + } + }, + + /** + * Insert the id currently in the entry box to the textarea, + * replacing the current selection or at the curso postion. + * When no selection is available the given title will be used + * as link title instead + */ + insertLink: function(title){ + if(!linkwiz.entry.value) return; + var sel = getSelection(linkwiz.textArea); + var stxt = sel.getText(); + if(!stxt && !DOKU_UHC) stxt=title; + + // prepend colon inside namespaces for non namespace pages + if(linkwiz.textArea.form['id'].value.indexOf(':') != -1 && + linkwiz.entry.value.indexOf(':') == -1){ + linkwiz.entry.value = ':'+linkwiz.entry.value; + } + + var link = '[['+linkwiz.entry.value+'|'; + if(stxt) link += stxt; + link += ']]'; + + var so = linkwiz.entry.value.length+3; + var eo = 2; + + pasteText(sel,link,{startofs: so, endofs: eo}); + linkwiz.hide(); + }, + + /** + * Start the page/namespace lookup timer + * + * Calls autocomplete_exec when the timer runs out + */ + autocomplete: function(){ + if(linkwiz.timer !== null){ + window.clearTimeout(linkwiz.timer); + linkwiz.timer = null; + } + + linkwiz.timer = window.setTimeout(linkwiz.autocomplete_exec,350); + }, + + /** + * Executes the AJAX call for the page/namespace lookup + */ + autocomplete_exec: function(){ + linkwiz.deselect(); + linkwiz.result.innerHTML = ''; + linkwiz.sack.runAJAX('call=linkwiz&q='+encodeURI(linkwiz.entry.value)); + }, + + /** + * Clears the result area + */ + clear: function(){ + linkwiz.result.innerHTML = 'Search for a matching page name above, or browse through the pages on the right'; + linkwiz.entry.value = ''; + }, + + /** + * Show the linkwizard + */ + show: function(){ + linkwiz.wiz.style.marginLeft = '0px'; + linkwiz.entry.focus(); + linkwiz.autocomplete(); + }, + + /** + * Hide the link wizard + */ + hide: function(){ + linkwiz.wiz.style.marginLeft = '-10000px'; + linkwiz.textArea.focus(); + }, + + /** + * Toggle the link wizard + */ + toggle: function(){ + if(linkwiz.wiz.style.marginLeft == '-10000px'){ + linkwiz.show(); + }else{ + linkwiz.hide(); + } + } +}; + diff -Naur dokuwiki-2009-02-14/lib/scripts/media.js dokuwiki-rc2009-12-02/lib/scripts/media.js --- dokuwiki-2009-02-14/lib/scripts/media.js 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/media.js 2009-12-02 19:50:12.000000000 +0100 @@ -3,7 +3,7 @@ * * @author Andreas Gohr */ -media = { +var media = { keepopen: false, hide: false, @@ -76,7 +76,7 @@ }else{ var name = e.target.title; } - if(!confirm(reallyDel + "\n" + name)) { + if(!confirm(LANG['del_confirm'] + "\n" + name)) { e.preventDefault(); return false; } else { @@ -141,6 +141,33 @@ }, /** + * Opens the searchfield + * + * @author Tobias Sarnowski + */ + showsearchfield: function(event,link){ + // prepare an AJAX call to fetch the search + var ajax = new sack(DOKU_BASE + 'lib/exe/ajax.php'); + ajax.AjaxFailedAlert = ''; + ajax.encodeURIString = false; + if(ajax.failed) return true; + + cleanMsgArea(); + + var content = $('media__content'); + content.innerHTML = '...'; + + ajax.elementObj = content; + ajax.afterCompletion = function(){ + media.selectorattach(content); + media.confirmattach(content); + media.updatehide(); + }; + ajax.runAJAX(link.search.substr(1)+'&call=mediasearchlist'); + return false; + }, + + /** * Toggles the keep open state * * @author Andreas Gohr @@ -208,7 +235,7 @@ } return false; } - opener.insertTags('wiki__text','{{:'+id+'|','}}',''); + opener.insertTags('wiki__text','{{'+id+'|','}}',''); if(!media.keepopen) window.close(); opener.focus(); diff -Naur dokuwiki-2009-02-14/lib/scripts/script.js dokuwiki-rc2009-12-02/lib/scripts/script.js --- dokuwiki-2009-02-14/lib/scripts/script.js 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/script.js 2009-12-02 19:50:12.000000000 +0100 @@ -17,9 +17,6 @@ var is_opera_seven = (window.opera && document.childNodes); } -// prepare empty toolbar for checks by lazy plugins -var toolbar = ''; - /** * Handy shortcut to document.getElementById * @@ -69,7 +66,7 @@ var els = node.getElementsByTagName(tag); var elsLen = els.length; var pattern = new RegExp("(^|\\s)"+searchClass+"(\\s|$)"); - for (i = 0, j = 0; i < elsLen; i++) { + for (var i = 0, j = 0; i < elsLen; i++) { if ( pattern.test(els[i].className) ) { classElements[j] = els[i]; j++; @@ -203,12 +200,18 @@ if(!document.getElementById) return; var header = $('toc__header'); if(!header) return; + var toc = $('toc__inside'); var obj = document.createElement('span'); obj.id = 'toc__toggle'; - obj.innerHTML = '−'; - obj.className = 'toc_close'; obj.style.cursor = 'pointer'; + if (toc && toc.style.display == 'none') { + obj.innerHTML = '+'; + obj.className = 'toc_open'; + } else { + obj.innerHTML = '−'; + obj.className = 'toc_close'; + } prependChild(header,obj); obj.parentNode.onclick = toggleToc; @@ -236,29 +239,6 @@ } /** - * This enables/disables checkboxes for acl-administration - * - * @author Frank Schubert - */ -function checkAclLevel(){ - if(document.getElementById) { - var scope = $('acl_scope').value; - - //check for namespace - if( (scope.indexOf(":*") > 0) || (scope == "*") ){ - document.getElementsByName('acl_checkbox[4]')[0].disabled=false; - document.getElementsByName('acl_checkbox[8]')[0].disabled=false; - }else{ - document.getElementsByName('acl_checkbox[4]')[0].checked=false; - document.getElementsByName('acl_checkbox[8]')[0].checked=false; - - document.getElementsByName('acl_checkbox[4]')[0].disabled=true; - document.getElementsByName('acl_checkbox[8]')[0].disabled=true; - } - } -} - -/** * Display an insitu footnote popup * * @author Andreas Gohr @@ -497,6 +477,9 @@ else input2.disabled = (input2.type!='checkbox'); } }); + input1.checked = false; // chrome reselects on back button which messes up the logic + } else if(input1.type=='submit'){ + input1.disabled = true; } } }); @@ -520,9 +503,10 @@ /** * Display error for Windows Shares on browsers other than IE * - * Michael Klier + * @author Michael Klier */ function checkWindowsShares() { + if(!LANG['nosmblinks']) return true; var elems = getElementsByClass('windows',document,'a'); if(elems){ for(var i=0; i + * @author Michael Klier */ addInitEvent(function(){ checkWindowsShares(); }); + +/** + * Highlight the section when hovering over the appropriate section edit button + * + * @author Andreas Gohr + */ +addInitEvent(function(){ + var break_classes = new RegExp('secedit|toc|page'); + var btns = getElementsByClass('btn_secedit',document,'form'); + for(var i=0; i + */ +function selection_class(){ + this.start = 0; + this.end = 0; + this.obj = null; + this.rangeCopy = null; + this.scroll = 0; + this.fix = 0; + + this.getLength = function(){ + return this.end - this.start; + }; + + this.getText = function(){ + if(!this.obj) return ''; + return this.obj.value.substring(this.start,this.end); + } +} + +/** + * Get current selection/cursor position in a given textArea + * + * @link http://groups.drupal.org/node/1210 + * @author Andreas Gohr + * @link http://linebyline.blogspot.com/2006/11/textarea-cursor-position-in-internet.html + * @returns object - a selection object + */ +function getSelection(textArea) { + var sel = new selection_class(); + + sel.obj = textArea; + sel.start = textArea.value.length; + sel.end = textArea.value.length; + + textArea.focus(); + if(document.getSelection) { // Mozilla et al. + sel.start = textArea.selectionStart; + sel.end = textArea.selectionEnd; + sel.scroll = textArea.scrollTop; + } else if(document.selection) { // MSIE + /* + * This huge lump of code is neccessary to work around two MSIE bugs: + * + * 1. Selections trim newlines at the end of the code + * 2. Selections count newlines as two characters + */ + + // The current selection + sel.rangeCopy = document.selection.createRange().duplicate(); + + var before_range = document.body.createTextRange(); + before_range.moveToElementText(textArea); // Selects all the text + before_range.setEndPoint("EndToStart", sel.rangeCopy); // Moves the end where we need it + + var before_finished = false, selection_finished = false; + var before_text, selection_text; + // Load the text values we need to compare + before_text = before_range.text; + selection_text = sel.rangeCopy.text; + + sel.start = before_text.length; + sel.end = sel.start + selection_text.length; + + // Check each range for trimmed newlines by shrinking the range by 1 character and seeing + // if the text property has changed. If it has not changed then we know that IE has trimmed + // a \r\n from the end. + do { + if (!before_finished) { + if (before_range.compareEndPoints("StartToEnd", before_range) == 0) { + before_finished = true; + } else { + before_range.moveEnd("character", -1); + if (before_range.text == before_text) { + sel.start += 2; + sel.end += 2; + } else { + before_finished = true; + } + } + } + if (!selection_finished) { + if (sel.rangeCopy.compareEndPoints("StartToEnd", sel.rangeCopy) == 0) { + selection_finished = true; + } else { + sel.rangeCopy.moveEnd("character", -1); + if (sel.rangeCopy.text == selection_text) { + sel.end += 2; + } else { + selection_finished = true; + } + } + } + } while ((!before_finished || !selection_finished)); + + + // count number of newlines in str to work around stupid IE selection bug + var countNL = function(str) { + var m = str.split("\r\n"); + if (!m || !m.length) return 0; + return m.length-1; + }; + sel.fix = countNL(sel.obj.value.substring(0,sel.start)); + + } + return sel; +} + +/** + * Set the selection + * + * You need to get a selection object via getSelection() first, then modify the + * start and end properties and pass it back to this function. + * + * @link http://groups.drupal.org/node/1210 + * @author Andreas Gohr + * @param object selection - a selection object as returned by getSelection() + */ +function setSelection(selection){ + if(document.getSelection){ // FF + // what a pleasure in FF ;) + selection.obj.setSelectionRange(selection.start,selection.end); + if(selection.scroll) selection.obj.scrollTop = selection.scroll; + } else if(document.selection) { // IE + selection.rangeCopy.collapse(true); + selection.rangeCopy.moveStart('character',selection.start - selection.fix); + selection.rangeCopy.moveEnd('character',selection.end - selection.start); + selection.rangeCopy.select(); + } +} + +/** + * Inserts the given text at the current cursor position or replaces the current + * selection + * + * @author Andreas Gohr + * @param string text - the new text to be pasted + * @param objct selecttion - selection object returned by getSelection + * @param int opts.startofs - number of charcters at the start to skip from new selection + * @param int opts.endofs - number of characters at the end to skip from new selection + * @param bool opts.nosel - set true if new text should not be selected + */ +function pasteText(selection,text,opts){ + if(!opts) opts = {}; + // replace the content + + selection.obj.value = + selection.obj.value.substring(0, selection.start) + text + + selection.obj.value.substring(selection.end, selection.obj.value.length); + + // set new selection + selection.end = selection.start + text.length; + + // modify the new selection if wanted + if(opts.startofs) selection.start += opts.startofs; + if(opts.endofs) selection.end -= opts.endofs; + + // no selection wanted? set cursor to end position + if(opts.nosel) selection.start = selection.end; + + setSelection(selection); +} + + +/** + * Format selection + * + * Apply tagOpen/tagClose to selection in textarea, use sampleText instead + * of selection if there is none. + * + * @author Andreas Gohr + */ +function insertTags(textAreaID, tagOpen, tagClose, sampleText){ + var txtarea = $(textAreaID); + + var selection = getSelection(txtarea); + var text = selection.getText(); + var opts; + + // don't include trailing space in selection + if(text.charAt(text.length - 1) == ' '){ + selection.end--; + text = selection.getText(); + } + + if(!text){ + // nothing selected, use the sample text and select it + text = sampleText; + opts = { + startofs: tagOpen.length, + endofs: tagClose.length + }; + }else{ + // place cursor at the end + opts = { + nosel: true + }; + } + + // surround with tags + text = tagOpen + text + tagClose; + + // do it + pasteText(selection,text,opts); +} + +/** + * Wraps around pasteText() for backward compatibility + * + * @author Andreas Gohr + */ +function insertAtCarret(textAreaID, text){ + var txtarea = $(textAreaID); + var selection = getSelection(txtarea); + pasteText(selection,text,{nosel: true}); +} + diff -Naur dokuwiki-2009-02-14/lib/scripts/toolbar.js dokuwiki-rc2009-12-02/lib/scripts/toolbar.js --- dokuwiki-2009-02-14/lib/scripts/toolbar.js 1970-01-01 01:00:00.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/scripts/toolbar.js 2009-12-02 19:50:12.000000000 +0100 @@ -0,0 +1,252 @@ + +// used to identify pickers +var pickercounter=0; + +/** + * Create a toolbar + * + * @param string tbid ID of the element where to insert the toolbar + * @param string edid ID of the editor textarea + * @param array tb Associative array defining the buttons + * @author Andreas Gohr + */ +function initToolbar(tbid,edid,tb){ + var toolbar = $(tbid); + if(!toolbar) return; + var edit = $(edid); + if(!edit) return; + if(edit.readOnly) return; + + //empty the toolbar area: + toolbar.innerHTML=''; + + var cnt = tb.length; + for(var i=0; i assign it as onclick + actionFunc = 'tb_'+tb[i]['type']; + if( isFunction(window[actionFunc]) ){ + addEvent(btn,'click', bind(window[actionFunc],btn,tb[i],edid)); + toolbar.appendChild(btn); + continue; + } + + // type is a init function -> execute it + actionFunc = 'addBtnAction'+tb[i]['type'].charAt(0).toUpperCase()+tb[i]['type'].substring(1); + if( isFunction(window[actionFunc]) ){ + if(window[actionFunc](btn, tb[i], edid)){ + toolbar.appendChild(btn); + } + continue; + } + + alert('unknown toolbar type: '+tb[i]['type']+' '+actionFunc); + } // end for + +} + +/** + * Button action for format buttons + * + * @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 + * @author Gabriel Birke + * @author Andreas Gohr + */ +function tb_format(btn, props, edid) { + var sample = props['title']; + if(props['sample']){ + sample = props['sample']; + } + insertTags(edid, + fixtxt(props['open']), + fixtxt(props['close']), + fixtxt(sample)); + pickerClose(); + return false; +} + +/** + * Button action for format buttons + * + * This works exactly as tb_format() except that, if multiple lines + * are selected, each line will be formatted seperately + * + * @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 + * @author Gabriel Birke + * @author Andreas Gohr + */ +function tb_formatln(btn, props, edid) { + var sample = props['title']; + if(props['sample']){ + sample = props['sample']; + } + sample = fixtxt(sample); + + props['open'] = fixtxt(props['open']); + props['close'] = fixtxt(props['close']); + + // is something selected? + var opts; + var selection = getSelection($(edid)); + if(selection.getLength()){ + sample = selection.getText(); + opts = {nosel: true}; + }else{ + opts = { + startofs: props['open'].length, + endofs: props['close'].length + }; + } + + sample = sample.split("\n").join(props['close']+"\n"+props['open']); + sample = props['open']+sample+props['close']; + + pasteText(selection,sample,opts); + + pickerClose(); + return false; +} + +/** + * Button action for insert buttons + * + * @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 + * @author Gabriel Birke + * @author Andreas Gohr + */ +function tb_insert(btn, props, edid) { + insertAtCarret(edid,fixtxt(props['insert'])); + pickerClose(); + return false; +} + +/** + * Button action for the media popup + * + * @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 + * @author Andreas Gohr + */ +function tb_mediapopup(btn, props, edid) { + window.open( + DOKU_BASE+props['url']+encodeURIComponent(NS), + props['name'], + props['options']); + return false; +} + +/** + * Button action for automatic headlines + * + * Insert a new headline based on the current section level + * + * @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 + * @author Andreas Gohr + */ +function tb_autohead(btn, props, edid){ + var lvl = currentHeadlineLevel(edid); + + // determine new level + lvl += props['mod']; + if(lvl < 1) lvl = 1; + if(lvl > 5) lvl = 5; + + var tags = '='; + for(var i=0; i<=5-lvl; i++) tags += '='; + insertTags(edid, tags+' ', ' '+tags+"\n", props['text']); + pickerClose(); + return false; +} + + +/** + * Add button action for picker buttons and create picker element + * + * @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 + * @author Gabriel Birke + */ +function addBtnActionPicker(btn, props, edid) { + var pickerid = 'picker'+(pickercounter++); + createPicker(pickerid, props, edid); + addEvent(btn,'click',function(){ + pickerToggle(pickerid,btn); + return false; + }); + return true; +} + +/** + * Add button action for the link wizard 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 + * @author Andreas Gohr + */ +function addBtnActionLinkwiz(btn, props, edid) { + linkwiz.init($(edid)); + addEvent(btn,'click',function(){ + linkwiz.toggle(); + return false; + }); + return true; +} + +/** + * Show/Hide a previosly created picker window + * + * @author Andreas Gohr + */ +function pickerToggle(pickerid,btn){ + var picker = $(pickerid); + if(picker.style.marginLeft == '-10000px'){ + var x = findPosX(btn); + var y = findPosY(btn); + picker.style.left = (x+3)+'px'; + picker.style.top = (y+btn.offsetHeight+3)+'px'; + picker.style.marginLeft = '0px'; + }else{ + picker.style.marginLeft = '-10000px'; + } +} + +/** + * Close all open pickers + * + * @author Andreas Gohr + */ +function pickerClose(){ + var pobjs = getElementsByClass('picker'); + for(var i=0; i '.$lang['img_date'].':
    '.strftime($conf['dformat'],$t).'
    '; + if($t) print '
    '.$lang['img_date'].':
    '.dformat($t).'
    '; $t = tpl_img_getTag('File.Name'); if($t) print '
    '.$lang['img_fname'].':
    '.hsc($t).'
    '; diff -Naur dokuwiki-2009-02-14/lib/tpl/default/images/button-php.gif dokuwiki-rc2009-12-02/lib/tpl/default/images/button-php.gif --- dokuwiki-2009-02-14/lib/tpl/default/images/button-php.gif 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/tpl/default/images/button-php.gif 2009-12-02 19:50:12.000000000 +0100 @@ -1,4 +1 @@ -GIF89aPÂfff1eœÿÿÿ‰Žyÿÿÿÿÿÿÿÿÿÿÿÿ!ù -ÿ,PªºÜþ0ÊI—¸8ëÍ»ÿ`¨AižhZ -Cë¾p,Ï´,Œjž³uïÿ°€¤+šxÀ¤2ˆ[]Ž+'ñøÂT‘X—u°å^ZݘpJ,GfªÌæ²YÙµ{ÞF2‡Ç§´¬Wƒ¿uot[]„mbMh(iS'vvs +
    diff -Naur dokuwiki-2009-02-14/lib/tpl/default/media.css dokuwiki-rc2009-12-02/lib/tpl/default/media.css --- dokuwiki-2009-02-14/lib/tpl/default/media.css 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/tpl/default/media.css 2009-12-02 19:50:12.000000000 +0100 @@ -35,7 +35,7 @@ /* --- Tree formatting --- */ #media__tree img { - float:left; + float: left; padding: 0.5em 0.3em 0 0; } diff -Naur dokuwiki-2009-02-14/lib/tpl/default/print.css dokuwiki-rc2009-12-02/lib/tpl/default/print.css --- dokuwiki-2009-02-14/lib/tpl/default/print.css 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/tpl/default/print.css 2009-12-02 19:50:12.000000000 +0100 @@ -7,26 +7,26 @@ table { font-size: 100%; - padding:0; - margin:0; + padding: 0; + margin: 0; } -tr,td,th {padding:0; margin:0;} +tr,td,th { padding: 0; margin: 0; } -img {border:0} +img { border: 0; } a { - color:#000000; - text-decoration:none; + color: #000000; + text-decoration: none; background: none !important; } div.meta { - clear:both; + clear: both; margin-top: 1em; - font-size:70%; - text-align:right; + font-size: 70%; + text-align: right; } @@ -36,7 +36,7 @@ div.error, div.breadcrumbs, div.secedit { - display:none; + display: none; } /* --------------------- Text formating -------------------------------- */ @@ -60,7 +60,7 @@ } /* existing wikilink */ -a.wikilink1 {text-decoration:underline } +a.wikilink1 { text-decoration: underline; } /* the document */ div.page { @@ -83,15 +83,15 @@ padding-top: 0.5em; padding-bottom: 0; border-bottom: 1px solid #000000; - clear:left; + clear: left; } /* special headlines */ -h1 {font-size: 160%; font-weight: bold;} -h2 {font-size: 150%; } -h3 {font-size: 140%; border-bottom: none; } -h4 {font-size: 120%; border-bottom: none; } -h5 {font-size: 100%; border-bottom: none; } +h1 { font-size: 160%; font-weight: bold; } +h2 { font-size: 150%; } +h3 { font-size: 140%; border-bottom: none; } +h4 { font-size: 120%; border-bottom: none; } +h5 { font-size: 100%; border-bottom: none; } /* embedded images */ img.media { @@ -133,10 +133,10 @@ margin-bottom: 0; } -div.dokuwiki ol {list-style-type: decimal} -div.dokuwiki ol ol {list-style-type: upper-roman} -div.dokuwiki ol ol ol {list-style-type: lower-alpha} -div.dokuwiki ol ol ol ol {list-style-type: lower-greek} +div.dokuwiki ol { list-style-type: decimal; } +div.dokuwiki ol ol { list-style-type: upper-roman; } +div.dokuwiki ol ol ol { list-style-type: lower-alpha; } +div.dokuwiki ol ol ol ol { list-style-type: lower-greek; } /* the list items overriding the ol definition */ span.li { @@ -176,29 +176,29 @@ } /* footnotes */ -div.footnotes{ - clear:both; +div.footnotes { + clear: both; border-top: 1px solid #000000; padding-left: 1em; margin-top: 1em; } -div.fn{ - font-size:90%; +div.fn { + font-size: 90%; } -a.fn_top{ - vertical-align:super; - font-size:80%; +a.fn_top { + vertical-align: super; + font-size: 80%; } -a.fn_bot{ - vertical-align:super; - font-size:80%; - font-weight:bold; +a.fn_bot { + vertical-align: super; + font-size: 80%; + font-weight: bold; } -acronym{ +acronym { border: 0; } @@ -222,17 +222,17 @@ border: 1px solid #000000; } -.leftalign{ +.leftalign { text-align: left; } -.centeralign{ +.centeralign { text-align: center; } -.rightalign{ +.rightalign { text-align: right; } -.toc, .footerinc, .header, .bar, .user {display:none} +.toc, .footerinc, .header, .bar, .user { display: none; } diff -Naur dokuwiki-2009-02-14/lib/tpl/default/rtl.css dokuwiki-rc2009-12-02/lib/tpl/default/rtl.css --- dokuwiki-2009-02-14/lib/tpl/default/rtl.css 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/tpl/default/rtl.css 2009-12-02 19:50:12.000000000 +0100 @@ -34,7 +34,7 @@ } div.meta div.user { - float: right + float: right; } div.meta div.doc { @@ -72,18 +72,18 @@ } /* special headlines */ -div.dokuwiki h1 {margin-left: 0px; margin-right: 0px;} -div.dokuwiki h2 {margin-left: 0px; margin-right: 20px;} -div.dokuwiki h3 {margin-left: 0px; margin-right: 40px;} -div.dokuwiki h4 {margin-left: 0px; margin-right: 60px;} -div.dokuwiki h5 {margin-left: 0px; margin-right: 80px;} +div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; } +div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; } +div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; } +div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; } +div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; } /* indent different sections */ -div.dokuwiki div.level1 {margin-left: 0px; margin-right: 3px;} -div.dokuwiki div.level2 {margin-left: 0px; margin-right: 23px;} -div.dokuwiki div.level3 {margin-left: 0px; margin-right: 43px;} -div.dokuwiki div.level4 {margin-left: 0px; margin-right: 63px;} -div.dokuwiki div.level5 {margin-left: 0px; margin-right: 83px;} +div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; } +div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; } +div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; } +div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; } +div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; } /* TOC control */ div.dokuwiki div.toc { @@ -105,12 +105,12 @@ div.dokuwiki ul.toc li { background-position: right 0.6em; - padding-right:0.4em; + padding-right: 0.4em; direction: rtl; } div.dokuwiki ul.toc li.clear { - padding-right:0.4em; + padding-right: 0.4em; } div.dokuwiki pre { diff -Naur dokuwiki-2009-02-14/lib/tpl/default/style.ini dokuwiki-rc2009-12-02/lib/tpl/default/style.ini --- dokuwiki-2009-02-14/lib/tpl/default/style.ini 2009-02-14 13:13:25.000000000 +0100 +++ dokuwiki-rc2009-12-02/lib/tpl/default/style.ini 2009-12-02 19:50:12.000000000 +0100 @@ -11,6 +11,8 @@ style.css = screen media.css = screen +_admin.css = screen +_linkwiz.css = screen rtl.css = rtl print.css = print diff -Naur dokuwiki-2009-02-14/README dokuwiki-rc2009-12-02/README --- dokuwiki-2009-02-14/README 2009-02-14 13:13:24.000000000 +0100 +++ dokuwiki-rc2009-12-02/README 2009-12-02 19:50:11.000000000 +0100 @@ -4,6 +4,6 @@ For Installation Instructions see http://www.dokuwiki.org/install -DokuWiki - 2004-2008 (c) by Andreas Gohr -See COPYING for license info +DokuWiki - 2004-2009 (c) Andreas Gohr +See COPYING and file headers for license info diff -Naur dokuwiki-2009-02-14/VERSION dokuwiki-rc2009-12-02/VERSION --- dokuwiki-2009-02-14/VERSION 2009-05-26 16:56:56.000000000 +0200 +++ dokuwiki-rc2009-12-02/VERSION 2009-12-02 20:17:36.000000000 +0100 @@ -1 +1 @@ -2009-02-14b +rc2009-12-02 "Mulled Wine"